Merge branch 'master' into create-slice-creators

Author: EskiMojo14

docs/api/createSlice.mdx

@@ -255,13 +255,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,

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,6 +1,6 @@
 {
   "name": "@rtk-query/graphql-request-base-query",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "author": {
     "name": "Lenz Weber",
     "email": "mail@phryneas.de",
@@ -27,7 +27,7 @@
     "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": {

packages/toolkit/src/query/react/buildHooks.ts

@@ -915,7 +915,12 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
               (_: ApiRootState, lastResult: any) => lastResult,
               (_: ApiRootState) => stableArg,
             ],
-            queryStatePreSelector
+            queryStatePreSelector,
+            {
+              memoizeOptions: {
+                resultEqualityCheck: shallowEqual,
+              },
+            }
           ),
         [select, stableArg]
       )

packages/toolkit/src/query/tests/buildHooks.test.tsx

@@ -35,7 +35,7 @@ import { server } from './mocks/server'
 import type { UnknownAction } from 'redux'
 import type { SubscriptionOptions } from '@reduxjs/toolkit/dist/query/core/apiState'
 import type { SerializedError } from '@reduxjs/toolkit'
-import { createListenerMiddleware, configureStore } from '@reduxjs/toolkit'
+import { createListenerMiddleware, configureStore, createSlice } from '@reduxjs/toolkit'
 import { delay } from '../../utils'
 import type { SubscriptionSelectors } from '../core/buildMiddleware/types'
 import { countObjectKeys } from '../utils/countObjectKeys'
@@ -2052,7 +2052,19 @@ describe('hooks with createApi defaults set', () => {
       }),
     })
 
-    const storeRef = setupApiStore(api)
+    const counterSlice = createSlice({
+      name: "counter",
+      initialState: { count: 0 },
+      reducers: {
+        increment(state) {
+          state.count++
+        }
+      }
+    })
+
+    const storeRef = setupApiStore(api, {
+      counter: counterSlice.reducer,
+    })
 
     expectExactType(api.useGetPostsQuery)(api.endpoints.getPosts.useQuery)
     expectExactType(api.useUpdatePostMutation)(
@@ -2317,6 +2329,52 @@ describe('hooks with createApi defaults set', () => {
       await waitFor(() => expect(getRenderCount()).toBe(3))
     })
 
+    test('useQuery with selectFromResult option does not update when unrelated data in the store changes', async () => {
+      function Posts() {
+        const { posts } = api.endpoints.getPosts.useQuery(undefined, {
+          selectFromResult: ({ data }) => ({
+            // Intentionally use an unstable reference to force a rerender
+            posts: data?.filter((post) => post.name.includes('post')),
+          }),
+        })
+
+        getRenderCount = useRenderCounter()
+
+        return (
+          <div>
+            {posts?.map((post) => (
+              <div key={post.id}>{post.name}</div>
+            ))}
+          </div>
+        )
+      }
+
+      function CounterButton() {
+        return (
+          <div
+            data-testid="incrementButton"
+            onClick={() => storeRef.store.dispatch(counterSlice.actions.increment())}
+          >
+            Increment Count
+          </div>
+        )
+      }
+
+      render(
+        <div>
+          <Posts />
+          <CounterButton />
+        </div>,
+        { wrapper: storeRef.wrapper }
+      )
+
+      await waitFor(() => expect(getRenderCount()).toBe(2))
+
+      const incrementBtn = screen.getByTestId('incrementButton')
+      fireEvent.click(incrementBtn)
+      expect(getRenderCount()).toBe(2)
+    })
+
     test('useQuery with selectFromResult option has a type error if the result is not an object', async () => {
       function SelectedPost() {
         const _res1 = api.endpoints.getPosts.useQuery(undefined, {

packages/toolkit/src/tests/createSlice.test.ts

@@ -631,7 +631,7 @@ describe('createSlice', () => {
         '"create.asyncThunk is not a function"'
       )
     })
-    const createThunkSlice = buildCreateSlice({
+    const createAppSlice = buildCreateSlice({
       creators: { asyncThunk: asyncThunkCreator },
     })
     function pending(state: any[], action: any) {
@@ -648,7 +648,7 @@ describe('createSlice', () => {
     }
 
     test('successful thunk', async () => {
-      const slice = createThunkSlice({
+      const slice = createAppSlice({
         name: 'test',
         initialState: [] as any[],
         reducers: (create) => ({
@@ -691,7 +691,7 @@ describe('createSlice', () => {
     })
 
     test('rejected thunk', async () => {
-      const slice = createThunkSlice({
+      const slice = createAppSlice({
         name: 'test',
         initialState: [] as any[],
         reducers: (create) => ({
@@ -735,7 +735,7 @@ describe('createSlice', () => {
     })
 
     test('with options', async () => {
-      const slice = createThunkSlice({
+      const slice = createAppSlice({
         name: 'test',
         initialState: [] as any[],
         reducers: (create) => ({
@@ -784,7 +784,7 @@ describe('createSlice', () => {
     })
 
     test('has caseReducers for the asyncThunk', async () => {
-      const slice = createThunkSlice({
+      const slice = createAppSlice({
         name: 'test',
         initialState: [],
         reducers: (create) => ({

yarn.lock

@@ -7254,7 +7254,7 @@ __metadata:
     rimraf: ^3.0.2
     typescript: ^4.3.4
   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
   languageName: unknown
   linkType: soft