@reckona/mreact-router 0.0.153 → 0.0.155

package/src/render.ts

@@ -64,6 +64,7 @@ import {
   importAppRouterFileModule,
   importAppRouterSourceModule,
   fileImportMetaUrlPlugin,
+  rewriteCompatVendorPlaceholderImportsForRunner,
 } from "./module-runner.js";
 import { bytesResponse, htmlResponse } from "./http.js";
 import { isNotFoundError, isRedirectError, rewriteLocation } from "./navigation.js";
@@ -185,6 +186,9 @@ export interface RenderAppRequestOptions {
   routes?: readonly AppRoute[] | undefined;
   serverModules?: ReadonlyMap<string, BuiltServerModuleArtifact> | undefined;
   serverModuleCacheVersion?: string | undefined;
+  // True when serving through a dev server: request-time server transforms
+  // are expected there and must not trigger the production prebuild warning.
+  dev?: boolean | undefined;
   serverSourceFiles?: ReadonlyMap<string, string> | undefined;
   serverActions?: AppRouterServerActionOptions | undefined;
   serverActionReferencesByFile?:
@@ -479,7 +483,7 @@ type StreamModuleExports = Record<string, unknown> & {
 
 const serverTransformCache = new Map<string, TransformOutput>();
 const serverTransformCacheCounters = createRouterRuntimeCacheCounters();
-let productionDynamicServerTransformWarned = false;
+const productionDynamicServerTransformWarned = new Set<string>();
 const serverSourceFileCache = new Map<string, Promise<string>>();
 const serverSourceFileCacheCounters = createRouterRuntimeCacheCounters();
 const routeSourceAnalysisCache = new Map<string, Promise<RouteSourceAnalysis>>();
@@ -766,6 +770,7 @@ export async function resolveAppRouterMiddleware(options: {
 }
 
 async function renderAppRequestInternal(options: RenderAppRequestOptions): Promise<Response> {
+  warnProductionRenderWithoutPrebuiltModules(options);
   const timing = createRenderTiming(options.logger);
   const clientRouteInferenceCache =
     options.clientRouteInferenceCache ?? createClientRouteInferenceCache();
@@ -2643,7 +2648,22 @@ function transformServerModule(options: {
     return cached;
   }
 
-  warnProductionDynamicServerTransform();
+  // Only renders that were handed a prebuild map can have a prebuild gap;
+  // dev servers pass no serverModules and transform at request time by design.
+  if (options.serverModules !== undefined) {
+    warnProductionDynamicServerTransform(
+      options.filename,
+      options.serverOutput,
+      artifact === undefined
+        ? "no prebuilt server module for this output mode"
+        : !prebuiltServerModuleOutputOptionsMatch(
+              artifact,
+              options.serverAwaitHydration === true ? { serverAwaitHydration: true } : {},
+            )
+          ? `serverAwaitHydration mismatch (artifact=${artifact.metadata?.serverAwaitHydration === true}, requested=${options.serverAwaitHydration === true})`
+          : "stale prebuilt server module (source hash changed)",
+    );
+  }
 
   const output = transform({
     code: options.code,
@@ -2674,14 +2694,60 @@ function transformServerModule(options: {
 
 export const __transformServerModuleForTesting = transformServerModule;
 
-function warnProductionDynamicServerTransform(): void {
-  if (process.env.NODE_ENV !== "production" || productionDynamicServerTransformWarned) {
+let productionRenderWithoutPrebuiltModulesWarned = false;
+
+export function __resetProductionRenderWarningsForTesting(): void {
+  productionRenderWithoutPrebuiltModulesWarned = false;
+  productionDynamicServerTransformWarned.clear();
+}
+
+// Covers the deployment that forgot prebuilt modules entirely; per-module
+// gaps inside a provided prebuild map are reported by
+// warnProductionDynamicServerTransform with the affected file instead.
+export function __warnProductionRenderWithoutPrebuiltModulesForTesting(options: {
+  dev?: boolean | undefined;
+  serverModules?: ReadonlyMap<string, BuiltServerModuleArtifact> | undefined;
+}): void {
+  warnProductionRenderWithoutPrebuiltModules(options);
+}
+
+function warnProductionRenderWithoutPrebuiltModules(options: {
+  dev?: boolean | undefined;
+  serverModules?: ReadonlyMap<string, BuiltServerModuleArtifact> | undefined;
+}): void {
+  if (
+    process.env.NODE_ENV !== "production" ||
+    options.dev === true ||
+    options.serverModules !== undefined ||
+    productionRenderWithoutPrebuiltModulesWarned
+  ) {
     return;
   }
 
-  productionDynamicServerTransformWarned = true;
+  productionRenderWithoutPrebuiltModulesWarned = true;
   console.warn(
-    "mreact router: dynamic server transform path ran in production. Production deployments should provide prebuilt serverModules; otherwise request-time transforms use development compiler settings.",
+    "mreact router: production render without prebuilt serverModules. Request-time transforms use development compiler settings; pass the build output's serverModules (or set dev: true for dev servers).",
+  );
+}
+
+function warnProductionDynamicServerTransform(
+  filename: string,
+  serverOutput: ServerOutputMode,
+  reason: string,
+): void {
+  if (process.env.NODE_ENV !== "production") {
+    return;
+  }
+
+  const warnedKey = `${filename}\0${serverOutput}`;
+
+  if (productionDynamicServerTransformWarned.has(warnedKey)) {
+    return;
+  }
+
+  productionDynamicServerTransformWarned.add(warnedKey);
+  console.warn(
+    `mreact router: dynamic server transform path ran in production for ${filename} (serverOutput=${serverOutput}): ${reason}. Production deployments should provide prebuilt serverModules; otherwise request-time transforms use development compiler settings.`,
   );
 }
 
@@ -2887,7 +2953,8 @@ async function loadServerModule(
       serverModuleCacheVersion,
     });
   }
-  const moduleCode = prebuiltCode ?? code;
+  const moduleCode =
+    prebuiltCode === undefined ? code : rewriteCompatVendorPlaceholderImportsForRunner(prebuiltCode);
   const cacheKey =
     serverModuleCacheVersion === undefined
       ? undefined
@@ -3539,7 +3606,8 @@ async function loadServerStreamModule(
       serverModuleCacheVersion,
     });
   }
-  const moduleCode = prebuiltCode ?? code;
+  const moduleCode =
+    prebuiltCode === undefined ? code : rewriteCompatVendorPlaceholderImportsForRunner(prebuiltCode);
   const cacheKey =
     serverModuleCacheVersion === undefined
       ? undefined

package/src/vite.ts

@@ -549,6 +549,7 @@ async function handleAppRouterViteRequest(
       await renderAppRequest({
         appDir: project.routesDir,
         define: options.define,
+        dev: true,
         importPolicy: {
           ...options.importPolicy,
           allowedSourceDirs: project.allowedSourceDirs,