@trpc/next 10.43.0 → 11.0.0-next.92

package/dist/app-dir/client.d.ts

@@ -1,6 +1,6 @@
-import { CreateTRPCProxyClient } from '@trpc/client';
+import { CreateTRPCClient } from '@trpc/client';
 import { AnyRouter } from '@trpc/server';
 import { CreateTRPCNextAppRouterOptions } from './shared';
-export { experimental_createActionHook, experimental_serverActionLink, type UseTRPCActionResult, type inferActionResultProps, } from './create-action-hook';
-export declare function experimental_createTRPCNextAppDirClient<TRouter extends AnyRouter>(opts: CreateTRPCNextAppRouterOptions<TRouter>): CreateTRPCProxyClient<TRouter>;
+export { experimental_createActionHook, experimental_serverActionLink, type UseTRPCActionResult, } from './create-action-hook';
+export declare function experimental_createTRPCNextAppDirClient<TRouter extends AnyRouter>(opts: CreateTRPCNextAppRouterOptions<TRouter>): CreateTRPCClient<TRouter>;
 //# sourceMappingURL=client.d.ts.map

package/dist/app-dir/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/app-dir/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,EAEtB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AAE1D,OAAO,EAEL,6BAA6B,EAE7B,6BAA6B,EAE7B,KAAK,mBAAmB,EAExB,KAAK,sBAAsB,GAC5B,MAAM,sBAAsB,CAAC;AAS9B,wBAAgB,uCAAuC,CACrD,OAAO,SAAS,SAAS,EACzB,IAAI,EAAE,8BAA8B,CAAC,OAAO,CAAC,kCAwC9C"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/app-dir/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAEjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AAE1D,OAAO,EAEL,6BAA6B,EAE7B,6BAA6B,EAE7B,KAAK,mBAAmB,GACzB,MAAM,sBAAsB,CAAC;AAS9B,wBAAgB,uCAAuC,CACrD,OAAO,SAAS,SAAS,EACzB,IAAI,EAAE,8BAA8B,CAAC,OAAO,CAAC,6BAwC9C"}

package/dist/app-dir/create-action-hook.d.ts

@@ -1,5 +1,5 @@
 import { CreateTRPCClientOptions, TRPCClientError, TRPCLink } from '@trpc/client';
-import { AnyProcedure, AnyRouter, inferHandlerInput, MaybePromise, ProcedureOptions, Simplify } from '@trpc/server';
+import { AnyRouter, MaybePromise, ProcedureOptions, Simplify } from '@trpc/server';
 import { TRPCActionHandler } from './server';
 import { ActionHandlerDef } from './shared';
 type MutationArgs<TDef extends ActionHandlerDef> = TDef['input'] extends void ? [input?: undefined | void, opts?: ProcedureOptions] : [input: FormData | TDef['input'], opts?: ProcedureOptions];
@@ -29,14 +29,6 @@ interface UseTRPCActionLoadingResult<TDef extends ActionHandlerDef> extends UseT
 }
 export type UseTRPCActionResult<TDef extends ActionHandlerDef> = UseTRPCActionErrorResult<TDef> | UseTRPCActionIdleResult<TDef> | UseTRPCActionLoadingResult<TDef> | UseTRPCActionSuccessResult<TDef>;
 export declare function experimental_serverActionLink<TRouter extends AnyRouter = AnyRouter>(): TRPCLink<TRouter>;
