@reckona/mreact-router 0.0.132 → 0.0.134

package/dist/render.js

@@ -4,7 +4,7 @@ import { access, readFile, stat } from "node:fs/promises";
 import { dirname, join, relative, resolve, sep } from "node:path";
 import { formatDiagnostic, transform } from "@reckona/mreact-compiler";
 import { createQueryClient, dehydrate, __MREACT_QUERY_STATE_SCRIPT_ID, runWithQueryClient, } from "@reckona/mreact-query";
-import { createStringSink, renderAsyncBoundary, renderOutOfOrderReorderScript, renderToReadableStream, } from "@reckona/mreact-server";
+import { createStringSink, renderAsyncBoundary, renderOutOfOrderReorderScript, renderReactNodeToString, renderToReadableStream, } from "@reckona/mreact-server";
 import { createClientRouteInferenceCache, formatClientRouteInferenceDiagnostic, inferClientRouteModule, } from "./client-route-inference.js";
 import { hydrationMarkerParts, routeIdForPath, withHydrationMarkers, withRouteMarkers, } from "./navigation-runtime.js";
 import { assetPath } from "./assets.js";
@@ -24,7 +24,7 @@ import { hasLoaderExport, isStreamRouteSource, routeClosureMayUseAwaitBoundary,
 import { emitRouterLog, logDurationMs, logNow } from "./logger.js";
 import { createRouterRuntimeCacheCounters, readRouterRuntimeCacheEntry, routerRuntimeCacheStat, } from "./cache-stats.js";
 import { bundleRouterModule } from "./bundle-pipeline.js";
-import { vitePluginsCacheKey } from "./vite-plugin-cache-key.js";
+import { viteDefineCacheKey, vitePluginsCacheKey } from "./vite-plugin-cache-key.js";
 import { invokeRouterInstrumentation, traceContextFromRequest, } from "./trace.js";
 import { mergeRouteMiddlewareControls, middlewareMatches, parseRouteMiddlewareControl, parseStaticMiddlewareConfig, shouldSkipMiddleware, } from "./middleware.js";
 import { applyFileConventionMetadata, injectHeadMetadata, mergeRouteMetadata, responseHeadersForMetadata, serializeRobots, serializeSitemap, } from "./metadata.js";
@@ -51,6 +51,7 @@ export async function preloadBuiltRequestModules(options) {
                 serverModules: options.serverModules,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
                 serverSourceFiles: options.serverSourceFiles,
+                define: options.define,
                 vitePlugins: options.vitePlugins,
             });
         }
@@ -65,6 +66,7 @@ export async function preloadBuiltRequestModules(options) {
                 serverModules: options.serverModules,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
                 serverSourceFiles: options.serverSourceFiles,
+                define: options.define,
                 vitePlugins: options.vitePlugins,
             });
             continue;
@@ -96,6 +98,7 @@ export async function preloadBuiltRequestModules(options) {
                 importPolicy: options.importPolicy,
                 serverModules: options.serverModules,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
+                define: options.define,
                 vitePlugins: options.vitePlugins,
             });
         }
@@ -117,7 +120,7 @@ async function preloadBuiltPageRouteModules(options) {
             serverOutput: "string",
         });
         assertNoFatalServerDiagnostics(options.file, stringOutput.diagnostics);
-        await loadServerModule(stringOutput.code, options.file, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins);
+        await loadServerModule(stringOutput.code, options.file, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins);
     }
     if (options.analysis.streamRoute) {
         const streamOutput = transformServerModule({
@@ -130,7 +133,7 @@ async function preloadBuiltPageRouteModules(options) {
             serverAwaitHydration: options.analysis.clientInference.client,
         });
         assertNoFatalServerDiagnostics(options.file, streamOutput.diagnostics);
-        await loadServerStreamModule(streamOutput.code, options.file, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins);
+        await loadServerStreamModule(streamOutput.code, options.file, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins);
     }
     await preloadShellModulesForPage({
         appDir: options.appDir,
@@ -138,6 +141,7 @@ async function preloadBuiltPageRouteModules(options) {
         serverModules: options.serverModules,
         serverModuleCacheVersion: options.serverModuleCacheVersion,
         serverSourceFiles: options.serverSourceFiles,
+        define: options.define,
         vitePlugins: options.vitePlugins,
     });
     if (!hasGenerateMetadataExport(options.code)) {
@@ -155,6 +159,7 @@ async function preloadBuiltPageRouteModules(options) {
             serverModules: options.serverModules,
             serverModuleCacheVersion: options.serverModuleCacheVersion,
             serverSourceFiles: options.serverSourceFiles,
+            define: options.define,
             vitePlugins: options.vitePlugins,
         });
     }
@@ -170,7 +175,7 @@ async function preloadShellModulesForPage(options) {
             serverOutput: "string",
         });
         assertNoFatalServerDiagnostics(shell.file, output.diagnostics);
