Merge branch 'master' into create-slice-creators

Author: EskiMojo14

docs/api/createEntityAdapter.mdx

@@ -274,6 +274,39 @@ const booksSlice = createSlice({
 })
 ```
 
+You can also pass in an array of entities or a `Record<EntityId, T>` object to pre-populate the initial state with some entities:
+
+```js
+const booksSlice = createSlice({
+  name: 'books',
+  initialState: booksAdapter.getInitialState(
+    {
+      loading: 'idle',
+    },
+    [
+      { id: 'a', title: 'First' },
+      { id: 'b', title: 'Second' },
+    ],
+  ),
+  reducers: {},
+})
+```
+
+This is equivalent to calling:
+
+```js
+const initialState = booksAdapter.getInitialState({
+  loading: 'idle',
+})
+
+const prePopulatedState = booksAdapter.setAll(initialState, [
+  { id: 'a', title: 'First' },
+  { id: 'b', title: 'Second' },
+])
+```
+
+The first parameter can be `undefined` if no additional properties are needed.
+
 ### Selector Functions
 
 The entity adapter will contain a `getSelectors()` function that returns a set of selectors that know how to read the contents of an entity state object:

docs/api/createSelector.mdx

@@ -9,6 +9,8 @@ hide_title: true
 
 # `createSelector`
 
+## Overview
+
 The `createSelector` utility from the [Reselect library](https://github.com/reduxjs/reselect), re-exported for ease of use.
 
 For more details on using `createSelector`, see:
@@ -24,7 +26,7 @@ allowed using string keypaths as input selectors. This was removed, as it ultima
 the string keypaths made static typing for selectors difficult.
 :::
 
-# `createDraftSafeSelector`
+## `createDraftSafeSelector`
 
 In general, we recommend against using selectors inside of reducers:
 
@@ -86,3 +88,52 @@ const draftSafeSelector = createWeakMapDraftSafeSelector(
 ```
 
 :::
+
+### Defining a Pre-Typed `createDraftSelector`
+
+As of RTK 2.1, you can define a "pre-typed" version of `createDraftSafeSelector` that can have the type for `state` built in. This lets you set up those types once, so you don't have to repeat them each time you call `createDraftSafeSelector`.
+
+```ts no-transpile
+const createTypedDraftSafeSelector =
+  createDraftSafeSelector.withTypes<RootState>()
+```
+
+Import and use the pre-typed `createTypedDraftSafeSelector` function, and it will automatically know that the `state` argument is of type `RootState`.
+
+:::warning Known Limitations
+Currently this approach only works if input selectors are provided as a single array.
+
+If you pass the input selectors as separate inline arguments, the parameter types of the result function will not be inferred. As a workaround you can either
+
+1. Wrap your input selectors in a single array
+2. You can annotate the parameter types of the result function:
+
+```ts no-transpile
+import { createSelector } from 'reselect'
+
+interface Todo {
+  id: number
+  completed: boolean
+}
+
+interface Alert {
+  id: number
+  read: boolean
+}
+
+export interface RootState {
+  todos: Todo[]
+  alerts: Alert[]
+}
+
+export const createTypedDraftSafeSelector =
+  createDraftSafeSelector.withTypes<RootState>()
+
+const selectTodoIds = createTypedDraftSafeSelector(
+  // Type of `state` is set to `RootState`, no need to manually set the type
+  (state) => state.todos,
+  // ❌ Known limitation: Parameter types are not inferred in this scenario
+  // so you will have to manually annotate them.
+  (todos: Todo[]) => todos.map(({ id }) => id),
+)
+```

docs/rtk-query/api/created-api/code-splitting.mdx

@@ -25,7 +25,14 @@ const injectEndpoints = (endpointOptions: InjectedEndpointOptions) =>
 
 interface InjectedEndpointOptions {
   endpoints: (build: EndpointBuilder) => NewEndpointDefinitions
-  overrideExisting?: boolean
+  /**
+   * Optionally allows endpoints to be overridden if defined by multiple `injectEndpoints` calls.
+   *
+   * If set to `true`, will override existing endpoints with the new definition.
+   * If set to `'throw'`, will throw an error if an endpoint is redefined with a different definition.
+   * If set to `false` (or unset), will not override existing endpoints with the new definition, and log a warning in development.
+   */
+  overrideExisting?: boolean | 'throw'
 }
 ```
 

docs/rtk-query/usage/code-splitting.mdx

@@ -56,5 +56,7 @@ export const { useExampleQuery } = extendedApi
 ```
 
 :::tip
-If you inject an endpoint that already exists and don't explicitly specify `overrideExisting: true`, the endpoint will not be overridden. In development mode, you will get a warning about this.
+If you inject an endpoint that already exists and don't explicitly specify `overrideExisting: true`, the endpoint
+will not be overridden. In development mode, you will get a warning about this if `overrideExisting` is set to `false`,
+and an error will be throw if set to `'throw'`.
 :::

docs/tsconfig.json

@@ -23,15 +23,13 @@
       "@reduxjs/toolkit": ["packages/toolkit/src/index.ts"],
       "@reduxjs/toolkit/query": ["packages/toolkit/src/query/index.ts"],
       "@reduxjs/toolkit/query/react": [
-        "packages/toolkit/src/query/react/index.ts",
+        "packages/toolkit/src/query/react/index.ts"
       ],
       "@reduxjs/toolkit/dist/query/*": ["packages/toolkit/src/query/*"],
       "@virtual/*": ["docs/virtual/*"],
       "your-cool-library": ["docs/virtual/your-cool-library/index.ts"],
       "redux-logger": ["docs/virtual/redux-logger/index.ts"],
-      "petstore-api.generated": [
-        "docs/virtual/petstore-api.generated/index.ts",
-      ],
-    },
-  },
+      "petstore-api.generated": ["docs/virtual/petstore-api.generated/index.ts"]
+    }
+  }
 }

docs/usage/nextjs.mdx

@@ -380,7 +380,7 @@ It is worth noting that initializing the store with a `useEffect` would not work
 
 ### Caching
 
-The App Router has four seperate caches including `fetch` request and route caches. The most likely cache to cause issues is the route cache. If you have an application that accepts login you may have routes (e.g. the home route, `/`) that render different data based on the user you will need to disable the route cache by using the [`dynamic` export from the route handler](https://nextjs.org/docs/app/api-reference/file-conventions/route-segment-config#dynamic):
+The App Router has four separate caches including `fetch` request and route caches. The most likely cache to cause issues is the route cache. If you have an application that accepts login you may have routes (e.g. the home route, `/`) that render different data based on the user you will need to disable the route cache by using the [`dynamic` export from the route handler](https://nextjs.org/docs/app/api-reference/file-conventions/route-segment-config#dynamic):
 
 ```ts
 export const dynamic = 'force-dynamic'

docs/virtual/petstore-api.generated/petstore-api.generated.ts

@@ -14,7 +14,7 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx",
+    "jsx": "react-jsx"
   },
-  "include": ["src"],
+  "include": ["src"]
 }

examples/action-listener/counter/tsconfig.json

@@ -50,7 +50,7 @@
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.10",
     "playwright": "^1.31.1",
-    "prettier": "^3.2.4",
+    "prettier": "^3.2.5",
     "serve": "^14.2.0",
     "typescript": "^4.9.4"
   }

examples/publish-ci/cra4/package.json

@@ -14,7 +14,7 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx",
+    "jsx": "react-jsx"
   },
-  "include": ["src"],
+  "include": ["src"]
 }