-/**
- * @internal
- */
-export type inferActionResultProps<TProc extends AnyProcedure> = {
-    input: inferHandlerInput<TProc>[0];
-    output: TProc['_def']['_output_out'];
-    errorShape: TProc['_def']['_config']['$types']['errorShape'];
-};
 interface UseTRPCActionOptions<TDef extends ActionHandlerDef> {
     onSuccess?: (result: TDef['output']) => MaybePromise<void> | void;
     onError?: (result: TRPCClientError<TDef['errorShape']>) => MaybePromise<void>;

package/dist/app-dir/create-action-hook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-action-hook.d.ts","sourceRoot":"","sources":["../../src/app-dir/create-action-hook.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EAEvB,eAAe,EACf,QAAQ,EAET,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,YAAY,EACZ,SAAS,EACT,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,EAChB,QAAQ,EACT,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAc,MAAM,UAAU,CAAC;AAExD,KAAK,YAAY,CAAC,IAAI,SAAS,gBAAgB,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,GACzE,CAAC,KAAK,CAAC,EAAE,SAAS,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,gBAAgB,CAAC,GACnD,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAE/D,UAAU,uBAAuB,CAAC,IAAI,SAAS,gBAAgB;IAC7D,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;IAC9C,WAAW,EAAE,CAAC,GAAG,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;CACvE;AAED,UAAU,0BAA0B,CAAC,IAAI,SAAS,gBAAgB,CAChE,SAAQ,uBAAuB,CAAC,IAAI,CAAC;IACrC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB;AAED,UAAU,wBAAwB,CAAC,IAAI,SAAS,gBAAgB,CAC9D,SAAQ,uBAAuB,CAAC,IAAI,CAAC;IACrC,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IAC3C,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,uBAAuB,CAAC,IAAI,SAAS,gBAAgB,CAC7D,SAAQ,uBAAuB,CAAC,IAAI,CAAC;IACrC,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,0BAA0B,CAAC,IAAI,SAAS,gBAAgB,CAChE,SAAQ,uBAAuB,CAAC,IAAI,CAAC;IACrC,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB;AAGD,MAAM,MAAM,mBAAmB,CAAC,IAAI,SAAS,gBAAgB,IACzD,wBAAwB,CAAC,IAAI,CAAC,GAC9B,uBAAuB,CAAC,IAAI,CAAC,GAC7B,0BAA0B,CAAC,IAAI,CAAC,GAChC,0BAA0B,CAAC,IAAI,CAAC,CAAC;AAOrC,wBAAgB,6BAA6B,CAC3C,OAAO,SAAS,SAAS,GAAG,SAAS,KAClC,QAAQ,CAAC,OAAO,CAAC,CA6BrB;AAGD;;GAEG;AACH,MAAM,MAAM,sBAAsB,CAAC,KAAK,SAAS,YAAY,IAAI;IAC/D,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;IACrC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC;CAC9D,CAAC;AAEF,UAAU,oBAAoB,CAAC,IAAI,SAAS,gBAAgB;IAC1D,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,YAAY,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAClE,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CAC/E;AAGD,wBAAgB,6BAA6B,CAAC,OAAO,SAAS,SAAS,EACrE,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,oKA6FvC"}
+{"version":3,"file":"create-action-hook.d.ts","sourceRoot":"","sources":["../../src/app-dir/create-action-hook.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EAEvB,eAAe,EACf,QAAQ,EAET,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,SAAS,EACT,YAAY,EACZ,gBAAgB,EAChB,QAAQ,EACT,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAc,MAAM,UAAU,CAAC;AAExD,KAAK,YAAY,CAAC,IAAI,SAAS,gBAAgB,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,GACzE,CAAC,KAAK,CAAC,EAAE,SAAS,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,gBAAgB,CAAC,GACnD,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAE/D,UAAU,uBAAuB,CAAC,IAAI,SAAS,gBAAgB;IAC7D,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;IAC9C,WAAW,EAAE,CAAC,GAAG,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;CACvE;AAED,UAAU,0BAA0B,CAAC,IAAI,SAAS,gBAAgB,CAChE,SAAQ,uBAAuB,CAAC,IAAI,CAAC;IACrC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB;AAED,UAAU,wBAAwB,CAAC,IAAI,SAAS,gBAAgB,CAC9D,SAAQ,uBAAuB,CAAC,IAAI,CAAC;IACrC,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IAC3C,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,uBAAuB,CAAC,IAAI,SAAS,gBAAgB,CAC7D,SAAQ,uBAAuB,CAAC,IAAI,CAAC;IACrC,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,0BAA0B,CAAC,IAAI,SAAS,gBAAgB,CAChE,SAAQ,uBAAuB,CAAC,IAAI,CAAC;IACrC,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB;AAGD,MAAM,MAAM,mBAAmB,CAAC,IAAI,SAAS,gBAAgB,IACzD,wBAAwB,CAAC,IAAI,CAAC,GAC9B,uBAAuB,CAAC,IAAI,CAAC,GAC7B,0BAA0B,CAAC,IAAI,CAAC,GAChC,0BAA0B,CAAC,IAAI,CAAC,CAAC;AAOrC,wBAAgB,6BAA6B,CAC3C,OAAO,SAAS,SAAS,GAAG,SAAS,KAClC,QAAQ,CAAC,OAAO,CAAC,CA6BrB;AAED,UAAU,oBAAoB,CAAC,IAAI,SAAS,gBAAgB;IAC1D,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,YAAY,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAClE,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CAC/E;AAGD,wBAAgB,6BAA6B,CAAC,OAAO,SAAS,SAAS,EACrE,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,oKA6FvC"}

package/dist/app-dir/links/nextCache.js

@@ -26,7 +26,7 @@ function experimental_nextCacheLink(opts) {
                         const procedureResult = await server.callProcedure({
                             procedures: opts.router._def.procedures,
                             path,
-                            rawInput: input,
+                            getRawInput: async ()=>input,
                             ctx: ctx,
                             type
                         });

package/dist/app-dir/links/nextCache.mjs

@@ -22,7 +22,7 @@ function experimental_nextCacheLink(opts) {
                         const procedureResult = await callProcedure({
                             procedures: opts.router._def.procedures,
                             path,
-                            rawInput: input,
+                            getRawInput: async ()=>input,
                             ctx: ctx,
                             type
                         });

package/dist/app-dir/server.d.ts

@@ -2,7 +2,7 @@ import { AnyProcedure, AnyRootConfig, AnyRouter, MaybePromise, Simplify } from '
 import { TRPCResponse } from '@trpc/server/rpc';
 import { ActionHandlerDef, CreateTRPCNextAppRouterOptions, inferActionDef } from './shared';
 import { NextAppDirDecoratedProcedureRecord } from './types';
-export declare function experimental_createTRPCNextAppDirServer<TRouter extends AnyRouter>(opts: CreateTRPCNextAppRouterOptions<TRouter>): NextAppDirDecoratedProcedureRecord<TRouter["_def"]["record"]>;
+export declare function experimental_createTRPCNextAppDirServer<TRouter extends AnyRouter>(opts: CreateTRPCNextAppRouterOptions<TRouter>): NextAppDirDecoratedProcedureRecord<TRouter["_def"]["_config"], TRouter["_def"]["record"]>;
 /**
  * @internal
  */
@@ -19,7 +19,7 @@ export declare function experimental_createServerActionHandler<TInstance extends
 }): <TProc extends AnyProcedure>(proc: TProc) => TRPCActionHandler<{
     input: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<TProc>>[0];
     output: TProc["_def"]["_output_out"];
-    errorShape: TProc["_def"]["_config"]["$types"]["errorShape"];
+    errorShape: TInstance["_config"]["$types"]["errorShape"];
 }>;
 export declare function experimental_revalidateEndpoint(req: Request): Promise<Response>;
 //# sourceMappingURL=server.d.ts.map

package/dist/app-dir/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/app-dir/server.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,YAAY,EACZ,aAAa,EACb,SAAS,EAIT,YAAY,EACZ,QAAQ,EAET,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAShD,OAAO,EACL,gBAAgB,EAChB,8BAA8B,EAE9B,cAAc,EAEf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,kCAAkC,EAAE,MAAM,SAAS,CAAC;AAG7D,wBAAgB,uCAAuC,CACrD,OAAO,SAAS,SAAS,EACzB,IAAI,EAAE,8BAA8B,CAAC,OAAO,CAAC,iEAwB9C;AAED;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,IAAI,SAAS,gBAAgB,IAAI,CAC7D,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAC5B,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAE/D,wBAAgB,sCAAsC,CACpD,SAAS,SAAS;IAChB,OAAO,EAAE,aAAa,CAAC;CACxB,EAED,CAAC,EAAE,SAAS,EACZ,IAAI,EAAE;IACJ,aAAa,EAAE,MAAM,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACzE;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;;;;GAgEF;AAGD,wBAAsB,+BAA+B,CAAC,GAAG,EAAE,OAAO,qBAiBjE"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/app-dir/server.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,YAAY,EACZ,aAAa,EACb,SAAS,EAIT,YAAY,EACZ,QAAQ,EAET,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAShD,OAAO,EACL,gBAAgB,EAChB,8BAA8B,EAE9B,cAAc,EAEf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,kCAAkC,EAAE,MAAM,SAAS,CAAC;AAG7D,wBAAgB,uCAAuC,CACrD,OAAO,SAAS,SAAS,EACzB,IAAI,EAAE,8BAA8B,CAAC,OAAO,CAAC,6FA2B9C;AAED;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,IAAI,SAAS,gBAAgB,IAAI,CAC7D,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAC5B,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAE/D,wBAAgB,sCAAsC,CACpD,SAAS,SAAS;IAChB,OAAO,EAAE,aAAa,CAAC;CACxB,EAED,CAAC,EAAE,SAAS,EACZ,IAAI,EAAE;IACJ,aAAa,EAAE,MAAM,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACzE;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;;;;GAgEF;AAGD,wBAAsB,+BAA+B,CAAC,GAAG,EAAE,OAAO,qBAiBjE"}

package/dist/app-dir/server.js

@@ -92,8 +92,8 @@ function experimental_createServerActionHandler(t, opts) {
                     input: undefined,
                     ctx: ctx1,
                     path: 'serverAction',
-                    rawInput,
-                    type: proc._type
+                    getRawInput: async ()=>rawInput,
+                    type: proc._def.type
                 });
                 const transformedJSON = shared.transformTRPCResponse(config, {
                     result: {
@@ -109,7 +109,7 @@ function experimental_createServerActionHandler(t, opts) {
                     error,
                     input: rawInput,
                     path: 'serverAction',
-                    type: proc._type
+                    type: proc._def.type
                 });
                 // TODO: send the right HTTP header?!
                 return shared.transformTRPCResponse(t._config, {

package/dist/app-dir/server.mjs

@@ -88,8 +88,8 @@ function experimental_createServerActionHandler(t, opts) {
                     input: undefined,
                     ctx: ctx1,
                     path: 'serverAction',
-                    rawInput,
-                    type: proc._type
+                    getRawInput: async ()=>rawInput,
+                    type: proc._def.type
                 });
                 const transformedJSON = transformTRPCResponse(config, {
                     result: {
@@ -105,7 +105,7 @@ function experimental_createServerActionHandler(t, opts) {
                     error,
                     input: rawInput,
                     path: 'serverAction',
-                    type: proc._type
+                    type: proc._def.type
                 });
                 // TODO: send the right HTTP header?!
                 return transformTRPCResponse(t._config, {

package/dist/app-dir/shared.d.ts

@@ -1,10 +1,10 @@
 import { CreateTRPCClientOptions, Resolver, TRPCUntypedClient } from '@trpc/client';
-import { AnyProcedure, AnyQueryProcedure, AnyRouter, Filter, inferHandlerInput, ProtectedIntersection, ThenArg } from '@trpc/server';
+import { AnyProcedure, AnyQueryProcedure, AnyRootConfig, AnyRouter, Filter, inferHandlerInput, ProtectedIntersection, ThenArg } from '@trpc/server';
 /**
  * @internal
  */
 export type UseProcedureRecord<TRouter extends AnyRouter> = {
-    [TKey in keyof Filter<TRouter['_def']['record'], AnyQueryProcedure | AnyRouter>]: TRouter['_def']['record'][TKey] extends AnyRouter ? UseProcedureRecord<TRouter['_def']['record'][TKey]> : Resolver<TRouter['_def']['record'][TKey]>;
+    [TKey in keyof Filter<TRouter['_def']['record'], AnyQueryProcedure | AnyRouter>]: TRouter['_def']['record'][TKey] extends AnyRouter ? UseProcedureRecord<TRouter['_def']['record'][TKey]> : Resolver<TRouter['_def']['_config'], TRouter['_def']['record'][TKey]>;
 };
 export declare function createUseProxy<TRouter extends AnyRouter>(client: TRPCUntypedClient<TRouter>): UseProcedureRecord<TRouter>;
 type NextAppRouterUse<TRouter extends AnyRouter> = {
@@ -39,10 +39,10 @@ export interface ActionHandlerDef {
 /**
  * @internal
  */
-export type inferActionDef<TProc extends AnyProcedure> = {
+export type inferActionDef<TConfig extends AnyRootConfig, TProc extends AnyProcedure> = {
     input: inferHandlerInput<TProc>[0];
     output: TProc['_def']['_output_out'];
-    errorShape: TProc['_def']['_config']['$types']['errorShape'];
+    errorShape: TConfig['$types']['errorShape'];
 };
 export {};
 //# sourceMappingURL=shared.d.ts.map

package/dist/app-dir/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/app-dir/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,QAAQ,EACR,iBAAiB,EAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,MAAM,EACN,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,EACR,MAAM,cAAc,CAAC;AAGtB;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI;KACzD,IAAI,IAAI,MAAM,MAAM,CACnB,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACzB,iBAAiB,GAAG,SAAS,CAC9B,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GACjD,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GACnD,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;CAC9C,CAAC;AAEF,wBAAgB,cAAc,CAAC,OAAO,SAAS,SAAS,EACtD,MAAM,EAAE,iBAAiB,CAAC,OAAO,CAAC,+BAOnC;AAED,KAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,IAAI;IACjD,CAAC,KAAK,SAAS,OAAO,CAAC,OAAO,CAAC,EAAE,EAC/B,EAAE,EAAE,CAAC,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,GACjD;SACA,IAAI,IAAI,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KAC5C,CAAC;IACF,CAAC,KAAK,SAAS,OAAO,CAAC,OAAO,CAAC,EAC7B,EAAE,EAAE,CAAC,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK,KAAK,GAC5C,OAAO,CAAC,KAAK,CAAC,CAAC;CACnB,CAAC;AACF,KAAK,2BAA2B,CAAC,OAAO,SAAS,SAAS,IAAI;IAC5D,GAAG,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;CAChC,CAAC;AACF,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,SAAS,IAC3D,qBAAqB,CACnB,2BAA2B,CAAC,OAAO,CAAC,EACpC,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEJ;;GAEG;AACH,MAAM,WAAW,8BAA8B,CAAC,OAAO,SAAS,SAAS;IACvE,MAAM,EAAE,MAAM,uBAAuB,CAAC,OAAO,CAAC,CAAC;CAChD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,UAIjE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,QAAQ,CAM5D;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;CACjB;AAGD;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,KAAK,SAAS,YAAY,IAAI;IACvD,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;IACrC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC;CAC9D,CAAC"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/app-dir/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,QAAQ,EACR,iBAAiB,EAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,SAAS,EACT,MAAM,EACN,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,EACR,MAAM,cAAc,CAAC;AAGtB;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI;KACzD,IAAI,IAAI,MAAM,MAAM,CACnB,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACzB,iBAAiB,GAAG,SAAS,CAC9B,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GACjD,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GACnD,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;CAC1E,CAAC;AAEF,wBAAgB,cAAc,CAAC,OAAO,SAAS,SAAS,EACtD,MAAM,EAAE,iBAAiB,CAAC,OAAO,CAAC,+BAOnC;AAED,KAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,IAAI;IACjD,CAAC,KAAK,SAAS,OAAO,CAAC,OAAO,CAAC,EAAE,EAC/B,EAAE,EAAE,CAAC,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,GACjD;SACA,IAAI,IAAI,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KAC5C,CAAC;IACF,CAAC,KAAK,SAAS,OAAO,CAAC,OAAO,CAAC,EAC7B,EAAE,EAAE,CAAC,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK,KAAK,GAC5C,OAAO,CAAC,KAAK,CAAC,CAAC;CACnB,CAAC;AACF,KAAK,2BAA2B,CAAC,OAAO,SAAS,SAAS,IAAI;IAC5D,GAAG,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;CAChC,CAAC;AACF,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,SAAS,IAC3D,qBAAqB,CACnB,2BAA2B,CAAC,OAAO,CAAC,EACpC,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEJ;;GAEG;AACH,MAAM,WAAW,8BAA8B,CAAC,OAAO,SAAS,SAAS;IACvE,MAAM,EAAE,MAAM,uBAAuB,CAAC,OAAO,CAAC,CAAC;CAChD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,UAIjE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,QAAQ,CAM5D;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;CACjB;AAGD;;GAEG;AACH,MAAM,MAAM,cAAc,CACxB,OAAO,SAAS,aAAa,EAC7B,KAAK,SAAS,YAAY,IACxB;IACF,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;IACrC,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC;CAC7C,CAAC"}

package/dist/app-dir/types.d.ts

@@ -1,7 +1,7 @@
 import { Resolver } from '@trpc/client';
-import { AnyMutationProcedure, AnyProcedure, AnyQueryProcedure, AnyRouter, AnySubscriptionProcedure, ProcedureArgs, ProcedureRouterRecord } from '@trpc/server';
-export type DecorateProcedureServer<TProcedure extends AnyProcedure> = TProcedure extends AnyQueryProcedure ? {
-    query: Resolver<TProcedure>;
+import { AnyMutationProcedure, AnyProcedure, AnyQueryProcedure, AnyRootConfig, AnyRouter, AnySubscriptionProcedure, ProcedureArgs, ProcedureRouterRecord } from '@trpc/server';
+export type DecorateProcedureServer<TConfig extends AnyRootConfig, TProcedure extends AnyProcedure> = TProcedure extends AnyQueryProcedure ? {
+    query: Resolver<TConfig, TProcedure>;
     revalidate: (input?: ProcedureArgs<TProcedure['_def']>[0]) => Promise<{
         revalidated: false;
         error: string;
@@ -9,11 +9,11 @@ export type DecorateProcedureServer<TProcedure extends AnyProcedure> = TProcedur
         revalidated: true;
     }>;
 } : TProcedure extends AnyMutationProcedure ? {
-    mutate: Resolver<TProcedure>;
+    mutate: Resolver<TConfig, TProcedure>;
 } : TProcedure extends AnySubscriptionProcedure ? {
-    subscribe: Resolver<TProcedure>;
+    subscribe: Resolver<TConfig, TProcedure>;
 } : never;
-export type NextAppDirDecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord> = {
-    [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter ? NextAppDirDecoratedProcedureRecord<TProcedures[TKey]['_def']['record']> : TProcedures[TKey] extends AnyProcedure ? DecorateProcedureServer<TProcedures[TKey]> : never;
+export type NextAppDirDecoratedProcedureRecord<TConfig extends AnyRootConfig, TProcedures extends ProcedureRouterRecord> = {
+    [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter ? NextAppDirDecoratedProcedureRecord<TConfig, TProcedures[TKey]['_def']['record']> : TProcedures[TKey] extends AnyProcedure ? DecorateProcedureServer<TConfig, TProcedures[TKey]> : never;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/app-dir/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/app-dir/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,wBAAwB,EACxB,aAAa,EACb,qBAAqB,EACtB,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,uBAAuB,CAAC,UAAU,SAAS,YAAY,IACjE,UAAU,SAAS,iBAAiB,GAChC;IACE,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC5B,UAAU,EAAE,CACV,KAAK,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KACzC,OAAO,CACV;QAAE,WAAW,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,WAAW,EAAE,IAAI,CAAA;KAAE,CAC9D,CAAC;CACH,GACD,UAAU,SAAS,oBAAoB,GACvC;IACE,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;CAC9B,GACD,UAAU,SAAS,wBAAwB,GAC3C;IACE,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;CACjC,GACD,KAAK,CAAC;AAEZ,MAAM,MAAM,kCAAkC,CAC5C,WAAW,SAAS,qBAAqB,IACvC;KACD,IAAI,IAAI,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,SAAS,GAC5D,kCAAkC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,GACvE,WAAW,CAAC,IAAI,CAAC,SAAS,YAAY,GACtC,uBAAuB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAC1C,KAAK;CACV,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/app-dir/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,SAAS,EACT,wBAAwB,EACxB,aAAa,EACb,qBAAqB,EACtB,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,uBAAuB,CACjC,OAAO,SAAS,aAAa,EAC7B,UAAU,SAAS,YAAY,IAC7B,UAAU,SAAS,iBAAiB,GACpC;IACE,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACrC,UAAU,EAAE,CACV,KAAK,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KACzC,OAAO,CACV;QAAE,WAAW,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,WAAW,EAAE,IAAI,CAAA;KAAE,CAC9D,CAAC;CACH,GACD,UAAU,SAAS,oBAAoB,GACvC;IACE,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;CACvC,GACD,UAAU,SAAS,wBAAwB,GAC3C;IACE,SAAS,EAAE,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;CAC1C,GACD,KAAK,CAAC;AAEV,MAAM,MAAM,kCAAkC,CAC5C,OAAO,SAAS,aAAa,EAC7B,WAAW,SAAS,qBAAqB,IACvC;KACD,IAAI,IAAI,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,SAAS,GAC5D,kCAAkC,CAChC,OAAO,EACP,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CACpC,GACD,WAAW,CAAC,IAAI,CAAC,SAAS,YAAY,GACtC,uBAAuB,CAAC,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,GACnD,KAAK;CACV,CAAC"}

package/dist/bundle-analysis.json

@@ -0,0 +1,146 @@
+{
+  "bundleSize": 20957,
+  "bundleOrigSize": 30577,
+  "bundleReduction": 31.46,
+  "modules": [
+    {
+      "id": "/src/withTRPC.tsx",
+      "size": 6882,
+      "origSize": 8409,
+      "renderedExports": [
+        "withTRPC"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/createTRPCNext.tsx",
+        "/src/index.ts"
+      ],
+      "percent": 32.84,
+      "reduction": 18.16
+    },
+    {
+      "id": "/src/app-dir/server.ts",
+      "size": 3709,
+      "origSize": 4842,
+      "renderedExports": [
+        "experimental_createTRPCNextAppDirServer",
+        "experimental_createServerActionHandler",
+        "experimental_revalidateEndpoint"
+      ],
+      "removedExports": [],
+      "dependents": [],
+      "percent": 17.7,
+      "reduction": 23.4
+    },
+    {
+      "id": "/src/app-dir/create-action-hook.tsx",
+      "size": 3310,
+      "origSize": 5650,
+      "renderedExports": [
+        "experimental_serverActionLink",
+        "experimental_createActionHook"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/app-dir/client.ts"
+      ],
+      "percent": 15.79,
+      "reduction": 41.42
+    },
+    {
+      "id": "/src/app-dir/links/nextCache.ts",
+      "size": 2479,
+      "origSize": 2682,
+      "renderedExports": [
+        "experimental_nextCacheLink"
+      ],
+      "removedExports": [],
+      "dependents": [],
+      "percent": 11.83,
+      "reduction": 7.57
+    },
+    {
+      "id": "/src/app-dir/client.ts",
+      "size": 1264,
+      "origSize": 1801,
+      "renderedExports": [
+        "experimental_createTRPCNextAppDirClient"
+      ],
+      "removedExports": [],
+      "dependents": [],
+      "percent": 6.03,
+      "reduction": 29.82
+    },
+    {
+      "id": "/src/app-dir/links/nextHttp.ts",
+      "size": 1210,
+      "origSize": 1473,
+      "renderedExports": [
+        "experimental_nextHttpLink"
+      ],
+      "removedExports": [],
+      "dependents": [],
+      "percent": 5.77,
+      "reduction": 17.85
+    },
+    {
+      "id": "/src/createTRPCNext.tsx",
+      "size": 950,
+      "origSize": 2372,
+      "renderedExports": [
+        "createTRPCNext"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/index.ts"
+      ],
+      "percent": 4.53,
+      "reduction": 59.95
+    },
+    {
+      "id": "/src/app-dir/formDataToObject.ts",
+      "size": 818,
+      "origSize": 826,
+      "renderedExports": [
+        "formDataToObject"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/app-dir/server.ts"
+      ],
+      "percent": 3.9,
+      "reduction": 0.97
+    },
+    {
+      "id": "/src/app-dir/shared.ts",
+      "size": 335,
+      "origSize": 2460,
+      "renderedExports": [
+        "generateCacheTag",
+        "isFormData"
+      ],
+      "removedExports": [
+        "createUseProxy"
+      ],
+      "dependents": [
+        "/src/app-dir/server.ts",
+        "/src/app-dir/create-action-hook.tsx",
+        "/src/app-dir/links/nextCache.ts",
+        "/src/app-dir/links/nextHttp.ts"
+      ],
+      "percent": 1.6,
+      "reduction": 86.38
+    },
+    {
+      "id": "/src/index.ts",
+      "size": 0,
+      "origSize": 62,
+      "renderedExports": [],
+      "removedExports": [],
+      "dependents": [],
+      "percent": 0,
+      "reduction": 100
+    }
+  ],
+  "moduleCount": 10
+}

package/dist/createTRPCNext.d.ts

@@ -1,4 +1,4 @@
-import { CreateReactUtilsProxy, DecoratedProcedureRecord, TRPCUseQueries } from '@trpc/react-query/shared';
+import { CreateReactUtils, DecoratedProcedureRecord, TRPCUseQueries } from '@trpc/react-query/shared';
 import { AnyRouter, ProtectedIntersection } from '@trpc/server';
 import { NextPageContext } from 'next/types';
 import { withTRPC, WithTRPCNoSSROptions, WithTRPCSSROptions } from './withTRPC';
@@ -11,17 +11,17 @@ export interface CreateTRPCNextBase<TRouter extends AnyRouter, TSSRContext exten
      *
      * @see https://trpc.io/docs/client/react/useUtils
      */
-    useContext(): CreateReactUtilsProxy<TRouter, TSSRContext>;
+    useContext(): CreateReactUtils<TRouter, TSSRContext>;
     /**
      * @see https://trpc.io/docs/client/react/useUtils
      */
-    useUtils(): CreateReactUtilsProxy<TRouter, TSSRContext>;
+    useUtils(): CreateReactUtils<TRouter, TSSRContext>;
     withTRPC: ReturnType<typeof withTRPC<TRouter, TSSRContext>>;
     useQueries: TRPCUseQueries<TRouter>;
 }
 /**
  * @internal
  */
-export type CreateTRPCNext<TRouter extends AnyRouter, TSSRContext extends NextPageContext, TFlags> = ProtectedIntersection<CreateTRPCNextBase<TRouter, TSSRContext>, DecoratedProcedureRecord<TRouter['_def']['record'], TFlags>>;
+export type CreateTRPCNext<TRouter extends AnyRouter, TSSRContext extends NextPageContext, TFlags> = ProtectedIntersection<CreateTRPCNextBase<TRouter, TSSRContext>, DecoratedProcedureRecord<TRouter['_def']['_config'], TRouter['_def']['record'], TFlags>>;
 export declare function createTRPCNext<TRouter extends AnyRouter, TSSRContext extends NextPageContext = NextPageContext, TFlags = null>(opts: WithTRPCNoSSROptions<TRouter> | WithTRPCSSROptions<TRouter>): CreateTRPCNext<TRouter, TSSRContext, TFlags>;
 //# sourceMappingURL=createTRPCNext.d.ts.map

package/dist/createTRPCNext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTRPCNext.d.ts","sourceRoot":"","sources":["../src/createTRPCNext.tsx"],"names":[],"mappings":"AAEA,OAAO,EAIL,qBAAqB,EACrB,wBAAwB,EACxB,cAAc,EACf,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,kBAAkB,CACjC,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe;IAEnC;;;;OAIG;IACH,UAAU,IAAI,qBAAqB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC1D;;OAEG;IACH,QAAQ,IAAI,qBAAqB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACxD,QAAQ,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;IAC5D,UAAU,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,CACxB,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,EACnC,MAAM,IACJ,qBAAqB,CACvB,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,EACxC,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAC5D,CAAC;AAEF,wBAAgB,cAAc,CAC5B,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,GAAG,eAAe,EACrD,MAAM,GAAG,IAAI,EAEb,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAChE,cAAc,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,CA2B9C"}
+{"version":3,"file":"createTRPCNext.d.ts","sourceRoot":"","sources":["../src/createTRPCNext.tsx"],"names":[],"mappings":"AAEA,OAAO,EAGL,gBAAgB,EAEhB,wBAAwB,EACxB,cAAc,EACf,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,kBAAkB,CACjC,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe;IAEnC;;;;OAIG;IACH,UAAU,IAAI,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACrD;;OAEG;IACH,QAAQ,IAAI,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACnD,QAAQ,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;IAC5D,UAAU,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,CACxB,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,EACnC,MAAM,IACJ,qBAAqB,CACvB,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,EACxC,wBAAwB,CACtB,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAC1B,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACzB,MAAM,CACP,CACF,CAAC;AAEF,wBAAgB,cAAc,CAC5B,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,GAAG,eAAe,EACrD,MAAM,GAAG,IAAI,EAEb,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAChE,cAAc,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,CA2B9C"}

package/dist/index.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var reactQuery$1 = require('@tanstack/react-query');
-var reactQuery = require('@trpc/react-query');
+var reactQuery = require('@tanstack/react-query');
+var client = require('@trpc/client');
 var shared = require('@trpc/react-query/shared');
 var React = require('react');
 var ssrPrepass = require('react-ssr-prepass');
@@ -35,7 +35,7 @@ function transformQueryOrMutationCacheErrors(result) {
 function withTRPC(opts) {
     const { config: getClientConfig  } = opts;
     return (AppOrPage)=>{
-        const trpc = reactQuery.createReactQueryHooks(opts);
+        const trpc = shared.createRootHooks(opts);
         const WithTRPC = (props)=>{
             const [prepassProps] = React.useState(()=>{
                 if (props.trpc) {
@@ -61,9 +61,9 @@ function withTRPC(opts) {
                 queryClient: queryClient,
                 ssrState: ssrState,
                 ssrContext: ssrContext
-            }, /*#__PURE__*/ React__default["default"].createElement(reactQuery$1.QueryClientProvider, {
+            }, /*#__PURE__*/ React__default["default"].createElement(reactQuery.QueryClientProvider, {
                 client: queryClient
-            }, /*#__PURE__*/ React__default["default"].createElement(reactQuery$1.Hydrate, {
+            }, /*#__PURE__*/ React__default["default"].createElement(reactQuery.HydrationBoundary, {
                 state: hydratedState
             }, /*#__PURE__*/ React__default["default"].createElement(AppOrPage, Object.assign({}, props)))));
         };
@@ -92,7 +92,7 @@ function withTRPC(opts) {
                 const config = getClientConfig({
                     ctx
                 });
-                const trpcClient = reactQuery.createTRPCClient(config);
+                const trpcClient = client.createTRPCUntypedClient(config);
                 const queryClient = shared.getQueryClient(config);
                 const trpcProp = {
                     config,
@@ -123,7 +123,7 @@ function withTRPC(opts) {
                         });
                     });
                 }
-                const dehydratedCache = reactQuery$1.dehydrate(queryClient, {
+                const dehydratedCache = reactQuery.dehydrate(queryClient, {
                     shouldDehydrateQuery () {
                         // makes sure errors are also dehydrated
                         return true;
@@ -166,7 +166,7 @@ function withTRPC(opts) {
 
 /* istanbul ignore file -- @preserve */ // We're testing this through E2E-testing
 function createTRPCNext(opts) {
-    const hooks = shared.createHooksInternal(opts);
+    const hooks = shared.createRootHooks(opts);
     // TODO: maybe set TSSRContext to `never` when using `WithTRPCNoSSROptions`
     const _withTRPC = withTRPC(opts);
     return shared$1.createFlatProxy((key)=>{
@@ -175,7 +175,7 @@ function createTRPCNext(opts) {
                 const context = hooks.useUtils();
                 // create a stable reference of the utils context
                 return React.useMemo(()=>{
-                    return shared.createReactQueryUtilsProxy(context);
+                    return shared.createReactQueryUtils(context);
                 }, [
                     context
                 ]);
@@ -187,7 +187,7 @@ function createTRPCNext(opts) {
         if (key === 'withTRPC') {
             return _withTRPC;
         }
-        return shared.createReactProxyDecoration(key, hooks);
+        return shared.createReactDecoration(key, hooks);
     });
 }
 

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { dehydrate, QueryClientProvider, Hydrate } from '@tanstack/react-query';
-import { createReactQueryHooks, createTRPCClient } from '@trpc/react-query';
-import { getQueryClient, createHooksInternal, createReactQueryUtilsProxy, createReactProxyDecoration } from '@trpc/react-query/shared';
+import { dehydrate, QueryClientProvider, HydrationBoundary } from '@tanstack/react-query';
+import { createTRPCUntypedClient } from '@trpc/client';
+import { createRootHooks, getQueryClient, createReactQueryUtils, createReactDecoration } from '@trpc/react-query/shared';
 import React, { createElement, useState, useMemo } from 'react';
 import ssrPrepass from 'react-ssr-prepass';
 import { createFlatProxy } from '@trpc/server/shared';
@@ -26,7 +26,7 @@ function transformQueryOrMutationCacheErrors(result) {
 function withTRPC(opts) {
     const { config: getClientConfig  } = opts;
     return (AppOrPage)=>{
-        const trpc = createReactQueryHooks(opts);
+        const trpc = createRootHooks(opts);
         const WithTRPC = (props)=>{
             const [prepassProps] = useState(()=>{
                 if (props.trpc) {
@@ -54,7 +54,7 @@ function withTRPC(opts) {
                 ssrContext: ssrContext
             }, /*#__PURE__*/ React.createElement(QueryClientProvider, {
                 client: queryClient
-            }, /*#__PURE__*/ React.createElement(Hydrate, {
+            }, /*#__PURE__*/ React.createElement(HydrationBoundary, {
                 state: hydratedState
             }, /*#__PURE__*/ React.createElement(AppOrPage, Object.assign({}, props)))));
         };
@@ -83,7 +83,7 @@ function withTRPC(opts) {
                 const config = getClientConfig({
                     ctx
                 });
-                const trpcClient = createTRPCClient(config);
+                const trpcClient = createTRPCUntypedClient(config);
                 const queryClient = getQueryClient(config);
                 const trpcProp = {
                     config,
@@ -157,7 +157,7 @@ function withTRPC(opts) {
 
 /* istanbul ignore file -- @preserve */ // We're testing this through E2E-testing
 function createTRPCNext(opts) {
-    const hooks = createHooksInternal(opts);
+    const hooks = createRootHooks(opts);
     // TODO: maybe set TSSRContext to `never` when using `WithTRPCNoSSROptions`
     const _withTRPC = withTRPC(opts);
     return createFlatProxy((key)=>{
@@ -166,7 +166,7 @@ function createTRPCNext(opts) {
                 const context = hooks.useUtils();
                 // create a stable reference of the utils context
                 return useMemo(()=>{
-                    return createReactQueryUtilsProxy(context);
+                    return createReactQueryUtils(context);
                 }, [
                     context
                 ]);
@@ -178,7 +178,7 @@ function createTRPCNext(opts) {
         if (key === 'withTRPC') {
             return _withTRPC;
         }
-        return createReactProxyDecoration(key, hooks);
+        return createReactDecoration(key, hooks);
     });
 }
 

package/dist/withTRPC.d.ts

@@ -1,4 +1,4 @@
-import type { CreateTRPCClientOptions } from '@trpc/client';
+import { CreateTRPCClientOptions } from '@trpc/client';
 import { TRPCClientError } from '@trpc/react-query';
 import { CreateTRPCReactOptions, CreateTRPCReactQueryClientConfig } from '@trpc/react-query/shared';
 import type { AnyRouter } from '@trpc/server';

package/dist/withTRPC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withTRPC.d.ts","sourceRoot":"","sources":["../src/withTRPC.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAIL,eAAe,EAEhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,sBAAsB,EACtB,gCAAgC,EAEjC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAe,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAGL,iBAAiB,EACjB,eAAe,EAChB,MAAM,4BAA4B,CAAC;AA2BpC,MAAM,MAAM,cAAc,CAAC,OAAO,SAAS,SAAS,IAClD,uBAAuB,CAAC,OAAO,CAAC,GAC9B,gCAAgC,GAAG;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEN,UAAU,eAAe,CAAC,OAAO,SAAS,SAAS,CACjD,SAAQ,sBAAsB,CAAC,OAAO,CAAC;IACvC,MAAM,EAAE,CAAC,IAAI,EAAE;QAAE,GAAG,CAAC,EAAE,eAAe,CAAA;KAAE,KAAK,cAAc,CAAC,OAAO,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,kBAAkB,CAAC,OAAO,SAAS,SAAS,CAC3D,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,GAAG,EAAE,IAAI,CAAC;IACV,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QACpB,GAAG,EAAE,eAAe,CAAC;QACrB,YAAY,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;KAC1C,KAAK,YAAY,CAAC;CACpB;AACD,MAAM,WAAW,oBAAoB,CAAC,OAAO,SAAS,SAAS,CAC7D,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,GAAG,CAAC,EAAE,KAAK,CAAC;CACb;AAED,wBAAgB,QAAQ,CACtB,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,GAAG,eAAe,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,eAU9C,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,KAAG,iBAAiB,CA+KxE"}
+{"version":3,"file":"withTRPC.d.ts","sourceRoot":"","sources":["../src/withTRPC.tsx"],"names":[],"mappings":"AAWA,OAAO,EACL,uBAAuB,EAGxB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,eAAe,EAAuB,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAEL,sBAAsB,EACtB,gCAAgC,EAEjC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAe,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAGL,iBAAiB,EACjB,eAAe,EAChB,MAAM,4BAA4B,CAAC;AA2BpC,MAAM,MAAM,cAAc,CAAC,OAAO,SAAS,SAAS,IAClD,uBAAuB,CAAC,OAAO,CAAC,GAC9B,gCAAgC,GAAG;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEN,UAAU,eAAe,CAAC,OAAO,SAAS,SAAS,CACjD,SAAQ,sBAAsB,CAAC,OAAO,CAAC;IACvC,MAAM,EAAE,CAAC,IAAI,EAAE;QAAE,GAAG,CAAC,EAAE,eAAe,CAAA;KAAE,KAAK,cAAc,CAAC,OAAO,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,kBAAkB,CAAC,OAAO,SAAS,SAAS,CAC3D,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,GAAG,EAAE,IAAI,CAAC;IACV,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QACpB,GAAG,EAAE,eAAe,CAAC;QACrB,YAAY,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;KAC1C,KAAK,YAAY,CAAC;CACpB;AACD,MAAM,WAAW,oBAAoB,CAAC,OAAO,SAAS,SAAS,CAC7D,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,GAAG,CAAC,EAAE,KAAK,CAAC;CACb;AAED,wBAAgB,QAAQ,CACtB,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,GAAG,eAAe,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,eAU9C,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,KAAG,iBAAiB,CA+KxE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/next",
-  "version": "10.43.0",
+  "version": "11.0.0-next.92+06cebb01",
   "description": "The tRPC Next.js library",
   "author": "KATT",
   "license": "MIT",
@@ -26,6 +26,7 @@
     "build": "rollup --config rollup.config.ts --configPlugin rollup-plugin-swc3",
     "dev": "pnpm build --watch",
     "codegen-entrypoints": "tsx entrypoints.script.ts",
+    "ts-watch": "tsc --project tsconfig.watch.json --watch",
     "lint": "eslint --cache --ext \".js,.ts,.tsx\" --ignore-path ../../.gitignore --report-unused-disable-directives src"
   },
   "exports": {
@@ -65,10 +66,10 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@tanstack/react-query": "^4.18.0",
-    "@trpc/client": "10.43.0",
-    "@trpc/react-query": "10.43.0",
-    "@trpc/server": "10.43.0",
+    "@tanstack/react-query": "^5.0.0",
+    "@trpc/client": "11.0.0-next.92+06cebb01",
+    "@trpc/react-query": "11.0.0-next.92+06cebb01",
+    "@trpc/server": "11.0.0-next.92+06cebb01",
     "next": "*",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
@@ -77,10 +78,10 @@
     "react-ssr-prepass": "^1.5.0"
   },
   "devDependencies": {
-    "@tanstack/react-query": "^4.18.0",
-    "@trpc/client": "10.43.0",
-    "@trpc/react-query": "10.43.0",
-    "@trpc/server": "10.43.0",
+    "@tanstack/react-query": "^5.0.0",
+    "@trpc/client": "11.0.0-next.92+06cebb01",
+    "@trpc/react-query": "11.0.0-next.92+06cebb01",
+    "@trpc/server": "11.0.0-next.92+06cebb01",
     "@types/express": "^4.17.17",
     "@types/node": "^18.16.16",
     "@types/react": "^18.2.8",
@@ -100,5 +101,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "0d505fd7415f537bd3e263971686b13a78584167"
+  "gitHead": "06cebb015144e438281edace5dc4a5328477e495"
 }

package/src/app-dir/client.ts

@@ -1,6 +1,6 @@
 import {
   clientCallTypeToProcedureType,
-  CreateTRPCProxyClient,
+  CreateTRPCClient,
   createTRPCUntypedClient,
 } from '@trpc/client';
 import { AnyRouter } from '@trpc/server';
@@ -14,8 +14,6 @@ export {
   experimental_serverActionLink,
   // ts-prune-ignore-next
   type UseTRPCActionResult,
-  // ts-prune-ignore-next
-  type inferActionResultProps,
 } from './create-action-hook';
 
 type QueryResult = {
@@ -65,6 +63,6 @@ export function experimental_createTRPCNextAppDirClient<
     });
 
     return promise;
-  }) as CreateTRPCProxyClient<TRouter>;
+  }) as CreateTRPCClient<TRouter>;
   // });
 }

package/src/app-dir/create-action-hook.tsx

@@ -7,9 +7,7 @@ import {
 } from '@trpc/client';
 import { transformResult } from '@trpc/client/shared';
 import {
-  AnyProcedure,
   AnyRouter,
-  inferHandlerInput,
   MaybePromise,
   ProcedureOptions,
   Simplify,
@@ -101,16 +99,6 @@ export function experimental_serverActionLink<
       });
 }
 
-// ts-prune-ignore-next
-/**
- * @internal
- */
-export type inferActionResultProps<TProc extends AnyProcedure> = {
-  input: inferHandlerInput<TProc>[0];
-  output: TProc['_def']['_output_out'];
-  errorShape: TProc['_def']['_config']['$types']['errorShape'];
-};
-
 interface UseTRPCActionOptions<TDef extends ActionHandlerDef> {
   onSuccess?: (result: TDef['output']) => MaybePromise<void> | void;
   onError?: (result: TRPCClientError<TDef['errorShape']>) => MaybePromise<void>;

package/src/app-dir/links/nextCache.ts

@@ -40,7 +40,7 @@ export function experimental_nextCacheLink<TRouter extends AnyRouter>(
               const procedureResult = await callProcedure({
                 procedures: opts.router._def.procedures,
                 path,
-                rawInput: input,
+                getRawInput: async () => input,
                 ctx: ctx,
                 type,
               });

package/src/app-dir/server.ts

@@ -58,7 +58,10 @@ export function experimental_createTRPCNextAppDirServer<
     }
 
     return (client[procedureType] as any)(procedurePath, ...callOpts.args);
-  }) as NextAppDirDecoratedProcedureRecord<TRouter['_def']['record']>;
+  }) as NextAppDirDecoratedProcedureRecord<
+    TRouter['_def']['_config'],
+    TRouter['_def']['record']
+  >;
 }
 
 /**
@@ -91,7 +94,7 @@ export function experimental_createServerActionHandler<
   // TODO allow this to take a `TRouter` in addition to a `AnyProcedure`
   return function createServerAction<TProc extends AnyProcedure>(
     proc: TProc,
-  ): TRPCActionHandler<Simplify<inferActionDef<TProc>>> {
+  ): TRPCActionHandler<Simplify<inferActionDef<TInstance['_config'], TProc>>> {
     return async function actionHandler(
       rawInput: FormData | inferProcedureInput<TProc>,
     ) {
@@ -116,8 +119,8 @@ export function experimental_createServerActionHandler<
           input: undefined,
           ctx,
           path: 'serverAction',
-          rawInput,
-          type: proc._type,
+          getRawInput: async () => rawInput,
+          type: proc._def.type,
         });
 
         const transformedJSON = transformTRPCResponse(config, {
@@ -134,7 +137,7 @@ export function experimental_createServerActionHandler<
           error,
           input: rawInput,
           path: 'serverAction',
-          type: proc._type,
+          type: proc._def.type,
         });
 
         // TODO: send the right HTTP header?!
@@ -143,7 +146,7 @@ export function experimental_createServerActionHandler<
           error: shape,
         });
       }
-    } as TRPCActionHandler<inferActionDef<TProc>>;
+    } as TRPCActionHandler<inferActionDef<TInstance['_config'], TProc>>;
   };
 }
 

package/src/app-dir/shared.ts

@@ -6,6 +6,7 @@ import {
 import {
   AnyProcedure,
   AnyQueryProcedure,
+  AnyRootConfig,
   AnyRouter,
   Filter,
   inferHandlerInput,
@@ -23,7 +24,7 @@ export type UseProcedureRecord<TRouter extends AnyRouter> = {
     AnyQueryProcedure | AnyRouter
   >]: TRouter['_def']['record'][TKey] extends AnyRouter
     ? UseProcedureRecord<TRouter['_def']['record'][TKey]>
-    : Resolver<TRouter['_def']['record'][TKey]>;
+    : Resolver<TRouter['_def']['_config'], TRouter['_def']['record'][TKey]>;
 };
 
 export function createUseProxy<TRouter extends AnyRouter>(
@@ -92,8 +93,11 @@ export interface ActionHandlerDef {
 /**
  * @internal
  */
-export type inferActionDef<TProc extends AnyProcedure> = {
+export type inferActionDef<
+  TConfig extends AnyRootConfig,
+  TProc extends AnyProcedure,
+> = {
   input: inferHandlerInput<TProc>[0];
   output: TProc['_def']['_output_out'];
-  errorShape: TProc['_def']['_config']['$types']['errorShape'];
+  errorShape: TConfig['$types']['errorShape'];
 };

package/src/app-dir/types.ts

@@ -3,38 +3,45 @@ import {
   AnyMutationProcedure,
   AnyProcedure,
   AnyQueryProcedure,
+  AnyRootConfig,
   AnyRouter,
   AnySubscriptionProcedure,
   ProcedureArgs,
   ProcedureRouterRecord,
 } from '@trpc/server';
 
-export type DecorateProcedureServer<TProcedure extends AnyProcedure> =
-  TProcedure extends AnyQueryProcedure
-    ? {
-        query: Resolver<TProcedure>;
-        revalidate: (
-          input?: ProcedureArgs<TProcedure['_def']>[0],
-        ) => Promise<
-          { revalidated: false; error: string } | { revalidated: true }
-        >;
-      }
-    : TProcedure extends AnyMutationProcedure
-    ? {
-        mutate: Resolver<TProcedure>;
-      }
-    : TProcedure extends AnySubscriptionProcedure
-    ? {
-        subscribe: Resolver<TProcedure>;
-      }
-    : never;
+export type DecorateProcedureServer<
+  TConfig extends AnyRootConfig,
+  TProcedure extends AnyProcedure,
+> = TProcedure extends AnyQueryProcedure
+  ? {
+      query: Resolver<TConfig, TProcedure>;
+      revalidate: (
+        input?: ProcedureArgs<TProcedure['_def']>[0],
+      ) => Promise<
+        { revalidated: false; error: string } | { revalidated: true }
+      >;
+    }
+  : TProcedure extends AnyMutationProcedure
+  ? {
+      mutate: Resolver<TConfig, TProcedure>;
+    }
+  : TProcedure extends AnySubscriptionProcedure
+  ? {
+      subscribe: Resolver<TConfig, TProcedure>;
+    }
+  : never;
 
 export type NextAppDirDecoratedProcedureRecord<
+  TConfig extends AnyRootConfig,
   TProcedures extends ProcedureRouterRecord,
 > = {
   [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter
-    ? NextAppDirDecoratedProcedureRecord<TProcedures[TKey]['_def']['record']>
+    ? NextAppDirDecoratedProcedureRecord<
+        TConfig,
+        TProcedures[TKey]['_def']['record']
+      >
     : TProcedures[TKey] extends AnyProcedure
-    ? DecorateProcedureServer<TProcedures[TKey]>
+    ? DecorateProcedureServer<TConfig, TProcedures[TKey]>
     : never;
 };

package/src/createTRPCNext.tsx

@@ -1,10 +1,10 @@
 /* istanbul ignore file -- @preserve */
 // We're testing this through E2E-testing
 import {
-  createHooksInternal,
-  createReactProxyDecoration,
-  createReactQueryUtilsProxy,
-  CreateReactUtilsProxy,
+  createReactDecoration,
+  createReactQueryUtils,
+  CreateReactUtils,
+  createRootHooks,
   DecoratedProcedureRecord,
   TRPCUseQueries,
 } from '@trpc/react-query/shared';
@@ -26,11 +26,11 @@ export interface CreateTRPCNextBase<
    *
    * @see https://trpc.io/docs/client/react/useUtils
    */
-  useContext(): CreateReactUtilsProxy<TRouter, TSSRContext>;
+  useContext(): CreateReactUtils<TRouter, TSSRContext>;
   /**
    * @see https://trpc.io/docs/client/react/useUtils
    */
-  useUtils(): CreateReactUtilsProxy<TRouter, TSSRContext>;
+  useUtils(): CreateReactUtils<TRouter, TSSRContext>;
   withTRPC: ReturnType<typeof withTRPC<TRouter, TSSRContext>>;
   useQueries: TRPCUseQueries<TRouter>;
 }
@@ -44,7 +44,11 @@ export type CreateTRPCNext<
   TFlags,
 > = ProtectedIntersection<
   CreateTRPCNextBase<TRouter, TSSRContext>,
-  DecoratedProcedureRecord<TRouter['_def']['record'], TFlags>
+  DecoratedProcedureRecord<
+    TRouter['_def']['_config'],
+    TRouter['_def']['record'],
+    TFlags
+  >
 >;
 
 export function createTRPCNext<
@@ -54,7 +58,7 @@ export function createTRPCNext<
 >(
   opts: WithTRPCNoSSROptions<TRouter> | WithTRPCSSROptions<TRouter>,
 ): CreateTRPCNext<TRouter, TSSRContext, TFlags> {
-  const hooks = createHooksInternal<TRouter, TSSRContext>(opts);
+  const hooks = createRootHooks<TRouter, TSSRContext>(opts);
 
   // TODO: maybe set TSSRContext to `never` when using `WithTRPCNoSSROptions`
   const _withTRPC = withTRPC(opts);
@@ -65,7 +69,7 @@ export function createTRPCNext<
         const context = hooks.useUtils();
         // create a stable reference of the utils context
         return useMemo(() => {
-          return (createReactQueryUtilsProxy as any)(context);
+          return (createReactQueryUtils as any)(context);
         }, [context]);
       };
     }
@@ -78,6 +82,6 @@ export function createTRPCNext<
       return _withTRPC;
     }
 
-    return createReactProxyDecoration(key, hooks);
+    return createReactDecoration(key, hooks);
   });
 }

package/src/withTRPC.tsx

@@ -5,19 +5,18 @@
 import {
   dehydrate,
   DehydratedState,
-  Hydrate,
+  HydrationBoundary,
   QueryClient,
   QueryClientProvider,
 } from '@tanstack/react-query';
-import type { CreateTRPCClientOptions } from '@trpc/client';
 import {
-  createReactQueryHooks,
-  createTRPCClient,
-  TRPCClient,
-  TRPCClientError,
-  TRPCClientErrorLike,
-} from '@trpc/react-query';
+  CreateTRPCClientOptions,
+  createTRPCUntypedClient,
+  TRPCUntypedClient,
+} from '@trpc/client';
+import { TRPCClientError, TRPCClientErrorLike } from '@trpc/react-query';
 import {
+  createRootHooks,
   CreateTRPCReactOptions,
   CreateTRPCReactQueryClientConfig,
   getQueryClient,
@@ -89,12 +88,12 @@ export function withTRPC<
   type TRPCPrepassProps = {
     config: WithTRPCConfig<TRouter>;
     queryClient: QueryClient;
-    trpcClient: TRPCClient<TRouter>;
+    trpcClient: TRPCUntypedClient<TRouter>;
     ssrState: 'prepass';
     ssrContext: TSSRContext;
   };
   return (AppOrPage: NextComponentType<any, any, any>): NextComponentType => {
-    const trpc = createReactQueryHooks<TRouter, TSSRContext>(opts);
+    const trpc = createRootHooks<TRouter, TSSRContext>(opts);
 
     const WithTRPC = (
       props: AppPropsType<NextRouter, any> & {
@@ -135,9 +134,9 @@ export function withTRPC<
           ssrContext={ssrContext}
         >
           <QueryClientProvider client={queryClient}>
-            <Hydrate state={hydratedState}>
+            <HydrationBoundary state={hydratedState}>
               <AppOrPage {...props} />
-            </Hydrate>
+            </HydrationBoundary>
           </QueryClientProvider>
         </trpc.Provider>
       );
@@ -176,7 +175,7 @@ export function withTRPC<
         }
 
         const config = getClientConfig({ ctx });
-        const trpcClient = createTRPCClient(config);
+        const trpcClient = createTRPCUntypedClient(config);
         const queryClient = getQueryClient(config);
 
         const trpcProp: TRPCPrepassProps = {