-        await loadServerModule(output.code, shell.file, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins);
+        await loadServerModule(output.code, shell.file, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins);
     }
 }
 function fatalServerDiagnostics(diagnostics) {
@@ -364,6 +369,7 @@ async function renderAppRequestInternal(options) {
             serverModuleCacheVersion: options.serverModuleCacheVersion,
             serverSourceFiles: options.serverSourceFiles,
             timing,
+            define: options.define,
             vitePlugins: options.vitePlugins,
         });
     finishRenderTimingPhase(timing, phaseStartedAt, "middlewareMs");
@@ -487,6 +493,7 @@ async function renderAppRequestInternal(options) {
             clientRouteInferenceCache,
             serverModuleCacheVersion: options.serverModuleCacheVersion,
             serverSourceFiles: options.serverSourceFiles,
+            define: options.define,
             timing,
             vitePlugins: options.vitePlugins,
         });
@@ -533,6 +540,7 @@ async function renderAppRequestInternal(options) {
                 clientRouteInferenceCache,
                 serverModuleCacheVersion: undefined,
                 serverSourceFiles: options.serverSourceFiles,
+                define: options.define,
                 vitePlugins: options.vitePlugins,
             });
         finishRenderTimingPhase(timing, phaseStartedAt, "routeCodeAnalysisMs");
@@ -559,6 +567,7 @@ async function renderAppRequestInternal(options) {
                 routePath: matched.route.path,
                 serverModules: options.serverModules,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
+                define: options.define,
                 vitePlugins: options.vitePlugins,
                 timing,
             })
@@ -631,7 +640,7 @@ async function renderAppRequestInternal(options) {
                     params: matched.params,
                     queryClient,
                     request: options.request,
-                }, matched.route.file, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins, undefined, options.importPolicy));
+                }, matched.route.file, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins, undefined, options.importPolicy));
                 const pageHtml = renderedPage.html;
                 const pageHtmlForLayout = clientRoute
                     ? withHydrationMarkers({
@@ -752,6 +761,7 @@ async function renderAppRequestInternal(options) {
                     assetBaseUrl: options.assetBaseUrl,
                     clientRoute,
                     data: dataPromise ?? Promise.resolve(undefined),
+                    define: options.define,
                     loadingFile,
                     pageFile: matched.route.file,
                     params: matched.params,
@@ -793,6 +803,7 @@ async function renderAppRequestInternal(options) {
                 serverModules: options.serverModules,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
                 serverSourceFiles: options.serverSourceFiles,
+                define: options.define,
                 vitePlugins: options.vitePlugins,
                 clientRouteInferenceCache,
                 importPolicy: options.importPolicy,
@@ -844,7 +855,7 @@ async function renderAppRequestInternal(options) {
             params: matched.params,
             queryClient,
             request: options.request,
-        }, matched.route.file, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins, timing, options.importPolicy));
+        }, matched.route.file, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins, timing, options.importPolicy));
         finishRenderTimingPhase(timing, phaseStartedAt, "pageRenderMs");
         const pageHtml = renderedPage.html;
         // Wrap the page (not the full document) with the hydration marker so
@@ -906,6 +917,7 @@ async function renderAppRequestInternal(options) {
             serverModules: options.serverModules,
             serverModuleCacheVersion: options.serverModuleCacheVersion,
             serverSourceFiles: options.serverSourceFiles,
+            define: options.define,
             vitePlugins: options.vitePlugins,
         });
         finishRenderTimingPhase(timing, phaseStartedAt, "metadataMs");
@@ -1175,7 +1187,7 @@ async function renderSpecialRoute(options) {
         routeId: routeIdForPath(options.routePath ?? new URL(options.request.url).pathname),
         traceId: traceContextFromRequest(options.request)?.traceId,
     };
