ci(react-query): update vitest/expect-expect rule as error

packages/react-query-devtools/eslint.config.js

@@ -1,6 +1,5 @@
 // @ts-check
 
-import vitest from '@vitest/eslint-plugin'
 import pluginReact from '@eslint-react/eslint-plugin'
 import pluginReactHooks from 'eslint-plugin-react-hooks'
 import rootConfig from './root.eslint.config.js'
@@ -20,11 +19,4 @@ export default [
       'react-hooks/rules-of-hooks': 'error',
     },
   },
-  {
-    plugins: { vitest },
-    rules: {
-      ...vitest.configs.recommended.rules,
-      'vitest/expect-expect': 'warn',
-    },
-  },
 ]

packages/react-query-next-experimental/eslint.config.js

@@ -1,6 +1,5 @@
 // @ts-check
 
-import vitest from '@vitest/eslint-plugin'
 import pluginReact from '@eslint-react/eslint-plugin'
 import pluginReactHooks from 'eslint-plugin-react-hooks'
 import rootConfig from './root.eslint.config.js'
@@ -21,11 +20,4 @@ export default [
       'react-hooks/rules-of-hooks': 'error',
     },
   },
-  {
-    plugins: { vitest },
-    rules: {
-      ...vitest.configs.recommended.rules,
-      'vitest/expect-expect': 'warn',
-    },
-  },
 ]

packages/react-query-persist-client/eslint.config.js

@@ -1,6 +1,5 @@
 // @ts-check
 
-import vitest from '@vitest/eslint-plugin'
 import pluginReact from '@eslint-react/eslint-plugin'
 import pluginReactHooks from 'eslint-plugin-react-hooks'
 import rootConfig from './root.eslint.config.js'
@@ -20,11 +19,4 @@ export default [
       'react-hooks/rules-of-hooks': 'error',
     },
   },
-  {
-    plugins: { vitest },
-    rules: {
-      ...vitest.configs.recommended.rules,
-      'vitest/expect-expect': 'warn',
-    },
-  },
 ]

packages/react-query/eslint.config.js

@@ -1,6 +1,5 @@
 // @ts-check
 
-import vitest from '@vitest/eslint-plugin'
 import pluginReact from '@eslint-react/eslint-plugin'
 // @ts-expect-error
 import pluginReactCompiler from 'eslint-plugin-react-compiler'
@@ -32,11 +31,4 @@ export default [
       'react-compiler/react-compiler': 'off',
     },
   },
-  {
-    plugins: { vitest },
-    rules: {
-      ...vitest.configs.recommended.rules,
-      'vitest/expect-expect': 'warn',
-    },
-  },
 ]

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

@@ -68,11 +68,17 @@ describe('QueryErrorResetBoundary', () => {
         </QueryErrorResetBoundary>,
       )
 
-      await waitFor(() => rendered.getByText('error boundary'))
-      await waitFor(() => rendered.getByText('retry'))
+      await waitFor(() =>
+        expect(rendered.getByText('error boundary')).toBeInTheDocument(),
+      )
+      await waitFor(() =>
+        expect(rendered.getByText('retry')).toBeInTheDocument(),
+      )
       succeed = true
       fireEvent.click(rendered.getByText('retry'))
-      await waitFor(() => rendered.getByText('data'))
+      await waitFor(() =>
+        expect(rendered.getByText('data')).toBeInTheDocument(),
+      )
       consoleMock.mockRestore()
     })
 
@@ -132,11 +138,17 @@ describe('QueryErrorResetBoundary', () => {
         </QueryErrorResetBoundary>,
       )
 
-      await waitFor(() => rendered.getByText('error boundary'))
-      await waitFor(() => rendered.getByText('retry'))
+      await waitFor(() =>
+        expect(rendered.getByText('error boundary')).toBeInTheDocument(),
+      )
+      await waitFor(() =>
+        expect(rendered.getByText('retry')).toBeInTheDocument(),
+      )
       succeed = true
       fireEvent.click(rendered.getByText('retry'))
-      await waitFor(() => rendered.getByText('status: error'))
+      await waitFor(() =>
+        expect(rendered.getByText('status: error')).toBeInTheDocument(),
+      )
       consoleMock.mockRestore()
     })
 
@@ -198,11 +210,17 @@ describe('QueryErrorResetBoundary', () => {
         </QueryErrorResetBoundary>,
       )
 
-      await waitFor(() => rendered.getByText('error boundary'))
-      await waitFor(() => rendered.getByText('retry'))
+      await waitFor(() =>
+        expect(rendered.getByText('error boundary')).toBeInTheDocument(),
+      )
+      await waitFor(() =>
+        expect(rendered.getByText('retry')).toBeInTheDocument(),
+      )
       succeed = true
       fireEvent.click(rendered.getByText('retry'))
-      await waitFor(() => rendered.getByText('data'))
+      await waitFor(() =>
+        expect(rendered.getByText('data')).toBeInTheDocument(),
+      )
       consoleMock.mockRestore()
     })
 
