Merge branch 'v2.0-integration' into pr/configure-produce-implementation

Author: ben.durrant

.github/FUNDING.yml

@@ -1 +1 @@
-github: [phryneas, markerikson]
+github: [phryneas, markerikson, EskiMojo14]

.github/workflows/tests.yml

@@ -105,7 +105,7 @@ jobs:
       fail-fast: false
       matrix:
         node: ['16.x']
-        ts: ['4.7', '4.8', '4.9', '5.0']
+        ts: ['4.7', '4.8', '4.9', '5.0', '5.1', '5.2']
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -149,16 +149,7 @@ jobs:
       fail-fast: false
       matrix:
         node: ['16.x']
-        example:
-          [
-            'cra4',
-            'cra5',
-            'next',
-            'vite',
-            'node-standard',
-            'node-esm',
-            'are-the-types-wrong',
-          ]
+        example: ['cra4', 'cra5', 'next', 'vite', 'node-standard', 'node-esm']
     defaults:
       run:
         working-directory: ./examples/publish-ci/${{ matrix.example }}
@@ -197,9 +188,27 @@ jobs:
 
       - name: Run test step
         run: yarn test
-        if: matrix.example != 'are-the-types-wrong'
 
-      - name: Run test step (attw)
-        # Ignore "FalseCJS" errors in the `attw` job
-        run: yarn test -n FalseCJS
-        if: matrix.example == 'are-the-types-wrong'
+  are-the-types-wrong:
+    name: Check package config with are-the-types-wrong
+
+    needs: [build]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        node: ['16.x']
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: package
+          path: packages/toolkit
+
+      - name: show folder
+        run: ls -l .
+
+      - name: Run are-the-types-wrong
+        run: npx @arethetypeswrong/cli ./package.tgz --format table --ignore-rules false-cjs

docs/api/actionCreatorMiddleware.mdx

@@ -63,6 +63,6 @@ const actionCreatorMiddleware = createActionCreatorInvariantMiddleware({
 
 const store = configureStore({
   reducer,
-  middleware: new Tuple(actionCreatorMiddleware),
+  middleware: () => new Tuple(actionCreatorMiddleware),
 })
 ```

docs/api/autoBatchEnhancer.mdx

@@ -48,14 +48,9 @@ const counterSlice = createSlice({
 })
 const { incrementBatched, decrementUnbatched } = counterSlice.actions
 
+// includes batch enhancer by default, as of RTK 2.0
 const store = configureStore({
   reducer: counterSlice.reducer,
-  // highlight-start
-  enhancers: (getDefaultEnhancers) => {
-    // Add the autobatch enhancer to the store setup
-    return getDefaultEnhancers().concat(autoBatchEnhancer())
-  },
-  // highlight-end
 })
 ```
 
@@ -74,6 +69,25 @@ type AutoBatchOptions =
 export type autoBatchEnhancer = (options?: AutoBatchOptions) => StoreEnhancer
 ```
 
+:::tip
+As of RTK 2.0, the `autoBatchEnhancer` is included by default when calling `configureStore`.
+
+This means to configure it, you should instead pass an callback that receives `getDefaultEnhancers` and calls it with your desired settings.
+
+```ts title="Configuring autoBatchEnhancer with getDefaultEnhancers"
+import { configureStore } from '@reduxjs/toolkit'
+
+const store = configureStore({
+  reducer: () => 0,
+  enhancers: (getDefaultEnhancers) =>
+    getDefaultEnhancers({
+      autoBatch: { type: 'tick' },
+    }),
+})
+```
+
+:::
+
 Creates a new instance of the autobatch store enhancer.
 
 Any action that is tagged with `action.meta[SHOULD_AUTOBATCH] = true` will be treated as "low-priority", and a notification callback will be queued. The enhancer will delay notifying subscribers until either:
@@ -140,4 +154,4 @@ This allows Redux users to selectively tag certain actions for effective batchin
 
 ### RTK Query and Batching
 
-RTK Query already marks several of its key internal action types as batchable. If you add the `autoBatchEnhancer` to the store setup, it will improve the overall UI performance, especially when rendering large lists of components that use the RTKQ query hooks.
+RTK Query already marks several of its key internal action types as batchable. By adding the `autoBatchEnhancer` to the store setup, it improves the overall UI performance, especially when rendering large lists of components that use the RTKQ query hooks.

docs/api/codemods.mdx

@@ -9,11 +9,15 @@ hide_title: true
 
 # Codemods
 
-Per [the description in `1.9.0-alpha.0`](https://github.com/reduxjs/redux-toolkit/releases/tag/v1.9.0-alpha.0), we plan to remove the "object" argument from `createReducer` and `createSlice.extraReducers` in the future RTK 2.0 major version. In `1.9.0-alpha.0`, we added a one-shot runtime warning to each of those APIs.
+Per [the description in `1.9.0`](https://github.com/reduxjs/redux-toolkit/releases/tag/v1.9.0), we have removed the "object" argument from `createReducer` and `createSlice.extraReducers` in the RTK 2.0 major version. We've also added a new optional form of `createSlice.reducers` that uses a callback instead of an object.
 
 To simplify upgrading codebases, we've published a set of codemods that will automatically transform the deprecated "object" syntax into the equivalent "builder" syntax.
 
-The codemods package is available on NPM as [**`@reduxjs/rtk-codemods`**](https://www.npmjs.com/package/@reduxjs/rtk-codemods). It currently contains two codemods: `createReducerBuilder` and `createSliceBuilder`.
+The codemods package is available on NPM as [**`@reduxjs/rtk-codemods`**](https://www.npmjs.com/package/@reduxjs/rtk-codemods). It currently contains these codemods:
+
+- `createReducerBuilder`: migrates `createReducer` calls that use the removed object syntax to the builder callback syntax
+- `createSliceBuilder`: migrates `createSlice` calls that use the removed object syntax for `extraReducers` to the builder callback syntax
+- `createSliceReducerBuilder`: migrates `createSlice` calls that use the still-standard object syntax for `reducers` to the optional new builder callback syntax, including uses of prepared reducers
 
 To run the codemods against your codebase, run `npx @reduxjs/rtk-codemods <TRANSFORM NAME> path/of/files/ or/some**/*glob.js`.