@reckona/mreact-router 0.0.153 → 0.0.155

package/dist/render.js

@@ -15,7 +15,7 @@ import { dispatchServerActionRequest, prepareRouteServerActions, } from "./actio
 import { serverActionCookie } from "./csrf.js";
 import { beginRouteCacheContext, cachedRouteResponse, cacheRouteResponse, routeCacheKey, routeCachePolicyFromSource, } from "./cache.js";
 import { resolveRouterCacheLimit } from "./cache-config.js";
-import { importAppRouterBuiltFileModule, importAppRouterFileModule, importAppRouterSourceModule, fileImportMetaUrlPlugin, } from "./module-runner.js";
+import { importAppRouterBuiltFileModule, importAppRouterFileModule, importAppRouterSourceModule, fileImportMetaUrlPlugin, rewriteCompatVendorPlaceholderImportsForRunner, } from "./module-runner.js";
 import { bytesResponse, htmlResponse } from "./http.js";
 import { isNotFoundError, isRedirectError, rewriteLocation } from "./navigation.js";
 import { createAppRouterImportPolicyPlugin } from "./import-policy.js";
@@ -193,7 +193,7 @@ function assertNoFatalServerDiagnostics(filename, diagnostics) {
 }
 const serverTransformCache = new Map();
 const serverTransformCacheCounters = createRouterRuntimeCacheCounters();
-let productionDynamicServerTransformWarned = false;
+const productionDynamicServerTransformWarned = new Set();
 const serverSourceFileCache = new Map();
 const serverSourceFileCacheCounters = createRouterRuntimeCacheCounters();
 const routeSourceAnalysisCache = new Map();
@@ -347,6 +347,7 @@ export async function resolveAppRouterMiddleware(options) {
     return { response: middlewareResponse, type: "response" };
 }
 async function renderAppRequestInternal(options) {
+    warnProductionRenderWithoutPrebuiltModules(options);
     const timing = createRenderTiming(options.logger);
     const clientRouteInferenceCache = options.clientRouteInferenceCache ?? createClientRouteInferenceCache();
     let phaseStartedAt = renderTimingPhaseStartedAt(timing);
@@ -1742,7 +1743,15 @@ function transformServerModule(options) {
     if (cached !== undefined) {
         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,
         ...(options.clientBoundaryImports === undefined
@@ -1762,12 +1771,37 @@ function transformServerModule(options) {
     return output;
 }
 export const __transformServerModuleForTesting = transformServerModule;
-function warnProductionDynamicServerTransform() {
-    if (process.env.NODE_ENV !== "production" || productionDynamicServerTransformWarned) {
+let productionRenderWithoutPrebuiltModulesWarned = false;
+export function __resetProductionRenderWarningsForTesting() {
+    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) {
+    warnProductionRenderWithoutPrebuiltModules(options);
+}
+function warnProductionRenderWithoutPrebuiltModules(options) {
+    if (process.env.NODE_ENV !== "production" ||
+        options.dev === true ||
+        options.serverModules !== undefined ||
+        productionRenderWithoutPrebuiltModulesWarned) {
+        return;
+    }
+    productionRenderWithoutPrebuiltModulesWarned = true;
+    console.warn("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, serverOutput, reason) {
+    if (process.env.NODE_ENV !== "production") {
+        return;
+    }
+    const warnedKey = `${filename}\0${serverOutput}`;
+    if (productionDynamicServerTransformWarned.has(warnedKey)) {
         return;
     }
-    productionDynamicServerTransformWarned = 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.");
+    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.`);
 }
 async function analyzeRouteSource(options) {
     const sourceHash = memoizedHashText(options.code);
@@ -1873,7 +1907,7 @@ async function loadServerModule(code, sourcefile, serverModules, serverModuleCac
             serverModuleCacheVersion,
         });
     }
-    const moduleCode = prebuiltCode ?? code;
+    const moduleCode = prebuiltCode === undefined ? code : rewriteCompatVendorPlaceholderImportsForRunner(prebuiltCode);
     const cacheKey = serverModuleCacheVersion === undefined
         ? undefined
         : `server-component:${serverModuleCacheVersion}:${sourcefile}:${moduleCode === code ? codeHash : memoizedHashText(moduleCode)}:${importPolicyCacheKey(importPolicy)}:${viteDefineCacheKey(define)}:${vitePluginsCacheKey(vitePlugins)}`;
@@ -2198,7 +2232,7 @@ async function loadServerStreamModule(code, sourcefile, serverModules, serverMod
             serverModuleCacheVersion,
         });
     }
-    const moduleCode = prebuiltCode ?? code;
+    const moduleCode = prebuiltCode === undefined ? code : rewriteCompatVendorPlaceholderImportsForRunner(prebuiltCode);
     const cacheKey = serverModuleCacheVersion === undefined
         ? undefined
         : `server-stream-component:${serverModuleCacheVersion}:${sourcefile}:${moduleCode === code ? codeHash : memoizedHashText(moduleCode)}:${importPolicyCacheKey(importPolicy)}:${viteDefineCacheKey(define)}:${vitePluginsCacheKey(vitePlugins)}`;