@@ -259,10 +277,14 @@ describe('QueryErrorResetBoundary', () => {
       )
 
       await waitFor(() =>
-        rendered.getByText('status: pending, fetchStatus: idle'),
+        expect(
+          rendered.getByText('status: pending, fetchStatus: idle'),
+        ).toBeInTheDocument(),
       )
       fireEvent.click(rendered.getByRole('button', { name: /refetch/i }))
-      await waitFor(() => rendered.getByText('error boundary'))
+      await waitFor(() =>
+        expect(rendered.getByText('error boundary')).toBeInTheDocument(),
+      )
       consoleMock.mockRestore()
     })
 
@@ -316,11 +338,17 @@ describe('QueryErrorResetBoundary', () => {
         </QueryErrorResetBoundary>,
       )
 
-      await waitFor(() => rendered.getByText('error boundary'))
-      await waitFor(() => rendered.getByText('retry'))
+      await waitFor(() =>
+        expect(rendered.getByText('error boundary')).toBeInTheDocument(),
+      )
+      await waitFor(() =>
+        expect(rendered.getByText('retry')).toBeInTheDocument(),
+      )
       succeed = true
       fireEvent.click(rendered.getByText('retry'))
-      await waitFor(() => rendered.getByText('error boundary'))
+      await waitFor(() =>
+        expect(rendered.getByText('error boundary')).toBeInTheDocument(),
+      )
       consoleMock.mockRestore()
     })
 
@@ -376,11 +404,17 @@ describe('QueryErrorResetBoundary', () => {
         </QueryErrorResetBoundary>,
       )
 
-      await waitFor(() => rendered.getByText('error boundary'))
-      await waitFor(() => rendered.getByText('retry'))
+      await waitFor(() =>
+        expect(rendered.getByText('error boundary')).toBeInTheDocument(),
+      )
+      await waitFor(() =>
+        expect(rendered.getByText('retry')).toBeInTheDocument(),
+      )
       succeed = true
       fireEvent.click(rendered.getByText('retry'))
-      await waitFor(() => rendered.getByText('data'))
+      await waitFor(() =>
+        expect(rendered.getByText('data')).toBeInTheDocument(),
+      )
       consoleMock.mockRestore()
     })
 
@@ -440,11 +474,17 @@ describe('QueryErrorResetBoundary', () => {
         </QueryErrorResetBoundary>,
       )
 
-      await waitFor(() => rendered.getByText('error boundary'))
-      await waitFor(() => rendered.getByText('retry'))
+      await waitFor(() =>
+        expect(rendered.getByText('error boundary')).toBeInTheDocument(),
+      )
+      await waitFor(() =>
+        expect(rendered.getByText('retry')).toBeInTheDocument(),
+      )
       shouldReset = true
       fireEvent.click(rendered.getByText('retry'))
-      await waitFor(() => rendered.getByText('error boundary'))
+      await waitFor(() =>
+        expect(rendered.getByText('error boundary')).toBeInTheDocument(),
+      )
       succeed = true
       shouldReset = false
       fireEvent.click(rendered.getByText('retry'))
@@ -651,11 +691,17 @@ describe('QueryErrorResetBoundary', () => {
         </QueryErrorResetBoundary>,
       )
 
-      await waitFor(() => rendered.getByText('error boundary'))
-      await waitFor(() => rendered.getByText('retry'))
+      await waitFor(() =>
+        expect(rendered.getByText('error boundary')).toBeInTheDocument(),
+      )
+      await waitFor(() =>
+        expect(rendered.getByText('retry')).toBeInTheDocument(),
+      )
       succeed = true
       fireEvent.click(rendered.getByText('retry'))
-      await waitFor(() => rendered.getByText('data'))
+      await waitFor(() =>
+        expect(rendered.getByText('data')).toBeInTheDocument(),
+      )
       consoleMock.mockRestore()
     })
   })
@@ -715,11 +761,17 @@ describe('QueryErrorResetBoundary', () => {
         </QueryErrorResetBoundary>,
       )
 
-      await waitFor(() => rendered.getByText('error boundary'))
-      await waitFor(() => rendered.getByText('retry'))
+      await waitFor(() =>
+        expect(rendered.getByText('error boundary')).toBeInTheDocument(),
+      )
+      await waitFor(() =>
+        expect(rendered.getByText('retry')).toBeInTheDocument(),
+      )
       succeed = true
       fireEvent.click(rendered.getByText('retry'))
-      await waitFor(() => rendered.getByText('data'))
+      await waitFor(() =>
+        expect(rendered.getByText('data')).toBeInTheDocument(),
+      )
       consoleMock.mockRestore()
     })
 
