Merge branch 'master' into v2.0-integration

# Conflicts:
#	packages/toolkit/package.json
#	packages/toolkit/src/tests/__snapshots__/serializableStateInvariantMiddleware.test.ts.snap
#	packages/toolkit/src/tests/configureStore.typetest.ts

Author: markerikson

docs/api/immutabilityMiddleware.mdx

@@ -29,11 +29,11 @@ interface ImmutableStateInvariantMiddlewareOptions {
    */
   isImmutable?: IsImmutableFunc
   /** 
-    An array of dot-separated path strings that match named nodes from 
+    An array of dot-separated path strings or RegExps that match named nodes from 
     the root state to ignore when checking for immutability.
     Defaults to undefined
    */
-  ignoredPaths?: string[]
+  ignoredPaths?: (string | RegExp)[]
   /** Print a warning if checks take longer than N ms. Default: 32ms */
   warnAfter?: number
   // @deprecated. Use ignoredPaths

docs/api/otherExports.mdx

@@ -58,10 +58,6 @@ The default immutable update function from the [`immer` library](https://immerjs
 
 [The `current` function](https://immerjs.github.io/immer/current) from the [`immer` library](https://immerjs.github.io/immer/), which takes a snapshot of the current state of a draft and finalizes it (but without freezing). Current is a great utility to print the current state during debugging, and the output of `current` can also be safely leaked outside the producer.
 
-### `original`
-
-[The `original` function](https://immerjs.github.io/immer/original) from the [`immer` library](https://immerjs.github.io/immer/), which returns the original object. This is particularly useful for referential equality check in reducers.
-
 ```ts
 import { createReducer, createAction, current } from '@reduxjs/toolkit'
 
@@ -80,6 +76,10 @@ const todosReducer = createReducer(initialState, (builder) => {
 })
 ```
 
+### `original`
+
+[The `original` function](https://immerjs.github.io/immer/original) from the [`immer` library](https://immerjs.github.io/immer/), which returns the original object. This is particularly useful for referential equality check in reducers.
+
 ### `isDraft`
 
 [The `isDraft` function](https://immerjs.github.io/immer/original) from the [`immer` library](https://immerjs.github.io/immer/), which checks to see if a given value is a Proxy-wrapped "draft" state.

docs/api/serializabilityMiddleware.mdx

@@ -39,16 +39,17 @@ interface SerializableStateInvariantMiddlewareOptions {
   ignoredActions?: string[]
 
   /**
-   * An array of dot-separated path strings to ignore when checking
-   * for serializability, Defaults to ['meta.arg', 'meta.baseQueryMeta']
+   * An array of dot-separated path strings or regular expressions to ignore
+   * when checking for serializability, Defaults to
+   * ['meta.arg', 'meta.baseQueryMeta']
    */
-  ignoredActionPaths?: string[]
+  ignoredActionPaths?: (string | RegExp)[]
 
   /**
-   * An array of dot-separated path strings to ignore when checking
-   * for serializability, Defaults to []
+   * An array of dot-separated path strings or regular expressions to ignore
+   * when checking for serializability, Defaults to []
    */
-  ignoredPaths?: string[]
+  ignoredPaths?: (string | RegExp)[]
   /**
    * Execution time warning threshold. If the middleware takes longer
    * than `warnAfter` ms, a warning will be displayed in the console.

docs/introduction/getting-started.md

@@ -7,6 +7,8 @@ hide_title: true
 
 import LiteYouTubeEmbed from 'react-lite-youtube-embed';
 import 'react-lite-youtube-embed/dist/LiteYouTubeEmbed.css'
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
 
  
 
@@ -46,18 +48,35 @@ npx create-react-app my-app --template redux-typescript
 
 Redux Toolkit is available as a package on NPM for use with a module bundler or in a Node application:
 
+<Tabs>
+  <TabItem value="npm" label="npm" default>
+
 ```bash
-# NPM
 npm install @reduxjs/toolkit
 ```
 
-or
+If you need React bindings:
+
+```bash
+npm install react-redux
+```
+
+  </TabItem>
+  <TabItem value="yarn" label="yarn" default>
 
 ```bash
-# Yarn
 yarn add @reduxjs/toolkit
 ```
 
+If you need React bindings:
+
+```bash
+yarn add react-redux
+```
+
+  </TabItem>
+</Tabs>
+
 It is also available as a precompiled UMD package that defines a `window.RTK` global variable.
 The UMD package can be used as a [`<script>` tag](https://unpkg.com/@reduxjs/toolkit/dist/redux-toolkit.umd.js) directly.
 

docs/rtk-query/api/createApi.mdx

@@ -82,11 +82,15 @@ export const { useGetPokemonByNameQuery } = pokemonApi
 #### baseQuery function arguments
 
 - `args` - The return value of the `query` function for a given endpoint
-- `api` - The `BaseQueryApi` object, containing `signal`, `dispatch`, `getState` and `extra` properties
+- `api` - The `BaseQueryApi` object contains:
   - `signal` - An [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal) object that may be used to abort DOM requests and/or read whether the request is aborted.
+  - `abort` - The [`abort()`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController/abort) method of the AbortController attached to `signal`.
   - `dispatch` - The `store.dispatch` method for the corresponding Redux store
   - `getState` - A function that may be called to access the current store state
   - `extra` - Provided as thunk.extraArgument to the configureStore getDefaultMiddleware option.
+  - `endpoint` - The name of the endpoint. 
+  - `type` - Type of request (`query` or `mutation`).
+  - `forced` - Indicates if a query has been forced.
 - `extraOptions` - The value of the optional `extraOptions` property provided for a given endpoint
 
 #### baseQuery function signature
@@ -106,8 +110,13 @@ export type BaseQueryFn<
 
 export interface BaseQueryApi {
   signal: AbortSignal
+  abort: (reason?: string) => void
   dispatch: ThunkDispatch<any, any, any>
   getState: () => unknown
+  extra: unknown
+  endpoint: string
+  type: 'query' | 'mutation'
+  forced?: boolean
 }
 
 export type QueryReturnValue<T = unknown, E = unknown, M = unknown> =

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

@@ -107,6 +107,7 @@ interface SimpleUsage {
     | EndpointMatcherFunction
     | Array<string | RegExp | EndpointMatcherFunction>
   endpointOverrides?: EndpointOverrides[]
+  flattenArg?: boolean
 }
 
 export type EndpointMatcherFunction = (

docs/rtk-query/usage/customizing-queries.mdx

@@ -177,7 +177,7 @@ See also [Websocket Chat API with a transformed response shape](./streaming-upda
 
 ## Customizing query responses with `transformErrorResponse`
 
-Individual endpoints on [`createApi`](../api/createApi.mdx) accept a [`transformErrorResponse`](../api/createApi.mdx) property which allows manipulation of the errir returned by a query or mutation before it hits the cache.
+Individual endpoints on [`createApi`](../api/createApi.mdx) accept a [`transformErrorResponse`](../api/createApi.mdx) property which allows manipulation of the error returned by a query or mutation before it hits the cache.
 
 `transformErrorResponse` is called with the error that a failed `baseQuery` returns for the corresponding endpoint, and the return value of `transformErrorResponse` is used as the cached error associated with that endpoint call.
 

packages/rtk-codemods/bin/cli.js

@@ -511,7 +511,7 @@ export function findNonSerializableValue(
   path?: string,
   isSerializable?: (value: unknown) => boolean,
   getEntries?: (value: unknown) => [string, any][],
-  ignoredPaths?: readonly string[]
+  ignoredPaths?: readonly (string | RegExp)[]
 ): NonSerializableValue | false
 
 export { freeze }
@@ -762,9 +762,9 @@ export { Selector }
 // @public
 export interface SerializableStateInvariantMiddlewareOptions {
   getEntries?: (value: any) => [string, any][]
-  ignoredActionPaths?: string[]
+  ignoredActionPaths?: (string | RegExp)[]
   ignoredActions?: string[]
-  ignoredPaths?: string[]
+  ignoredPaths?: (string | RegExp)[]
   ignoreState?: boolean
   isSerializable?: (value: any) => boolean
   warnAfter?: number

packages/toolkit/etc/redux-toolkit.api.md

@@ -1,5 +1,5 @@
 export { createEntityAdapter } from './create_adapter'
-export {
+export type {
   Dictionary,
   EntityState,
   EntityAdapter,