Fix prefetching multiple queries causes only the last one to be passe…

…d to page (#3551)
blitz-js · Jul 17, 2022 · 8d9ea00 · 8d9ea00
1 parent ab4d9de
commit 8d9ea00
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.changeset/twelve-lemons-smile.md b/.changeset/twelve-lemons-smile.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Fix prefetching multiple queries causes only the last one to be passed to page
diff --git a/packages/blitz-next/src/index-server.ts b/packages/blitz-next/src/index-server.ts
@@ -134,7 +134,9 @@ export const setupBlitzServer = ({plugins, onError}: SetupBlitzOptions) => {
         defaultOptions = {},
         infinite = false,
       ) => {
-        queryClient = new QueryClient({defaultOptions})
+        if (!queryClient) {
+          queryClient = new QueryClient({defaultOptions})
+        }
 
         const queryKey = infinite ? getInfiniteQueryKey(fn, input) : getQueryKey(fn, input)
         await queryClient.prefetchQuery(queryKey, () => fn(input, ctx))