From dfae30ff5ea2398cf4d860d73edcd134b304537a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciar=C3=A1n=20Curley?= Date: Mon, 31 Aug 2026 11:50:46 +0100 Subject: [PATCH 1/2] chore: use infiniteQuery instead of fetchInfiniteQuery et al --- .../preact-query/src/__tests__/ssr.test.tsx | 12 ++++--- .../usePrefetchInfiniteQuery.test.tsx | 3 +- .../src/__tests__/hydration.test.tsx | 32 +++++++++---------- .../react-query/src/__tests__/ssr.test.tsx | 12 ++++--- .../usePrefetchInfiniteQuery.test.tsx | 3 +- 5 files changed, 34 insertions(+), 28 deletions(-) diff --git a/packages/preact-query/src/__tests__/ssr.test.tsx b/packages/preact-query/src/__tests__/ssr.test.tsx index 04415291d6..00bbe7d0af 100644 --- a/packages/preact-query/src/__tests__/ssr.test.tsx +++ b/packages/preact-query/src/__tests__/ssr.test.tsx @@ -167,11 +167,13 @@ describe('Server Side Rendering', () => { ) } - queryClient.prefetchInfiniteQuery({ - queryKey: key, - queryFn, - initialPageParam: 0, - }) + void queryClient + .infiniteQuery({ + queryKey: key, + queryFn, + initialPageParam: 0, + }) + .catch(noop) await vi.advanceTimersByTimeAsync(10) const markup = renderToString( diff --git a/packages/preact-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx b/packages/preact-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx index 8a6b781919..167cc9b173 100644 --- a/packages/preact-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx +++ b/packages/preact-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx @@ -7,6 +7,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { QueryCache, QueryClient, + noop, usePrefetchInfiniteQuery, useSuspenseInfiniteQuery, } from '..' @@ -107,7 +108,7 @@ describe('usePrefetchInfiniteQuery', () => { allPages.length < data.length ? allPages.length : undefined, } - queryClient.prefetchInfiniteQuery({ ...queryOpts, pages: 3 }) + void queryClient.infiniteQuery({ ...queryOpts, pages: 3 }).catch(noop) await vi.advanceTimersByTimeAsync(30) queryOpts.queryFn.mockClear() diff --git a/packages/query-core/src/__tests__/hydration.test.tsx b/packages/query-core/src/__tests__/hydration.test.tsx index 356b47bc6f..2d677d986c 100644 --- a/packages/query-core/src/__tests__/hydration.test.tsx +++ b/packages/query-core/src/__tests__/hydration.test.tsx @@ -1536,7 +1536,7 @@ describe('dehydration and rehydration', () => { const queryCache = new QueryCache() const queryClient = new QueryClient({ queryCache }) - const prefetchPromise = queryClient.prefetchInfiniteQuery({ + const prefetchPromise = queryClient.infiniteQuery({ queryKey: key, queryFn: ({ pageParam }) => sleep(10).then(() => ({ @@ -1548,7 +1548,7 @@ describe('dehydration and rehydration', () => { items: Array nextCursor: number }) => lastPage.nextCursor, - }) + }).catch(noop) await vi.advanceTimersByTimeAsync(10) await prefetchPromise @@ -1575,7 +1575,7 @@ describe('dehydration and rehydration', () => { const queryCache = new QueryCache() const queryClient = new QueryClient({ queryCache }) - const prefetchPromise = queryClient.prefetchInfiniteQuery({ + const prefetchPromise = queryClient.infiniteQuery({ queryKey: key, queryFn: ({ pageParam }) => sleep(10).then(() => ({ @@ -1585,7 +1585,7 @@ describe('dehydration and rehydration', () => { initialPageParam: 0, getNextPageParam: (lastPage: { data: string; next: number }) => lastPage.next, - }) + }).catch(noop) await vi.advanceTimersByTimeAsync(10) await prefetchPromise @@ -1595,7 +1595,7 @@ describe('dehydration and rehydration', () => { const hydrationClient = new QueryClient({ queryCache: hydrationCache }) hydrate(hydrationClient, dehydrated) - const resultPromise = hydrationClient.fetchInfiniteQuery({ + const resultPromise = hydrationClient.infiniteQuery({ queryKey: key, queryFn: ({ pageParam }) => sleep(10).then(() => ({ @@ -1617,7 +1617,7 @@ describe('dehydration and rehydration', () => { const key = queryKey() const serverClient = new QueryClient({ queryCache: new QueryCache() }) - const prefetchPromise = serverClient.prefetchInfiniteQuery({ + const prefetchPromise = serverClient.infiniteQuery({ queryKey: key, queryFn: ({ pageParam }) => sleep(10).then(() => ({ @@ -1627,7 +1627,7 @@ describe('dehydration and rehydration', () => { initialPageParam: 0, getNextPageParam: (lastPage: { items: Array; next: number }) => lastPage.next, - }) + }).catch(noop) await vi.advanceTimersByTimeAsync(10) await prefetchPromise @@ -1652,7 +1652,7 @@ describe('dehydration and rehydration', () => { const key = queryKey() const serverClient = new QueryClient({ queryCache: new QueryCache() }) - const prefetchPromise = serverClient.prefetchInfiniteQuery({ + const prefetchPromise = serverClient.infiniteQuery({ queryKey: key, queryFn: ({ pageParam }) => sleep(10).then(() => ({ @@ -1662,7 +1662,7 @@ describe('dehydration and rehydration', () => { initialPageParam: 0, getNextPageParam: (lastPage: { items: Array; next: number }) => lastPage.next, - }) + }).catch(noop) await vi.advanceTimersByTimeAsync(10) await prefetchPromise @@ -1679,7 +1679,7 @@ describe('dehydration and rehydration', () => { expect(beforeRefetch?.pages).toHaveLength(1) expect(beforeRefetch?.pageParams).toHaveLength(1) - const resultPromise = clientClient.fetchInfiniteQuery({ + const resultPromise = clientClient.infiniteQuery({ queryKey: key, queryFn: ({ pageParam }) => sleep(10).then(() => ({ @@ -1703,7 +1703,7 @@ describe('dehydration and rehydration', () => { const key = queryKey() const serverClient = new QueryClient({ queryCache: new QueryCache() }) - const prefetchPromise = serverClient.prefetchInfiniteQuery({ + const prefetchPromise = serverClient.infiniteQuery({ queryKey: key, queryFn: ({ pageParam }) => sleep(10).then(() => ({ @@ -1713,7 +1713,7 @@ describe('dehydration and rehydration', () => { initialPageParam: 0, getNextPageParam: (lastPage: { data: string; next: number }) => lastPage.next, - }) + }).catch(noop) await vi.advanceTimersByTimeAsync(10) await prefetchPromise @@ -1734,7 +1734,7 @@ describe('dehydration and rehydration', () => { const key = queryKey() const serverClient = new QueryClient({ queryCache: new QueryCache() }) - const prefetchPromise = serverClient.prefetchInfiniteQuery({ + const prefetchPromise = serverClient.infiniteQuery({ queryKey: key, queryFn: ({ pageParam }) => sleep(10).then(() => ({ @@ -1745,7 +1745,7 @@ describe('dehydration and rehydration', () => { pages: 2, getNextPageParam: (lastPage: { items: Array; next: number }) => lastPage.next, - }) + }).catch(noop) await vi.advanceTimersByTimeAsync(20) await prefetchPromise @@ -1761,7 +1761,7 @@ describe('dehydration and rehydration', () => { }>(key) expect(beforeRefetch?.pages).toHaveLength(2) - const resultPromise = clientClient.fetchInfiniteQuery({ + const resultPromise = clientClient.infiniteQuery({ queryKey: key, queryFn: ({ pageParam }) => sleep(10).then(() => ({ @@ -1772,7 +1772,7 @@ describe('dehydration and rehydration', () => { pages: 2, getNextPageParam: (lastPage: { items: Array; next: number }) => lastPage.next, - }) + }).catch(noop) await vi.advanceTimersByTimeAsync(20) const result = await resultPromise diff --git a/packages/react-query/src/__tests__/ssr.test.tsx b/packages/react-query/src/__tests__/ssr.test.tsx index cb55b29eff..0cd46d434d 100644 --- a/packages/react-query/src/__tests__/ssr.test.tsx +++ b/packages/react-query/src/__tests__/ssr.test.tsx @@ -153,11 +153,13 @@ describe('Server Side Rendering', () => { ) } - queryClient.prefetchInfiniteQuery({ - queryKey: key, - queryFn, - initialPageParam: 0, - }) + void queryClient + .infiniteQuery({ + queryKey: key, + queryFn, + initialPageParam: 0, + }) + .catch(noop) await vi.advanceTimersByTimeAsync(10) const markup = renderToString( diff --git a/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx b/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx index 7e3df99f01..420e0cab8f 100644 --- a/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx +++ b/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx @@ -5,6 +5,7 @@ import { queryKey, sleep } from '@tanstack/query-test-utils' import { QueryCache, QueryClient, + noop, usePrefetchInfiniteQuery, useSuspenseInfiniteQuery, } from '..' @@ -104,7 +105,7 @@ describe('usePrefetchInfiniteQuery', () => { allPages.length < data.length ? allPages.length : undefined, } - queryClient.prefetchInfiniteQuery({ ...queryOpts, pages: 3 }) + void queryClient.infiniteQuery({ ...queryOpts, pages: 3 }).catch(noop) await vi.advanceTimersByTimeAsync(30) queryOpts.queryFn.mockClear() From e976c33b756d8174066e669a3e61abee9d1de4f5 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2026 11:09:28 +0000 Subject: [PATCH 2/2] ci: apply automated fixes --- .../src/__tests__/hydration.test.tsx | 176 ++++++++++-------- 1 file changed, 95 insertions(+), 81 deletions(-) diff --git a/packages/query-core/src/__tests__/hydration.test.tsx b/packages/query-core/src/__tests__/hydration.test.tsx index 2d677d986c..c608525fd5 100644 --- a/packages/query-core/src/__tests__/hydration.test.tsx +++ b/packages/query-core/src/__tests__/hydration.test.tsx @@ -1536,19 +1536,21 @@ describe('dehydration and rehydration', () => { const queryCache = new QueryCache() const queryClient = new QueryClient({ queryCache }) - const prefetchPromise = queryClient.infiniteQuery({ - queryKey: key, - queryFn: ({ pageParam }) => - sleep(10).then(() => ({ - items: [`page-${pageParam}`], - nextCursor: pageParam + 1, - })), - initialPageParam: 0, - getNextPageParam: (lastPage: { - items: Array - nextCursor: number - }) => lastPage.nextCursor, - }).catch(noop) + const prefetchPromise = queryClient + .infiniteQuery({ + queryKey: key, + queryFn: ({ pageParam }) => + sleep(10).then(() => ({ + items: [`page-${pageParam}`], + nextCursor: pageParam + 1, + })), + initialPageParam: 0, + getNextPageParam: (lastPage: { + items: Array + nextCursor: number + }) => lastPage.nextCursor, + }) + .catch(noop) await vi.advanceTimersByTimeAsync(10) await prefetchPromise @@ -1575,17 +1577,19 @@ describe('dehydration and rehydration', () => { const queryCache = new QueryCache() const queryClient = new QueryClient({ queryCache }) - const prefetchPromise = queryClient.infiniteQuery({ - queryKey: key, - queryFn: ({ pageParam }) => - sleep(10).then(() => ({ - data: `page-${pageParam}`, - next: pageParam + 1, - })), - initialPageParam: 0, - getNextPageParam: (lastPage: { data: string; next: number }) => - lastPage.next, - }).catch(noop) + const prefetchPromise = queryClient + .infiniteQuery({ + queryKey: key, + queryFn: ({ pageParam }) => + sleep(10).then(() => ({ + data: `page-${pageParam}`, + next: pageParam + 1, + })), + initialPageParam: 0, + getNextPageParam: (lastPage: { data: string; next: number }) => + lastPage.next, + }) + .catch(noop) await vi.advanceTimersByTimeAsync(10) await prefetchPromise @@ -1617,17 +1621,19 @@ describe('dehydration and rehydration', () => { const key = queryKey() const serverClient = new QueryClient({ queryCache: new QueryCache() }) - const prefetchPromise = serverClient.infiniteQuery({ - queryKey: key, - queryFn: ({ pageParam }) => - sleep(10).then(() => ({ - items: [`item-${pageParam}`], - next: pageParam + 1, - })), - initialPageParam: 0, - getNextPageParam: (lastPage: { items: Array; next: number }) => - lastPage.next, - }).catch(noop) + const prefetchPromise = serverClient + .infiniteQuery({ + queryKey: key, + queryFn: ({ pageParam }) => + sleep(10).then(() => ({ + items: [`item-${pageParam}`], + next: pageParam + 1, + })), + initialPageParam: 0, + getNextPageParam: (lastPage: { items: Array; next: number }) => + lastPage.next, + }) + .catch(noop) await vi.advanceTimersByTimeAsync(10) await prefetchPromise @@ -1652,17 +1658,19 @@ describe('dehydration and rehydration', () => { const key = queryKey() const serverClient = new QueryClient({ queryCache: new QueryCache() }) - const prefetchPromise = serverClient.infiniteQuery({ - queryKey: key, - queryFn: ({ pageParam }) => - sleep(10).then(() => ({ - items: [`page-${pageParam}`], - next: pageParam + 1, - })), - initialPageParam: 0, - getNextPageParam: (lastPage: { items: Array; next: number }) => - lastPage.next, - }).catch(noop) + const prefetchPromise = serverClient + .infiniteQuery({ + queryKey: key, + queryFn: ({ pageParam }) => + sleep(10).then(() => ({ + items: [`page-${pageParam}`], + next: pageParam + 1, + })), + initialPageParam: 0, + getNextPageParam: (lastPage: { items: Array; next: number }) => + lastPage.next, + }) + .catch(noop) await vi.advanceTimersByTimeAsync(10) await prefetchPromise @@ -1703,17 +1711,19 @@ describe('dehydration and rehydration', () => { const key = queryKey() const serverClient = new QueryClient({ queryCache: new QueryCache() }) - const prefetchPromise = serverClient.infiniteQuery({ - queryKey: key, - queryFn: ({ pageParam }) => - sleep(10).then(() => ({ - data: `p${pageParam}`, - next: pageParam + 1, - })), - initialPageParam: 0, - getNextPageParam: (lastPage: { data: string; next: number }) => - lastPage.next, - }).catch(noop) + const prefetchPromise = serverClient + .infiniteQuery({ + queryKey: key, + queryFn: ({ pageParam }) => + sleep(10).then(() => ({ + data: `p${pageParam}`, + next: pageParam + 1, + })), + initialPageParam: 0, + getNextPageParam: (lastPage: { data: string; next: number }) => + lastPage.next, + }) + .catch(noop) await vi.advanceTimersByTimeAsync(10) await prefetchPromise @@ -1734,18 +1744,20 @@ describe('dehydration and rehydration', () => { const key = queryKey() const serverClient = new QueryClient({ queryCache: new QueryCache() }) - const prefetchPromise = serverClient.infiniteQuery({ - queryKey: key, - queryFn: ({ pageParam }) => - sleep(10).then(() => ({ - items: [`item-${pageParam}`], - next: pageParam + 1, - })), - initialPageParam: 0, - pages: 2, - getNextPageParam: (lastPage: { items: Array; next: number }) => - lastPage.next, - }).catch(noop) + const prefetchPromise = serverClient + .infiniteQuery({ + queryKey: key, + queryFn: ({ pageParam }) => + sleep(10).then(() => ({ + items: [`item-${pageParam}`], + next: pageParam + 1, + })), + initialPageParam: 0, + pages: 2, + getNextPageParam: (lastPage: { items: Array; next: number }) => + lastPage.next, + }) + .catch(noop) await vi.advanceTimersByTimeAsync(20) await prefetchPromise @@ -1761,18 +1773,20 @@ describe('dehydration and rehydration', () => { }>(key) expect(beforeRefetch?.pages).toHaveLength(2) - const resultPromise = clientClient.infiniteQuery({ - queryKey: key, - queryFn: ({ pageParam }) => - sleep(10).then(() => ({ - items: [`item-${pageParam}`], - next: pageParam + 1, - })), - initialPageParam: 0, - pages: 2, - getNextPageParam: (lastPage: { items: Array; next: number }) => - lastPage.next, - }).catch(noop) + const resultPromise = clientClient + .infiniteQuery({ + queryKey: key, + queryFn: ({ pageParam }) => + sleep(10).then(() => ({ + items: [`item-${pageParam}`], + next: pageParam + 1, + })), + initialPageParam: 0, + pages: 2, + getNextPageParam: (lastPage: { items: Array; next: number }) => + lastPage.next, + }) + .catch(noop) await vi.advanceTimersByTimeAsync(20) const result = await resultPromise