chore: Disable vitest globals (#6216)

packages/eslint-plugin-query/src/__tests__/configs.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest'
 import { configs } from '../configs'
 
 describe('configs', () => {

packages/eslint-plugin-query/tsconfig.json

@@ -1,7 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "types": ["vitest/globals"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }

packages/query-async-storage-persister/src/__tests__/asyncThrottle.test.ts

@@ -1,4 +1,4 @@
-import { vi } from 'vitest'
+import { describe, expect, test, vi } from 'vitest'
 import { asyncThrottle } from '../asyncThrottle'
 import { sleep as delay } from './utils'
 

packages/query-async-storage-persister/tsconfig.json

@@ -1,7 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "types": ["vitest/globals"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }

packages/query-async-storage-persister/vitest.config.ts

@@ -5,7 +5,6 @@ export default defineConfig({
     name: 'query-async-storage-persister',
     dir: './src',
     watch: false,
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })

packages/query-core/src/tests/focusManager.test.tsx

@@ -1,4 +1,4 @@
-import { vi } from 'vitest'
+import { beforeEach, describe, expect, it, test, vi } from 'vitest'
 import { sleep } from '../utils'
 import { FocusManager } from '../focusManager'
 import { setIsServer } from './utils'

packages/query-core/src/tests/hydration.test.tsx

@@ -1,4 +1,4 @@
-import { expect, vi } from 'vitest'
+import { describe, expect, test, vi } from 'vitest'
 import { QueryCache } from '../queryCache'
 import { dehydrate, hydrate } from '../hydration'
 import { MutationCache } from '../mutationCache'

packages/query-core/src/tests/infiniteQueryBehavior.test.tsx

@@ -1,5 +1,5 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
 import { CancelledError, InfiniteQueryObserver } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 import type { InfiniteQueryObserverResult, QueryCache, QueryClient } from '..'

packages/query-core/src/tests/infiniteQueryObserver.test.tsx

@@ -1,4 +1,4 @@
-import { expect, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { InfiniteQueryObserver } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 import type { QueryClient } from '..'

packages/query-core/src/tests/mutationCache.test.tsx

@@ -1,5 +1,5 @@
+import { describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
 import { MutationCache, MutationObserver } from '..'
 import { createQueryClient, executeMutation, queryKey, sleep } from './utils'
 

packages/query-core/src/tests/mutationObserver.test.tsx

@@ -1,5 +1,5 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
 import { MutationObserver } from '..'
 import { createQueryClient, sleep } from './utils'
 import type { QueryClient } from '..'

packages/query-core/src/tests/mutations.test.tsx

@@ -1,4 +1,4 @@
-import { vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
 import { MutationObserver } from '../mutationObserver'
 import { createQueryClient, executeMutation, queryKey, sleep } from './utils'

packages/query-core/src/tests/notifyManager.test.tsx

@@ -1,4 +1,4 @@
-import { vi } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import { createNotifyManager } from '../notifyManager'
 import { sleep } from './utils'
 

packages/query-core/src/tests/onlineManager.test.tsx

@@ -1,4 +1,4 @@
-import { vi } from 'vitest'
+import { beforeEach, describe, expect, test, vi } from 'vitest'
 import { OnlineManager } from '../onlineManager'
 import { setIsServer, sleep } from './utils'
 

packages/query-core/src/tests/queriesObserver.test.tsx

@@ -1,5 +1,5 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
 import { QueriesObserver } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 import type { QueryClient, QueryObserverResult } from '..'

packages/query-core/src/tests/query.test.tsx

@@ -1,5 +1,5 @@
+import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
 import { QueryObserver, isCancelledError, onlineManager } from '..'
 import {
   createQueryClient,

packages/query-core/src/tests/queryCache.test.tsx

@@ -1,5 +1,5 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
 import { QueryCache, QueryClient, QueryObserver } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 

packages/query-core/src/tests/queryClient.test.tsx

@@ -1,5 +1,5 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import '@testing-library/jest-dom/vitest'
 
 import {
   MutationObserver,

packages/query-core/src/tests/queryClient.types.test.tsx

@@ -1,3 +1,4 @@
+import { describe, it } from 'vitest'
 import { QueryClient } from '../queryClient'
 import { doNotExecute } from './utils'
 import type { Equal, Expect } from './utils'

packages/query-core/src/tests/queryObserver.test.tsx

@@ -1,4 +1,12 @@
-import { vi } from 'vitest'
+import {
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  expectTypeOf,
+  test,
+  vi,
+} from 'vitest'
 import { QueryObserver, focusManager } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 import type { QueryClient, QueryObserverResult } from '..'

packages/query-core/src/tests/utils.test.tsx

@@ -1,4 +1,4 @@
-import { vi } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import {
   addToEnd,
   addToStart,

packages/query-core/src/tests/utils.ts

@@ -1,5 +1,5 @@
-import { act } from '@testing-library/react'
 import { vi } from 'vitest'
+import { act } from '@testing-library/react'
 import { QueryClient, onlineManager } from '..'
 import * as utils from '../utils'
 import type { SpyInstance } from 'vitest'

packages/query-core/tsconfig.json

@@ -1,7 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "types": ["vitest/globals"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }

packages/query-core/vitest.config.ts

@@ -6,7 +6,6 @@ export default defineConfig({
     dir: './src',
     watch: false,
     environment: 'jsdom',
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })

packages/query-devtools/src/__tests__/devtools.test.tsx

@@ -1,3 +1,5 @@
+import { describe, expect, it } from 'vitest'
+
 describe('ReactQueryDevtools', () => {
   it('should be able to open and close devtools', async () => {
     expect(1).toBe(1)

packages/query-devtools/src/__tests__/utils.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest'
 import { deleteNestedDataByPath, updateNestedDataByPath } from '../utils'
 
 describe('Utils tests', () => {

packages/query-devtools/tsconfig.json

@@ -2,8 +2,13 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "types": ["vitest/globals"]
+    "jsxImportSource": "solid-js"
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }

packages/query-devtools/vitest.config.ts

@@ -6,9 +6,7 @@ export default defineConfig({
     name: 'query-devtools',
     dir: './src',
     watch: false,
-    setupFiles: [],
     environment: 'jsdom',
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
   plugins: [solid()],

packages/query-persist-client-core/src/__tests__/createPersister.test.ts

@@ -1,5 +1,5 @@
+import { describe, expect, test, vi } from 'vitest'
 import { Query, QueryCache, hashKey } from '@tanstack/query-core'
-import { vi } from 'vitest'
 import {
   PERSISTER_KEY_PREFIX,
   experimental_createPersister,

packages/query-persist-client-core/src/__tests__/persist.test.ts

@@ -1,5 +1,5 @@
+import { describe, expect, test, vi } from 'vitest'
 import { QueriesObserver } from '@tanstack/query-core'
-import { vi } from 'vitest'
 import { persistQueryClientSubscribe } from '../persist'
 import {
   createMockPersister,

packages/query-persist-client-core/src/__tests__/utils.ts

@@ -1,5 +1,5 @@
-import { QueryClient } from '@tanstack/query-core'
 import { vi } from 'vitest'
+import { QueryClient } from '@tanstack/query-core'
 import type { QueryClientConfig } from '@tanstack/query-core'
 import type { PersistedClient, Persister } from '../persist'
 

packages/query-persist-client-core/tsconfig.json

@@ -1,7 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "types": ["vitest/globals"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }

packages/query-persist-client-core/vitest.config.ts

@@ -5,7 +5,6 @@ export default defineConfig({
     name: 'query-persist-client-core',
     dir: './src',
     watch: false,
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })

packages/query-sync-storage-persister/src/__tests__/storageIsFull.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, test } from 'vitest'
 import {
   MutationCache,
   QueryCache,

packages/query-sync-storage-persister/tsconfig.json

@@ -1,7 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "types": ["vitest/globals"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }

packages/query-sync-storage-persister/vitest.config.ts

@@ -5,7 +5,6 @@ export default defineConfig({
     name: 'query-sync-storage-persister',
     dir: './src',
     watch: false,
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })

packages/react-query-devtools/src/__tests__/devtools.test.tsx

@@ -1,3 +1,5 @@
+import { describe, expect, it } from 'vitest'
+
 describe('ReactQueryDevtools', () => {
   it('should be able to open and close devtools', async () => {
     expect(1).toBe(1)

packages/react-query-devtools/test-setup.ts

@@ -1,6 +1,11 @@
-import { act } from '@testing-library/react'
+import '@testing-library/jest-dom/vitest'
+import { act, cleanup } from '@testing-library/react'
+import { afterEach } from 'vitest'
 import { notifyManager } from '@tanstack/react-query'
 
+// https://testing-library.com/docs/react-testing-library/api#cleanup
+afterEach(() => cleanup())
+
 // Wrap notifications with act to make sure React knows about React Query updates
 notifyManager.setNotifyFunction((fn) => {
   act(fn)

packages/react-query-devtools/tsconfig.json

@@ -1,8 +1,14 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "jsx": "react",
-    "types": ["vitest/globals"]
+    "jsx": "react"
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "test-setup.ts",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }

packages/react-query-devtools/vitest.config.ts

@@ -7,7 +7,6 @@ export default defineConfig({
     watch: false,
     setupFiles: ['test-setup.ts'],
     environment: 'jsdom',
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })

packages/react-query-next-experimental/test-setup.ts

@@ -1,6 +1,11 @@
-import { act } from '@testing-library/react'
+import '@testing-library/jest-dom/vitest'
+import { act, cleanup } from '@testing-library/react'
+import { afterEach } from 'vitest'
 import { notifyManager } from '@tanstack/react-query'
 
+// https://testing-library.com/docs/react-testing-library/api#cleanup
+afterEach(() => cleanup())
+
 // Wrap notifications with act to make sure React knows about React Query updates
 notifyManager.setNotifyFunction((fn) => {
   act(fn)

packages/react-query-next-experimental/tsconfig.json

@@ -1,8 +1,14 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "jsx": "react",
-    "types": ["vitest/globals"]
+    "jsx": "react"
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "test-setup.ts",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }

packages/react-query-next-experimental/vitest.config.ts

@@ -7,7 +7,6 @@ export default defineConfig({
     watch: false,
     setupFiles: ['test-setup.ts'],
     environment: 'jsdom',
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })

packages/react-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx

@@ -1,7 +1,6 @@
+import { describe, expect, test, vi } from 'vitest'
 import * as React from 'react'
 import { fireEvent, render, waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
-
 import { QueryClient, useQueries, useQuery } from '@tanstack/react-query'
 import { persistQueryClientSave } from '@tanstack/query-persist-client-core'
 

packages/react-query-persist-client/src/__tests__/utils.ts

@@ -1,5 +1,4 @@
 import { act } from '@testing-library/react'
-
 import { QueryClient } from '@tanstack/react-query'
 import type { QueryClientConfig } from '@tanstack/react-query'