Merge branch 'master' into combineslices-example

Author: EskiMojo14

.codesandbox/ci.json

@@ -8,7 +8,7 @@
     "/examples/lazy-injection/kitchen-sink",
     "/examples/publish-ci/cra5"
   ],
-  "node": "18",
+  "node": "20",
   "buildCommand": "build:packages",
   "packages": [
     "packages/toolkit",

.github/workflows/publish.yml

@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '20.x'
+          node-version: '22.x'
           registry-url: 'https://registry.npmjs.org'
           cache: 'yarn'
       - run: yarn install --frozen-lockfile

.github/workflows/size.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - master
+      - 'feature/infinite-query-integration'
 permissions:
   pull-requests: write
 jobs:

.github/workflows/test-codegen.yml

@@ -39,7 +39,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ['20.x']
+        node-version: ['22.x']
         os: [ubuntu-latest]
 
     steps:
@@ -79,7 +79,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [20.x]
+        node-version: [22.x]
         os: [ubuntu-latest]
 
     steps:
@@ -125,7 +125,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [20.x]
+        node-version: [22.x]
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4

.github/workflows/tests.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['20.x']
+        node: ['22.x']
 
     steps:
       - name: Checkout repo
@@ -62,13 +62,27 @@ jobs:
           path: packages/toolkit/package.tgz
 
   test-dist:
-    name: Test against dist
+    name: Run local tests against build artifact (React ${{ matrix.react.version }})
     needs: [build]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        node: ['20.x']
+        node: ['22.x']
+        react:
+          [
+            {
+              version: '^18',
+              types: ^18,
+              react-dom: { version: '^18', types: '^18' },
+            },
+            {
+              version: '^19',
+              types: '^19',
+              react-dom: { version: '^19', types: '^19' },
+            },
+          ]
+
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -82,36 +96,63 @@ jobs:
       - name: Install deps
         run: yarn install
 
-      - uses: actions/download-artifact@v4
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
         with:
           name: package
           path: packages/toolkit
 
-      - run: ls -lah
+      - name: Check folder contents
+        run: ls -lah
+
+      - name: Install React ${{ matrix.react.version }} and React-DOM ${{ matrix.react.react-dom.version }}
+        run: yarn up react@${{ matrix.react.version }} react-dom@${{ matrix.react.react-dom.version }} @types/react@${{ matrix.react.types }} @types/react-dom@${{ matrix.react.react-dom.types }}
 
       - name: Install build artifact
         run: yarn workspace @reduxjs/toolkit add $(pwd)/package.tgz
 
-      - run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json
-
-      - name: Run tests, against dist
-        env:
-          TEST_DIST: true
-        run: yarn test
+      - name: Erase path aliases
+        run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json
 
       - name: Run type tests with `moduleResolution Bundler`
         run: rm -rf dist && yarn tsc -p . --moduleResolution Bundler --module ESNext --noEmit false --declaration --emitDeclarationOnly --outDir dist --target ESNext && rm -rf dist
 
+      - name: Ensure there's no dist folder
+        run: rm -rf dist
+
+      - name: Change RTK package name to ensure node_modules is used
+        run: sed -i -e 's|@reduxjs/toolkit|@reduxjs/toolkit-test|' ./package.json
+
+      - name: Run tests, against installed artifact
+        env:
+          TEST_DIST: true
+        working-directory: ./packages/toolkit
+        run: ../../node_modules/.bin/vitest --run --typecheck
+
   test-types:
-    name: 'Test Types: TS ${{ matrix.ts }}'
+    name: 'Test Types: TS ${{ matrix.ts }} and React ${{ matrix.react.version }}'
 
     needs: [build]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        node: ['20.x']
-        ts: ['5.0', '5.1', '5.2', '5.3', '5.4', '5.5']
+        node: ['22.x']
+        ts: ['5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7', '5.8']
+        react:
+          [
+            {
+              version: '^18',
+              types: ^18,
+              react-dom: { version: '^18', types: '^18' },
+            },
+            {
+              version: '^19',
+              types: '^19',
+              react-dom: { version: '^19', types: '^19' },
+            },
+          ]
+
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -125,6 +166,9 @@ jobs:
       - name: Install deps
         run: yarn install
 
+      - name: Install React ${{ matrix.react.version }} and React-DOM ${{ matrix.react.react-dom.version }}
+        run: yarn up react@${{ matrix.react.version }} react-dom@${{ matrix.react.react-dom.version }} @types/react@${{ matrix.react.types }} @types/react-dom@${{ matrix.react.react-dom.types }}
+
       - name: Install TypeScript ${{ matrix.ts }}
         run: yarn add typescript@${{ matrix.ts }}
 
@@ -139,7 +183,8 @@ jobs:
       - name: Show installed RTK versions
         run: yarn info @reduxjs/toolkit
 
-      - run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json
+      - name: Erase path aliases
+        run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json
 
       - name: Test types
         env:
@@ -156,7 +201,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['20.x']
+        node: ['22.x']
         example:
           [
             'cra4',
@@ -203,12 +248,13 @@ jobs:
       - name: Show installed RTK versions
         run: yarn info @reduxjs/toolkit && yarn why @reduxjs/toolkit
 
-      - name: Set up JDK 17 for React Native build
+      - name: Set up JDK 21 for React Native build
         if: matrix.example == 'react-native' || matrix.example == 'expo'
         uses: actions/setup-java@v4
         with:
-          java-version: '17.x'
+          java-version: '21.x'
           distribution: 'temurin'
+          cache: 'gradle'
 
       - name: Build example
         env:
@@ -226,7 +272,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['20.x']
+        node: ['22.x']
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -258,8 +304,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['20.x']
-        ts: ['5.3', '5.4', '5.5', 'next']
+        node: ['22.x']
+        ts: ['5.3', '5.4', '5.5', '5.6', '5.7', '5.8', 'next']
         example:
           [
             { name: 'bundler', moduleResolution: 'Bundler' },

.yarn/patches/console-testing-library-npm-0.6.1-4d9957d402.patch

@@ -64,6 +64,11 @@ interface ConfigureStoreOptions<
    */
   devTools?: boolean | DevToolsOptions
 
+  /**
+   * Whether to check for duplicate middleware instances. Defaults to `true`.
+   */
+  duplicateMiddlewareCheck?: boolean
+
   /**
    * The initial state, same as Redux's createStore.
    * You may optionally specify it to hydrate the state
@@ -142,6 +147,12 @@ a list of the specific options that are available.
 
 Defaults to `true`.
 
+### `duplicateMiddlewareCheck`
+
+If enabled, the store will check the final middleware array to see if there are any duplicate middleware references. This will catch issues like accidentally adding the same RTK Query API middleware twice (such as adding both the base API middleware and an injected API middleware, which are actually the exact same function reference).
+
+Defaults to `true`.
+
 #### `trace`
 
 The Redux DevTools Extension recently added [support for showing action stack traces](https://github.com/reduxjs/redux-devtools/blob/main/extension/docs/Features/Trace.md) that show exactly where each action was dispatched.

.yarn/patches/console-testing-library__npm_0.3.1.patch

@@ -108,7 +108,7 @@ An object with the following optional fields:
 
 - `condition(arg, { getState, extra } ): boolean | Promise<boolean>`: a callback that can be used to skip execution of the payload creator and all action dispatches, if desired. See [Canceling Before Execution](#canceling-before-execution) for a complete description.
 - `dispatchConditionRejection`: if `condition()` returns `false`, the default behavior is that no actions will be dispatched at all. If you still want a "rejected" action to be dispatched when the thunk was canceled, set this flag to `true`.
-- `idGenerator(arg): string`: a function to use when generating the `requestId` for the request sequence. Defaults to use [nanoid](./otherExports.mdx/#nanoid), but you can implement your own ID generation logic.
+- `idGenerator(arg): string`: a function to use when generating the `requestId` for the request sequence. Defaults to use [nanoid](./otherExports.mdx#nanoid), but you can implement your own ID generation logic.
 - `serializeError(error: unknown) => any` to replace the internal `miniSerializeError` method with your own serialization logic.
 - `getPendingMeta({ arg, requestId }, { getState, extra }): any`: a function to create an object that will be merged into the `pendingAction.meta` field.
 
@@ -133,6 +133,18 @@ When dispatched, the thunk will:
   - if the promise failed and was not handled with `rejectWithValue`, dispatch the `rejected` action with a serialized version of the error value as `action.error`
 - Return a fulfilled promise containing the final dispatched action (either the `fulfilled` or `rejected` action object)
 
+## Thunk Dispatch Options
+
+The returned thunk action creator accepts an optional second argument with the following options:
+
+- `signal`: an optional [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal) that will be tracked by the internal abort signal (see [Canceling While Running](#canceling-while-running))
+
+```ts no-transpile
+const externalController = new AbortController()
+dispatch(fetchUserById(123, { signal: externalController.signal }))
+externalController.abort()
+```
+
 ## Promise Lifecycle Actions
 
 `createAsyncThunk` will generate three Redux action creators using [`createAction`](./createAction.mdx): `pending`, `fulfilled`, and `rejected`. Each lifecycle action creator will be attached to the returned thunk action creator so that your reducer logic can reference the action types and respond to the actions when dispatched. Each action object will contain the current unique `requestId` and `arg` values under `action.meta`.

docs/api/configureStore.mdx

@@ -341,7 +341,7 @@ const globalizedSelectors = booksAdapter.getSelectors((state) => state.books, {
 })
 ```
 
-If no instance is passed, it will default to [`createDraftSafeSelector`](./createSelector#createDraftSafeSelector).
+If no instance is passed, it will default to [`createDraftSafeSelector`](./createSelector.mdx#createdraftsafeselector).
 
 :::
 
@@ -377,6 +377,8 @@ If `updateMany()` is called with multiple updates targeted to the same ID, they
 
 For both `updateOne()` and `updateMany()`, changing the ID of one existing entity to match the ID of a second existing entity will cause the first to replace the second completely.
 
+Additionally, if there is no item for that ID, the update will be silently ignored.
+
 ## Examples
 
 Exercising several of the CRUD methods and selectors: