@reckona/mreact-router 0.0.181 → 0.0.183

package/src/vite.ts

@@ -69,6 +69,7 @@ export interface AppRouterViteMiddlewareOptions extends AppRouterProjectOptions
 
 type AppRouterViteRuntimeMiddlewareOptions = AppRouterViteMiddlewareOptions & {
   clientRouteInferenceCache?: ClientRouteInferenceCache | undefined;
+  devServerModuleCacheVersion?: (() => string | undefined) | undefined;
   navigationScanVitePlugins?: readonly PluginOption[] | undefined;
   viteDevServer?: ViteDevServer | undefined;
 };
@@ -193,6 +194,7 @@ export function createAppRouterVitePlugin(options: AppRouterVitePluginOptions):
   // built-in CSS plugin) whose `transform` requires a dev-server environment the
   // lightweight navigation scan cannot provide. Mirrors what the build forwards.
   let userVitePlugins: readonly PluginOption[] | undefined;
+  let devServerModuleCacheVersion = 0;
 
   const plugin: MreactRouterPlugin = {
     [mreactRouterConfigKey]: {
@@ -245,6 +247,7 @@ export function createAppRouterVitePlugin(options: AppRouterVitePluginOptions):
         const middlewareOptions: AppRouterViteRuntimeMiddlewareOptions = {
           ...options,
           define: server.config.define,
+          devServerModuleCacheVersion: () => `dev:${devServerModuleCacheVersion}`,
           navigationScanVitePlugins: userVitePlugins ?? [],
           viteDevServer: server,
           vitePlugins: server.config.plugins,
@@ -260,8 +263,13 @@ export function createAppRouterVitePlugin(options: AppRouterVitePluginOptions):
         return;
       }
 
+      devServerModuleCacheVersion += 1;
       const timestamp = Date.now();
-      const updates = Array.from(context.server.moduleGraph.idToModuleMap.values())
+      const hotModules =
+        context.modules.length > 0
+          ? context.modules
+          : Array.from(context.server.moduleGraph.idToModuleMap.values());
+      const updates = hotModules
         .filter((moduleNode) => isMreactClientDevModuleId(moduleNode.id))
         .map((moduleNode) => {
           context.server.moduleGraph.invalidateModule(moduleNode);
@@ -580,20 +588,51 @@ async function handleAppRouterViteRequest(
         clientStylesByFile,
         clientRouteInferenceCache: options.clientRouteInferenceCache,
         navigationScripts,
+        onRenderError(error) {
+          sendViteErrorOverlay(options.viteDevServer, error);
+        },
         request,
         logger: options.logger,
         routeCache: options.routeCache,
         routeMatcher,
         routes,
         serverActions: options.serverActions,
+        devServerModuleCacheVersion: options.devServerModuleCacheVersion?.(),
         vitePlugins: routeTransformPlugins,
       }),
     );
   } catch (error) {
+    sendViteErrorOverlay(options.viteDevServer, error);
     next(error);
   }
 }
 
+function sendViteErrorOverlay(server: ViteDevServer | undefined, error: unknown): void {
+  if (server === undefined) {
+    return;
+  }
+
+  if (error instanceof Error) {
+    server.ssrFixStacktrace(error);
+  }
+  server.ws.send({
+    type: "error",
+    err: viteErrorPayload(error),
+  });
+}
+
+function viteErrorPayload(error: unknown): { message: string; stack: string } {
+  if (error instanceof Error) {
+    return {
+      message: error.message,
+      stack: error.stack ?? error.message,
+    };
+  }
+
+  const message = String(error);
+  return { message, stack: message };
+}
+
 /**
  * Renders a development client asset generated by the app-router Vite integration.
  */
@@ -907,9 +946,7 @@ async function devNavigationScripts(
         console.warn(formatClientRouteInferenceDiagnostic(navigationRuntimeDiagnostic));
       }
 
-      return navigation
-        ? ([route.path, navigationRuntimeScriptForDev()] as const)
-        : undefined;
+      return navigation ? ([route.path, navigationRuntimeScriptForDev()] as const) : undefined;
     }),
   );