@@ -779,11 +831,17 @@ describe('QueryErrorResetBoundary', () => {
         </QueryErrorResetBoundary>,
       )
 
-      await waitFor(() => rendered.getByText('error boundary'))
-      await waitFor(() => rendered.getByText('retry'))
+      await waitFor(() =>
+        expect(rendered.getByText('error boundary')).toBeInTheDocument(),
+      )
+      await waitFor(() =>
+        expect(rendered.getByText('retry')).toBeInTheDocument(),
+      )
       succeed = true
       fireEvent.click(rendered.getByText('retry'))
-      await waitFor(() => rendered.getByText('data'))
+      await waitFor(() =>
+        expect(rendered.getByText('data')).toBeInTheDocument(),
+      )
       consoleMock.mockRestore()
     })
   })

packages/react-query/src/__tests__/infiniteQueryOptions.test-d.tsx

@@ -1,4 +1,4 @@
-import { describe, expectTypeOf, it, test } from 'vitest'
+import { assertType, describe, expectTypeOf, it, test } from 'vitest'
 import { QueryClient, dataTagSymbol, skipToken } from '@tanstack/query-core'
 import { infiniteQueryOptions } from '../infiniteQueryOptions'
 import { useInfiniteQuery } from '../useInfiniteQuery'
@@ -12,14 +12,16 @@ import type {
 
 describe('infiniteQueryOptions', () => {
   it('should not allow excess properties', () => {
-    infiniteQueryOptions({
-      queryKey: ['key'],
-      queryFn: () => Promise.resolve('data'),
-      getNextPageParam: () => 1,
-      initialPageParam: 1,
-      // @ts-expect-error this is a good error, because stallTime does not exist!
-      stallTime: 1000,
-    })
+    assertType(
+      infiniteQueryOptions({
+        queryKey: ['key'],
+        queryFn: () => Promise.resolve('data'),
+        getNextPageParam: () => 1,
+        initialPageParam: 1,
+        // @ts-expect-error this is a good error, because stallTime does not exist!
+        stallTime: 1000,
+      }),
+    )
   })
   it('should infer types for callbacks', () => {
     infiniteQueryOptions({
@@ -159,14 +161,22 @@ describe('infiniteQueryOptions', () => {
       getNextPageParam: () => 1,
       initialPageParam: 1,
     })
-    // @ts-expect-error cannot pass infinite options to non-infinite query functions
-    useQuery(options)
-    // @ts-expect-error cannot pass infinite options to non-infinite query functions
-    queryClient.ensureQueryData(options)
-    // @ts-expect-error cannot pass infinite options to non-infinite query functions
-    queryClient.fetchQuery(options)
-    // @ts-expect-error cannot pass infinite options to non-infinite query functions
-    queryClient.prefetchQuery(options)
+    assertType(
+      // @ts-expect-error cannot pass infinite options to non-infinite query functions
+      useQuery(options),
+    )
+    assertType(
+      // @ts-expect-error cannot pass infinite options to non-infinite query functions
+      queryClient.ensureQueryData(options),
+    )
+    assertType(
+      // @ts-expect-error cannot pass infinite options to non-infinite query functions
+      queryClient.fetchQuery(options),
+    )
+    assertType(
+      // @ts-expect-error cannot pass infinite options to non-infinite query functions
+      queryClient.prefetchQuery(options),
+    )
   })
 
   test('allow optional initialData function', () => {

packages/react-query/src/__tests__/queryOptions.test-d.tsx

@@ -1,4 +1,4 @@
-import { describe, expectTypeOf, it } from 'vitest'
+import { assertType, describe, expectTypeOf, it } from 'vitest'
 import {
   QueriesObserver,
   QueryClient,
@@ -18,12 +18,14 @@ import type {
 
 describe('queryOptions', () => {
   it('should not allow excess properties', () => {
-    queryOptions({
-      queryKey: ['key'],
-      queryFn: () => Promise.resolve(5),
-      // @ts-expect-error this is a good error, because stallTime does not exist!
-      stallTime: 1000,
-    })
+    assertType(
+      queryOptions({
+        queryKey: ['key'],
+        queryFn: () => Promise.resolve(5),
+        // @ts-expect-error this is a good error, because stallTime does not exist!
+        stallTime: 1000,
+      }),
+    )
   })
   it('should infer types for callbacks', () => {
     queryOptions({
@@ -203,7 +205,7 @@ describe('queryOptions', () => {
   })
 
   it('should allow undefined response in initialData', () => {
-    return (id: string | null) =>
+    assertType((id: string | null) =>
       queryOptions({
         queryKey: ['todo', id],
         queryFn: () =>
@@ -218,7 +220,8 @@ describe('queryOptions', () => {
                 id,
                 title: 'Initial Data',
               },
-      })
+      }),
+    )
   })
 
   it('should allow optional initialData object', () => {
@@ -248,7 +251,7 @@ describe('queryOptions', () => {
       queryFn: () => Promise.resolve(1),
     })
 
-    somethingWithQueryOptions(options)
+    assertType(somethingWithQueryOptions(options))
   })
 
   it('should return a custom query key type', () => {