@trpc/react-query 10.28.0 → 10.28.2

package/dist/ssg/ssg.d.ts

@@ -1,16 +1,16 @@
-import { DehydrateOptions, DehydratedState, InfiniteData } from '@tanstack/react-query';
-import { AnyRouter, inferProcedureOutput } from '@trpc/server';
-import { CreateSSGHelpersOptions } from '../server/types';
-/**
- * Create functions you can use for server-side rendering / static generation
- * @deprecated use `createServerSideHelpers` instead
- */
-export declare function createSSGHelpers<TRouter extends AnyRouter>(opts: CreateSSGHelpersOptions<TRouter>): {
-    prefetchQuery: <TPath extends keyof TRouter["_def"]["queries"] & string, TProcedure extends TRouter["_def"]["queries"][TPath]>(path: TPath, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<TProcedure>>) => Promise<void>;
-    prefetchInfiniteQuery: <TPath_1 extends keyof TRouter["_def"]["queries"] & string, TProcedure_1 extends TRouter["_def"]["queries"][TPath_1]>(path: TPath_1, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<TProcedure_1>>) => Promise<void>;
-    fetchQuery: <TPath_2 extends keyof TRouter["_def"]["queries"] & string, TProcedure_2 extends TRouter["_def"]["queries"][TPath_2], TOutput extends inferProcedureOutput<TProcedure_2>>(path: TPath_2, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<TProcedure_2>>) => Promise<TOutput>;
-    fetchInfiniteQuery: <TPath_3 extends keyof TRouter["_def"]["queries"] & string, TProcedure_3 extends TRouter["_def"]["queries"][TPath_3], TOutput_1 extends inferProcedureOutput<TProcedure_3>>(path: TPath_3, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<TProcedure_3>>) => Promise<InfiniteData<TOutput_1>>;
-    dehydrate: (opts?: DehydrateOptions) => DehydratedState;
-    queryClient: import("@tanstack/react-query").QueryClient;
-};
+import { DehydratedState, DehydrateOptions, InfiniteData } from '@tanstack/react-query';
+import { AnyRouter, inferHandlerInput, inferProcedureOutput } from '@trpc/server';
+import { CreateSSGHelpersOptions } from '../server/types';
+/**
+ * Create functions you can use for server-side rendering / static generation
+ * @deprecated use `createServerSideHelpers` instead
+ */
+export declare function createSSGHelpers<TRouter extends AnyRouter>(opts: CreateSSGHelpersOptions<TRouter>): {
+    prefetchQuery: <TPath extends keyof TRouter["_def"]["queries"] & string, TProcedure extends TRouter["_def"]["queries"][TPath]>(path: TPath, ...args: inferHandlerInput<TProcedure>) => Promise<void>;
+    prefetchInfiniteQuery: <TPath_1 extends keyof TRouter["_def"]["queries"] & string, TProcedure_1 extends TRouter["_def"]["queries"][TPath_1]>(path: TPath_1, ...args: inferHandlerInput<TProcedure_1>) => Promise<void>;
+    fetchQuery: <TPath_2 extends keyof TRouter["_def"]["queries"] & string, TProcedure_2 extends TRouter["_def"]["queries"][TPath_2], TOutput extends inferProcedureOutput<TProcedure_2>>(path: TPath_2, ...args: inferHandlerInput<TProcedure_2>) => Promise<TOutput>;
+    fetchInfiniteQuery: <TPath_3 extends keyof TRouter["_def"]["queries"] & string, TProcedure_3 extends TRouter["_def"]["queries"][TPath_3], TOutput_1 extends inferProcedureOutput<TProcedure_3>>(path: TPath_3, ...args: inferHandlerInput<TProcedure_3>) => Promise<InfiniteData<TOutput_1>>;
+    dehydrate: (opts?: DehydrateOptions) => DehydratedState;
+    queryClient: import("@tanstack/react-query").QueryClient;
+};
 //# sourceMappingURL=ssg.d.ts.map

