@trpc/server 11.0.0-next.325 → 11.0.0-next.327

package/dist/adapters/fastify/fastifyTRPCPlugin.js

@@ -40,7 +40,7 @@ function fastifyTRPCPlugin(fastify, opts, done) {
         });
         fastify.get(prefix ?? '/', {
             websocket: true
-        }, ({ socket  }, req)=>onConnection(socket, req.raw));
+        }, (socket, req)=>onConnection(socket, req.raw));
     }
     done();
 }

package/dist/adapters/fastify/fastifyTRPCPlugin.mjs

@@ -38,7 +38,7 @@ function fastifyTRPCPlugin(fastify, opts, done) {
         });
         fastify.get(prefix ?? '/', {
             websocket: true
-        }, ({ socket  }, req)=>onConnection(socket, req.raw));
+        }, (socket, req)=>onConnection(socket, req.raw));
     }
     done();
 }

package/dist/adapters/next-app-dir/nextAppDirCaller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nextAppDirCaller.d.ts","sourceRoot":"","sources":["../../../src/adapters/next-app-dir/nextAppDirCaller.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAGvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AAGzF,OAAO,KAAK,EACV,YAAY,EACZ,QAAQ,EACT,MAAM,yCAAyC,CAAC;AAIjD,KAAK,eAAe,CAAC,QAAQ,IAAI,MAAM,SAAS,QAAQ,GACpD;IACE,aAAa,CAAC,EAAE,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;CAC9C,GACD;IACE,aAAa,EAAE,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;CAC7C,CAAC;AAEN;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EACvC,MAAM,EAAE,QAAQ,CACd;IACE;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,mBAAmB,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;CACzD,GAAG,eAAe,CAAC,QAAQ,CAAC,CAC9B,GACA,cAAc,CAAC,QAAQ,CAAC,CA8E1B"}
+{"version":3,"file":"nextAppDirCaller.d.ts","sourceRoot":"","sources":["../../../src/adapters/next-app-dir/nextAppDirCaller.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAGvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AAGzF,OAAO,KAAK,EACV,YAAY,EACZ,QAAQ,EACT,MAAM,yCAAyC,CAAC;AAKjD,KAAK,eAAe,CAAC,QAAQ,IAAI,MAAM,SAAS,QAAQ,GACpD;IACE,aAAa,CAAC,EAAE,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;CAC9C,GACD;IACE,aAAa,EAAE,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;CAC7C,CAAC;AAEN;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EACvC,MAAM,EAAE,QAAQ,CACd;IACE;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,mBAAmB,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;CACzD,GAAG,eAAe,CAAC,QAAQ,CAAC,CAC9B,GACA,cAAc,CAAC,QAAQ,CAAC,CAsF1B"}

package/dist/adapters/next-app-dir/nextAppDirCaller.js

@@ -4,6 +4,7 @@ require('../../unstable-core-do-not-import/utils.js');
 var TRPCError = require('../../unstable-core-do-not-import/error/TRPCError.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
 var formDataToObject = require('./formDataToObject.js');
+var redirect = require('./redirect.js');
 var rethrowNextErrors = require('./rethrowNextErrors.js');
 
 /**
@@ -52,6 +53,9 @@ var rethrowNextErrors = require('./rethrowNextErrors.js');
                         getRawInput: async ()=>input,
                         path: '',
                         input
+                    }).then((data)=>{
+                        if (data instanceof redirect.TRPCRedirectError) throw data;
+                        return data;
                     }).catch(handleError);
                 }
             case 'query':
@@ -63,6 +67,9 @@ var rethrowNextErrors = require('./rethrowNextErrors.js');
                         getRawInput: async ()=>input1,
                         path: '',
                         input: input1
+                    }).then((data)=>{
+                        if (data instanceof redirect.TRPCRedirectError) throw data;
+                        return data;
                     }).catch(handleError);
                 }
             default:

package/dist/adapters/next-app-dir/nextAppDirCaller.mjs

@@ -2,6 +2,7 @@ import '../../unstable-core-do-not-import/utils.mjs';
 import { TRPCError, getTRPCErrorFromUnknown } from '../../unstable-core-do-not-import/error/TRPCError.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
 import { formDataToObject } from './formDataToObject.mjs';
+import { TRPCRedirectError } from './redirect.mjs';
 import { rethrowNextErrors } from './rethrowNextErrors.mjs';
 
 /**
@@ -50,6 +51,9 @@ import { rethrowNextErrors } from './rethrowNextErrors.mjs';
                         getRawInput: async ()=>input,
                         path: '',
                         input
+                    }).then((data)=>{
+                        if (data instanceof TRPCRedirectError) throw data;
+                        return data;
                     }).catch(handleError);
                 }
             case 'query':
@@ -61,6 +65,9 @@ import { rethrowNextErrors } from './rethrowNextErrors.mjs';
                         getRawInput: async ()=>input1,
                         path: '',
                         input: input1
+                    }).then((data)=>{
+                        if (data instanceof TRPCRedirectError) throw data;
+                        return data;
                     }).catch(handleError);
                 }
             default:

package/dist/adapters/next-app-dir/redirect.d.ts

@@ -1,15 +1,18 @@
-import type { redirect as __redirect } from 'next/navigation';
+import type { RedirectType } from 'next/navigation';
 import { TRPCError } from '../../@trpc/server';
 /**
  * @internal
  */
 export declare class TRPCRedirectError extends TRPCError {
-    readonly args: [url: string, type?: import("next/navigation").RedirectType | undefined];
-    constructor(...args: Parameters<typeof __redirect>);
+    readonly args: readonly [string, RedirectType | undefined];
+    constructor(url: URL | string, redirectType?: RedirectType);
 }
 /**
  * Like `next/navigation`'s `redirect()` but throws a `TRPCError` that later will be handled by Next.js
+ * This provides better typesafety than the `next/navigation`'s `redirect()` since the action continues
+ * to execute on the frontend even if Next's `redirect()` has a return type of `never`.
  * @public
+ * @remark You should only use this if you're also using `nextAppDirCaller`.
  */
-export declare const redirect: typeof __redirect;
+export declare const redirect: (url: URL | string, redirectType?: RedirectType) => undefined;
 //# sourceMappingURL=redirect.d.ts.map

package/dist/adapters/next-app-dir/redirect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redirect.d.ts","sourceRoot":"","sources":["../../../src/adapters/next-app-dir/redirect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,IAAI,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,SAAS;IAC9C,SAAgB,IAAI,2EAAC;gBACT,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC;CAUnD;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,OAAO,UAE7B,CAAC"}
+{"version":3,"file":"redirect.d.ts","sourceRoot":"","sources":["../../../src/adapters/next-app-dir/redirect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,SAAS;IAC9C,SAAgB,IAAI,8CAAC;gBACT,GAAG,EAAE,GAAG,GAAG,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;CAS3D;AAED;;;;;;GAMG;AACH,eAAO,MAAM,QAAQ,QAAS,GAAG,GAAG,MAAM,iBAAiB,YAAY,cAGtE,CAAC"}

package/dist/adapters/next-app-dir/redirect.js

@@ -7,21 +7,27 @@ require('../../unstable-core-do-not-import/rootConfig.js');
 /**
  * @internal
  */ class TRPCRedirectError extends TRPCError.TRPCError {
-    constructor(...args){
-        const [url] = args;
+    constructor(url, redirectType){
         super({
             // TODO(?): This should maybe a custom error code
             code: 'UNPROCESSABLE_CONTENT',
             message: `Redirect error to "${url}" that will be handled by Next.js`
         });
-        this.args = args;
+        this.args = [
+            url.toString(),
+            redirectType
+        ];
     }
 }
 /**
  * Like `next/navigation`'s `redirect()` but throws a `TRPCError` that later will be handled by Next.js
+ * This provides better typesafety than the `next/navigation`'s `redirect()` since the action continues
+ * to execute on the frontend even if Next's `redirect()` has a return type of `never`.
  * @public
- */ const redirect = (...args)=>{
-    throw new TRPCRedirectError(...args);
+ * @remark You should only use this if you're also using `nextAppDirCaller`.
+ */ const redirect = (url, redirectType)=>{
+    // We rethrow this internally so the returntype on the client is undefined.
+    return new TRPCRedirectError(url, redirectType);
 };
 
 exports.TRPCRedirectError = TRPCRedirectError;

package/dist/adapters/next-app-dir/redirect.mjs

@@ -5,21 +5,27 @@ import '../../unstable-core-do-not-import/rootConfig.mjs';
 /**
  * @internal
  */ class TRPCRedirectError extends TRPCError {
-    constructor(...args){
-        const [url] = args;
+    constructor(url, redirectType){
         super({
             // TODO(?): This should maybe a custom error code
             code: 'UNPROCESSABLE_CONTENT',
             message: `Redirect error to "${url}" that will be handled by Next.js`
         });
-        this.args = args;
+        this.args = [
+            url.toString(),
+            redirectType
+        ];
     }
 }
 /**
  * Like `next/navigation`'s `redirect()` but throws a `TRPCError` that later will be handled by Next.js
+ * This provides better typesafety than the `next/navigation`'s `redirect()` since the action continues
+ * to execute on the frontend even if Next's `redirect()` has a return type of `never`.
  * @public
- */ const redirect = (...args)=>{
-    throw new TRPCRedirectError(...args);
+ * @remark You should only use this if you're also using `nextAppDirCaller`.
+ */ const redirect = (url, redirectType)=>{
+    // We rethrow this internally so the returntype on the client is undefined.
+    return new TRPCRedirectError(url, redirectType);
 };
 
 export { TRPCRedirectError, redirect };

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 97903,
-  "bundleOrigSize": 157073,
-  "bundleReduction": 37.67,
+  "bundleSize": 98628,
+  "bundleOrigSize": 157786,
+  "bundleReduction": 37.49,
   "modules": [
     {
       "id": "/src/adapters/ws.ts",
@@ -15,7 +15,7 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 10.39,
+      "percent": 10.31,
       "reduction": 0
     },
     {
@@ -27,7 +27,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 9.68,
+      "percent": 9.61,
       "reduction": 20.86
     },
     {
@@ -43,7 +43,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 6.54,
+      "percent": 6.49,
       "reduction": 59.24
     },
     {
@@ -62,7 +62,7 @@
         "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 5.96,
+      "percent": 5.91,
       "reduction": 41.71
     },
     {
@@ -78,7 +78,7 @@
       "dependents": [
         "/src/adapters/node-http/content-type/form-data/index.ts"
       ],
-      "percent": 5.08,
+      "percent": 5.05,
       "reduction": 38
     },
     {
@@ -92,7 +92,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 4.51,
+      "percent": 4.48,
       "reduction": 32.71
     },
     {
@@ -106,7 +106,7 @@
       "dependents": [
         "/src/adapters/node-http/index.ts"
       ],
-      "percent": 4.02,
+      "percent": 3.99,
       "reduction": 13.56
     },
     {
@@ -120,7 +120,7 @@
       "dependents": [
         "/src/adapters/fetch/index.ts"
       ],
-      "percent": 3.54,
+      "percent": 3.52,
       "reduction": 9.9
     },
     {
@@ -139,7 +139,7 @@
       "dependents": [
         "/src/adapters/aws-lambda/index.ts"
       ],
-      "percent": 3.38,
+      "percent": 3.35,
       "reduction": 34.98
     },
     {
@@ -156,9 +156,23 @@
         "/src/observable/index.ts",
         "/src/observable/operators.ts"
       ],
-      "percent": 3.2,
+      "percent": 3.17,
       "reduction": 0.67
     },
+    {
+      "id": "/src/adapters/next-app-dir/nextAppDirCaller.ts",
+      "size": 3050,
+      "origSize": 3903,
+      "renderedExports": [
+        "nextAppDirCaller"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/adapters/next-app-dir.ts"
+      ],
+      "percent": 3.09,
+      "reduction": 21.85
+    },
     {
       "id": "/src/observable/operators.ts",
       "size": 2756,
@@ -172,7 +186,7 @@
       "dependents": [
         "/src/observable/index.ts"
       ],
-      "percent": 2.82,
+      "percent": 2.79,
       "reduction": 0
     },
     {
@@ -192,23 +206,9 @@
         "/src/unstable-core-do-not-import/router.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 2.8,
+      "percent": 2.78,
       "reduction": 45.94
     },
-    {
-      "id": "/src/adapters/next-app-dir/nextAppDirCaller.ts",
-      "size": 2732,
-      "origSize": 3597,
-      "renderedExports": [
-        "nextAppDirCaller"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/adapters/next-app-dir.ts"
-      ],
-      "percent": 2.79,
-      "reduction": 24.05
-    },
     {
       "id": "/src/unstable-core-do-not-import/initTRPC.ts",
       "size": 2665,
@@ -220,7 +220,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 2.72,
+      "percent": 2.7,
       "reduction": 41.3
     },
     {
@@ -240,7 +240,7 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 2.68,
+      "percent": 2.66,
       "reduction": 55.5
     },
     {
@@ -255,7 +255,7 @@
         "/src/adapters/fastify/index.ts",
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 2.53,
+      "percent": 2.51,
       "reduction": 36.53
     },
     {
@@ -267,7 +267,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 2.5,
+      "percent": 2.48,
       "reduction": 32.42
     },
     {
@@ -288,7 +288,7 @@
         "/src/unstable-core-do-not-import/middleware.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 1.77,
+      "percent": 1.76,
       "reduction": 19.47
     },
     {
@@ -302,7 +302,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts"
       ],
-      "percent": 1.68,
+      "percent": 1.66,
       "reduction": 34.79
     },
     {
@@ -314,7 +314,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.64,
+      "percent": 1.62,
       "reduction": 29.12
     },
     {
@@ -328,7 +328,7 @@
       "dependents": [
         "/src/adapters/node-http/content-type/json/index.ts"
       ],
-      "percent": 1.62,
+      "percent": 1.61,
       "reduction": 0.19
     },
     {
@@ -340,7 +340,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.61,
+      "percent": 1.6,
       "reduction": 21.04
     },
     {
@@ -353,7 +353,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.56,
+      "percent": 1.55,
       "reduction": 27.6
     },
     {
@@ -370,13 +370,13 @@
         "/src/unstable-core-do-not-import/utils.ts",
         "/src/unstable-core-do-not-import/router.ts"
       ],
-      "percent": 1.54,
+      "percent": 1.53,
       "reduction": 5.58
     },
     {
       "id": "/src/adapters/fastify/fastifyTRPCPlugin.ts",
-      "size": 1486,
-      "origSize": 2263,
+      "size": 1481,
+      "origSize": 2259,
       "renderedExports": [
         "fastifyTRPCPlugin"
       ],
@@ -384,8 +384,8 @@
       "dependents": [
         "/src/adapters/fastify/index.ts"
       ],
-      "percent": 1.52,
-      "reduction": 34.33
+      "percent": 1.5,
+      "reduction": 34.44
     },
     {
       "id": "/src/adapters/node-http/content-type/form-data/streamSlice.ts",
@@ -398,7 +398,7 @@
       "dependents": [
         "/src/adapters/node-http/content-type/form-data/fileUploadHandler.ts"
       ],
-      "percent": 1.42,
+      "percent": 1.41,
       "reduction": 0
     },
     {
@@ -414,7 +414,7 @@
         "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts",
         "/src/unstable-core-do-not-import/error/getErrorShape.ts"
       ],
-      "percent": 1.29,
+      "percent": 1.28,
       "reduction": 22.76
     },
     {
@@ -439,7 +439,7 @@
         "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 1.12,
+      "percent": 1.11,
       "reduction": 23.23
     },
     {
@@ -457,6 +457,23 @@
       "percent": 1.01,
       "reduction": 56.22
     },
+    {
+      "id": "/src/adapters/next-app-dir/redirect.ts",
+      "size": 987,
+      "origSize": 1143,
+      "renderedExports": [
+        "TRPCRedirectError",
+        "redirect"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/adapters/next-app-dir.ts",
+        "/src/adapters/next-app-dir/nextAppDirCaller.ts",
+        "/src/adapters/next-app-dir/rethrowNextErrors.ts"
+      ],
+      "percent": 1,
+      "reduction": 13.65
+    },
     {
       "id": "/src/adapters/next-app-dir/formDataToObject.ts",
       "size": 818,
@@ -468,7 +485,7 @@
       "dependents": [
         "/src/adapters/next-app-dir/nextAppDirCaller.ts"
       ],
-      "percent": 0.84,
+      "percent": 0.83,
       "reduction": 0.97
     },
     {
@@ -529,7 +546,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts"
       ],
-      "percent": 0.64,
+      "percent": 0.63,
       "reduction": 43.49
     },
     {
@@ -545,22 +562,6 @@
       "percent": 0.59,
       "reduction": 65.23
     },
-    {
-      "id": "/src/adapters/next-app-dir/redirect.ts",
-      "size": 575,
-      "origSize": 732,
-      "renderedExports": [
-        "TRPCRedirectError",
-        "redirect"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/adapters/next-app-dir.ts",
-        "/src/adapters/next-app-dir/rethrowNextErrors.ts"
-      ],
-      "percent": 0.59,
-      "reduction": 21.45
-    },
     {
       "id": "/src/adapters/next-app-dir/rethrowNextErrors.ts",
       "size": 422,
@@ -599,7 +600,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.35,
+      "percent": 0.34,
       "reduction": 71.37
     },
     {
@@ -627,7 +628,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 0.23,
+      "percent": 0.22,
       "reduction": 94.55
     },
     {
@@ -665,8 +666,8 @@
       ],
       "removedExports": [],
       "dependents": [
-        "/src/adapters/node-http/content-type/form-data/index.ts",
-        "/src/adapters/node-http/content-type/json/index.ts"
+        "/src/adapters/node-http/content-type/json/index.ts",
+        "/src/adapters/node-http/content-type/form-data/index.ts"
       ],
       "percent": 0.12,
       "reduction": 86.68
@@ -802,8 +803,8 @@
       "removedExports": [],
       "dependents": [
         "/src/adapters/express.ts",
-        "/src/adapters/next.ts",
-        "/src/adapters/standalone.ts"
+        "/src/adapters/standalone.ts",
+        "/src/adapters/next.ts"
       ],
       "percent": 0,
       "reduction": 100

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-next.325+f1170b720",
+  "version": "11.0.0-next.327+1c757e8d3",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -126,7 +126,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@fastify/websocket": "^7.1.2",
+    "@fastify/websocket": "^10.0.1",
     "@tanstack/react-query": "^5.25.0",
     "@types/aws-lambda": "^8.10.97",
     "@types/express": "^4.17.17",
@@ -140,7 +140,7 @@
     "devalue": "^4.0.0",
     "eslint": "^8.56.0",
     "express": "^4.17.1",
-    "fastify": "^4.13.0",
+    "fastify": "^4.16.0",
     "fastify-plugin": "^4.5.0",
     "hash-sum": "^2.0.0",
     "myzod": "^1.3.1",
@@ -161,5 +161,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "f1170b720166af7de6180f5adf856f73c30835bc"
+  "gitHead": "1c757e8d30578eb3172495c300383867a0307444"
 }

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -60,7 +60,7 @@ export function fastifyTRPCPlugin<TRouter extends AnyRouter>(
       ...(opts.trpcOptions as unknown as WSSHandlerOptions<TRouter>),
     });
 
-    fastify.get(prefix ?? '/', { websocket: true }, ({ socket }, req) =>
+    fastify.get(prefix ?? '/', { websocket: true }, (socket, req) =>
       onConnection(socket, req.raw),
     );
   }

package/src/adapters/next-app-dir/nextAppDirCaller.ts

@@ -12,6 +12,7 @@ import type {
   Simplify,
 } from '../../unstable-core-do-not-import/types';
 import { formDataToObject } from './formDataToObject';
+import { TRPCRedirectError } from './redirect';
 import { rethrowNextErrors } from './rethrowNextErrors';
 
 type ContextCallback<TContext> = object extends TContext
@@ -95,6 +96,10 @@ export function nextAppDirCaller<TContext>(
             path: '',
             input,
           })
