diff --git a/integration-tests/react-query-utils/pages/page-with-prefetch-inf-query.tsx b/integration-tests/react-query-utils/pages/page-with-prefetch-inf-query.tsx
index 0b0981ff8f..622ecfa879 100644
--- a/integration-tests/react-query-utils/pages/page-with-prefetch-inf-query.tsx
+++ b/integration-tests/react-query-utils/pages/page-with-prefetch-inf-query.tsx
@@ -1,4 +1,4 @@
-import {useSuspenseInfiniteQuery} from "@blitzjs/rpc"
+import {useInfiniteQuery} from "@blitzjs/rpc"
import {gSSP} from "../app/blitz-server"
import testQuery from "../app/queries/getInfiniteData"
@@ -12,12 +12,12 @@ export const getServerSideProps = gSSP(async ({ctx}) => {
})
const PageWithPrefetchInfQuery = () => {
- const [data] = useSuspenseInfiniteQuery(
+ const [data] = useInfiniteQuery(
testQuery,
(pageParams) => ({...pageParams, name: "hello world"}),
{
+ suspense: false,
getNextPageParam: (lastPage) => lastPage,
- initialPageParam: {name: "hello world"},
},
)
return
{data ? data : "no-data"}
diff --git a/integration-tests/react-query-utils/test/index.test.ts b/integration-tests/react-query-utils/test/index.test.ts
index c73053497b..7423ec1cc8 100644
--- a/integration-tests/react-query-utils/test/index.test.ts
+++ b/integration-tests/react-query-utils/test/index.test.ts
@@ -51,22 +51,22 @@ const runTests = () => {
)
})
- // describe("prefetch infinite query", () => {
- // it(
- // "should work",
- // async () => {
- // const browser = await webdriver(appPort, "/page-with-prefetch-inf-query")
-
- // browser.waitForElementByCss("#data", 0)
- // const newText = await browser.elementByCss("#data").text()
- // expect(newText).not.toMatch("no-data")
- // expect(newText).toMatch("thanks")
-
- // if (browser) await browser.close()
- // },
- // 5000 * 60 * 2,
- // )
- // })
+ describe("prefetch infinite query", () => {
+ it(
+ "should work",
+ async () => {
+ const browser = await webdriver(appPort, "/page-with-prefetch-inf-query")
+
+ browser.waitForElementByCss("#data", 0)
+ const newText = await browser.elementByCss("#data").text()
+ expect(newText).not.toMatch("no-data")
+ expect(newText).toMatch("thanks")
+
+ if (browser) await browser.close()
+ },
+ 5000 * 60 * 2,
+ )
+ })
describe("invalidate query", () => {
it(
diff --git a/integration-tests/trailing-slash/next-env.d.ts b/integration-tests/trailing-slash/next-env.d.ts
index 725dd6f245..4f11a03dc6 100644
--- a/integration-tests/trailing-slash/next-env.d.ts
+++ b/integration-tests/trailing-slash/next-env.d.ts
@@ -1,6 +1,5 @@
///
///
-///
// NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
+// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/integration-tests/trailing-slash/pages/use-query.tsx b/integration-tests/trailing-slash/pages/use-query.tsx
index 51ead85c0c..2fee1c3d98 100644
--- a/integration-tests/trailing-slash/pages/use-query.tsx
+++ b/integration-tests/trailing-slash/pages/use-query.tsx
@@ -1,9 +1,9 @@
import getBasic from "../app/queries/getBasic"
-import {useSuspenseQuery} from "@blitzjs/rpc"
+import {useQuery} from "@blitzjs/rpc"
import {Suspense} from "react"
function Content() {
- const [result] = useSuspenseQuery(getBasic, undefined)
+ const [result] = useQuery(getBasic, undefined)
return
{result}
}
diff --git a/integration-tests/trailing-slash/tsconfig.json b/integration-tests/trailing-slash/tsconfig.json
index e39f5a770e..f391da135f 100644
--- a/integration-tests/trailing-slash/tsconfig.json
+++ b/integration-tests/trailing-slash/tsconfig.json
@@ -1,16 +1,10 @@
{
"extends": "@blitzjs/config/tsconfig.nextjs.json",
- "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types", ".next/types/**/*.ts"],
+ "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"],
"compilerOptions": {
"paths": {
"react": ["./node_modules/@types/react"]
- },
- "plugins": [
- {
- "name": "next"
- }
- ],
- "strictNullChecks": true
+ }
},
"exclude": ["node_modules"],
"baseUrl": "."
diff --git a/integration-tests/utils/package.json b/integration-tests/utils/package.json
index 2af3351bc5..d5604e9d63 100644
--- a/integration-tests/utils/package.json
+++ b/integration-tests/utils/package.json
@@ -22,7 +22,7 @@
"get-port": "6.1.2",
"node-fetch": "3.2.3",
"pkg-dir": "5.0.0",
- "playwright-chromium": "1.49.1",
+ "playwright-chromium": "1.28.0",
"react": "19.0.0",
"react-dom": "19.0.0",
"resolve-cwd": "3.0.0",
diff --git a/package.json b/package.json
index bad343bf42..bfd68be590 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,9 @@
]
},
"pnpm": {
+ "patchedDependencies": {
+ "next-auth@4.24.7": "patches/next-auth@4.24.7.patch"
+ },
"overrides": {
"@types/mime": "3.0.4",
"next": "15.0.1",
diff --git a/packages/blitz-auth/src/client/index.tsx b/packages/blitz-auth/src/client/index.tsx
index 6190cd610a..246d1aff43 100644
--- a/packages/blitz-auth/src/client/index.tsx
+++ b/packages/blitz-auth/src/client/index.tsx
@@ -152,7 +152,7 @@ export interface UseSessionOptions {
}
export const useSession = (options: UseSessionOptions = {}): ClientSession => {
- const suspense = options?.suspense ?? true
+ const suspense = options?.suspense ?? Boolean(globalThis.__BLITZ_SUSPENSE_ENABLED)
let initialState: ClientSession
if (options.initialPublicData) {
diff --git a/packages/blitz-auth/src/global.ts b/packages/blitz-auth/src/global.ts
index 0916eba0ff..c4def8d920 100644
--- a/packages/blitz-auth/src/global.ts
+++ b/packages/blitz-auth/src/global.ts
@@ -5,5 +5,6 @@ import type {SessionConfigMethods} from "./shared"
declare global {
var sessionConfig: AuthPluginOptions & SessionConfigMethods
var __BLITZ_SESSION_COOKIE_PREFIX: string | undefined
+ var __BLITZ_SUSPENSE_ENABLED: boolean
var __BLITZ_GET_RSC_CONTEXT: () => Promise
}
diff --git a/packages/blitz-next/src/index-server.ts b/packages/blitz-next/src/index-server.ts
index 5be8137274..a3af4c8528 100644
--- a/packages/blitz-next/src/index-server.ts
+++ b/packages/blitz-next/src/index-server.ts
@@ -123,15 +123,11 @@ const prefetchQueryFactory = (
}
if (infinite) {
- await queryClient.prefetchQuery({
- queryKey: getInfiniteQueryKey(fn, input),
- queryFn: () => fn(input, ctx),
- })
+ await queryClient.prefetchInfiniteQuery(getInfiniteQueryKey(fn, input), () =>
+ fn(input, ctx),
+ )
} else {
- await queryClient.prefetchQuery({
- queryKey: getQueryKey(fn, input),
- queryFn: () => fn(input, ctx),
- })
+ await queryClient.prefetchQuery(getQueryKey(fn, input), () => fn(input, ctx))
}
},
}
@@ -247,6 +243,7 @@ export interface BlitzConfig extends NextConfig {
}
}
+
export function withBlitz(nextConfig: BlitzConfig = {}): NextConfig {
if (
process.env.NODE_ENV !== "production" &&
diff --git a/packages/blitz-next/src/provider.tsx b/packages/blitz-next/src/provider.tsx
index 51f18693d6..ba414b3162 100644
--- a/packages/blitz-next/src/provider.tsx
+++ b/packages/blitz-next/src/provider.tsx
@@ -1,4 +1,4 @@
-import {QueryClientProvider, HydrationBoundary} from "@blitzjs/rpc"
+import {QueryClientProvider, Hydrate} from "@blitzjs/rpc"
import type {QueryClient, HydrateOptions} from "@blitzjs/rpc"
import React from "react"
@@ -12,16 +12,20 @@ export type BlitzProviderProps = {
export const BlitzProvider = ({
client = globalThis.queryClient,
+ contextSharing = false,
dehydratedState,
hydrateOptions,
children,
}: BlitzProviderProps) => {
if (client) {
return (
-
-
+
+
{children}
-
+
)
}
diff --git a/packages/blitz-rpc/package.json b/packages/blitz-rpc/package.json
index bb3d0aaf7f..08c9612386 100644
--- a/packages/blitz-rpc/package.json
+++ b/packages/blitz-rpc/package.json
@@ -27,7 +27,7 @@
],
"dependencies": {
"@swc/core": "1.3.7",
- "@tanstack/react-query": "5.51.1",
+ "@tanstack/react-query": "4.24.4",
"b64-lite": "1.4.0",
"bad-behavior": "1.0.1",
"chalk": "^4.1.0",
@@ -36,7 +36,7 @@
"supports-color": "8.1.1"
},
"peerDependencies": {
- "@tanstack/query-core": "5.51.1",
+ "@tanstack/query-core": "4.24.4",
"blitz": "2.2.1",
"next": "*",
"react": "*"
@@ -44,7 +44,7 @@
"devDependencies": {
"@blitzjs/auth": "2.2.1",
"@blitzjs/config": "2.2.1",
- "@tanstack/query-core": "5.51.1",
+ "@tanstack/query-core": "4.24.4",
"@types/debug": "4.1.7",
"@types/react": "npm:types-react@19.0.0",
"@types/react-dom": "npm:types-react-dom@19.0.0",
diff --git a/packages/blitz-rpc/src/global.ts b/packages/blitz-rpc/src/global.ts
index 9b4f11c9b6..950669f38e 100644
--- a/packages/blitz-rpc/src/global.ts
+++ b/packages/blitz-rpc/src/global.ts
@@ -4,6 +4,7 @@ import type {Ctx} from "blitz"
declare global {
var queryClient: QueryClient
+ var __BLITZ_SUSPENSE_ENABLED: boolean
var blitzRpcRpcLoggerOptions: RpcLoggerOptions | undefined
var __BLITZ_GET_RSC_CONTEXT: () => Promise
}
diff --git a/packages/blitz-rpc/src/index-browser.tsx b/packages/blitz-rpc/src/index-browser.tsx
index ed6f648eb6..a134bcde90 100644
--- a/packages/blitz-rpc/src/index-browser.tsx
+++ b/packages/blitz-rpc/src/index-browser.tsx
@@ -15,8 +15,6 @@ export {
useMutation,
usePaginatedQuery,
useQuery,
- useSuspenseInfiniteQuery,
- useSuspenseQuery,
} from "./query/react-query"
export type {
DefaultOptions,
@@ -30,6 +28,5 @@ export type {
export * from "./query/utils"
import {reactQueryClientReExports} from "./query/react-query"
-const {QueryClientProvider, HydrationBoundary, useQueryErrorResetBoundary} =
- reactQueryClientReExports
-export {QueryClientProvider, HydrationBoundary, useQueryErrorResetBoundary}
+const {QueryClientProvider, Hydrate, useQueryErrorResetBoundary} = reactQueryClientReExports
+export {QueryClientProvider, Hydrate, useQueryErrorResetBoundary}
diff --git a/packages/blitz-rpc/src/query/react-query/index.ts b/packages/blitz-rpc/src/query/react-query/index.ts
index ec1bec1097..e7aa4d0f0a 100644
--- a/packages/blitz-rpc/src/query/react-query/index.ts
+++ b/packages/blitz-rpc/src/query/react-query/index.ts
@@ -28,6 +28,11 @@ export const BlitzRpcPlugin = createClientPlugin<
>((options?: BlitzRpcOptions) => {
const initializeQueryClient = () => {
const {reactQueryOptions} = options || {}
+ let suspenseEnabled = reactQueryOptions?.queries?.suspense ?? true
+ if (!process.env.CLI_COMMAND_CONSOLE && !process.env.CLI_COMMAND_DB) {
+ globalThis.__BLITZ_SUSPENSE_ENABLED = suspenseEnabled
+ }
+
return new QueryClient({
defaultOptions: {
...reactQueryOptions,
@@ -42,6 +47,7 @@ export const BlitzRpcPlugin = createClientPlugin<
return false
},
...reactQueryOptions?.queries,
+ suspense: suspenseEnabled,
},
},
})
diff --git a/packages/blitz-rpc/src/query/react-query/react-query.ts b/packages/blitz-rpc/src/query/react-query/react-query.ts
index 697cfbaa39..d8872ce867 100644
--- a/packages/blitz-rpc/src/query/react-query/react-query.ts
+++ b/packages/blitz-rpc/src/query/react-query/react-query.ts
@@ -1,21 +1,13 @@
-import {
- useQueryErrorResetBoundary,
- QueryClientProvider,
- HydrationBoundary,
- keepPreviousData,
-} from "@tanstack/react-query"
-import type {DefaultError, InfiniteData} from "@tanstack/query-core"
+import {useQueryErrorResetBoundary, QueryClientProvider, Hydrate} from "@tanstack/react-query"
import {useInfiniteQuery as useInfiniteReactQuery} from "@tanstack/react-query"
-import {useSuspenseInfiniteQuery as useSuspenseInfiniteReactQuery} from "@tanstack/react-query"
import {useQuery as useReactQuery} from "@tanstack/react-query"
-import {useSuspenseQuery as useSuspenseReactQuery} from "@tanstack/react-query"
import {useMutation as useReactQueryMutation} from "@tanstack/react-query"
export const reactQueryClientReExports = {
useQueryErrorResetBoundary,
QueryClientProvider,
- HydrationBoundary,
+ Hydrate,
}
import type {
@@ -26,8 +18,6 @@ import type {
UseMutationOptions,
UseMutationResult,
MutateOptions,
- UseSuspenseQueryOptions,
- UseSuspenseInfiniteQueryOptions,
} from "@tanstack/react-query"
import {isServer, FirstParam, PromiseReturnType, AsyncFunc} from "blitz"
@@ -62,42 +52,43 @@ export type RestQueryResult = Omit,
- TError = DefaultError,
+ TError = unknown,
TSelectedData = TResult,
>(
queryFn: T,
params: FirstParam,
- options?: Omit, "queryKey"> & QueryNonLazyOptions,
-): [TSelectedData | undefined, RestQueryResult]
+ options?: UseQueryOptions & QueryNonLazyOptions,
+): [TSelectedData, RestQueryResult]
export function useQuery<
T extends AsyncFunc,
TResult = PromiseReturnType,
- TError = DefaultError,
+ TError = unknown,
TSelectedData = TResult,
>(
queryFn: T,
params: FirstParam,
- options: Omit, "queryKey"> & QueryLazyOptions,
-): [TSelectedData | undefined, RestQueryResult]
+ options: UseQueryOptions & QueryLazyOptions,
+): [TSelectedData | undefined, RestQueryResult]
export function useQuery<
T extends AsyncFunc,
TResult = PromiseReturnType,
- TError = DefaultError,
+ TError = unknown,
TSelectedData = TResult,
>(
queryFn: T,
params: FirstParam,
- options: Omit, "queryKey"> = {},
+ options: UseQueryOptions = {},
) {
if (typeof queryFn === "undefined") {
throw new Error("useQuery is missing the first argument - it must be a query function")
}
- let enabled = isServer ? false : options?.enabled ?? options?.enabled !== null
+ const suspenseEnabled = Boolean(globalThis.__BLITZ_SUSPENSE_ENABLED)
+ let enabled = isServer && suspenseEnabled ? false : options?.enabled ?? options?.enabled !== null
let routerIsReady = false
const router = useRouter()
if (router) {
- routerIsReady = router?.isReady || isServer
+ routerIsReady = router?.isReady || (isServer && suspenseEnabled)
} else {
routerIsReady = true
}
@@ -108,70 +99,19 @@ export function useQuery<
queryKey: routerIsReady ? queryKey : ["_routerNotReady_"],
queryFn: routerIsReady
? ({signal}) => enhancedResolverRpcClient(params, {fromQueryHook: true}, signal)
- : (emptyQueryFn as PromiseReturnType),
+ : (emptyQueryFn as any),
...options,
enabled,
})
- const rest = {
- ...queryRest,
- ...getQueryCacheFunctions, TResult, T>(queryFn, params),
- }
-
- return [data, rest]
-}
-
-// -------------------------
-// useSuspenseQuery
-// -------------------------
-
-export function useSuspenseQuery<
- T extends AsyncFunc,
- TResult = PromiseReturnType,
- TError = DefaultError,
- TSelectedData = TResult,
->(
- queryFn: T,
- params: FirstParam,
- options?: Omit, "queryKey"> & QueryNonLazyOptions,
-): [TSelectedData, RestQueryResult]
-export function useSuspenseQuery<
- T extends AsyncFunc,
- TResult = PromiseReturnType,
- TError = DefaultError,
- TSelectedData = TResult,
->(
- queryFn: T,
- params: FirstParam,
- options: Omit, "queryKey"> &
- QueryLazyOptions,
-): [TSelectedData | undefined, RestQueryResult]
-export function useSuspenseQuery<
- T extends AsyncFunc,
- TResult = PromiseReturnType,
- TError = DefaultError,
- TSelectedData = TResult,
->(
- queryFn: T,
- params: FirstParam,
- options: Omit, "queryKey"> = {},
-) {
- if (typeof queryFn === "undefined") {
- throw new Error("useQuery is missing the first argument - it must be a query function")
- }
-
- const enhancedResolverRpcClient = sanitizeQuery(queryFn)
- const queryKey = getQueryKey(queryFn, params)
-
- let routerIsReady = false
- const router = useRouter()
- if (router) {
- routerIsReady = router?.isReady || isServer
- } else {
- routerIsReady = true
- }
-
- if (isServer) {
+ if (
+ queryRest.fetchStatus === "idle" &&
+ isServer &&
+ suspenseEnabled !== false &&
+ !data &&
+ (!options || !("suspense" in options) || options.suspense) &&
+ (!options || !("enabled" in options) || options.enabled)
+ ) {
const e = new NextError()
e.name = "Rendering Suspense fallback..."
e.digest = "DYNAMIC_SERVER_USAGE"
@@ -181,19 +121,12 @@ export function useSuspenseQuery<
throw e
}
- const {data, ...queryRest} = useSuspenseReactQuery({
- queryKey: routerIsReady ? queryKey : ["_routerNotReady_"],
- queryFn: routerIsReady
- ? ({signal}) => enhancedResolverRpcClient(params, {fromQueryHook: true}, signal)
- : (emptyQueryFn as PromiseReturnType),
- ...options,
- })
-
const rest = {
...queryRest,
...getQueryCacheFunctions, TResult, T>(queryFn, params),
}
+ // return [data, rest as RestQueryResult]
return [data, rest]
}
@@ -206,42 +139,43 @@ export type RestPaginatedResult = Omit,
- TError = DefaultError,
+ TError = unknown,
TSelectedData = TResult,
>(
queryFn: T,
params: FirstParam,
- options?: Omit, "queryKey"> & QueryNonLazyOptions,
-): [TSelectedData | undefined, RestPaginatedResult]
+ options?: UseQueryOptions & QueryNonLazyOptions,
+): [TSelectedData, RestPaginatedResult]
export function usePaginatedQuery<
T extends AsyncFunc,
TResult = PromiseReturnType,
- TError = DefaultError,
+ TError = unknown,
TSelectedData = TResult,
>(
queryFn: T,
params: FirstParam,
- options: Omit, "queryKey"> & QueryLazyOptions,
+ options: UseQueryOptions & QueryLazyOptions,
): [TSelectedData | undefined, RestPaginatedResult]
export function usePaginatedQuery<
T extends AsyncFunc,
TResult = PromiseReturnType,
- TError = DefaultError,
+ TError = unknown,
TSelectedData = TResult,
>(
queryFn: T,
params: FirstParam,
- options: Omit, "queryKey"> = {},
+ options: UseQueryOptions = {},
) {
if (typeof queryFn === "undefined") {
throw new Error("usePaginatedQuery is missing the first argument - it must be a query function")
}
- let enabled = isServer ? false : options?.enabled ?? options?.enabled !== null
+ const suspenseEnabled = Boolean(globalThis.__BLITZ_SUSPENSE_ENABLED)
+ let enabled = isServer && suspenseEnabled ? false : options?.enabled ?? options?.enabled !== null
let routerIsReady = false
const router = useRouter()
if (router) {
- routerIsReady = router?.isReady || isServer
+ routerIsReady = router?.isReady || (isServer && suspenseEnabled)
} else {
routerIsReady = true
}
@@ -252,13 +186,20 @@ export function usePaginatedQuery<
queryKey: routerIsReady ? queryKey : ["_routerNotReady_"],
queryFn: routerIsReady
? ({signal}) => enhancedResolverRpcClient(params, {fromQueryHook: true}, signal)
- : (emptyQueryFn as PromiseReturnType),
+ : (emptyQueryFn as any),
...options,
- placeholderData: keepPreviousData,
+ keepPreviousData: true,
enabled,
})
- if (queryRest.fetchStatus === "idle" && isServer && !data) {
+ if (
+ queryRest.fetchStatus === "idle" &&
+ isServer &&
+ suspenseEnabled !== false &&
+ !data &&
+ (!options || !("suspense" in options) || options.suspense) &&
+ (!options || !("enabled" in options) || options.enabled)
+ ) {
const e = new NextError()
e.name = "Rendering Suspense fallback..."
e.digest = "DYNAMIC_SERVER_USAGE"
@@ -295,43 +236,43 @@ interface InfiniteQueryConfig
export function useInfiniteQuery<
T extends AsyncFunc,
TResult = PromiseReturnType,
- TError = DefaultError,
+ TError = unknown,
TSelectedData = TResult,
>(
queryFn: T,
getQueryParams: (pageParam: any) => FirstParam,
- options: Omit, "queryKey"> &
- QueryNonLazyOptions,
-): [TSelectedData[] | undefined, RestInfiniteResult]
+ options: InfiniteQueryConfig & QueryNonLazyOptions,
+): [TSelectedData[], RestInfiniteResult]
export function useInfiniteQuery<
T extends AsyncFunc,
TResult = PromiseReturnType,
- TError = DefaultError,
+ TError = unknown,
TSelectedData = TResult,
>(
queryFn: T,
getQueryParams: (pageParam: any) => FirstParam,
- options: Omit, "queryKey"> & QueryLazyOptions,
+ options: InfiniteQueryConfig & QueryLazyOptions,
): [TSelectedData[] | undefined, RestInfiniteResult]
export function useInfiniteQuery<
T extends AsyncFunc,
TResult = PromiseReturnType,
- TError = DefaultError,
+ TError = unknown,
TSelectedData = TResult,
>(
queryFn: T,
getQueryParams: (pageParam: any) => FirstParam,
- options: Omit, "queryKey">,
+ options: InfiniteQueryConfig,
) {
if (typeof queryFn === "undefined") {
throw new Error("useInfiniteQuery is missing the first argument - it must be a query function")
}
- let enabled = isServer ? false : options?.enabled ?? options?.enabled !== null
+ const suspenseEnabled = Boolean(globalThis.__BLITZ_SUSPENSE_ENABLED)
+ let enabled = isServer && suspenseEnabled ? false : options?.enabled ?? options?.enabled !== null
let routerIsReady = false
const router = useRouter()
if (router) {
- routerIsReady = router?.isReady || isServer
+ routerIsReady = router?.isReady || (isServer && suspenseEnabled)
} else {
routerIsReady = true
}
@@ -351,93 +292,14 @@ export function useInfiniteQuery<
enabled,
})
- const infiniteQueryData = data as InfiniteData
-
- const rest = {
- ...queryRest,
- ...getQueryCacheFunctions, TResult, T>(queryFn, getQueryParams),
- pageParams: infiniteQueryData?.pageParams,
- }
-
- return [infiniteQueryData?.pages as any, rest]
-}
-
-// -------------------------
-// useInfiniteQuery
-// -------------------------
-export interface RestInfiniteResult
- extends Omit, "data">,
- QueryCacheFunctions {
- pageParams: any
-}
-
-interface InfiniteQueryConfig
- extends UseInfiniteQueryOptions {
- // getPreviousPageParam?: (lastPage: TResult, allPages: TResult[]) => TGetPageParamResult
- // getNextPageParam?: (lastPage: TResult, allPages: TResult[]) => TGetPageParamResult
-}
-
-export function useSuspenseInfiniteQuery<
- T extends AsyncFunc,
- TResult = PromiseReturnType,
- TError = DefaultError,
- TSelectedData = TResult,
->(
- queryFn: T,
- getQueryParams: (pageParam: any) => FirstParam,
- options: Omit, "queryKey"> &
- QueryNonLazyOptions,
-): [TSelectedData[], RestInfiniteResult]
-export function useSuspenseInfiniteQuery<
- T extends AsyncFunc,
- TResult = PromiseReturnType,
- TError = DefaultError,
- TSelectedData = TResult,
->(
- queryFn: T,
- getQueryParams: (pageParam: any) => FirstParam,
- options: Omit, "queryKey"> &
- QueryLazyOptions,
-): [TSelectedData[] | undefined, RestInfiniteResult]
-export function useSuspenseInfiniteQuery<
- T extends AsyncFunc,
- TResult = PromiseReturnType,
- TError = DefaultError,
- TSelectedData = TResult,
->(
- queryFn: T,
- getQueryParams: (pageParam: any) => FirstParam,
- options: Omit, "queryKey">,
-) {
- if (typeof queryFn === "undefined") {
- throw new Error("useInfiniteQuery is missing the first argument - it must be a query function")
- }
-
- let routerIsReady = false
- const router = useRouter()
- if (router) {
- routerIsReady = router?.isReady || isServer
- } else {
- routerIsReady = true
- }
- const enhancedResolverRpcClient = sanitizeQuery(queryFn)
- const queryKey = getInfiniteQueryKey(queryFn, getQueryParams)
-
- const {data, ...queryRest} = useSuspenseInfiniteReactQuery({
- // we need an extra cache key for infinite loading so that the cache for
- // for this query is stored separately since the hook result is an array of results.
- // Without this cache for usePaginatedQuery and this will conflict and break.
- queryKey: routerIsReady ? queryKey : ["_routerNotReady_"],
- queryFn: routerIsReady
- ? ({pageParam, signal}) =>
- enhancedResolverRpcClient(getQueryParams(pageParam), {fromQueryHook: true}, signal)
- : (emptyQueryFn as any),
- ...options,
- })
-
- const infiniteQueryData = data as InfiniteData
-
- if (queryRest.fetchStatus === "idle" && isServer && !infiniteQueryData) {
+ if (
+ queryRest.fetchStatus === "idle" &&
+ isServer &&
+ suspenseEnabled !== false &&
+ !data &&
+ (!options || !("suspense" in options) || options.suspense) &&
+ (!options || !("enabled" in options) || options.enabled)
+ ) {
const e = new NextError()
e.name = "Rendering Suspense fallback..."
e.digest = "DYNAMIC_SERVER_USAGE"
@@ -450,10 +312,10 @@ export function useSuspenseInfiniteQuery<
const rest = {
...queryRest,
...getQueryCacheFunctions, TResult, T>(queryFn, getQueryParams),
- pageParams: infiniteQueryData?.pageParams,
+ pageParams: data?.pageParams,
}
- return [infiniteQueryData?.pages as unknown, rest]
+ return [data?.pages as any, rest]
}
// -------------------------------------------------------------------
@@ -490,7 +352,7 @@ export declare type MutationFunction = (
export function useMutation<
TData = unknown,
- TError = DefaultError,
+ TError = unknown,
TVariables = void,
TContext = unknown,
>(
@@ -500,11 +362,11 @@ export function useMutation<
const enhancedResolverRpcClient = sanitizeMutation(mutationResolver)
const {mutate, mutateAsync, ...rest} = useReactQueryMutation(
+ (variables) => enhancedResolverRpcClient(variables, {fromQueryHook: true}),
{
- mutationFn: (variables) => enhancedResolverRpcClient(variables, {fromQueryHook: true}),
throwOnError: true,
...config,
- },
+ } as any,
)
return [mutateAsync, rest] as MutationResultPair
diff --git a/packages/blitz-rpc/src/query/utils.ts b/packages/blitz-rpc/src/query/utils.ts
index fa12cc1394..7ce9b6b341 100644
--- a/packages/blitz-rpc/src/query/utils.ts
+++ b/packages/blitz-rpc/src/query/utils.ts
@@ -31,10 +31,16 @@ type MutateOptions = {
}
export const initializeQueryClient = () => {
+ let suspenseEnabled = true
+ if (!process.env.CLI_COMMAND_CONSOLE && !process.env.CLI_COMMAND_DB) {
+ suspenseEnabled = Boolean(globalThis.__BLITZ_SUSPENSE_ENABLED)
+ }
+
return new QueryClient({
defaultOptions: {
queries: {
...(isServer && {cacheTime: 0}),
+ suspense: suspenseEnabled,
retry: (failureCount, error: any) => {
if (process.env.NODE_ENV !== "production") return false
@@ -49,7 +55,7 @@ export const initializeQueryClient = () => {
}
// Query client is initialised in `BlitzRpcPlugin`, and can only be used with BlitzRpcPlugin right now
-export const getQueryClient = () => globalThis.queryClient as QueryClient
+export const getQueryClient = () => globalThis.queryClient
function isRpcClient(f: any): f is RpcClient {
return !!f._isRpcClient
@@ -165,9 +171,7 @@ interface InvalidateQuery {
export const invalidateQuery: InvalidateQuery = (resolver = undefined, ...params: []) => {
const fullQueryKey =
typeof resolver === "undefined" ? undefined : getQueryKey(resolver, ...params)
- return getQueryClient().invalidateQueries({
- queryKey: fullQueryKey,
- })
+ return getQueryClient().invalidateQueries(fullQueryKey)
}
export function setQueryData(
diff --git a/packages/blitz-rpc/test/unit/react-query-utils.unit.test.ts b/packages/blitz-rpc/test/unit/react-query-utils.unit.test.ts
index f7d28864f2..d09fb217b7 100644
--- a/packages/blitz-rpc/test/unit/react-query-utils.unit.test.ts
+++ b/packages/blitz-rpc/test/unit/react-query-utils.unit.test.ts
@@ -59,7 +59,7 @@ describe("invalidateQuery", () => {
expect(spyRefetchQueries).toBeCalledTimes(1)
const calledWith = spyRefetchQueries.mock.calls[0]![0] as any
// json of the queryKey is "a"
- expect(calledWith.queryKey[1].json).toEqual("a")
+ expect(calledWith[1].json).toEqual("a")
})
})
@@ -90,7 +90,7 @@ describe("setQueryData", () => {
expect(spySetQueryData).toBeCalledTimes(1)
const invalidateCalledWith = spyRefetchQueries.mock.calls[0]![0] as any
- expect(invalidateCalledWith.queryKey[1].json).toEqual("params")
+ expect(invalidateCalledWith[1].json).toEqual("params")
const calledWith = spySetQueryData.mock.calls[0] as Array
expect(calledWith[0][1].json).toEqual("params")
diff --git a/patches/next-auth@4.24.7.patch b/patches/next-auth@4.24.7.patch
new file mode 100644
index 0000000000..092a042cd6
--- /dev/null
+++ b/patches/next-auth@4.24.7.patch
@@ -0,0 +1,23 @@
+diff --git a/package.json b/package.json
+index c89e03c41a03de738cfb0ad090a63c2e99dadc7b..a5f38083c24732651c427c2b2d17cbcb23495473 100644
+--- a/package.json
++++ b/package.json
+@@ -57,6 +57,18 @@
+ "./providers/*": {
+ "types": "./providers/*.d.ts",
+ "default": "./providers/*.js"
++ },
++ "./core/init": {
++ "types": "./core/init.d.ts",
++ "default": "./core/init.js"
++ },
++ "./core/lib/oauth/authorization-url": {
++ "types": "./core/lib/oauth/authorization-url.d.ts",
++ "default": "./core/lib/oauth/authorization-url.js"
++ },
++ "./core/lib/oauth/callback": {
++ "types": "./core/lib/oauth/callback.d.ts",
++ "default": "./core/lib/oauth/callback.js"
+ }
+ },
+ "files": [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4405629bdd..aaeb043724 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,6 +10,11 @@ overrides:
"@types/react": npm:types-react@rc
"@types/react-dom": npm:types-react-dom@rc
+patchedDependencies:
+ next-auth@4.24.7:
+ hash: xxwv3g3ul7bnzqsfasefw3kyq4
+ path: patches/next-auth@4.24.7.patch
+
importers:
.:
dependencies:
@@ -80,8 +85,8 @@ importers:
specifier: ^4.5.0
version: 4.6.1(prisma@4.6.1)
"@tanstack/react-query":
- specifier: 5.51.1
- version: 5.51.1(react@19.0.0)
+ specifier: 4.0.10
+ version: 4.0.10(react-dom@19.0.0)(react@19.0.0)
blitz:
specifier: 2.2.1
version: link:../../packages/blitz
@@ -160,7 +165,7 @@ importers:
version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0)(react@19.0.0)
next-auth:
specifier: 4.24.7
- version: 4.24.7(next@15.0.1)(react-dom@19.0.0)(react@19.0.0)
+ version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@19.0.0)(react@19.0.0)
prisma:
specifier: 6.1.0
version: 6.1.0
@@ -493,8 +498,8 @@ importers:
specifier: 3.2.3
version: 3.2.3
playwright:
- specifier: 1.49.1
- version: 1.49.1
+ specifier: 1.28.0
+ version: 1.28.0
ts-node:
specifier: 10.9.1
version: 10.9.1(@types/node@18.7.13)(typescript@4.8.4)
@@ -596,8 +601,8 @@ importers:
specifier: 13.0.3
version: 13.0.3
playwright:
- specifier: 1.49.1
- version: 1.49.1
+ specifier: 1.28.0
+ version: 1.28.0
prettier:
specifier: ^2.7.1
version: 2.7.1
@@ -821,8 +826,8 @@ importers:
specifier: 3.2.3
version: 3.2.3
playwright:
- specifier: 1.49.1
- version: 1.49.1
+ specifier: 1.28.0
+ version: 1.28.0
ts-node:
specifier: 10.9.1
version: 10.9.1(@types/node@18.7.13)(typescript@4.9.5)
@@ -918,8 +923,8 @@ importers:
specifier: 6.1.0
version: 6.1.0(prisma@6.1.0)
"@tanstack/react-query":
- specifier: 5.51.1
- version: 5.51.1(react@19.0.0)
+ specifier: 4.0.10
+ version: 4.0.10(react-dom@19.0.0)(react@19.0.0)
blitz:
specifier: 2.2.1
version: link:../../packages/blitz
@@ -1259,8 +1264,8 @@ importers:
specifier: 5.0.0
version: 5.0.0
playwright-chromium:
- specifier: 1.49.1
- version: 1.49.1
+ specifier: 1.28.0
+ version: 1.28.0
react:
specifier: 19.0.0
version: 19.0.0
@@ -1607,7 +1612,7 @@ importers:
version: 15.0.1(@babel/core@7.20.2)(react-dom@19.0.0)(react@19.0.0)
next-auth:
specifier: 4.24.7
- version: 4.24.7(next@15.0.1)(react-dom@19.0.0)(react@19.0.0)
+ version: 4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@19.0.0)(react@19.0.0)
react:
specifier: 19.0.0
version: 19.0.0
@@ -1730,8 +1735,8 @@ importers:
specifier: 1.3.7
version: 1.3.7
"@tanstack/react-query":
- specifier: 5.51.1
- version: 5.51.1(react@19.0.0)
+ specifier: 4.24.4
+ version: 4.24.4(react-dom@19.0.0)(react@19.0.0)
b64-lite:
specifier: 1.4.0
version: 1.4.0
@@ -1758,8 +1763,8 @@ importers:
specifier: 2.2.1
version: link:../config
"@tanstack/query-core":
- specifier: 5.51.1
- version: 5.51.1
+ specifier: 4.24.4
+ version: 4.24.4
"@types/debug":
specifier: 4.1.7
version: 4.1.7
@@ -6738,12 +6743,34 @@ packages:
}
dev: true
- /@tanstack/query-core@5.51.1:
+ /@tanstack/query-core@4.24.4:
resolution:
{
- integrity: sha512-fJBMQMpo8/KSsWW5ratJR5+IFr7YNJ3K2kfP9l5XObYHsgfVy1w3FJUWU4FT2fj7+JMaEg33zOcNDBo0LMwHnw==,
+ integrity: sha512-9dqjv9eeB6VHN7lD3cLo16ZAjfjCsdXetSAD5+VyKqLUvcKTL0CklGQRJu+bWzdrS69R6Ea4UZo8obHYZnG6aA==,
}
+ /@tanstack/react-query@4.0.10(react-dom@19.0.0)(react@19.0.0):
+ resolution:
+ {
+ integrity: sha512-Wn5QhZUE5wvr6rGClV7KeQIUsdTmYR9mgmMZen7DSRWauHW2UTynFg3Kkf6pw+XlxxOLsyLWwz/Q6q1lSpM3TQ==,
+ }
+ peerDependencies:
+ react: ^16.8.0 || ^17.0.0 || ^18.0.0
+ react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+ react-native: "*"
+ peerDependenciesMeta:
+ react-dom:
+ optional: true
+ react-native:
+ optional: true
+ dependencies:
+ "@tanstack/query-core": 4.24.4
+ "@types/use-sync-external-store": 0.0.3
+ react: 19.0.0
+ react-dom: 19.0.0(react@19.0.0)
+ use-sync-external-store: 1.2.0(react@19.0.0)
+ dev: false
+
/@tanstack/react-query@4.13.0(react-dom@19.0.0)(react@19.0.0):
resolution:
{
@@ -6765,16 +6792,25 @@ packages:
use-sync-external-store: 1.2.0(react@19.0.0)
dev: true
- /@tanstack/react-query@5.51.1(react@19.0.0):
+ /@tanstack/react-query@4.24.4(react-dom@19.0.0)(react@19.0.0):
resolution:
{
- integrity: sha512-s47HKFnQ4HOJAHoIiXcpna/roMMPZJPy6fJ6p4ZNVn8+/onlLBEDd1+xc8OnDuwgvecqkZD7Z2mnSRbcWefrKw==,
+ integrity: sha512-RpaS/3T/a3pHuZJbIAzAYRu+1nkp+/enr9hfRXDS/mojwx567UiMksoqW4wUFWlwIvWTXyhot2nbIipTKEg55Q==,
}
peerDependencies:
- react: ^18.0.0
+ react: ^16.8.0 || ^17.0.0 || ^18.0.0
+ react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+ react-native: "*"
+ peerDependenciesMeta:
+ react-dom:
+ optional: true
+ react-native:
+ optional: true
dependencies:
- "@tanstack/query-core": 5.51.1
+ "@tanstack/query-core": 4.24.4
react: 19.0.0
+ react-dom: 19.0.0(react@19.0.0)
+ use-sync-external-store: 1.2.0(react@19.0.0)
dev: false
/@testim/chrome-version@1.1.2:
@@ -7732,6 +7768,13 @@ packages:
integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==,
}
+ /@types/use-sync-external-store@0.0.3:
+ resolution:
+ {
+ integrity: sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==,
+ }
+ dev: false
+
/@types/vinyl@2.0.6:
resolution:
{
@@ -13696,17 +13739,6 @@ packages:
integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==,
}
- /fsevents@2.3.2:
- resolution:
- {
- integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==,
- }
- engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
- os: [darwin]
- requiresBuild: true
- dev: true
- optional: true
-
/fsevents@2.3.3:
resolution:
{
@@ -17999,7 +18031,7 @@ packages:
}
dev: false
- /next-auth@4.24.7(next@15.0.1)(react-dom@19.0.0)(react@19.0.0):
+ /next-auth@4.24.7(patch_hash=xxwv3g3ul7bnzqsfasefw3kyq4)(next@15.0.1)(react-dom@19.0.0)(react@19.0.0):
resolution:
{
integrity: sha512-iChjE8ov/1K/z98gdKbn2Jw+2vLgJtVV39X+rCP5SGnVQuco7QOr19FRNGMIrD8d3LYhHWV9j9sKLzq1aDWWQQ==,
@@ -18025,6 +18057,7 @@ packages:
react: 19.0.0
react-dom: 19.0.0(react@19.0.0)
uuid: 8.3.2
+ patched: true
/next-router-mock@0.9.1(next@15.0.1)(react@19.0.0):
resolution:
@@ -19276,38 +19309,37 @@ packages:
pathe: 0.3.2
dev: true
- /playwright-chromium@1.49.1:
+ /playwright-chromium@1.28.0:
resolution:
{
- integrity: sha512-XAQDkZ1Eem1OONhfS8B2LM2mgHG/i5jIxooxjvqjbF/9GnLnRTJHdQamNjo1e4FZvt7J0BFD/15+qAcT0eKlfA==,
+ integrity: sha512-5IUBJShMJMaK6NmRj/7KWdvVqd7J8DqLH0wVdXBs/4MfZUAvByBB35y5v6B33NjlJg3SZGX5alR8TANrcKaJNA==,
}
- engines: {node: ">=18"}
+ engines: {node: ">=14"}
hasBin: true
requiresBuild: true
dependencies:
- playwright-core: 1.49.1
+ playwright-core: 1.28.0
dev: true
- /playwright-core@1.49.1:
+ /playwright-core@1.28.0:
resolution:
{
- integrity: sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==,
+ integrity: sha512-nJLknd28kPBiCNTbqpu6Wmkrh63OEqJSFw9xOfL9qxfNwody7h6/L3O2dZoWQ6Oxcm0VOHjWmGiCUGkc0X3VZA==,
}
- engines: {node: ">=18"}
+ engines: {node: ">=14"}
hasBin: true
dev: true
- /playwright@1.49.1:
+ /playwright@1.28.0:
resolution:
{
- integrity: sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==,
+ integrity: sha512-kyOXGc5y1mgi+hgEcCIyE1P1+JumLrxS09nFHo5sdJNzrucxPRAGwM4A2X3u3SDOfdgJqx61yIoR6Av+5plJPg==,
}
- engines: {node: ">=18"}
+ engines: {node: ">=14"}
hasBin: true
+ requiresBuild: true
dependencies:
- playwright-core: 1.49.1
- optionalDependencies:
- fsevents: 2.3.2
+ playwright-core: 1.28.0
dev: true
/pluralize@8.0.0:
@@ -22947,7 +22979,6 @@ packages:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
react: 19.0.0
- dev: true
/use@3.1.1:
resolution: