Merge branch 'v2.0-integration' into dynamic-middleware-2

Author: EskiMojo14

.github/workflows/tests.yml

@@ -105,7 +105,7 @@ jobs:
       fail-fast: false
       matrix:
         node: ['16.x']
-        ts: ['4.1', '4.2', '4.3', '4.4', '4.5', '4.6', '4.7', '4.8', '4.9.2-rc']
+        ts: ['4.7', '4.8', '4.9', '5.0']
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2

docs/api/immutabilityMiddleware.mdx

@@ -36,8 +36,6 @@ interface ImmutableStateInvariantMiddlewareOptions {
   ignoredPaths?: (string | RegExp)[]
   /** Print a warning if checks take longer than N ms. Default: 32ms */
   warnAfter?: number
-  // @deprecated. Use ignoredPaths
-  ignore?: string[]
 }
 ```
 

docs/package.json

@@ -4,7 +4,6 @@
     "@manaflair/redux-batch": "^1.0.0",
     "@types/nanoid": "^2.1.0",
     "@types/react": "^18.0",
-    "@types/redux-logger": "^3.0.8",
     "async-mutex": "^0.3.2",
     "axios": "^0.20.0",
     "formik": "^2.1.5",

docs/rtk-query/usage/customizing-create-api.mdx

@@ -19,11 +19,16 @@ You can create your own versions of `createApi` by either specifying non-default
 
 ## Customizing the React-Redux Hooks
 
-If you want the hooks to use different versions of `useSelector` or `useDispatch`, such as if you are using a custom context, you can pass these in at module creation:
+If you want the hooks to use different versions of `useSelector`, `useDispatch` and `useStore`, such as if you are using a custom context, you can pass these in at module creation:
 
 ```ts
 import * as React from 'react'