package/dist/ssg/ssg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssg.d.ts","sourceRoot":"","sources":["../../src/ssg/ssg.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,YAAY,EAEb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,SAAS,EAGT,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAG1D;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC;;;;;uBA6F9B,gBAAgB,KAMrB,eAAe;;EAcnB"}
+{"version":3,"file":"ssg.d.ts","sourceRoot":"","sources":["../../src/ssg/ssg.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,gBAAgB,EAChB,YAAY,EACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,SAAS,EAET,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAG1D;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC;;;;;uBA6F9B,gBAAgB,KAMrB,eAAe;;EAcnB"}

package/dist/utils/inferReactQueryProcedure.d.ts

@@ -1,24 +1,24 @@
-import { TRPCClientErrorLike } from '@trpc/client';
-import { AnyMutationProcedure, AnyProcedure, AnyQueryProcedure, AnyRouter, inferProcedureInput } from '@trpc/server';
-import { inferTransformedProcedureOutput } from '@trpc/server/shared';
-import { UseTRPCMutationOptions, UseTRPCMutationResult, UseTRPCQueryOptions, UseTRPCQueryResult } from '../shared';
-/**
- * @internal
- */
-export declare type InferQueryOptions<TProcedure extends AnyProcedure, TPath extends string> = Omit<UseTRPCQueryOptions<TPath, inferProcedureInput<TProcedure>, inferTransformedProcedureOutput<TProcedure>, inferTransformedProcedureOutput<TProcedure>, TRPCClientErrorLike<TProcedure>>, 'select'>;
-/**
- * @internal
- */
-export declare type InferMutationOptions<TProcedure extends AnyProcedure> = UseTRPCMutationOptions<inferProcedureInput<TProcedure>, TRPCClientErrorLike<TProcedure>, inferTransformedProcedureOutput<TProcedure>>;
-/**
- * @internal
- */
-export declare type InferQueryResult<TProcedure extends AnyProcedure> = UseTRPCQueryResult<inferTransformedProcedureOutput<TProcedure>, TRPCClientErrorLike<TProcedure>>;
-/**
- * @internal
- */
-export declare type InferMutationResult<TProcedure extends AnyProcedure, TContext = unknown> = UseTRPCMutationResult<inferTransformedProcedureOutput<TProcedure>, TRPCClientErrorLike<TProcedure>, inferProcedureInput<TProcedure>, TContext>;
-export declare type inferReactQueryProcedureOptions<TRouter extends AnyRouter, TPath extends string = ''> = {
-    [TKey in keyof TRouter['_def']['record']]: TRouter['_def']['record'][TKey] extends infer TRouterOrProcedure ? TRouterOrProcedure extends AnyRouter ? inferReactQueryProcedureOptions<TRouterOrProcedure, `${TPath}${TKey & string}.`> : TRouterOrProcedure extends AnyMutationProcedure ? InferMutationOptions<TRouterOrProcedure> : TRouterOrProcedure extends AnyQueryProcedure ? InferQueryOptions<TRouterOrProcedure, `${TPath}${TKey & string}`> : never : never;
-};
+import { TRPCClientErrorLike } from '@trpc/client';
+import { AnyMutationProcedure, AnyProcedure, AnyQueryProcedure, AnyRouter, inferProcedureInput } from '@trpc/server';
+import { inferTransformedProcedureOutput } from '@trpc/server/shared';
+import { UseTRPCMutationOptions, UseTRPCMutationResult, UseTRPCQueryOptions, UseTRPCQueryResult } from '../shared';
+/**
+ * @internal
+ */
+export type InferQueryOptions<TProcedure extends AnyProcedure, TPath extends string> = Omit<UseTRPCQueryOptions<TPath, inferProcedureInput<TProcedure>, inferTransformedProcedureOutput<TProcedure>, inferTransformedProcedureOutput<TProcedure>, TRPCClientErrorLike<TProcedure>>, 'select'>;
+/**
+ * @internal
+ */
+export type InferMutationOptions<TProcedure extends AnyProcedure> = UseTRPCMutationOptions<inferProcedureInput<TProcedure>, TRPCClientErrorLike<TProcedure>, inferTransformedProcedureOutput<TProcedure>>;
+/**
+ * @internal
+ */
+export type InferQueryResult<TProcedure extends AnyProcedure> = UseTRPCQueryResult<inferTransformedProcedureOutput<TProcedure>, TRPCClientErrorLike<TProcedure>>;
+/**
+ * @internal
+ */
+export type InferMutationResult<TProcedure extends AnyProcedure, TContext = unknown> = UseTRPCMutationResult<inferTransformedProcedureOutput<TProcedure>, TRPCClientErrorLike<TProcedure>, inferProcedureInput<TProcedure>, TContext>;
+export type inferReactQueryProcedureOptions<TRouter extends AnyRouter, TPath extends string = ''> = {
+    [TKey in keyof TRouter['_def']['record']]: TRouter['_def']['record'][TKey] extends infer TRouterOrProcedure ? TRouterOrProcedure extends AnyRouter ? inferReactQueryProcedureOptions<TRouterOrProcedure, `${TPath}${TKey & string}.`> : TRouterOrProcedure extends AnyMutationProcedure ? InferMutationOptions<TRouterOrProcedure> : TRouterOrProcedure extends AnyQueryProcedure ? InferQueryOptions<TRouterOrProcedure, `${TPath}${TKey & string}`> : never : never;
+};
 //# sourceMappingURL=inferReactQueryProcedure.d.ts.map

package/dist/utils/inferReactQueryProcedure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inferReactQueryProcedure.d.ts","sourceRoot":"","sources":["../../src/utils/inferReactQueryProcedure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,mBAAmB,EACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,WAAW,CAAC;AAEnB;;GAEG;AACH,oBAAY,iBAAiB,CAC3B,UAAU,SAAS,YAAY,EAC/B,KAAK,SAAS,MAAM,IAClB,IAAI,CACN,mBAAmB,CACjB,KAAK,EACL,mBAAmB,CAAC,UAAU,CAAC,EAC/B,+BAA+B,CAAC,UAAU,CAAC,EAC3C,+BAA+B,CAAC,UAAU,CAAC,EAC3C,mBAAmB,CAAC,UAAU,CAAC,CAChC,EACD,QAAQ,CACT,CAAC;AAEF;;GAEG;AACH,oBAAY,oBAAoB,CAAC,UAAU,SAAS,YAAY,IAC9D,sBAAsB,CACpB,mBAAmB,CAAC,UAAU,CAAC,EAC/B,mBAAmB,CAAC,UAAU,CAAC,EAC/B,+BAA+B,CAAC,UAAU,CAAC,CAC5C,CAAC;AAEJ;;GAEG;AACH,oBAAY,gBAAgB,CAAC,UAAU,SAAS,YAAY,IAC1D,kBAAkB,CAChB,+BAA+B,CAAC,UAAU,CAAC,EAC3C,mBAAmB,CAAC,UAAU,CAAC,CAChC,CAAC;AAEJ;;GAEG;AACH,oBAAY,mBAAmB,CAC7B,UAAU,SAAS,YAAY,EAC/B,QAAQ,GAAG,OAAO,IAChB,qBAAqB,CACvB,+BAA+B,CAAC,UAAU,CAAC,EAC3C,mBAAmB,CAAC,UAAU,CAAC,EAC/B,mBAAmB,CAAC,UAAU,CAAC,EAC/B,QAAQ,CACT,CAAC;AAEF,oBAAY,+BAA+B,CACzC,OAAO,SAAS,SAAS,EACzB,KAAK,SAAS,MAAM,GAAG,EAAE,IACvB;KACD,IAAI,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,kBAAkB,GACvG,kBAAkB,SAAS,SAAS,GAClC,+BAA+B,CAC7B,kBAAkB,EAClB,GAAG,KAAK,GAAG,IAAI,GAAG,MAAM,GAAG,CAC5B,GACD,kBAAkB,SAAS,oBAAoB,GAC/C,oBAAoB,CAAC,kBAAkB,CAAC,GACxC,kBAAkB,SAAS,iBAAiB,GAC5C,iBAAiB,CAAC,kBAAkB,EAAE,GAAG,KAAK,GAAG,IAAI,GAAG,MAAM,EAAE,CAAC,GACjE,KAAK,GACP,KAAK;CACV,CAAC"}
+{"version":3,"file":"inferReactQueryProcedure.d.ts","sourceRoot":"","sources":["../../src/utils/inferReactQueryProcedure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,mBAAmB,EACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,WAAW,CAAC;AAEnB;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAC3B,UAAU,SAAS,YAAY,EAC/B,KAAK,SAAS,MAAM,IAClB,IAAI,CACN,mBAAmB,CACjB,KAAK,EACL,mBAAmB,CAAC,UAAU,CAAC,EAC/B,+BAA+B,CAAC,UAAU,CAAC,EAC3C,+BAA+B,CAAC,UAAU,CAAC,EAC3C,mBAAmB,CAAC,UAAU,CAAC,CAChC,EACD,QAAQ,CACT,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,oBAAoB,CAAC,UAAU,SAAS,YAAY,IAC9D,sBAAsB,CACpB,mBAAmB,CAAC,UAAU,CAAC,EAC/B,mBAAmB,CAAC,UAAU,CAAC,EAC/B,+BAA+B,CAAC,UAAU,CAAC,CAC5C,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,UAAU,SAAS,YAAY,IAC1D,kBAAkB,CAChB,+BAA+B,CAAC,UAAU,CAAC,EAC3C,mBAAmB,CAAC,UAAU,CAAC,CAChC,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAC7B,UAAU,SAAS,YAAY,EAC/B,QAAQ,GAAG,OAAO,IAChB,qBAAqB,CACvB,+BAA+B,CAAC,UAAU,CAAC,EAC3C,mBAAmB,CAAC,UAAU,CAAC,EAC/B,mBAAmB,CAAC,UAAU,CAAC,EAC/B,QAAQ,CACT,CAAC;AAEF,MAAM,MAAM,+BAA+B,CACzC,OAAO,SAAS,SAAS,EACzB,KAAK,SAAS,MAAM,GAAG,EAAE,IACvB;KACD,IAAI,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,kBAAkB,GACvG,kBAAkB,SAAS,SAAS,GAClC,+BAA+B,CAC7B,kBAAkB,EAClB,GAAG,KAAK,GAAG,IAAI,GAAG,MAAM,GAAG,CAC5B,GACD,kBAAkB,SAAS,oBAAoB,GAC/C,oBAAoB,CAAC,kBAAkB,CAAC,GACxC,kBAAkB,SAAS,iBAAiB,GAC5C,iBAAiB,CAAC,kBAAkB,EAAE,GAAG,KAAK,GAAG,IAAI,GAAG,MAAM,EAAE,CAAC,GACjE,KAAK,GACP,KAAK;CACV,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/react-query",
-  "version": "10.28.0",
+  "version": "10.28.2",
   "description": "The tRPC React library",
   "author": "KATT",
   "license": "MIT",
@@ -64,17 +64,17 @@
   },
   "peerDependencies": {
     "@tanstack/react-query": "^4.18.0",
-    "@trpc/client": "10.28.0",
-    "@trpc/server": "10.28.0",
+    "@trpc/client": "10.28.2",
+    "@trpc/server": "10.28.2",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
   },
   "devDependencies": {
     "@tanstack/react-query": "^4.18.0",
-    "@trpc/client": "10.28.0",
-    "@trpc/server": "10.28.0",
+    "@trpc/client": "10.28.2",
+    "@trpc/server": "10.28.2",
     "@types/express": "^4.17.17",
-    "@types/node": "^18.7.20",
+    "@types/node": "^18.16.16",
     "@types/react": "^18.2.6",
     "eslint": "^8.40.0",
     "express": "^4.17.1",
@@ -91,5 +91,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "7aadb24ce0bc20ae27f32bd80891ef6da5885e5e"
+  "gitHead": "055c27724a3163ee9fde633f92f30756caf7690b"
 }

package/src/createTRPCReact.tsx

@@ -6,9 +6,9 @@ import {
   AnyQueryProcedure,
   AnyRouter,
   AnySubscriptionProcedure,
+  inferProcedureInput,
   ProcedureRouterRecord,
   ProtectedIntersection,
-  inferProcedureInput,
 } from '@trpc/server';
 import {
   createFlatProxy,
@@ -19,13 +19,13 @@ import { useMemo } from 'react';
 import { QueryKey, QueryType } from './internals/getArrayQueryKey';
 import { TRPCUseQueries } from './internals/useQueries';
 import {
-  CreateReactUtilsProxy,
   createReactProxyDecoration,
   createReactQueryUtilsProxy,
+  CreateReactUtilsProxy,
 } from './shared';
 import {
-  CreateReactQueryHooks,
   createHooksInternal,
+  CreateReactQueryHooks,
 } from './shared/hooks/createRootHooks';
 import {
   CreateClient,

package/src/internals/context.tsx

@@ -1,13 +1,11 @@
 import {
+  CancelOptions,
   FetchInfiniteQueryOptions,
   FetchQueryOptions,
-  QueryClient,
-} from '@tanstack/react-query';
-import {
-  CancelOptions,
   InfiniteData,
   InvalidateOptions,
   InvalidateQueryFilters,
+  QueryClient,
   RefetchOptions,
   RefetchQueryFilters,
   ResetOptions,
@@ -18,9 +16,9 @@ import {
 import {
   CreateTRPCProxyClient,
   TRPCClient,
+  TRPCClientError,
   TRPCRequestOptions,
 } from '@trpc/client';
-import { TRPCClientError } from '@trpc/client';
 import type { AnyRouter } from '@trpc/server';
 import { inferHandlerInput, inferProcedureInput } from '@trpc/server';
 import { inferTransformedProcedureOutput } from '@trpc/server/shared';

package/src/internals/getQueryKey.ts

@@ -5,8 +5,8 @@ import {
   DeepPartial,
   inferProcedureInput,
 } from '@trpc/server';
-import { QueryType, getArrayQueryKey } from '../internals/getArrayQueryKey';
-import { DecorateProcedure, DecoratedProcedureRecord } from '../shared';
+import { getArrayQueryKey, QueryType } from '../internals/getArrayQueryKey';
+import { DecoratedProcedureRecord, DecorateProcedure } from '../shared';
 
 /**
  * We treat `undefined` as an input the same as omitting an `input`

package/src/interop.ts

@@ -1,10 +1,10 @@
 // interop:
 import { AnyRouter } from '@trpc/server';
-import { CreateTRPCReact, createHooksInternalProxy } from './createTRPCReact';
+import { createHooksInternalProxy, CreateTRPCReact } from './createTRPCReact';
 import { CreateTRPCReactOptions } from './shared';
 import {
-  CreateReactQueryHooks,
   createHooksInternal,
+  CreateReactQueryHooks,
 } from './shared/hooks/createRootHooks';
 
 /**

package/src/server/ssgProxy.ts

@@ -1,6 +1,6 @@
 import {
-  DehydrateOptions,
   DehydratedState,
+  DehydrateOptions,
   InfiniteData,
   QueryClient,
 } from '@tanstack/react-query';
@@ -9,8 +9,8 @@ import {
   AnyQueryProcedure,
   AnyRouter,
   Filter,
-  ProtectedIntersection,
   inferHandlerInput,
+  ProtectedIntersection,
 } from '@trpc/server';
 import {
   createFlatProxy,

package/src/shared/hooks/createHooksInternal.tsx

@@ -1,15 +1,15 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import {
-  DehydratedState,
-  QueryClient,
   useInfiniteQuery as __useInfiniteQuery,
   useMutation as __useMutation,
   useQueries as __useQueries,
   useQuery as __useQuery,
+  DehydratedState,
   hashQueryKey,
+  QueryClient,
   useQueryClient,
 } from '@tanstack/react-query';
-import { TRPCClientErrorLike, createTRPCClient } from '@trpc/client';
+import { createTRPCClient, TRPCClientErrorLike } from '@trpc/client';
 import type { AnyRouter } from '@trpc/server';
 import { Observable } from '@trpc/server/observable';
 import React, {
@@ -19,9 +19,12 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import { SSRState, TRPCContext } from '../../internals/context';
-import { TRPCContextState } from '../../internals/context';
-import { QueryType, getArrayQueryKey } from '../../internals/getArrayQueryKey';
+import {
+  SSRState,
+  TRPCContext,
+  TRPCContextState,
+} from '../../internals/context';
+import { getArrayQueryKey, QueryType } from '../../internals/getArrayQueryKey';
 import { getClientArgs } from '../../internals/getClientArgs';
 import { useHookResult } from '../../internals/useHookResult';
 import { TRPCUseQueries } from '../../internals/useQueries';
@@ -286,16 +289,23 @@ export function createRootHooks<
     const { abortOnUnmount, client, ssrState, queryClient, prefetchQuery } =
       context;
 
+    const defaultOpts = queryClient.getQueryDefaults(
+      getArrayQueryKey(pathAndInput, 'query'),
+    );
+
     if (
       typeof window === 'undefined' &&
       ssrState === 'prepass' &&
       opts?.trpc?.ssr !== false &&
-      opts?.enabled !== false &&
+      (opts?.enabled ?? defaultOpts?.enabled) !== false &&
       !queryClient.getQueryCache().find(getArrayQueryKey(pathAndInput, 'query'))
     ) {
       void prefetchQuery(pathAndInput as any, opts as any);
     }
-    const ssrOpts = useSSRQueryOptionsIfNeeded(pathAndInput, 'query', opts);
+    const ssrOpts = useSSRQueryOptionsIfNeeded(pathAndInput, 'query', {
+      ...defaultOpts,
+      ...opts,
+    });
 
     const shouldAbortOnUnmount =
       opts?.trpc?.abortOnUnmount ?? config?.abortOnUnmount ?? abortOnUnmount;
@@ -337,6 +347,10 @@ export function createRootHooks<
     const queryClient = useQueryClient({ context: ReactQueryContext });
     const actualPath = Array.isArray(path) ? path[0] : path;
 
+    const defaultOpts = queryClient.getMutationDefaults([
+      actualPath.split('.'),
+    ]);
+
     const hook = __useMutation({
       ...opts,
       mutationKey: [actualPath.split('.')],
@@ -347,12 +361,13 @@ export function createRootHooks<
       },
       context: ReactQueryContext,
       onSuccess(...args) {
-        const originalFn = () => opts?.onSuccess?.(...args);
+        const originalFn = () =>
+          opts?.onSuccess?.(...args) ?? defaultOpts?.onSuccess?.(...args);
 
         return mutationSuccessOverride({
           originalFn,
           queryClient,
-          meta: opts?.meta ?? {},
+          meta: opts?.meta ?? defaultOpts?.meta ?? {},
         });
       },
     }) as UseTRPCMutationResult<unknown, TError, unknown, unknown>;
@@ -433,19 +448,29 @@ export function createRootHooks<
       abortOnUnmount,
     } = useContext();
 
+    const defaultOpts = queryClient.getQueryDefaults(
+      getArrayQueryKey(pathAndInput, 'infinite'),
+    );
+
     if (
       typeof window === 'undefined' &&
       ssrState === 'prepass' &&
       opts?.trpc?.ssr !== false &&
-      opts?.enabled !== false &&
+      (opts?.enabled ?? defaultOpts?.enabled) !== false &&
       !queryClient
         .getQueryCache()
         .find(getArrayQueryKey(pathAndInput, 'infinite'))
     ) {
-      void prefetchInfiniteQuery(pathAndInput as any, opts as any);
+      void prefetchInfiniteQuery(
+        pathAndInput as any,
+        { ...defaultOpts, ...opts } as any,
+      );
     }
 
-    const ssrOpts = useSSRQueryOptionsIfNeeded(pathAndInput, 'infinite', opts);
+    const ssrOpts = useSSRQueryOptionsIfNeeded(pathAndInput, 'infinite', {
+      ...defaultOpts,
+      ...opts,
+    });
 
     // request option should take priority over global
     const shouldAbortOnUnmount = opts?.trpc?.abortOnUnmount ?? abortOnUnmount;

package/src/shared/hooks/deprecated/createHooksInternal.tsx

@@ -1,32 +1,35 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import {
-  DehydratedState,
-  QueryClient,
   useInfiniteQuery as __useInfiniteQuery,
   useMutation as __useMutation,
   useQueries as __useQueries,
   useQuery as __useQuery,
+  DehydratedState,
   hashQueryKey,
+  QueryClient,
   useQueryClient,
 } from '@tanstack/react-query';
-import { TRPCClientErrorLike, createTRPCClient } from '@trpc/client';
+import { createTRPCClient, TRPCClientErrorLike } from '@trpc/client';
 import type {
   AnyRouter,
-  ProcedureRecord,
   inferHandlerInput,
   inferProcedureClientError,
   inferProcedureInput,
   inferProcedureOutput,
   inferSubscriptionOutput,
+  ProcedureRecord,
 } from '@trpc/server';
 import { inferObservableValue } from '@trpc/server/observable';
 import { inferTransformedProcedureOutput } from '@trpc/server/shared';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { SSRState, TRPCContext } from '../../../internals/context';
-import { TRPCContextState } from '../../../internals/context';
 import {
-  QueryType,
+  SSRState,
+  TRPCContext,
+  TRPCContextState,
+} from '../../../internals/context';
+import {
   getArrayQueryKey,
+  QueryType,
 } from '../../../internals/getArrayQueryKey';
 import { getClientArgs } from '../../../internals/getClientArgs';
 import { useHookResult } from '../../../internals/useHookResult';

package/src/shared/proxy/utilsProxy.ts

@@ -10,14 +10,14 @@ import {
   SetDataOptions,
   Updater,
 } from '@tanstack/react-query';
-import { TRPCClientError, createTRPCClientProxy } from '@trpc/client';
+import { createTRPCClientProxy, TRPCClientError } from '@trpc/client';
 import {
   AnyQueryProcedure,
   AnyRouter,
   DeepPartial,
   Filter,
-  ProtectedIntersection,
   inferProcedureInput,
+  ProtectedIntersection,
 } from '@trpc/server';
 import {
   createFlatProxy,
@@ -25,12 +25,12 @@ import {
   inferTransformedProcedureOutput,
 } from '@trpc/server/shared';
 import {
+  contextProps,
   DecoratedProxyTRPCContextProps,
+  TRPCContextState,
   TRPCFetchInfiniteQueryOptions,
   TRPCFetchQueryOptions,
-  contextProps,
 } from '../../internals/context';
-import { TRPCContextState } from '../../internals/context';
 import { QueryKeyKnown } from '../../internals/getArrayQueryKey';
 import { getQueryKeyInternal } from '../../internals/getQueryKey';
 

package/src/ssg/ssg.ts

@@ -1,8 +1,8 @@
 import {
-  DehydrateOptions,
+  dehydrate,
   DehydratedState,
+  DehydrateOptions,
   InfiniteData,
-  dehydrate,
 } from '@tanstack/react-query';
 import {
   AnyRouter,