Merge pull request #5120 from reduxjs/vitest-bumps

aryaemami59 · web-flow · commit 3615d1ae6806 · 2025-12-13T16:14:23.000-06:00
bump vitest to v4
diff --git a/examples/publish-ci/vite/package.json b/examples/publish-ci/vite/package.json
@@ -26,12 +26,12 @@
     "@types/node": "^17.0.45",
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.10",
-    "@vitejs/plugin-react": "^3.0.0",
+    "@vitejs/plugin-react": "^5",
     "playwright": "^1.31.1",
     "prettier": "^3.2.5",
     "serve": "^14.2.0",
     "typescript": "^5.8.2",
-    "vite": "^4.2.1"
+    "vite": "^7"
   },
   "msw": {
     "workerDirectory": "public"
diff --git a/examples/query/react/infinite-queries/package.json b/examples/query/react/infinite-queries/package.json
@@ -31,13 +31,13 @@
     "@types/react": "18.3.12",
     "@types/react-dom": "18.3.1",
     "@types/react-native-web": "^0.19",
-    "@vitejs/plugin-react": "^4.2.1",
+    "@vitejs/plugin-react": "^5",
     "jsdom": "^23.2.0",
     "msw": "^2.6.6",
     "prettier": "^3.2.1",
     "typescript": "^5.8.2",
-    "vite": "^5.0.0",
-    "vitest": "^1.2.0"
+    "vite": "^7",
+    "vitest": "^4"
   },
   "resolutions": {
     "@types/react": "18.3.12",
diff --git a/examples/query/react/infinite-queries/src/App.test.tsx b/examples/query/react/infinite-queries/src/App.test.tsx
diff --git a/packages/rtk-codemods/package.json b/packages/rtk-codemods/package.json
@@ -36,7 +36,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.2.5",
-    "vitest": "^1.6.0"
+    "vitest": "^4"
   },
   "engines": {
     "node": ">= 16"
diff --git a/packages/rtk-query-codegen-openapi/package.json b/packages/rtk-query-codegen-openapi/package.json
@@ -71,7 +71,7 @@
     "ts-node": "^10.9.2",
     "tsup": "^8.4.0",
     "vite-tsconfig-paths": "^5.0.1",
-    "vitest": "^2.0.5",
+    "vitest": "^4",
     "yalc": "^1.0.0-pre.47"
   },
   "dependencies": {
diff --git a/packages/rtk-query-codegen-openapi/tsconfig.json b/packages/rtk-query-codegen-openapi/tsconfig.json
@@ -24,6 +24,6 @@
     "sourceMap": true,
     "strict": true,
     "target": "ESNext",
-    "types": ["vitest/globals", "vitest/importMeta"]
+    "types": ["vitest/globals", "vitest/importMeta", "node"]
   }
 }
diff --git a/packages/rtk-query-graphql-request-base-query/package.json b/packages/rtk-query-graphql-request-base-query/package.json
@@ -38,7 +38,7 @@
     "microbundle": "^0.13.3",
     "rimraf": "^3.0.2",
     "typescript": "^5.8.2",
