Merge branch 'master' of https://github.com/reduxjs/redux-toolkit into rn-example-ci

Author: aryaemami59

docs/api/createListenerMiddleware.mdx

@@ -486,21 +486,16 @@ To fix this, the middleware provides types for defining "pre-typed" versions of
 ```ts no-transpile
 // listenerMiddleware.ts
 import { createListenerMiddleware, addListener } from '@reduxjs/toolkit'
-import type { TypedStartListening, TypedAddListener } from '@reduxjs/toolkit'
-
 import type { RootState, AppDispatch } from './store'
 
 export const listenerMiddleware = createListenerMiddleware()
 
-export type AppStartListening = TypedStartListening<RootState, AppDispatch>
-
-export const startAppListening =
-  listenerMiddleware.startListening as AppStartListening
-
-export const addAppListener = addListener as TypedAddListener<
+export const startAppListening = listenerMiddleware.startListening.withTypes<
   RootState,
   AppDispatch
->
+>()
+
+export const addAppListener = addListener.withTypes<RootState, AppDispatch>()
 ```
 
 Then import and use those pre-typed methods in your components.

docs/api/createSlice.mdx

@@ -251,13 +251,12 @@ Instead, import `buildCreateSlice` and `asyncThunkCreator`, and create your own
 ```ts
 import { buildCreateSlice, asyncThunkCreator } from '@reduxjs/toolkit'
 
-// name is up to you
-export const createSliceWithThunks = buildCreateSlice({
+export const createAppSlice = buildCreateSlice({
   creators: { asyncThunk: asyncThunkCreator },
 })
 ```
 
-Then import this `createSlice` as needed instead of the exported version from RTK.
+Then import this `createAppSlice` as needed instead of the exported version from RTK.
 
 :::
 

docs/usage/migrating-rtk-2.md

@@ -657,11 +657,11 @@ In practice, we hope these are reasonable tradeoffs. Creating thunks inside of `
 Here's what the new callback syntax looks like:
 
 ```ts
-const createSliceWithThunks = buildCreateSlice({
+const createAppSlice = buildCreateSlice({
   creators: { asyncThunk: asyncThunkCreator },
 })
 
-const todosSlice = createSliceWithThunks({
+const todosSlice = createAppSlice({
   name: 'todos',
   initialState: {
     loading: false,

docs/usage/nextjs.mdx

@@ -386,7 +386,7 @@ The App Router has four seperate caches including `fetch` request and route cach
 export const dynamic = 'force-dynamic'
 ```
 
-After a mutation you should also invalidate the cache by calling (`revalidatePath`)[https://nextjs.org/docs/app/api-reference/functions/revalidatePath] or (`revalidateTag`)[https://nextjs.org/docs/app/api-reference/functions/revalidateTag] as appropriate.
+After a mutation you should also invalidate the cache by calling [`revalidatePath`](https://nextjs.org/docs/app/api-reference/functions/revalidatePath) or [`revalidateTag`](https://nextjs.org/docs/app/api-reference/functions/revalidateTag) as appropriate.
 
 ### RTK Query
 

packages/rtk-codemods/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reduxjs/rtk-codemods",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "scripts": {
     "lint": "eslint --cache .",
     "test": "vitest",
@@ -39,5 +39,9 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/reduxjs/redux-toolkit.git"
   }
 }

packages/rtk-query-graphql-request-base-query/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@rtk-query/graphql-request-base-query",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "author": {
     "name": "Lenz Weber",
     "email": "mail@phryneas.de",
     "url": "https://phryneas.de/"
   },
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/reduxjs/redux-toolkit.git"
+  },
   "type": "module",
   "source": "src/index.ts",
   "main": "./dist/index.cjs",
@@ -16,17 +20,18 @@
   "scripts": {
     "build": "microbundle",
     "prepack": "rimraf dist/*; yarn build",
-    "dev": "microbundle watch"
+    "dev": "microbundle watch",
+    "test": "true"
   },
   "dependencies": {
-    "graphql-request": "^4.0.0"
+    "graphql-request": "^4.0.0 || ^5.0.0 || ^6.0.0"
   },
   "peerDependencies": {
-    "@reduxjs/toolkit": "^1.7.1",
+    "@reduxjs/toolkit": "^1.7.1 || ^2.0.0",
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "devDependencies": {
-    "@reduxjs/toolkit": "^1.6.0",
+    "@reduxjs/toolkit": "^1.6.0 || ^2.0.0",
     "graphql": "^16.5.0",
     "microbundle": "^0.13.3",
     "rimraf": "^3.0.2",

packages/toolkit/package.json

@@ -57,7 +57,7 @@
     "@testing-library/user-event": "^13.1.5",
     "@types/json-stringify-safe": "^5.0.0",
     "@types/nanoid": "^2.1.0",
-    "@types/node": "^10.14.4",
+    "@types/node": "^20.11.0",
     "@types/query-string": "^6.3.0",
     "@types/react": "^18.0.12",
     "@types/react-dom": "^18.0.5",
@@ -90,7 +90,7 @@
     "tsup": "^7.2.0",
     "tsx": "^3.12.2",
     "typescript": "5.2",
-    "vitest": "^0.30.1",
+    "vitest": "^1.1.3",
     "yargs": "^15.3.1"
   },
   "scripts": {

packages/toolkit/src/createSlice.ts

@@ -350,7 +350,7 @@ interface AsyncThunkCreator<
   State,
   CurriedThunkApiConfig extends PreventCircular<AsyncThunkConfig> = PreventCircular<AsyncThunkConfig>
 > {
-  <ThunkArg extends any, Returned = unknown>(
+  <Returned, ThunkArg = void>(
     payloadCreator: AsyncThunkPayloadCreator<
       Returned,
       ThunkArg,
@@ -369,8 +369,8 @@ interface AsyncThunkCreator<
     CurriedThunkApiConfig
   >
   <
-    ThunkArg extends any,
-    Returned = unknown,
+    Returned,
+    ThunkArg,
     ThunkApiConfig extends PreventCircular<AsyncThunkConfig> = {}
   >(
     payloadCreator: AsyncThunkPayloadCreator<