Skip to content

[pull] main from TanStack:main #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 31, 2026
Merged

[pull] main from TanStack:main #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 25 additions & 16 deletions packages/angular-query-persist-client/src/__tests__/with-persist-query-client.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import {
QueryClient,
injectQuery,
noop,
provideTanStackQuery,
} from '@tanstack/angular-query-experimental'
import { persistQueryClientSave } from '@tanstack/query-persist-client-core'
Expand Down Expand Up @@ -71,10 +72,12 @@ describe('withPersistQueryClient', () => {
}> = []

const queryClient = new QueryClient()
queryClient.prefetchQuery({
queryKey: key,
queryFn: () => sleep(10).then(() => 'hydrated'),
})
void queryClient
.query({
queryKey: key,
queryFn: () => sleep(10).then(() => 'hydrated'),
})
.catch(noop)
await vi.advanceTimersByTimeAsync(10)

const persister = createMockPersister()
Expand Down Expand Up @@ -162,10 +165,12 @@ describe('withPersistQueryClient', () => {
}> = []

const queryClient = new QueryClient()
queryClient.prefetchQuery({
queryKey: key,
queryFn: () => sleep(10).then(() => 'hydrated'),
})
void queryClient
.query({
queryKey: key,
queryFn: () => sleep(10).then(() => 'hydrated'),
})
.catch(noop)
await vi.advanceTimersByTimeAsync(10)

const persister = createMockPersister()
Expand Down Expand Up @@ -253,10 +258,12 @@ describe('withPersistQueryClient', () => {
}> = []

const queryClient = new QueryClient()
queryClient.prefetchQuery({
queryKey: key,
queryFn: () => sleep(10).then(() => 'hydrated'),
})
void queryClient
.query({
queryKey: key,
queryFn: () => sleep(10).then(() => 'hydrated'),
})
.catch(noop)
await vi.advanceTimersByTimeAsync(10)

const persister = createMockPersister()
Expand Down Expand Up @@ -333,10 +340,12 @@ describe('withPersistQueryClient', () => {
it('should call onSuccess after successful restoring', async () => {
const key = queryKey()
const queryClient = new QueryClient()
queryClient.prefetchQuery({
queryKey: key,
queryFn: () => sleep(10).then(() => 'hydrated'),
})
void queryClient
.query({
queryKey: key,
queryFn: () => sleep(10).then(() => 'hydrated'),
})
.catch(noop)
await vi.advanceTimersByTimeAsync(10)

const persister = createMockPersister()
Expand Down
12 changes: 7 additions & 5 deletions packages/preact-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type {
Persister,
} from '../../../query-persist-client-core/src'
import { persistQueryClientSave } from '../../../query-persist-client-core/src'
import { notifyManager } from '../../../query-core/src'
import { notifyManager, noop } from '../../../query-core/src'
import { act, cleanup, render } from '@testing-library/preact'
import type { UseQueryResult } from '../../../preact-query/src'
import { QueryClient, useQuery } from '../../../preact-query/src'
Expand Down Expand Up @@ -53,10 +53,12 @@ describe('PersistQueryClientProvider (preact)', () => {
const states: Array<UseQueryResult<string>> = []

const queryClient = new QueryClient()
queryClient.prefetchQuery({
queryKey: key,
queryFn: () => sleep(10).then(() => 'hydrated'),
})
void queryClient
.query({
queryKey: key,
queryFn: () => sleep(10).then(() => 'hydrated'),
})
.catch(noop)
await vi.advanceTimersByTimeAsync(10)

const persister = createMockPersister()
Expand Down
73 changes: 44 additions & 29 deletions packages/preact-query/src/__tests__/HydrationBoundary.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
QueryClient,
QueryClientProvider,
dehydrate,
noop,
useQuery,
} from '..'

Expand All @@ -22,10 +23,12 @@ describe('Preact hydration', () => {
beforeEach(async () => {
vi.useFakeTimers()
const queryClient = new QueryClient()
queryClient.prefetchQuery({
queryKey: stringKey,
queryFn: () => sleep(10).then(() => ['stringCached']),
})
void queryClient
.query({
queryKey: stringKey,
queryFn: () => sleep(10).then(() => ['stringCached']),
})
.catch(noop)
await vi.advanceTimersByTimeAsync(10)
const dehydrated = dehydrate(queryClient)
stringifiedState = JSON.stringify(dehydrated)
Expand Down Expand Up @@ -132,14 +135,18 @@ describe('Preact hydration', () => {

const intermediateClient = new QueryClient()

intermediateClient.prefetchQuery({
queryKey: stringKey,
queryFn: () => sleep(20).then(() => ['should change']),
})
intermediateClient.prefetchQuery({
queryKey: addedKey,
queryFn: () => sleep(20).then(() => [addedKey[0]]),
})
void intermediateClient
.query({
queryKey: stringKey,
queryFn: () => sleep(20).then(() => ['should change']),
})
.catch(noop)
void intermediateClient
.query({
queryKey: addedKey,
queryFn: () => sleep(20).then(() => [addedKey[0]]),
})
.catch(noop)
await vi.advanceTimersByTimeAsync(20)
const dehydrated = dehydrate(intermediateClient)
intermediateClient.clear()
Expand Down Expand Up @@ -202,14 +209,18 @@ describe('Preact hydration', () => {
expect(rendered.getByText(stringKey[0]!)).toBeInTheDocument()

const intermediateClient = new QueryClient()
intermediateClient.prefetchQuery({
queryKey: stringKey,
queryFn: () => sleep(20).then(() => ['should not change']),
})
intermediateClient.prefetchQuery({
queryKey: addedKey,
queryFn: () => sleep(20).then(() => [addedKey[0]]),
})
void intermediateClient
.query({
queryKey: stringKey,
queryFn: () => sleep(20).then(() => ['should not change']),
})
.catch(noop)
void intermediateClient
.query({
queryKey: addedKey,
queryFn: () => sleep(20).then(() => [addedKey[0]]),
})
.catch(noop)
await vi.advanceTimersByTimeAsync(20)

const newDehydratedState = dehydrate(intermediateClient)
Expand Down Expand Up @@ -431,10 +442,12 @@ describe('Preact hydration', () => {
// For the bug to trigger, there needs to already be a query in the cache,
// with a dataUpdatedAt earlier than the dehydratedAt of the next query
const clientQueryClient = new QueryClient()
clientQueryClient.prefetchQuery({
queryKey: promiseKey,
queryFn: () => sleep(20).then(() => 'existing'),
})
void clientQueryClient
.query({
queryKey: promiseKey,
queryFn: () => sleep(20).then(() => 'existing'),
})
.catch(noop)
await vi.advanceTimersByTimeAsync(20)

const prefetchQueryClient = new QueryClient({
Expand All @@ -444,11 +457,13 @@ describe('Preact hydration', () => {
},
},
})
prefetchQueryClient.prefetchQuery({
queryKey: promiseKey,
queryFn: () =>
sleep(10).then(() => Promise.reject(new Error('Query failed'))),
})
void prefetchQueryClient
.query({
queryKey: promiseKey,
queryFn: () =>
sleep(10).then(() => Promise.reject(new Error('Query failed'))),
})
.catch(noop)

const dehydratedState = dehydrate(prefetchQueryClient)

Expand Down
21 changes: 13 additions & 8 deletions packages/preact-query/src/__tests__/ssr-hydration.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
QueryClientProvider,
dehydrate,
hydrate,
noop,
useQuery,
} from '..'
import { setIsServer } from './utils'
Expand Down Expand Up @@ -72,10 +73,12 @@ describe('Server side rendering with de/rehydration', () => {
const prefetchClient = new QueryClient({
queryCache: prefetchCache,
})
await prefetchClient.prefetchQuery({
queryKey: successKey,
queryFn: () => fetchDataSuccess('success'),
})
await prefetchClient
.query({
queryKey: successKey,
queryFn: () => fetchDataSuccess('success'),
})
.catch(noop)
const dehydratedStateServer = dehydrate(prefetchClient)
const renderCache = new QueryCache()
const renderClient = new QueryClient({
Expand Down Expand Up @@ -149,10 +152,12 @@ describe('Server side rendering with de/rehydration', () => {
const prefetchClient = new QueryClient({
queryCache: prefetchCache,
})
await prefetchClient.prefetchQuery({
queryKey: errorKey,
queryFn: () => fetchDataError(),
})
await prefetchClient
.query({
queryKey: errorKey,
queryFn: () => fetchDataError(),
})
.catch(noop)
const dehydratedStateServer = dehydrate(prefetchClient)
const renderCache = new QueryCache()
const renderClient = new QueryClient({
Expand Down
5 changes: 3 additions & 2 deletions packages/preact-query/src/__tests__/ssr.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
QueryCache,
QueryClient,
QueryClientProvider,
noop,
useInfiniteQuery,
useMutationState,
useQuery,
Expand Down Expand Up @@ -59,7 +60,7 @@ describe('Server Side Rendering', () => {
it('should add prefetched data to cache', async () => {
const key = queryKey()

const promise = queryClient.fetchQuery({
const promise = queryClient.query({
queryKey: key,
queryFn: () => sleep(10).then(() => 'data'),
})
Expand Down Expand Up @@ -87,7 +88,7 @@ describe('Server Side Rendering', () => {
)
}

queryClient.prefetchQuery({ queryKey: key, queryFn })
void queryClient.query({ queryKey: key, queryFn }).catch(noop)
await vi.advanceTimersByTimeAsync(10)

const markup = renderToString(
Expand Down
7 changes: 4 additions & 3 deletions packages/preact-query/src/__tests__/usePrefetchQuery.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import {
QueryCache,
QueryClient,
noop,
usePrefetchQuery,
useQueryErrorResetBoundary,
useSuspenseQuery,
Expand Down Expand Up @@ -87,7 +88,7 @@ describe('usePrefetchQuery', () => {
)
}

queryClient.fetchQuery(queryOpts)
void queryClient.query(queryOpts).catch(noop)
await vi.advanceTimersByTimeAsync(10)
queryOpts.queryFn.mockClear()
const rendered = renderWithClient(queryClient, <App />)
Expand Down Expand Up @@ -132,7 +133,7 @@ describe('usePrefetchQuery', () => {
)
}

queryClient.prefetchQuery(queryOpts)
void queryClient.query(queryOpts).catch(noop)
await vi.advanceTimersByTimeAsync(10)
queryFn.mockClear()
const rendered = renderWithClient(queryClient, <App />)
Expand Down Expand Up @@ -222,7 +223,7 @@ describe('usePrefetchQuery', () => {
)
}

queryClient.prefetchQuery(queryOpts)
void queryClient.query(queryOpts).catch(noop)
await vi.advanceTimersByTimeAsync(10)
queryFn.mockClear()

Expand Down
Loading
Loading