@tanstack/react-query 5.0.0-alpha.81 → 5.0.0-alpha.85

package/src/__tests__/useQuery.test.tsx

@@ -1,6 +1,9 @@
 import { act, fireEvent, render, waitFor } from '@testing-library/react'
 import '@testing-library/jest-dom'
 import * as React from 'react'
+import { ErrorBoundary } from 'react-error-boundary'
+import { vi } from 'vitest'
+import { QueryCache, keepPreviousData, useQuery } from '..'
 import {
   Blink,
   createQueryClient,
@@ -19,9 +22,6 @@ import type {
   UseQueryOptions,
   UseQueryResult,
 } from '..'
-import { QueryCache, useQuery, keepPreviousData } from '..'
-import { ErrorBoundary } from 'react-error-boundary'
-import { vi } from 'vitest'
 import type { Mock } from 'vitest'
 
 describe('useQuery', () => {
@@ -2603,24 +2603,24 @@ describe('useQuery', () => {
         refetchOnWindowFocus: 'always',
       })
       states.push(state)
-      return null
+      return (
+        <div>
+          <div>
+            data: {state.data}, isFetching: {String(state.isFetching)}
+          </div>
+        </div>
+      )
     }
 
-    renderWithClient(queryClient, <Page />)
+    const rendered = renderWithClient(queryClient, <Page />)
 
-    await sleep(20)
+    await waitFor(() => rendered.getByText('data: 0, isFetching: false'))
 
     act(() => {
       window.dispatchEvent(new Event('visibilitychange'))
     })
 
-    await sleep(20)
-
-    await waitFor(() => expect(states.length).toBe(4))
-    expect(states[0]).toMatchObject({ data: undefined, isFetching: true })
-    expect(states[1]).toMatchObject({ data: 0, isFetching: false })
-    expect(states[2]).toMatchObject({ data: 0, isFetching: true })
-    expect(states[3]).toMatchObject({ data: 1, isFetching: false })
+    await waitFor(() => rendered.getByText('data: 1, isFetching: false'))
   })
 
   it('should calculate focus behaviour for `refetchOnWindowFocus` depending on function', async () => {
@@ -5458,6 +5458,7 @@ describe('useQuery', () => {
       await waitFor(() => rendered.getByText('failureReason: failed1'))
 
       const onlineMock = mockNavigatorOnLine(false)
+      window.dispatchEvent(new Event('offline'))
 
       await sleep(20)
 

package/src/__tests__/useQuery.types.test.tsx

@@ -1,7 +1,7 @@
 import { useQuery } from '../useQuery'
 import { queryOptions } from '../queryOptions'
-import type { Expect, Equal } from './utils'
 import { doNotExecute } from './utils'
+import type { Equal, Expect } from './utils'
 
 describe('initialData', () => {
   describe('Config object overload', () => {

package/src/__tests__/utils.tsx

@@ -1,9 +1,10 @@
 import * as React from 'react'
 import { act, render } from '@testing-library/react'
-import type { QueryClientConfig } from '..'
-import { QueryClient, QueryClientProvider } from '..'
 import * as utils from '@tanstack/query-core'
 import { vi } from 'vitest'
+import { QueryClient, QueryClientProvider } from '..'
+import type { QueryClientConfig } from '..'
+import type { SpyInstance } from 'vitest'
 
 export function renderWithClient(
   client: QueryClient,
@@ -45,11 +46,13 @@ export function createQueryClient(config?: QueryClientConfig): QueryClient {
   return new QueryClient(config)
 }
 
-export function mockVisibilityState(value: DocumentVisibilityState) {
+export function mockVisibilityState(
+  value: DocumentVisibilityState,
+): SpyInstance<[], DocumentVisibilityState> {
   return vi.spyOn(document, 'visibilityState', 'get').mockReturnValue(value)
 }
 
-export function mockNavigatorOnLine(value: boolean) {
+export function mockNavigatorOnLine(value: boolean): SpyInstance<[], boolean> {
   return vi.spyOn(navigator, 'onLine', 'get').mockReturnValue(value)
 }
 

package/src/errorBoundaryUtils.ts

@@ -1,4 +1,6 @@
 'use client'
+import * as React from 'react'
+import { shouldThrowError } from './utils'
 import type {
   DefaultedQueryObserverOptions,
   Query,
@@ -7,8 +9,6 @@ import type {
   ThrowOnError,
 } from '@tanstack/query-core'
 import type { QueryErrorResetBoundaryValue } from './QueryErrorResetBoundary'
-import * as React from 'react'
-import { shouldThrowError } from './utils'
 
 export const ensurePreventErrorBoundaryRetry = <
   TQueryFnData,

package/src/suspense.ts

@@ -1,8 +1,8 @@
 import type {
   DefaultedQueryObserverOptions,
-  QueryObserverResult,
   QueryKey,
   QueryObserver,
+  QueryObserverResult,
 } from '@tanstack/query-core'
 import type { QueryErrorResetBoundaryValue } from './QueryErrorResetBoundary'
 

package/src/types.ts

@@ -1,17 +1,17 @@
 /* istanbul ignore file */
 
 import type {
+  DefaultError,
+  DefinedQueryObserverResult,
   InfiniteQueryObserverOptions,
   InfiniteQueryObserverResult,
+  MutateFunction,
+  MutationObserverOptions,
   MutationObserverResult,
+  QueryKey,
   QueryObserverOptions,
   QueryObserverResult,
-  QueryKey,
-  MutationObserverOptions,
-  MutateFunction,
-  DefinedQueryObserverResult,
   WithRequired,
-  DefaultError,
 } from '@tanstack/query-core'
 
 export interface UseBaseQueryOptions<

package/src/useBaseQuery.ts

@@ -1,18 +1,18 @@
 'use client'
 import * as React from 'react'
 
-import type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core'
 import { notifyManager } from '@tanstack/query-core'
 import { useQueryErrorResetBoundary } from './QueryErrorResetBoundary'
 import { useQueryClient } from './QueryClientProvider'
-import type { UseBaseQueryOptions } from './types'
 import { useIsRestoring } from './isRestoring'
 import {
   ensurePreventErrorBoundaryRetry,
   getHasError,
   useClearResetErrorBoundary,
 } from './errorBoundaryUtils'
-import { ensureStaleTime, shouldSuspend, fetchOptimistic } from './suspense'
+import { ensureStaleTime, fetchOptimistic, shouldSuspend } from './suspense'
+import type { UseBaseQueryOptions } from './types'
+import type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core'
 
 export function useBaseQuery<
   TQueryFnData,

package/src/useInfiniteQuery.ts

@@ -1,14 +1,14 @@
 'use client'
+import { InfiniteQueryObserver } from '@tanstack/query-core'
+import { useBaseQuery } from './useBaseQuery'
 import type {
-  QueryObserver,
-  QueryKey,
-  QueryClient,
   DefaultError,
   InfiniteData,
+  QueryClient,
+  QueryKey,
+  QueryObserver,
 } from '@tanstack/query-core'
-import { InfiniteQueryObserver } from '@tanstack/query-core'
 import type { UseInfiniteQueryOptions, UseInfiniteQueryResult } from './types'
-import { useBaseQuery } from './useBaseQuery'
 
 // HOOK
 export function useInfiniteQuery<

package/src/useIsFetching.ts

@@ -1,9 +1,9 @@
 'use client'
 import * as React from 'react'
-import type { QueryClient, QueryFilters } from '@tanstack/query-core'
 import { notifyManager } from '@tanstack/query-core'
 
 import { useQueryClient } from './QueryClientProvider'
+import type { QueryClient, QueryFilters } from '@tanstack/query-core'
 
 export function useIsFetching(
   filters?: QueryFilters,

package/src/useMutation.ts

@@ -1,14 +1,14 @@
 'use client'
 import * as React from 'react'
-import type { QueryClient, DefaultError } from '@tanstack/query-core'
-import { notifyManager, MutationObserver } from '@tanstack/query-core'
+import { MutationObserver, notifyManager } from '@tanstack/query-core'
 import { useQueryClient } from './QueryClientProvider'
+import { shouldThrowError } from './utils'
 import type {
   UseMutateFunction,
   UseMutationOptions,
   UseMutationResult,
 } from './types'
-import { shouldThrowError } from './utils'
+import type { DefaultError, QueryClient } from '@tanstack/query-core'
 
 // HOOK
 

package/src/useMutationState.ts

@@ -1,16 +1,16 @@
 'use client'
 import * as React from 'react'
 
+import { notifyManager, replaceEqualDeep } from '@tanstack/query-core'
+import { useQueryClient } from './QueryClientProvider'
 import type {
-  MutationFilters,
-  QueryClient,
+  DefaultError,
   Mutation,
   MutationCache,
-  DefaultError,
+  MutationFilters,
   MutationState,
+  QueryClient,
 } from '@tanstack/query-core'
-import { notifyManager, replaceEqualDeep } from '@tanstack/query-core'
-import { useQueryClient } from './QueryClientProvider'
 
 export function useIsMutating(
   filters?: MutationFilters,

package/src/useQueries.ts

@@ -1,17 +1,8 @@
 'use client'
 import * as React from 'react'
 
-import type {
-  QueryKey,
-  QueryFunction,
-  QueriesPlaceholderDataFunction,
-  QueryClient,
-  DefaultError,
-  QueriesObserverOptions,
-} from '@tanstack/query-core'
-import { notifyManager, QueriesObserver } from '@tanstack/query-core'
+import { QueriesObserver, notifyManager } from '@tanstack/query-core'
 import { useQueryClient } from './QueryClientProvider'
-import type { UseQueryOptions, UseQueryResult } from './types'
 import { useIsRestoring } from './isRestoring'
 import { useQueryErrorResetBoundary } from './QueryErrorResetBoundary'
 import {
@@ -21,10 +12,19 @@ import {
 } from './errorBoundaryUtils'
 import {
   ensureStaleTime,
-  shouldSuspend,
   fetchOptimistic,
+  shouldSuspend,
   willFetch,
 } from './suspense'
+import type { UseQueryOptions, UseQueryResult } from './types'
+import type {
+  DefaultError,
+  QueriesObserverOptions,
+  QueriesPlaceholderDataFunction,
+  QueryClient,
+  QueryFunction,
+  QueryKey,
+} from '@tanstack/query-core'
 
 // This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.
 // `placeholderData` function does not have a parameter

package/src/useQuery.ts

@@ -1,12 +1,12 @@
 'use client'
-import type { QueryClient, QueryKey, DefaultError } from '@tanstack/query-core'
 import { QueryObserver } from '@tanstack/query-core'
+import { useBaseQuery } from './useBaseQuery'
+import type { DefaultError, QueryClient, QueryKey } from '@tanstack/query-core'
 import type {
   DefinedUseQueryResult,
   UseQueryOptions,
   UseQueryResult,
 } from './types'
-import { useBaseQuery } from './useBaseQuery'
 import type {
   DefinedInitialDataOptions,
   UndefinedInitialDataOptions,