Merge branch 'main' into issue-4112

.all-contributorsrc

@@ -3896,6 +3896,17 @@
         "doc",
         "code"
       ]
+    },
+    {
+      "login": "dbrxnds",
+      "name": "David",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32268383?v=4",
+      "profile": "https://github.com/dbrxnds",
+      "contributions": [
+        "doc",
+        "code",
+        "test"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.changeset/chatty-gifts-whisper.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": minor
+"@blitzjs/rpc": minor
+---
+
+Add ability to format the error on the server before returning it to the client.

README.md

@@ -6,7 +6,7 @@
     <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
   </a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-411-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
+<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-412-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
   <a aria-label="License" href="https://github.com/blitz-js/blitz/blob/main/LICENSE">
     <img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
@@ -724,6 +724,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <td align="center"><a href="https://maotoramm.com"><img src="https://avatars.githubusercontent.com/u/5174884?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maotora ᕙ(⇀‸↼‶)ᕗ</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=maotora" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=maotora" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/vitaliemiron"><img src="https://avatars.githubusercontent.com/u/45145592?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitalie</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=vitaliemiron" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=vitaliemiron" title="Code">💻</a></td>
     <td align="center"><a href="https://estevao.org"><img src="https://avatars.githubusercontent.com/u/19409687?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nelson Estevão</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nelsonmestevao" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=nelsonmestevao" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/dbrxnds"><img src="https://avatars.githubusercontent.com/u/32268383?v=4?s=100" width="100px;" alt=""/><br /><sub><b>David</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dbrxnds" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=dbrxnds" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=dbrxnds" title="Tests">⚠️</a></td>
   </tr>
 </table>
 

apps/toolkit-app/src/auth/components/SignupForm.tsx

@@ -10,6 +10,7 @@ type SignupFormProps = {
 
 export const SignupForm = (props: SignupFormProps) => {
   const [signupMutation] = useMutation(signup)
+
   return (
     <div>
       <h1>Create an Account</h1>

apps/toolkit-app/src/auth/mutations/signup.ts

@@ -1,5 +1,4 @@
 import db from "db"
-import { SecurePassword } from "@blitzjs/auth/secure-password"
 import { Role } from "types"
 
 export default async function signup(input, ctx) {

apps/toolkit-app/src/blitz-server.ts

@@ -1,9 +1,8 @@
 import type { BlitzCliConfig } from "blitz"
+import { BlitzLogger } from "blitz"
 import { setupBlitzServer } from "@blitzjs/next"
-import { AuthServerPlugin, PrismaStorage } from "@blitzjs/auth"
+import { AuthServerPlugin, PrismaStorage, simpleRolesIsAuthorized } from "@blitzjs/auth"
 import db from "db"
-import { simpleRolesIsAuthorized } from "@blitzjs/auth"
-import { BlitzLogger } from "blitz"
 
 export const cliConfig: BlitzCliConfig = {
   customTemplates: "src/templates",
@@ -27,6 +26,9 @@ const { gSSP, gSP, api } = setupBlitzServer({
       isAuthorized: simpleRolesIsAuthorized,
     }),
   ],
+  formatError: (error) => {
+    return new Error("Formatted error" + error.message)
+  },
   logger: BlitzLogger({}),
 })
 

apps/toolkit-app/src/pages/api/rpc/[[...blitz]].ts

@@ -1,4 +1,12 @@
 import { rpcHandler } from "@blitzjs/rpc"
 import { api } from "src/blitz-server"
 
-export default api(rpcHandler({ onError: console.log }))
+export default api(
+  rpcHandler({
+    onError: console.log,
+    formatError: (error) => {
+      error.message = `FormatError handler: ${error.message}`
+      return error
+    },
+  })
+)

apps/toolkit-app/src/pages/index.tsx

@@ -44,7 +44,7 @@ const UserInfo = () => {
         <Link href={Routes.LoginPage()} className={styles.loginButton}>
           <strong>Login</strong>
         </Link>
-        <Link href="/api/auth/github/login" passHref>
+        <Link href="/api/auth/github/login" passHref legacyBehavior>
           <a className="button small">
             <strong>Sign in with GitHub</strong>
           </a>

integration-tests/auth-with-rpc/test/index.test.ts

@@ -1,11 +1,11 @@
-import {describe, it, expect, beforeAll, afterAll} from "vitest"
+import {afterAll, beforeAll, describe, expect, it} from "vitest"
 import {
-  killApp,
-  findPort,
-  runBlitzCommand,
-  blitzLaunchApp,
   blitzBuild,
+  blitzLaunchApp,
   blitzStart,
+  findPort,
+  killApp,
+  runBlitzCommand,
   waitFor,
 } from "../../utils/next-test-utils"
 import webdriver from "../../utils/next-webdriver"
@@ -15,7 +15,7 @@ let appPort: number
 
 const runTests = () => {
   describe("Auth", () => {
-   /* TODO - Add a non flaky Integration Test for custom plugin 
+    /* TODO - Add a non flaky Integration Test for custom plugin
    describe("custom plugin", () => {
       it("custom plugin - events", async () => {
         const browser = await webdriver(appPort, "/custom-plugin")

integration-tests/next-13-app-dir/next-env.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/basic-features/typescript for more information.

integration-tests/next-13-app-dir/test/index.test.ts

@@ -1,13 +1,6 @@
-import {describe, it, expect, beforeAll, afterAll} from "vitest"
+import {afterAll, beforeAll, describe, expect, it} from "vitest"
 import waitPort from "wait-port"
-import {
-  killApp,
-  findPort,
-  runBlitzCommand,
-  blitzLaunchApp,
-  blitzBuild,
-  blitzStart,
-} from "../../utils/next-test-utils"
+import {blitzLaunchApp, findPort, killApp, runBlitzCommand} from "../../utils/next-test-utils"
 import webdriver from "../../utils/next-webdriver"
 
 import fetch from "node-fetch"
@@ -43,7 +36,7 @@ const runTests = (mode?: string) => {
           const browser = await webdriver(appPort, "/authenticated-client")
           let errorMsg = await browser.elementById(`error`).text()
           expect(errorMsg).toMatch(/Error: You are not authenticated/)
-          if (browser) browser.close()
+          if (browser) await browser.close()
         },
         5000 * 60 * 2,
       )
@@ -55,7 +48,7 @@ const runTests = (mode?: string) => {
           const browser = await webdriver(appPort, "/authenticated-server")
           let errorMsg = await browser.elementById(`error`).text()
           expect(errorMsg).toMatch(/Error: You are not authenticated/)
-          if (browser) browser.close()
+          if (browser) await browser.close()
         },
         5000 * 60 * 2,
       )

integration-tests/next-13-app-dir/tsconfig.json

@@ -9,7 +9,8 @@
       {
         "name": "next"
       }
-    ]
+    ],
+    "strictNullChecks": true
   },
   "exclude": ["node_modules"],
   "baseUrl": "."

integration-tests/rpc/app/queries/getCustomStatusCodeFailure.js

@@ -0,0 +1,12 @@
+class ErrorWithStatusCode extends Error {
+  statusCode
+
+  constructor(message, statusCode) {
+    super(message)
+    this.statusCode = statusCode
+  }
+}
+
+export default async function getCustomStatusCodeFailure() {
+  throw new ErrorWithStatusCode("Error with custom status code for test", 418)
+}

integration-tests/rpc/test/index.test.js

@@ -1,14 +1,13 @@
-import {describe, it, expect, beforeAll, afterAll} from "vitest"
-import fs from "fs-extra"
+import {afterAll, beforeAll, describe, expect, it} from "vitest"
 import {join} from "path"
 import {
-  killApp,
+  fetchViaHTTP,
   findPort,
+  killApp,
   launchApp,
-  fetchViaHTTP,
   nextBuild,
-  nextStart,
   nextExport,
+  nextStart,
 } from "../../utils/next-test-utils"
 
 // jest.setTimeout(1000 * 60 * 2)

packages/blitz-next/src/index-server.ts

@@ -1,41 +1,43 @@
 import type {
-  NextConfig,
   GetServerSideProps,
   GetServerSidePropsResult,
   GetStaticProps,
   GetStaticPropsResult,
   NextApiRequest,
   NextApiResponse,
+  NextConfig,
 } from "next"
 import {
   AddParameters,
   AsyncFunc,
+  BlitzLogger,
   BlitzServerPlugin,
   Ctx as BlitzCtx,
   FirstParam,
-  RequestMiddleware,
-  MiddlewareResponse,
-  BlitzLogger,
+  handleRequestWithMiddleware,
   initializeLogger,
-  Simplify,
-  UnionToIntersection,
+  isRouteUrlObject,
+  MiddlewareResponse,
   reduceBlitzServerPlugins,
+  RouteUrlObject,
+  startWatcher,
+  stopWatcher,
 } from "blitz"
-import {handleRequestWithMiddleware, startWatcher, stopWatcher} from "blitz"
-import {installWebpackConfig, InstallWebpackConfigOptions, ResolverPathOptions} from "@blitzjs/rpc"
 import {
   DefaultOptions,
-  QueryClient,
-  getQueryKey,
-  getInfiniteQueryKey,
   dehydrate,
+  getInfiniteQueryKey,
+  getQueryKey,
+  installWebpackConfig,
+  InstallWebpackConfigOptions,
+  QueryClient,
+  ResolverPathOptions,
 } from "@blitzjs/rpc"
 import {IncomingMessage, ServerResponse} from "http"
 import {withSuperJsonProps} from "./superjson"
 import {ParsedUrlQuery} from "querystring"
 import {PreviewData} from "next/types"
 import {resolveHref} from "next/dist/shared/lib/router/utils/resolve-href"
-import {RouteUrlObject, isRouteUrlObject} from "blitz"
 
 export * from "./index-browser"
 
@@ -130,10 +132,12 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
   plugins,
   onError,
   logger,
+  formatError,
 }: {
   plugins: TPlugins
   onError?: (err: Error) => void
   logger?: ReturnType<typeof BlitzLogger>
+  formatError?: (err: Error) => Error
 }) => {
   initializeLogger(logger ?? BlitzLogger())
 
@@ -168,9 +172,9 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
             getClient(),
           ),
         )
-      } catch (err: any) {
-        onError?.(err)
-        throw err
+      } catch (error: any) {
+        onError?.(error)
+        throw formatError?.(error) ?? error
       }
     }
 
@@ -197,9 +201,9 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
             getClient(),
           ),
         )
-      } catch (err: any) {
-        onError?.(err)
-        throw err
+      } catch (error: any) {
+        onError?.(error)
+        throw formatError?.(error) ?? error
       }
     }
 
@@ -215,7 +219,8 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
         ])
       } catch (error: any) {
         onError?.(error)
-        return res.status(400).send(error)
+        const formattedError = formatError?.(error) ?? error
+        return res.status(400).send(formattedError)
       }
     }
 

packages/blitz-rpc/src/index-server.ts

@@ -1,6 +1,6 @@
 import {assert, baseLogger, Ctx, newLine, prettyMs, ResolverConfig} from "blitz"
 import {NextApiRequest, NextApiResponse} from "next"
-import {deserialize, serialize as superjsonSerialize, parse} from "superjson"
+import {deserialize, parse, serialize as superjsonSerialize} from "superjson"
 import {resolve} from "path"
 import chalk from "chalk"
 
@@ -149,6 +149,7 @@ async function getResolverMap(): Promise<ResolverFiles | null | undefined> {
 
 interface RpcConfig {
   onError?: (error: Error) => void
+  formatError?: (error: Error) => Error
 }
 
 export function rpcHandler(config: RpcConfig) {
@@ -265,7 +266,8 @@ export function rpcHandler(config: RpcConfig) {
           error.statusCode = 500
         }
 
-        const serializedError = superjsonSerialize(error)
+        const formattedError = config.formatError?.(error) ?? error
+        const serializedError = superjsonSerialize(formattedError)
 
         res.json({
           result: null,

packages/blitz/src/cli/utils/routes-manifest.ts

@@ -1,13 +1,10 @@
-import {join, dirname} from "path"
+import {join} from "path"
 import os from "os"
 import {promises} from "fs"
-const readFile = promises.readFile
-import {outputFile, readdir} from "fs-extra"
-import findUp from "find-up"
-import resolveFrom from "resolve-from"
+import {outputFile, readdir, readFile} from "fs-extra"
 import Watchpack from "watchpack"
-import {isInternalBlitzMonorepoDevelopment} from "./helpers"
 import {findNodeModulesRoot} from "./find-node-modules"
+
 const debug = require("debug")("blitz")
 export const CONFIG_FILE = ".blitz.config.compiled.js"
 export const NEXT_CONFIG_FILE = "next.config.js"

packages/blitz/src/middleware.ts

@@ -1,5 +1,5 @@
 import {IncomingMessage, ServerResponse} from "http"
-import {compose, Ctx, RequestMiddleware, MiddlewareNext, MiddlewareResponse} from "./index-server"
+import {compose, Ctx, MiddlewareNext, MiddlewareResponse, RequestMiddleware} from "./index-server"
 
 export async function handleRequestWithMiddleware<
   Req extends IncomingMessage = IncomingMessage,