+          .then((data) => {
+            if (data instanceof TRPCRedirectError) throw data;
+            return data;
+          })
           .catch(handleError);
       }
       case 'query': {
@@ -107,6 +112,10 @@ export function nextAppDirCaller<TContext>(
             path: '',
             input,
           })
+          .then((data) => {
+            if (data instanceof TRPCRedirectError) throw data;
+            return data;
+          })
           .catch(handleError);
       }
       default: {

package/src/adapters/next-app-dir/redirect.ts

@@ -1,4 +1,4 @@
-import type { redirect as __redirect } from 'next/navigation';
+import type { RedirectType } from 'next/navigation';
 import { TRPCError } from '../../@trpc/server';
 
 /**
@@ -6,22 +6,25 @@ import { TRPCError } from '../../@trpc/server';
  */
 export class TRPCRedirectError extends TRPCError {
   public readonly args;
-  constructor(...args: Parameters<typeof __redirect>) {
-    const [url] = args;
+  constructor(url: URL | string, redirectType?: RedirectType) {
     super({
       // TODO(?): This should maybe a custom error code
       code: 'UNPROCESSABLE_CONTENT',
       message: `Redirect error to "${url}" that will be handled by Next.js`,
     });
 
-    this.args = args;
+    this.args = [url.toString(), redirectType] as const;
   }
 }
 
 /**
  * Like `next/navigation`'s `redirect()` but throws a `TRPCError` that later will be handled by Next.js
+ * This provides better typesafety than the `next/navigation`'s `redirect()` since the action continues
+ * to execute on the frontend even if Next's `redirect()` has a return type of `never`.
  * @public
+ * @remark You should only use this if you're also using `nextAppDirCaller`.
  */
-export const redirect: typeof __redirect = (...args) => {
-  throw new TRPCRedirectError(...args);
+export const redirect = (url: URL | string, redirectType?: RedirectType) => {
+  // We rethrow this internally so the returntype on the client is undefined.
+  return new TRPCRedirectError(url, redirectType) as unknown as undefined;
 };