Merge remote-tracking branch 'origin/v1.9-integration' into fetchBaseQuery-timeout

Author: phryneas

.github/workflows/size.yml renamed to .github/workflows/size.yml.bak

@@ -31,7 +31,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: ['16.x']
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/test-codegen.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['14.x']
+        node: ['16.x']
 
     steps:
       - name: Checkout repo
@@ -58,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14.x']
+        node: ['16.x']
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -95,8 +95,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14.x']
-        ts: ['4.1', '4.2', '4.3', '4.4', '4.5', '4.6.1-rc', 'next']
+        node: ['16.x']
+        ts: ['4.1', '4.2', '4.3', '4.4', '4.5', '4.6', '4.7']
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2

.github/workflows/tests.yml

@@ -32,4 +32,4 @@ typesversions
 
 .yalc
 yalc.lock
-yalc.sig
+yalc.sig

.gitignore

@@ -98,16 +98,18 @@ For more details on how the `middleware` parameter works and the list of middlew
 
 ### `devTools`
 
-If this is a boolean, it will be used to indicate whether `configureStore` should automatically enable support for [the Redux DevTools browser extension](https://github.com/zalmoxisus/redux-devtools-extension).
+If this is a boolean, it will be used to indicate whether `configureStore` should automatically enable support for [the Redux DevTools browser extension](https://github.com/reduxjs/redux-devtools).
 
 If it is an object, then the DevTools Extension will be enabled, and the options object will be passed to `composeWithDevtools()`. See
-the DevTools Extension docs for [`EnhancerOptions`](https://github.com/zalmoxisus/redux-devtools-extension/blob/master/docs/API/Arguments.md#windowdevtoolsextensionconfig) for
+the DevTools Extension docs for [`EnhancerOptions`](https://github.com/reduxjs/redux-devtools/blob/main/extension/docs/API/Arguments.md) for
 a list of the specific options that are available.
 
 Defaults to `true`.
 
-The Redux DevTools Extension recently added [support for showing action stack traces](https://github.com/zalmoxisus/redux-devtools-extension/blob/d4ef75691ad294646f74bca38b973b19850a37cf/docs/Features/Trace.md) that show exactly where each action was dispatched. Capturing the traces can add a bit of overhead, so the DevTools Extension allows users to configure whether action stack traces are captured.
+#### `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.
+Capturing the traces can add a bit of overhead, so the DevTools Extension allows users to configure whether action stack traces are captured by [setting the 'trace' argument](https://github.com/reduxjs/redux-devtools/blob/main/extension/docs/API/Arguments.md#trace).
 If the DevTools are enabled by passing `true` or an object, then `configureStore` will default to enabling capturing action stack traces in development mode only.
 
 ### `preloadedState`
@@ -137,7 +139,7 @@ of `[offline, applyMiddleware, devToolsExtension]`.
 
 ```ts
 // file: reducers.ts noEmit
-import { Reducer } from '@reduxjs/toolkit'
+import type { Reducer } from '@reduxjs/toolkit'
 declare const rootReducer: Reducer<{}>
 export default rootReducer
 
@@ -154,12 +156,12 @@ const store = configureStore({ reducer: rootReducer })
 
 ```ts no-transpile
 // file: todos/todosReducer.ts noEmit
-import { Reducer } from '@reduxjs/toolkit'
+import type { Reducer } from '@reduxjs/toolkit'
 declare const reducer: Reducer<{}>
 export default reducer
 
 // file: visibility/visibilityReducer.ts noEmit
-import { Reducer } from '@reduxjs/toolkit'
+import type { Reducer } from '@reduxjs/toolkit'
 declare const reducer: Reducer<{}>
 export default reducer
 
@@ -169,8 +171,8 @@ import { configureStore } from '@reduxjs/toolkit'
 // We'll use redux-logger just as an example of adding another middleware
 import logger from 'redux-logger'
 
-// And use redux-batch as an example of adding enhancers
-import { reduxBatch } from '@manaflair/redux-batch'
+// And use redux-batched-subscribe as an example of adding enhancers
+import { batchedSubscribe } from 'redux-batched-subscribe'
 
 import todosReducer from './todos/todosReducer'
 import visibilityReducer from './visibility/visibilityReducer'
@@ -194,17 +196,19 @@ const preloadedState = {
   visibilityFilter: 'SHOW_COMPLETED',
 }
 
+const debounceNotify = _.debounce((notify) => notify())
+
 const store = configureStore({
   reducer,
   middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(logger),
   devTools: process.env.NODE_ENV !== 'production',
   preloadedState,
-  enhancers: [reduxBatch],
+  enhancers: [batchedSubscribe(debounceNotify)],
 })
 
 // The store has been created with these options:
 // - The slice reducers were automatically passed to combineReducers()
 // - redux-thunk and redux-logger were added as middleware
 // - The Redux DevTools Extension is disabled for production
-// - The middleware, batch, and devtools enhancers were composed together
+// - The middleware, batched subscribe, and devtools enhancers were composed together
 ```

.yarn/patches/react-scripts__npm_4.0.2.patch

@@ -149,12 +149,13 @@ This has different uses:
 
 ### As a TypeScript Type Guard
 
-This `match` method is a [TypeScript type guard](https://www.typescriptlang.org/docs/handbook/advanced-types.html#user-defined-type-guards) and can be used to discriminate the `payload` type of an action.
+This `match` method is a [TypeScript type guard](https://www.typescriptlang.org/docs/handbook/2/narrowing.html#using-type-predicates) and can be used to discriminate the `payload` type of an action.
 
 This behavior can be particularly useful when used in custom middlewares, where manual casts might be neccessary otherwise.
 
 ```ts
-import { createAction, Action } from '@reduxjs/toolkit'
+import { createAction } from '@reduxjs/toolkit'
+import type { Action } from '@reduxjs/toolkit'
 
 const increment = createAction<number>('INCREMENT')
 
@@ -171,8 +172,9 @@ function someFunction(action: Action) {
 The `match` method can also be used as a filter method, which makes it powerful when used with redux-observable:
 
 ```ts
-import { createAction, Action } from '@reduxjs/toolkit'
-import { Observable } from 'rxjs'
+import { createAction } from '@reduxjs/toolkit'
+import type { Action } from '@reduxjs/toolkit'
+import type { Observable } from 'rxjs'
 import { map, filter } from 'rxjs/operators'
 
 const increment = createAction<number>('INCREMENT')