Merge branch 'v2.0-integration' into feature/EntityAdapter-DraftableEntityState

Author: markerikson

.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

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/configureStore.mdx

@@ -100,18 +100,15 @@ If it is an object of slice reducers, like `{users : usersReducer, posts : posts
 
 ### `middleware`
 
-An optional array of Redux middleware functions, or a callback to customise the array of middleware.
+A callback which will receive `getDefaultMiddleware` as its argument,
+and should return a middleware array.
 
-If this option is provided, it should contain all the middleware functions you
+If this option is provided, it should return all the middleware functions you
 want added to the store. `configureStore` will automatically pass those to `applyMiddleware`.
 
 If not provided, `configureStore` will call `getDefaultMiddleware` and use the
 array of middleware functions it returns.
 
-Where you wish to add onto or customize the default middleware,
-you may pass a callback function that will receive `getDefaultMiddleware` as its argument,
-and should return a middleware array.
-
 For more details on how the `middleware` parameter works and the list of middleware that are added by default, see the
 [`getDefaultMiddleware` docs page](./getDefaultMiddleware.mdx).
 
@@ -123,7 +120,7 @@ import { configureStore, Tuple } from '@reduxjs/toolkit'
 
 configureStore({
   reducer: rootReducer,
-  middleware: new Tuple(additionalMiddleware, logger),
+  middleware: () => new Tuple(additionalMiddleware, logger),
 })
 ```
 
@@ -178,11 +175,6 @@ If you provide an array, this `applyMiddleware` enhancer will _not_ be used.
 `configureStore` will warn in console if any middleware are provided (or left as default) but not included in the final list of enhancers.
 
 ```ts no-transpile
-// warns - middleware left as default but not included in final enhancers
-configureStore({
-  reducer,
-  enhancers: [offline(offlineConfig)],
-})
 // warns - middleware customised but not included in final enhancers
 configureStore({
   reducer,
@@ -199,8 +191,8 @@ configureStore({
 // also allowed
 configureStore({
   reducer,
-  middleware: [],
-  enhancers: [offline(offlineConfig)],
+  middleware: () => [],
+  enhancers: ()  => [offline(offlineConfig)],
 })
 ```
 
@@ -209,20 +201,22 @@ configureStore({
 :::note Tuple
 Typescript users are required to use a `Tuple` instance (if not using a `getDefaultEnhancer` result, which is already a `Tuple`), for better inference.
 
+```
 import { configureStore, Tuple } from '@reduxjs/toolkit'
 
 configureStore({
 reducer: rootReducer,
-enhancers: new Tuple(offline),
+enhancers: () => new Tuple(offline),
 })
 
-````
+```
 
 Javascript-only users are free to use a plain array if preferred.
 
 :::
 
 ## Usage
+
 ### Basic Example
 
 ```ts
@@ -238,7 +232,7 @@ import rootReducer from './reducers'
 
 const store = configureStore({ reducer: rootReducer })
 // The store now has redux-thunk added and the Redux DevTools Extension is turned on
-````
+```
 
 ### Full Example
 

docs/api/getDefaultMiddleware.mdx

@@ -28,7 +28,7 @@ If you want to customize the list of middleware, you can supply an array of midd
 ```js
 const store = configureStore({
   reducer: rootReducer,
-  middleware: new Tuple(thunk, logger),
+  middleware: () => new Tuple(thunk, logger),
 })
 
 // Store specifically has the thunk and logger middleware applied

docs/api/immutabilityMiddleware.mdx

@@ -86,7 +86,7 @@ const immutableInvariantMiddleware = createImmutableStateInvariantMiddleware({
 const store = configureStore({
   reducer: exampleSliceReducer,
   // Note that this will replace all default middleware
-  middleware: new Tuple(immutableInvariantMiddleware),
+  middleware: () => new Tuple(immutableInvariantMiddleware),
 })
 ```
 

docs/api/serializabilityMiddleware.mdx

@@ -111,7 +111,7 @@ const serializableMiddleware = createSerializableStateInvariantMiddleware({
 
 const store = configureStore({
   reducer,
-  middleware: new Tuple(serializableMiddleware),
+  middleware: () => new Tuple(serializableMiddleware),
 })
 ```
 

docs/usage/usage-with-typescript.md

@@ -145,7 +145,7 @@ import { configureStore, Tuple } from '@reduxjs/toolkit'
 
 configureStore({
   reducer: rootReducer,
-  middleware: new Tuple(additionalMiddleware, logger),
+  middleware: () => new Tuple(additionalMiddleware, logger),
 })
 ```
 

errors.json

@@ -29,5 +29,7 @@
   "27": "Warning: Middleware for RTK-Query API at reducerPath \"\" has not been added to the store.\n    You must add the middleware for RTK-Query to function correctly!",
   "28": "Cannot refetch a query that has not been started yet.",
   "29": "`builder.addCase` cannot be called with an empty action type",
-  "30": "`builder.addCase` cannot be called with two reducers for the same action type"
-}
+  "30": "`builder.addCase` cannot be called with two reducers for the same action type",
+  "31": "\"middleware\" field must be a callback",
+  "32": "When using custom hooks for context, all  hooks need to be provided: .\\nHook  was either not provided or not a function."
+}

examples/publish-ci/cra4/package.json

@@ -4,10 +4,10 @@
   "private": true,
   "dependencies": {
     "@reduxjs/toolkit": "^2.0.0-beta.2",
-    "msw": "^0.49.2",
+    "msw": "^1.3.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-redux": "^9.0.0-alpha.1",
+    "react-redux": "^9.0.0-beta.0",
     "react-scripts": "^4",
     "web-vitals": "^2.1.4"
   },

examples/publish-ci/cra4/public/mockServiceWorker.js

@@ -2,7 +2,7 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker (0.49.3).
+ * Mock Service Worker (1.3.2).
  * @see https://github.com/mswjs/msw
  * - Please do NOT modify this file.
  * - Please do NOT serve this file on production.