rename hook to processRequestError

Author: markdalgleish

packages/remix-dev/vite/plugin.ts

@@ -669,9 +669,9 @@ export const remixVitePlugin: RemixVitePlugin = (options = {}) => {
           setTimeout(showUnstableWarning, 50);
         });
 
-        // Give the request handler access to the critical CSS in dev to avoid a
-        // flash of unstyled content since Vite injects CSS file contents via JS
         setDevServerHooks({
+          // Give the request handler access to the critical CSS in dev to avoid a
+          // flash of unstyled content since Vite injects CSS file contents via JS
           getCriticalCss: async (build, url) => {
             invariant(cachedPluginConfig);
             return getStylesForUrl(
@@ -682,7 +682,13 @@ export const remixVitePlugin: RemixVitePlugin = (options = {}) => {
               url
             );
           },
-          fixStacktrace: vite.ssrFixStacktrace,
+          // If an error is caught within the request handler, let Vite fix the
+          // stack trace so it maps back to the actual source code
+          processRequestError: (error) => {
+            if (error instanceof Error) {
+              vite.ssrFixStacktrace(error);
+            }
+          },
         });
 
         // We cache the pluginConfig here to make sure we're only invalidating virtual modules when necessary.

packages/remix-server-runtime/dev.ts

@@ -27,11 +27,11 @@ export function logDevReady(build: ServerBuild) {
 }
 
 type DevServerHooks = {
-  getCriticalCss: (
+  getCriticalCss?: (
     build: ServerBuild,
     pathname: string
   ) => Promise<string | undefined>;
-  fixStacktrace: (error: Error) => void;
+  processRequestError?: (error: unknown) => void;
 };
 
 const globalDevServerHooksKey = "__remix_devServerHooks";

packages/remix-server-runtime/server.ts

@@ -95,10 +95,10 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
 
     let matches = matchServerRoutes(routes, url.pathname);
     let handleError = (error: unknown) => {
-      let devServerHooks = getDevServerHooks();
-      if (devServerHooks && error instanceof Error) {
-        devServerHooks.fixStacktrace(error);
+      if (mode === ServerMode.Development) {
+        getDevServerHooks()?.processRequestError?.(error);
       }
+
       errorHandler(error, {
         context: loadContext,
         params: matches && matches.length > 0 ? matches[0].params : {},
@@ -142,7 +142,7 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
     } else {
       let criticalCss =
         mode === ServerMode.Development
-          ? await getDevServerHooks()?.getCriticalCss(_build, url.pathname)
+          ? await getDevServerHooks()?.getCriticalCss?.(_build, url.pathname)
           : undefined;
 
       response = await handleDocumentRequestRR(