-import { createDispatchHook, ReactReduxContextValue } from 'react-redux'
+import {
+  createDispatchHook,
+  createSelectorHook,
+  createStoreHook,
+  ReactReduxContextValue,
+} from 'react-redux'
 import {
   buildCreateApi,
   coreModule,
@@ -33,7 +38,13 @@ import {
 const MyContext = React.createContext<ReactReduxContextValue>(null as any)
 const customCreateApi = buildCreateApi(
   coreModule(),
-  reactHooksModule({ useDispatch: createDispatchHook(MyContext) })
+  reactHooksModule({
+    hooks: {
+      useDispatch: createDispatchHook(MyContext),
+      useSelector: createSelectorHook(MyContext),
+      useStore: createStoreHook(MyContext),
+    },
+  })
 )
 ```
 
@@ -81,7 +92,7 @@ export const myModule = (): Module<CustomModule> => ({
 
     return {
       injectEndpoint(endpoint, definition) {
-        const anyApi = (api as any) as Api<
+        const anyApi = api as any as Api<
           any,
           Record<string, any>,
           string,

docs/rtk-query/usage/error-handling.mdx

@@ -93,7 +93,13 @@ export const rtkQueryErrorLogger: Middleware =
     // RTK Query uses `createAsyncThunk` from redux-toolkit under the hood, so we're able to utilize these matchers!
     if (isRejectedWithValue(action)) {
       console.warn('We got a rejected action!')
-      toast.warn({ title: 'Async error!', message: action.error.data.message })
+      toast.warn({
+        title: 'Async error!',
+        message:
+          'data' in action.error
+            ? (action.error.data as { message: string }).message
+            : action.error.message,
+      })
     }
 
     return next(action)

docs/tsconfig.json

@@ -18,17 +18,36 @@
     "baseUrl": "..",
     "jsx": "preserve",
     "paths": {
-      "react": [ "../node_modules/@types/react" ],
-      "react-dom": [ "../node_modules/@types/react-dom" ],
-      "@reduxjs/toolkit": ["packages/toolkit/src/index.ts"],
-      "@reduxjs/toolkit/query": ["packages/toolkit/src/query/index.ts"],
+      "react": [
+        "../node_modules/@types/react"
+      ],
+      "react-dom": [
+        "../node_modules/@types/react-dom"
+      ],
+      "@reduxjs/toolkit": [
+        "packages/toolkit/src/index.ts"
+      ],
+      "@reduxjs/toolkit/query": [
+        "packages/toolkit/src/query/index.ts"
+      ],
       "@reduxjs/toolkit/query/react": [
         "packages/toolkit/src/query/react/index.ts"
       ],
-      "@reduxjs/toolkit/dist/query/*": ["packages/toolkit/src/query/*"],
-      "@virtual/*": ["docs/virtual/*"],
-      "your-cool-library": ["docs/virtual/your-cool-library/index.ts"],
-      "petstore-api.generated": ["docs/virtual/petstore-api.generated/index.ts"]
+      "@reduxjs/toolkit/dist/query/*": [
+        "packages/toolkit/src/query/*"
+      ],
+      "@virtual/*": [
+        "docs/virtual/*"
+      ],
+      "your-cool-library": [
+        "docs/virtual/your-cool-library/index.ts"
+      ],
+      "redux-logger": [
+        "docs/virtual/redux-logger/index.ts"
+      ],
+      "petstore-api.generated": [
+        "docs/virtual/petstore-api.generated/index.ts"
+      ]
     }
   }
-}
+}

docs/virtual/redux-logger/index.ts

@@ -0,0 +1,7 @@
+import type { Middleware } from 'redux'
+
+declare const logger: Middleware
+
+export { logger }
+
+export default logger

packages/toolkit/src/createSlice.ts

@@ -19,17 +19,6 @@ import type { Id, NoInfer, Tail } from './tsHelpers'
 import { freezeDraftable } from './utils'
 import type { CombinedSliceReducer, InjectConfig } from './combineSlices'
 
-let hasWarnedAboutObjectNotation = false
-
-/**
- * An action creator attached to a slice.
- *
- * @deprecated please use PayloadActionCreator directly
- *
- * @public
- */
-export type SliceActionCreator<P> = PayloadActionCreator<P>
-
 /**
  * The return value of `createSlice`
  *

packages/toolkit/src/devtoolsExtension.ts

@@ -90,18 +90,6 @@ export interface DevToolsEnhancerOptions {
    * function which takes `state` object and index as arguments, and should return `state` object back.
    */
   stateSanitizer?: <S>(state: S, index: number) => S
-  /**
-   * *string or array of strings as regex* - actions types to be hidden / shown in the monitors (while passed to the reducers).
-   * If `actionsWhitelist` specified, `actionsBlacklist` is ignored.
-   * @deprecated Use actionsDenylist instead.
-   */
-  actionsBlacklist?: string | string[]
-  /**
-   * *string or array of strings as regex* - actions types to be hidden / shown in the monitors (while passed to the reducers).
-   * If `actionsWhitelist` specified, `actionsBlacklist` is ignored.
-   * @deprecated Use actionsAllowlist instead.
-   */
-  actionsWhitelist?: string | string[]
   /**
    * *string or array of strings as regex* - actions types to be hidden / shown in the monitors (while passed to the reducers).
    * If `actionsAllowlist` specified, `actionsDenylist` is ignored.

packages/toolkit/src/immutableStateInvariantMiddleware.ts

@@ -167,8 +167,6 @@ export interface ImmutableStateInvariantMiddlewareOptions {
   ignoredPaths?: IgnorePaths
   /** Print a warning if checks take longer than N ms. Default: 32ms */
   warnAfter?: number
-  // @deprecated. Use ignoredPaths
-  ignore?: string[]
 }
 
 /**
@@ -226,12 +224,8 @@ export function createImmutableStateInvariantMiddleware(
       isImmutable = isImmutableDefault,
       ignoredPaths,
       warnAfter = 32,
-      ignore,
     } = options
 
-    // Alias ignore->ignoredPaths, but prefer ignoredPaths if present
-    ignoredPaths = ignoredPaths || ignore
-
     const track = trackForMutations.bind(null, isImmutable, ignoredPaths)
 
     return ({ getState }) => {