-    const pageHtml = await renderServerFileToHtml(options.routeFile, props, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.vitePlugins);
+    const pageHtml = await renderServerFileToHtml(options.routeFile, props, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.define, options.vitePlugins);
     const pageHtmlForLayout = options.navigation?.clientRoute === true
         ? withHydrationMarkers({
             assetBaseUrl: options.assetBaseUrl,
@@ -1194,6 +1206,7 @@ async function renderSpecialRoute(options) {
         serverModules: options.serverModules,
         serverModuleCacheVersion: options.serverModuleCacheVersion,
         serverSourceFiles: options.serverSourceFiles,
+        define: options.define,
         vitePlugins: options.vitePlugins,
     });
     return new Response(`<!DOCTYPE html>${clientNavigationHeadTags({
@@ -1206,7 +1219,7 @@ async function renderSpecialRoute(options) {
         status: options.status,
     });
 }
-async function renderServerFileToHtml(file, props, serverModules, serverModuleCacheVersion, serverSourceFiles, vitePlugins) {
+async function renderServerFileToHtml(file, props, serverModules, serverModuleCacheVersion, serverSourceFiles, define, vitePlugins) {
     const code = await readServerSourceFile(file, serverModuleCacheVersion, serverSourceFiles);
     const output = transformServerModule({
         code,
@@ -1218,7 +1231,7 @@ async function renderServerFileToHtml(file, props, serverModules, serverModuleCa
     if (fatalDiagnostics.length > 0) {
         throw new Error(formatServerDiagnostics(file, fatalDiagnostics));
     }
-    return runServerModule(output.code, props, file, serverModules, serverModuleCacheVersion, vitePlugins);
+    return runServerModule(output.code, props, file, serverModules, serverModuleCacheVersion, define, vitePlugins);
 }
 function normalizeErrorForProps(error) {
     if (error instanceof Error) {
@@ -1354,6 +1367,7 @@ async function loadServerRouteModule(options) {
     const code = await readServerSourceFile(options.file, options.serverModuleCacheVersion, options.serverSourceFiles);
     const externalSourceDirs = devExternalSourceDirs(options.file, options.importPolicy);
     if (options.serverModuleCacheVersion === undefined &&
+        options.define === undefined &&
         (options.vitePlugins === undefined || options.vitePlugins.length === 0) &&
         (externalSourceDirs === undefined || !hasRelativeSourceImport(code))) {
         return await importAppRouterFileModule(options.file);
@@ -1370,7 +1384,7 @@ async function loadServerRouteModule(options) {
         });
     }
     const moduleCode = artifactCode !== undefined && artifactCode.sourceHash === codeHash ? artifactCode.code : code;
-    const cacheKey = `server-route\0${options.file}\0${options.serverModuleCacheVersion}\0${codeHash}\0${memoizedHashText(moduleCode)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
+    const cacheKey = `server-route\0${options.file}\0${options.serverModuleCacheVersion}\0${codeHash}\0${memoizedHashText(moduleCode)}\0${viteDefineCacheKey(options.define)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
     const cached = readRouterRuntimeCacheEntry(serverRouteModuleCache, cacheKey, serverRouteModuleCacheCounters);
     if (cached !== undefined) {
         return cached;
@@ -1378,6 +1392,7 @@ async function loadServerRouteModule(options) {
     const loaded = importAppRouterSourceModule({
         cacheKey,
         code: moduleCode,
+        define: options.define,
         externalizeAppSourceModuleDirs: externalSourceDirs,
         label: `server-route:${options.file}`,
         plugins: [
@@ -1440,6 +1455,7 @@ async function runMiddleware(options) {
             module = await loadMiddlewareModule({
                 appDir: options.appDir,
                 code,
+                define: options.define,
                 file,
                 importPolicy: options.importPolicy,
                 serverModules: options.serverModules,
@@ -1506,7 +1522,7 @@ async function loadMiddlewareModule(options) {
         (await readServerSourceFile(options.file, options.serverModuleCacheVersion, options.serverSourceFiles));
     const cacheKey = options.serverModuleCacheVersion === undefined
         ? undefined
-        : `middleware\0${options.appDir}\0${options.file}\0${options.serverModuleCacheVersion}\0${memoizedHashText(code)}\0${importPolicyCacheKey(options.importPolicy)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
+        : `middleware\0${options.appDir}\0${options.file}\0${options.serverModuleCacheVersion}\0${memoizedHashText(code)}\0${importPolicyCacheKey(options.importPolicy)}\0${viteDefineCacheKey(options.define)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
     if (cacheKey !== undefined) {
         const cached = readRouterRuntimeCacheEntry(middlewareModuleCache, cacheKey, middlewareModuleCacheCounters);
         if (cached !== undefined) {
@@ -1516,6 +1532,7 @@ async function loadMiddlewareModule(options) {
     const loaded = loadBundledMiddlewareModule({
         appDir: options.appDir,
         code,
+        define: options.define,
         file: options.file,
         importPolicy: options.importPolicy,
         prebuiltArtifact: prebuiltRequestModuleArtifact(options.serverModules, options.file, code),
@@ -1535,6 +1552,7 @@ async function loadMiddlewareModule(options) {
 export async function bundleMiddlewareModuleCode(options) {
     const output = await bundleRouterModule({
         code: options.code,
+        define: options.define,
         filename: options.file,
         platform: "node",
         root: options.importPolicy?.projectRoot,
@@ -1566,6 +1584,7 @@ async function loadBundledMiddlewareModule(options) {
         (await bundleMiddlewareModuleCode({
             appDir: options.appDir,
             code: options.code,
+            define: options.define,
             file: options.file,
             importPolicy: options.importPolicy,
             vitePlugins: options.vitePlugins,
@@ -1574,9 +1593,10 @@ async function loadBundledMiddlewareModule(options) {
         ...(options.serverModuleCacheVersion === undefined
             ? {}
             : {
-                cacheKey: `middleware:${options.file}:${options.serverModuleCacheVersion}:${memoizedHashText(compiled)}:${vitePluginsCacheKey(options.vitePlugins)}`,
+                cacheKey: `middleware:${options.file}:${options.serverModuleCacheVersion}:${memoizedHashText(compiled)}:${viteDefineCacheKey(options.define)}:${vitePluginsCacheKey(options.vitePlugins)}`,
             }),
         code: compiled,
+        define: options.define,
         label: `middleware:${options.file}`,
         vitePlugins: options.vitePlugins,
     });
@@ -1641,7 +1661,7 @@ async function analyzeRouteSource(options) {
         finishRenderTimingPhase(options.timing, artifactStartedAt, "sourceAnalysisArtifactMs");
         return analysis;
     }
-    const cacheKey = `${options.serverModuleCacheVersion ?? "dev"}\0${options.filename}\0${sourceHash}\0${vitePluginsCacheKey(options.vitePlugins)}`;
+    const cacheKey = `${options.serverModuleCacheVersion ?? "dev"}\0${options.filename}\0${sourceHash}\0${viteDefineCacheKey(options.define)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
     const cached = readRouterRuntimeCacheEntry(routeSourceAnalysisCache, cacheKey, routeSourceAnalysisCacheCounters);
     if (cached !== undefined) {
         return cached;
@@ -1700,17 +1720,20 @@ function routeSourceFilesForAnalysis(options) {
         ? { [options.filename]: options.code }
         : { ...Object.fromEntries(options.serverSourceFiles), [options.filename]: options.code };
 }
-async function runServerModule(code, props, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins) {
-    const component = await loadServerComponent(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins);
-    return component(props);
+async function runServerModule(code, props, sourcefile, serverModules, serverModuleCacheVersion, define, vitePlugins) {
+    const component = await loadServerComponent(code, sourcefile, serverModules, serverModuleCacheVersion, define, vitePlugins);
+    return renderServerComponentResult(await component(props));
 }
-async function runServerModuleWithSlots(code, props, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, timing, importPolicy) {
+async function renderServerComponentResult(value) {
+    return typeof value === "string" ? value : renderReactNodeToString(value);
+}
+async function runServerModuleWithSlots(code, props, sourcefile, serverModules, serverModuleCacheVersion, define, vitePlugins, timing, importPolicy) {
     const moduleLoadStartedAt = renderTimingPhaseStartedAt(timing);
-    const module = await loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy);
+    const module = await loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, define, vitePlugins, importPolicy);
     finishRenderTimingPhase(timing, moduleLoadStartedAt, "pageModuleLoadMs");
     const component = selectServerComponent(module);
     const componentStartedAt = renderTimingPhaseStartedAt(timing);
-    const html = await component(props);
+    const html = await renderServerComponentResult(await component(props));
     finishRenderTimingPhase(timing, componentStartedAt, "pageComponentRenderMs");
     const slotsStartedAt = renderTimingPhaseStartedAt(timing);
     const slots = await renderRouteSlots(module.slots, props);
@@ -1720,7 +1743,7 @@ async function runServerModuleWithSlots(code, props, sourcefile, serverModules,
         slots,
     };
 }
-async function loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy) {
+async function loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, define, vitePlugins, importPolicy) {
     const artifact = serverModules?.get(sourcefile)?.string;
     const codeHash = memoizedHashText(code);
     const prebuiltCode = prebuiltServerComponentModuleCode(artifact, code, codeHash);
@@ -1736,10 +1759,11 @@ async function loadServerModule(code, sourcefile, serverModules, serverModuleCac
     const moduleCode = prebuiltCode ?? code;
     const cacheKey = serverModuleCacheVersion === undefined
         ? undefined
-        : `server-component:${serverModuleCacheVersion}:${sourcefile}:${moduleCode === code ? codeHash : memoizedHashText(moduleCode)}:${importPolicyCacheKey(importPolicy)}:${vitePluginsCacheKey(vitePlugins)}`;
+        : `server-component:${serverModuleCacheVersion}:${sourcefile}:${moduleCode === code ? codeHash : memoizedHashText(moduleCode)}:${importPolicyCacheKey(importPolicy)}:${viteDefineCacheKey(define)}:${vitePluginsCacheKey(vitePlugins)}`;
     return await importAppRouterSourceModule({
         cacheKey,
         code: moduleCode,
+        define,
         label: `server-component:${sourcefile}`,
         plugins: importPolicy === undefined
             ? undefined
@@ -1757,6 +1781,7 @@ async function loadServerModule(code, sourcefile, serverModules, serverModuleCac
                     dev: serverModuleCacheVersion === undefined,
                     serverModules,
                     serverOutput: "string",
+                    define,
                     vitePlugins,
                 },
             }
@@ -1775,8 +1800,8 @@ async function importBuiltServerModuleFile(options) {
         file: options.file,
     });
 }
-async function loadServerComponent(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy) {
-    const module = await loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy);
+async function loadServerComponent(code, sourcefile, serverModules, serverModuleCacheVersion, define, vitePlugins, importPolicy) {
+    const module = await loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, define, vitePlugins, importPolicy);
     return selectServerComponent(module);
 }
 function selectServerComponent(module) {
@@ -1792,7 +1817,10 @@ async function renderRouteSlots(slots, props) {
     }
     const rendered = {};
     for (const [name, value] of Object.entries(slots)) {
-        rendered[name] = typeof value === "function" ? await value(props) : value;
+        rendered[name] =
+            typeof value === "function"
+                ? await renderServerComponentResult(await value(props))
+                : await renderServerComponentResult(value);
     }
     return rendered;
 }
@@ -1803,10 +1831,11 @@ function runServerStreamModule(code, options) {
             props: options.props,
             serverModules: options.serverModules,
             serverModuleCacheVersion: options.serverModuleCacheVersion,
+            define: options.define,
             vitePlugins: options.vitePlugins,
             importPolicy: options.importPolicy,
         });
-        const layoutShells = await layoutShellsForPage(options.appDir, options.pageFile, options.props, slots, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache, options.vitePlugins, options.importPolicy);
+        const layoutShells = await layoutShellsForPage(options.appDir, options.pageFile, options.props, slots, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache, options.define, options.vitePlugins, options.importPolicy);
         const marker = options.clientRoute
             ? hydrationMarkerParts({
                 assetBaseUrl: options.assetBaseUrl,
@@ -1830,7 +1859,7 @@ function runServerStreamModule(code, options) {
             sink.append(shell.prefix);
         }
         sink.append(marker?.prefix ?? "");
-        await appendServerStreamModule(code, sink, options.props, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins, options.importPolicy);
+        await appendServerStreamModule(code, sink, options.props, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins, options.importPolicy);
         sink.append(marker?.suffix ?? "");
         for (const shell of [...layoutShells].reverse()) {
             sink.append(shell.suffix);
@@ -1939,8 +1968,8 @@ async function runServerStreamModuleWithLoading(code, options) {
         queryClient: options.queryClient,
         request: options.request,
     };
-    const layoutShells = await layoutShellsForPage(options.appDir, options.pageFile, loadingProps, {}, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache, options.vitePlugins, options.importPolicy);
-    const loadingHtml = await renderServerFileToHtml(options.loadingFile, loadingProps, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.vitePlugins);
+    const layoutShells = await layoutShellsForPage(options.appDir, options.pageFile, loadingProps, {}, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache, options.define, options.vitePlugins, options.importPolicy);
+    const loadingHtml = await renderServerFileToHtml(options.loadingFile, loadingProps, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.define, options.vitePlugins);
     const marker = options.clientRoute
         ? hydrationMarkerParts({
             assetBaseUrl: options.assetBaseUrl,
@@ -1970,7 +1999,7 @@ async function runServerStreamModuleWithLoading(code, options) {
                 params: options.params,
                 queryClient: options.queryClient,
                 request: options.request,
-            }, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins, options.importPolicy);
+            }, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins, options.importPolicy);
         }, {
             placeholder(boundarySink) {
                 boundarySink.append(loadingHtml);
@@ -2009,8 +2038,8 @@ async function renderVisibleOutOfOrderFragment(sink, id, value, render, options)
     await fragmentSink.drain();
     sink.append(`<template data-mreact-oob-fragment="${escapeHtmlAttribute(id)}">${fragmentSink.toString()}</template>`);
 }
-async function appendServerStreamModule(code, sink, props, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy) {
-    const module = await loadServerStreamModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy);
+async function appendServerStreamModule(code, sink, props, sourcefile, serverModules, serverModuleCacheVersion, define, vitePlugins, importPolicy) {
+    const module = await loadServerStreamModule(code, sourcefile, serverModules, serverModuleCacheVersion, define, vitePlugins, importPolicy);
     const component = selectStreamComponent(module);
     await component(sink, props);
 }
@@ -2018,7 +2047,7 @@ async function renderServerStreamSlots(code, options) {
     if (!hasRouteSlotsExport(code)) {
         return {};
     }
-    const module = await loadServerStreamModule(code, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins, options.importPolicy);
+    const module = await loadServerStreamModule(code, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins, options.importPolicy);
     if (module.slots === undefined) {
         return {};
     }
@@ -2038,7 +2067,7 @@ async function renderServerStreamSlots(code, options) {
 function hasRouteSlotsExport(code) {
     return /^\s*export\s+const\s+slots\s*=/m.test(code);
 }
-async function loadServerStreamModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy) {
+async function loadServerStreamModule(code, sourcefile, serverModules, serverModuleCacheVersion, define, vitePlugins, importPolicy) {
     const artifactCode = serverModules?.get(sourcefile)?.stream;
     const codeHash = memoizedHashText(code);
     const prebuiltCode = prebuiltServerComponentModuleCode(artifactCode, code, codeHash);
@@ -2054,10 +2083,11 @@ async function loadServerStreamModule(code, sourcefile, serverModules, serverMod
     const moduleCode = prebuiltCode ?? code;
     const cacheKey = serverModuleCacheVersion === undefined
         ? undefined
-        : `server-stream-component:${serverModuleCacheVersion}:${sourcefile}:${moduleCode === code ? codeHash : memoizedHashText(moduleCode)}:${importPolicyCacheKey(importPolicy)}:${vitePluginsCacheKey(vitePlugins)}`;
+        : `server-stream-component:${serverModuleCacheVersion}:${sourcefile}:${moduleCode === code ? codeHash : memoizedHashText(moduleCode)}:${importPolicyCacheKey(importPolicy)}:${viteDefineCacheKey(define)}:${vitePluginsCacheKey(vitePlugins)}`;
     return await importAppRouterSourceModule({
         cacheKey,
         code: moduleCode,
+        define,
         label: `server-stream-component:${sourcefile}`,
         plugins: importPolicy === undefined
             ? undefined
@@ -2075,6 +2105,7 @@ async function loadServerStreamModule(code, sourcefile, serverModules, serverMod
                     dev: serverModuleCacheVersion === undefined,
                     serverModules,
                     serverOutput: "stream",
+                    define,
                     vitePlugins,
                 },
             }
@@ -2096,7 +2127,7 @@ async function applyLayouts(options) {
     let shellHasOutOfOrderBoundary = false;
     const slotContext = createSlotRenderContext(options.slots);
     for (const shell of layoutFiles.reverse()) {
-        const rendered = await renderShellPrefixSuffix(options.appDir, shell, options.props, slotContext, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache, options.timing, options.vitePlugins, options.importPolicy);
+        const rendered = await renderShellPrefixSuffix(options.appDir, shell, options.props, slotContext, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache, options.timing, options.define, options.vitePlugins, options.importPolicy);
         shellHasOutOfOrderBoundary ||= rendered.hasOutOfOrderBoundary;
         html = `${rendered.prefix}${html}${rendered.suffix}`;
     }
@@ -2115,12 +2146,12 @@ async function applyLayouts(options) {
     await sink.drain();
     return sink.toString();
 }
-async function layoutShellsForPage(appDir, pageFile, props, slots, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, vitePlugins, importPolicy) {
+async function layoutShellsForPage(appDir, pageFile, props, slots, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, define, vitePlugins, importPolicy) {
     const layoutFiles = await shellFilesForPage(appDir, pageFile, serverModuleCacheVersion);
     const shells = [];
     const slotContext = createSlotRenderContext(slots);
     for (const shell of layoutFiles) {
-        shells.push(await renderShellPrefixSuffix(appDir, shell, props, slotContext, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, undefined, vitePlugins, importPolicy));
+        shells.push(await renderShellPrefixSuffix(appDir, shell, props, slotContext, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, undefined, define, vitePlugins, importPolicy));
     }
     warnUnconsumedRouteSlots({
         appDir,
@@ -2130,11 +2161,11 @@ async function layoutShellsForPage(appDir, pageFile, props, slots, serverModules
     });
     return shells;
 }
-async function renderShellPrefixSuffix(appDir, shell, props, slotContext, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, timing, vitePlugins, importPolicy) {
+async function renderShellPrefixSuffix(appDir, shell, props, slotContext, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, timing, define, vitePlugins, importPolicy) {
     const hasNamedSlots = Object.keys(slotContext.namedSlots).length > 0;
     const cacheKey = serverModuleCacheVersion === undefined || hasNamedSlots || shell.kind === "template"
         ? undefined
-        : `${appDir}\0${shell.file}\0${serverModuleCacheVersion}\0${importPolicyCacheKey(importPolicy)}\0${vitePluginsCacheKey(vitePlugins)}`;
+        : `${appDir}\0${shell.file}\0${serverModuleCacheVersion}\0${importPolicyCacheKey(importPolicy)}\0${viteDefineCacheKey(define)}\0${vitePluginsCacheKey(vitePlugins)}`;
     if (cacheKey !== undefined) {
         const cached = readRouterRuntimeCacheEntry(renderedShellCache, cacheKey, renderedShellCacheCounters);
         if (cached !== undefined && cached !== "impure") {
@@ -2184,8 +2215,8 @@ async function renderShellPrefixSuffix(appDir, shell, props, slotContext, server
     }
     phaseStartedAt = renderTimingPhaseStartedAt(timing);
     const component = shellUsesAwait
-        ? selectStreamComponent(await loadServerStreamModule(output.code, shell.file, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy))
-        : await loadServerComponent(output.code, shell.file, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy);
+        ? selectStreamComponent(await loadServerStreamModule(output.code, shell.file, serverModules, serverModuleCacheVersion, define, vitePlugins, importPolicy))
+        : await loadServerComponent(output.code, shell.file, serverModules, serverModuleCacheVersion, define, vitePlugins, importPolicy);
     addRenderTimingPhaseDuration(timing, phaseStartedAt, "layoutModuleLoadMs");
     phaseStartedAt = renderTimingPhaseStartedAt(timing);
     const layoutHtml = shellUsesAwait
@@ -2456,7 +2487,7 @@ async function loadRouteDataWithInstrumentation(options) {
 async function loadRouteLoaderModule(options) {
     const cacheKey = options.serverModuleCacheVersion === undefined
         ? undefined
-        : `${options.appDir}\0${options.filename}\0${options.serverModuleCacheVersion}\0${memoizedHashText(options.code)}\0${importPolicyCacheKey(options.importPolicy)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
+        : `${options.appDir}\0${options.filename}\0${options.serverModuleCacheVersion}\0${memoizedHashText(options.code)}\0${importPolicyCacheKey(options.importPolicy)}\0${viteDefineCacheKey(options.define)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
     if (cacheKey !== undefined) {
         const cached = readRouterRuntimeCacheEntry(routeLoaderModuleCache, cacheKey, routeLoaderModuleCacheCounters);
         if (cached !== undefined) {
@@ -2480,6 +2511,7 @@ async function loadRouteLoaderModule(options) {
 export async function bundleRouteLoaderModuleCode(options) {
     const output = await bundleRouterModule({
         code: stripRouteLoaderOnlyExports(options.code, options.filename),
+        define: options.define,
         externalizeAppSourceModuleDirs: options.externalizeAppSourceModuleDirs,
         filename: options.filename,
         platform: "node",
@@ -2516,15 +2548,17 @@ async function loadBundledRouteLoaderModule(options) {
                 : undefined,
             filename: options.filename,
             importPolicy: options.importPolicy,
+            define: options.define,
             vitePlugins: options.vitePlugins,
         }));
     return await importAppRouterSourceModule({
         ...(options.serverModuleCacheVersion === undefined
             ? {}
             : {
-                cacheKey: `loader:${options.filename}:${options.serverModuleCacheVersion}:${memoizedHashText(code)}`,
+                cacheKey: `loader:${options.filename}:${options.serverModuleCacheVersion}:${memoizedHashText(code)}:${viteDefineCacheKey(options.define)}`,
             }),
         code,
+        define: options.define,
         label: `loader:${options.filename}`,
     });
 }
@@ -2546,9 +2580,10 @@ async function loadRouteMetadata(options) {
         ...(options.serverModuleCacheVersion === undefined
             ? {}
             : {
-                cacheKey: `metadata:${options.filename}:${options.serverModuleCacheVersion}:${memoizedHashText(code)}`,
+                cacheKey: `metadata:${options.filename}:${options.serverModuleCacheVersion}:${memoizedHashText(code)}:${viteDefineCacheKey(options.define)}`,
             }),
         code,
+        define: options.define,
         label: `metadata:${options.filename}`,
     });
     return await resolveRouteMetadataModule(module, options.context);
@@ -2576,6 +2611,7 @@ function isRouteMetadata(value) {
 async function bundleRouteMetadataModuleCode(options) {
     const output = await bundleRouterModule({
         code: stripRouteMetadataOnlyExports(options.code, options.filename),
+        define: options.define,
         filename: options.filename,
         platform: "node",
         vitePlugins: options.vitePlugins,
@@ -2597,7 +2633,7 @@ async function bundleRouteMetadataModuleCode(options) {
 async function loadComposedRouteMetadata(options) {
     const cacheKey = options.serverModuleCacheVersion === undefined
         ? undefined
-        : `${options.appDir}\0${options.filename}\0${options.serverModuleCacheVersion}\0${memoizedHashText(options.code)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
+        : `${options.appDir}\0${options.filename}\0${options.serverModuleCacheVersion}\0${memoizedHashText(options.code)}\0${viteDefineCacheKey(options.define)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
     if (cacheKey !== undefined) {
         const cached = readRouterRuntimeCacheEntry(composedRouteMetadataCache, cacheKey, composedRouteMetadataCacheCounters);
         if (cached !== undefined) {
@@ -2636,6 +2672,7 @@ async function loadComposedRouteMetadataUncached(options) {
             importPolicy: options.importPolicy,
             serverModules: options.serverModules,
             serverModuleCacheVersion: options.serverModuleCacheVersion,
+            define: options.define,
             vitePlugins: options.vitePlugins,
         });
         if (shellMetadata !== undefined) {
@@ -2650,6 +2687,7 @@ async function loadComposedRouteMetadataUncached(options) {
         importPolicy: options.importPolicy,
         serverModules: options.serverModules,
         serverModuleCacheVersion: options.serverModuleCacheVersion,
+        define: options.define,
         vitePlugins: options.vitePlugins,
     });
     if (pageMetadata !== undefined) {