-    "vitest": "^1.6.0"
+    "vitest": "^4"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/rtk-query-graphql-request-base-query/tsconfig.json b/packages/rtk-query-graphql-request-base-query/tsconfig.json
@@ -11,7 +11,7 @@
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true,
-    "types": ["vitest/globals"]
+    "types": ["vitest/globals", "vitest/importMeta", "node"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -235,7 +235,7 @@
     "typescript": "^5.8.2",
     "valibot": "^1.0.0",
     "vite-tsconfig-paths": "^4.3.1",
-    "vitest": "^1.6.0",
+    "vitest": "^4",
     "yargs": "^15.3.1"
   },
   "scripts": {
diff --git a/packages/toolkit/src/entities/state_selectors.ts b/packages/toolkit/src/entities/state_selectors.ts
@@ -2,11 +2,7 @@ import type { CreateSelectorFunction, Selector } from 'reselect'
 import { createDraftSafeSelector } from '../createDraftSafeSelector'
 import type { EntityId, EntitySelectors, EntityState } from './models'
 
-type AnyFunction = (...args: any) => any
-type AnyCreateSelectorFunction = CreateSelectorFunction<
-  <F extends AnyFunction>(f: F) => F,
-  <F extends AnyFunction>(f: F) => F
->
+type AnyCreateSelectorFunction = CreateSelectorFunction<any, any, any>
 
 export type GetSelectorsOptions = {
   createSelector?: AnyCreateSelectorFunction
diff --git a/packages/toolkit/src/query/core/module.ts b/packages/toolkit/src/query/core/module.ts
@@ -74,6 +74,7 @@ import { createSelector as _createSelector } from './rtkImports'
 import { onFocus, onFocusLost, onOffline, onOnline } from './setupListeners'
 import type { InternalMiddlewareState } from './buildMiddleware/types'
 import { getOrInsertComputed } from '../utils'
+import type { CreateSelectorFunction } from 'reselect'
 
 /**
  * `ifOlderThan` - (default: `false` | `number`) - _number is value in seconds_
@@ -492,7 +493,7 @@ export interface CoreModuleOptions {
   /**
    * A selector creator (usually from `reselect`, or matching the same signature)
    */
-  createSelector?: typeof _createSelector
+  createSelector?: CreateSelectorFunction<any, any, any>
 }
 
 /**
diff --git a/packages/toolkit/src/query/react/module.ts b/packages/toolkit/src/query/react/module.ts
@@ -16,6 +16,7 @@ import {
   useSelector as rrUseSelector,
   useStore as rrUseStore,
 } from 'react-redux'
+import type { CreateSelectorFunction } from 'reselect'
 import { createSelector as _createSelector } from 'reselect'
 import {
   isInfiniteQueryDefinition,
@@ -130,7 +131,7 @@ export interface ReactHooksModuleOptions {
   /**
    * A selector creator (usually from `reselect`, or matching the same signature)
    */
-  createSelector?: typeof _createSelector
+  createSelector?: CreateSelectorFunction<any, any, any>
 }
 
 /**
diff --git a/packages/toolkit/src/query/tests/buildHooks.test-d.tsx b/packages/toolkit/src/query/tests/buildHooks.test-d.tsx
@@ -322,37 +322,6 @@ describe('type tests', () => {
       SelectedResult
     > = (state) => ({ posts: state.data?.posts ?? EMPTY_ARRAY })
 
-    expectTypeOf<
-      TypedQueryStateSelector<
-        PostsApiResponse,
-        QueryArgument,
-        BaseQueryFunction,
-        SelectedResult
-      >
-    >().toEqualTypeOf<
-      QueryStateSelector<
-        SelectedResult,
-        QueryDefinition<
-          QueryArgument,
-          BaseQueryFunction,
-          string,
-          PostsApiResponse
-        >
-      >
-    >()
-
-    expectTypeOf(typedSelectFromResult).toEqualTypeOf<
-      QueryStateSelector<
-        SelectedResult,
-        QueryDefinition<
-          QueryArgument,
-          BaseQueryFunction,
-          string,
-          PostsApiResponse
-        >
-      >
-    >()
-
     function PostsList() {
       const { posts } = useGetPostsQuery(undefined, {
         selectFromResult: typedSelectFromResult,
diff --git a/packages/toolkit/src/query/tests/createApi.test.ts b/packages/toolkit/src/query/tests/createApi.test.ts
@@ -1219,8 +1219,8 @@ describe('endpoint schemas', () => {
     stack: expect.any(String),
   } satisfies SerializedError
 
-  const onSchemaFailureGlobal = vi.fn<Parameters<SchemaFailureHandler>>()
-  const onSchemaFailureEndpoint = vi.fn<Parameters<SchemaFailureHandler>>()
+  const onSchemaFailureGlobal = vi.fn<SchemaFailureHandler>()
+  const onSchemaFailureEndpoint = vi.fn<SchemaFailureHandler>()
   afterEach(() => {
     onSchemaFailureGlobal.mockClear()
     onSchemaFailureEndpoint.mockClear()
diff --git a/packages/toolkit/src/query/tests/infiniteQueries.test-d.ts b/packages/toolkit/src/query/tests/infiniteQueries.test-d.ts
@@ -78,9 +78,11 @@ describe('Infinite queries', () => {
 
     expectTypeOf(pokemonApi.useGetInfinitePokemonInfiniteQuery).toBeFunction()
 
-    expectTypeOf(pokemonApi.endpoints.getInfinitePokemon.useInfiniteQuery)
-      .parameter(0)
-      .toEqualTypeOf<string | typeof skipToken>()
+    expectTypeOf<
+      Parameters<
+        typeof pokemonApi.endpoints.getInfinitePokemon.useInfiniteQuery
+      >[0]
+    >().toEqualTypeOf<string | typeof skipToken>()
 
     expectTypeOf(pokemonApi.endpoints.getInfinitePokemon.useInfiniteQueryState)
       .parameter(0)
@@ -128,9 +130,9 @@ describe('Infinite queries', () => {
     const useGetInfinitePokemonQuery =
       pokemonApi.endpoints.getInfinitePokemon.useInfiniteQuery
 
-    expectTypeOf(useGetInfinitePokemonQuery)
-      .parameter(0)
-      .toEqualTypeOf<string | typeof skipToken>()
+    expectTypeOf<
+      Parameters<typeof useGetInfinitePokemonQuery>[0]
+    >().toEqualTypeOf<string | typeof skipToken>()
 
     function PokemonList() {
       const {
diff --git a/packages/toolkit/src/query/tests/retry.test.ts b/packages/toolkit/src/query/tests/retry.test.ts
diff --git a/packages/toolkit/tsconfig.base.json b/packages/toolkit/tsconfig.base.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@`
`24`	`24`	`"sourceMap": true,`
`25`	`25`	`"strict": true,`
`26`	`26`	`"target": "ESNext",`
`27`		`- "types": ["vitest/globals", "vitest/importMeta"]`
	`27`	`+ "types": ["vitest/globals", "vitest/importMeta", "node"]`
`28`	`28`	`}`
`29`	`29`	`}`