@reckona/mreact-router 0.0.57 → 0.0.58

package/dist/render.js

@@ -25,6 +25,7 @@ import { emitRouterLog, logDurationMs, logNow } from "./logger.js";
 import { createRouterRuntimeCacheCounters, readRouterRuntimeCacheEntry, routerRuntimeCacheStat, } from "./cache-stats.js";
 import { bundleRouterModule } from "./bundle-pipeline.js";
 import { routeSecurityHeaders } from "./security-headers.js";
+import { vitePluginsCacheKey } from "./vite-plugin-cache-key.js";
 import { invokeRouterInstrumentation, traceContextFromRequest, } from "./trace.js";
 const nativeEscapeTransform = {
     batchImportName: "escapeHtmlBatch",
@@ -47,6 +48,7 @@ export async function preloadBuiltRequestModules(options) {
                 serverModules: options.serverModules,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
                 serverSourceFiles: options.serverSourceFiles,
+                vitePlugins: options.vitePlugins,
             });
         }
     }
@@ -108,7 +110,7 @@ async function preloadBuiltPageRouteModules(options) {
             serverOutput: "string",
         });
         assertNoFatalServerDiagnostics(options.file, stringOutput.diagnostics);
-        await loadServerModule(stringOutput.code, options.file, options.serverModules, options.serverModuleCacheVersion);
+        await loadServerModule(stringOutput.code, options.file, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins);
     }
     if (options.analysis.streamRoute) {
         const streamOutput = transformServerModule({
@@ -120,7 +122,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);
+        await loadServerStreamModule(streamOutput.code, options.file, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins);
     }
     await preloadShellModulesForPage({
         appDir: options.appDir,
@@ -128,6 +130,7 @@ async function preloadBuiltPageRouteModules(options) {
         serverModules: options.serverModules,
         serverModuleCacheVersion: options.serverModuleCacheVersion,
         serverSourceFiles: options.serverSourceFiles,
+        vitePlugins: options.vitePlugins,
     });
     if (!hasGenerateMetadataExport(options.code)) {
         await loadComposedRouteMetadata({
@@ -159,7 +162,7 @@ async function preloadShellModulesForPage(options) {
             serverOutput: "string",
         });
         assertNoFatalServerDiagnostics(shell.file, output.diagnostics);
-        await loadServerModule(output.code, shell.file, options.serverModules, options.serverModuleCacheVersion);
+        await loadServerModule(output.code, shell.file, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins);
     }
 }
 function fatalServerDiagnostics(diagnostics) {
@@ -353,6 +356,7 @@ async function renderAppRequestInternal(options) {
             serverModuleCacheVersion: options.serverModuleCacheVersion,
             serverSourceFiles: options.serverSourceFiles,
             timing,
+            vitePlugins: options.vitePlugins,
         });
     finishRenderTimingPhase(timing, phaseStartedAt, "middlewareMs");
     if (middlewareResult.type === "response") {
@@ -395,6 +399,7 @@ async function renderAppRequestInternal(options) {
             serverModules: options.serverModules,
             serverModuleCacheVersion: options.serverModuleCacheVersion,
             serverSourceFiles: options.serverSourceFiles,
+            vitePlugins: options.vitePlugins,
             status: 404,
             textFallback: "Not Found",
         });
@@ -420,6 +425,7 @@ async function renderAppRequestInternal(options) {
                 serverModules: options.serverModules,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
                 serverSourceFiles: options.serverSourceFiles,
+                vitePlugins: options.vitePlugins,
             });
         }
         if (matched.route.kind === "server") {
@@ -432,6 +438,7 @@ async function renderAppRequestInternal(options) {
                 serverModules: options.serverModules,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
                 serverSourceFiles: options.serverSourceFiles,
+                vitePlugins: options.vitePlugins,
             });
         }
         // Issue 080: page routes render HTML for GET / HEAD only. Other
@@ -604,7 +611,7 @@ async function renderAppRequestInternal(options) {
                     params: matched.params,
                     queryClient,
                     request: options.request,
-                }, matched.route.file, options.serverModules, options.serverModuleCacheVersion));
+                }, matched.route.file, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins));
                 const pageHtml = renderedPage.html;
                 const pageHtmlForLayout = clientRoute
                     ? withHydrationMarkers({
@@ -726,6 +733,7 @@ async function renderAppRequestInternal(options) {
                     serverModules: options.serverModules,
                     serverModuleCacheVersion: options.serverModuleCacheVersion,
                     serverSourceFiles: options.serverSourceFiles,
+                    vitePlugins: options.vitePlugins,
                     clientRouteInferenceCache,
                     script: clientScript,
                     clientReferenceManifest: output.metadata.clientReferenceManifest,
@@ -755,6 +763,7 @@ async function renderAppRequestInternal(options) {
                 serverModules: options.serverModules,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
                 serverSourceFiles: options.serverSourceFiles,
+                vitePlugins: options.vitePlugins,
                 clientRouteInferenceCache,
                 clientRoute,
                 script: clientScript,
@@ -803,7 +812,7 @@ async function renderAppRequestInternal(options) {
             params: matched.params,
             queryClient,
             request: options.request,
-        }, matched.route.file, options.serverModules, options.serverModuleCacheVersion, timing));
+        }, matched.route.file, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins, timing));
         finishRenderTimingPhase(timing, phaseStartedAt, "pageRenderMs");
         const pageHtml = renderedPage.html;
         // Wrap the page (not the full document) with the hydration marker so
@@ -921,6 +930,7 @@ async function renderAppRequestInternal(options) {
                 serverModules: options.serverModules,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
                 serverSourceFiles: options.serverSourceFiles,
+                vitePlugins: options.vitePlugins,
                 navigation: recoveryRoute,
                 status: 404,
                 textFallback: "Not Found",
@@ -944,6 +954,7 @@ async function renderAppRequestInternal(options) {
             serverModules: options.serverModules,
             serverModuleCacheVersion: options.serverModuleCacheVersion,
             serverSourceFiles: options.serverSourceFiles,
+            vitePlugins: options.vitePlugins,
             navigation: recoveryRoute,
             status: 500,
             textFallback: error instanceof Error ? error.message : String(error),
@@ -1120,7 +1131,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);
+    const pageHtml = await renderServerFileToHtml(options.routeFile, props, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.vitePlugins);
     const pageHtmlForLayout = options.navigation?.clientRoute === true
         ? withHydrationMarkers({
             assetBaseUrl: options.assetBaseUrl,
@@ -1139,6 +1150,7 @@ async function renderSpecialRoute(options) {
         serverModules: options.serverModules,
         serverModuleCacheVersion: options.serverModuleCacheVersion,
         serverSourceFiles: options.serverSourceFiles,
+        vitePlugins: options.vitePlugins,
     });
     return new Response(`<!DOCTYPE html>${clientNavigationHeadTags({
         assetBaseUrl: options.assetBaseUrl,
@@ -1149,7 +1161,7 @@ async function renderSpecialRoute(options) {
         status: options.status,
     });
 }
-async function renderServerFileToHtml(file, props, serverModules, serverModuleCacheVersion, serverSourceFiles) {
+async function renderServerFileToHtml(file, props, serverModules, serverModuleCacheVersion, serverSourceFiles, vitePlugins) {
     const code = await readServerSourceFile(file, serverModuleCacheVersion, serverSourceFiles);
     const output = transformServerModule({
         code,
@@ -1161,7 +1173,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);
+    return runServerModule(output.code, props, file, serverModules, serverModuleCacheVersion, vitePlugins);
 }
 function normalizeErrorForProps(error) {
     if (error instanceof Error) {
@@ -1270,7 +1282,8 @@ async function dispatchMetadataRoute(options) {
     return new Response("Invalid metadata route convention", { status: 500 });
 }
 async function loadServerRouteModule(options) {
-    if (options.serverModuleCacheVersion === undefined) {
+    if (options.serverModuleCacheVersion === undefined &&
+        (options.vitePlugins === undefined || options.vitePlugins.length === 0)) {
         return await importAppRouterFileModule(options.file);
     }
     const code = await readServerSourceFile(options.file, options.serverModuleCacheVersion, options.serverSourceFiles);
@@ -1286,7 +1299,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)}`;
+    const cacheKey = `server-route\0${options.file}\0${options.serverModuleCacheVersion}\0${codeHash}\0${memoizedHashText(moduleCode)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
     const cached = readRouterRuntimeCacheEntry(serverRouteModuleCache, cacheKey, serverRouteModuleCacheCounters);
     if (cached !== undefined) {
         return cached;
@@ -1297,6 +1310,7 @@ async function loadServerRouteModule(options) {
         label: `server-route:${options.file}`,
         ...(moduleCode === code ? { resolveDir: dirname(options.file) } : {}),
         sourcefile: options.file,
+        vitePlugins: options.vitePlugins,
     }).catch((error) => {
         serverRouteModuleCache.delete(cacheKey);
         throw error;
@@ -1341,6 +1355,7 @@ async function runMiddleware(options) {
                 serverModules: options.serverModules,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
                 serverSourceFiles: options.serverSourceFiles,
+                vitePlugins: options.vitePlugins,
             });
         }
         finally {
@@ -1439,7 +1454,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)}`;
+        : `middleware\0${options.appDir}\0${options.file}\0${options.serverModuleCacheVersion}\0${memoizedHashText(code)}\0${importPolicyCacheKey(options.importPolicy)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
     if (cacheKey !== undefined) {
         const cached = readRouterRuntimeCacheEntry(middlewareModuleCache, cacheKey, middlewareModuleCacheCounters);
         if (cached !== undefined) {
@@ -1453,6 +1468,7 @@ async function loadMiddlewareModule(options) {
         importPolicy: options.importPolicy,
         prebuiltArtifact: prebuiltRequestModuleArtifact(options.serverModules, options.file, code),
         serverModuleCacheVersion: options.serverModuleCacheVersion,
+        vitePlugins: options.vitePlugins,
     }).catch((error) => {
         if (cacheKey !== undefined) {
             middlewareModuleCache.delete(cacheKey);
@@ -1477,6 +1493,7 @@ export async function bundleMiddlewareModuleCode(options) {
                 label: "Middleware",
             }),
         ],
+        vitePlugins: options.vitePlugins,
     });
     const compiled = output.code;
     if (compiled === undefined) {
@@ -1498,15 +1515,17 @@ async function loadBundledMiddlewareModule(options) {
             code: options.code,
             file: options.file,
             importPolicy: options.importPolicy,
+            vitePlugins: options.vitePlugins,
         }));
     return importAppRouterSourceModule({
         ...(options.serverModuleCacheVersion === undefined
             ? {}
             : {
-                cacheKey: `middleware:${options.file}:${options.serverModuleCacheVersion}:${memoizedHashText(compiled)}`,
+                cacheKey: `middleware:${options.file}:${options.serverModuleCacheVersion}:${memoizedHashText(compiled)}:${vitePluginsCacheKey(options.vitePlugins)}`,
             }),
         code: compiled,
         label: `middleware:${options.file}`,
+        vitePlugins: options.vitePlugins,
     });
 }
 function middlewareMatches(config, pathname) {
@@ -1671,13 +1690,13 @@ function memoizedHashText(code) {
     codeHashCache.set(code, hash);
     return hash;
 }
-async function runServerModule(code, props, sourcefile, serverModules, serverModuleCacheVersion) {
-    const component = await loadServerComponent(code, sourcefile, serverModules, serverModuleCacheVersion);
+async function runServerModule(code, props, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins) {
+    const component = await loadServerComponent(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins);
     return component(props);
 }
-async function runServerModuleWithSlots(code, props, sourcefile, serverModules, serverModuleCacheVersion, timing) {
+async function runServerModuleWithSlots(code, props, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, timing) {
     const moduleLoadStartedAt = renderTimingPhaseStartedAt(timing);
-    const module = await loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion);
+    const module = await loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins);
     finishRenderTimingPhase(timing, moduleLoadStartedAt, "pageModuleLoadMs");
     const component = selectServerComponent(module);
     const componentStartedAt = renderTimingPhaseStartedAt(timing);
@@ -1691,7 +1710,7 @@ async function runServerModuleWithSlots(code, props, sourcefile, serverModules,
         slots,
     };
 }
-async function loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion) {
+async function loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins) {
     const artifact = serverModules?.get(sourcefile)?.string;
     const codeHash = memoizedHashText(code);
     const prebuiltCode = prebuiltServerComponentModuleCode(artifact, code, codeHash);
@@ -1707,7 +1726,7 @@ 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)}`;
+        : `server-component:${serverModuleCacheVersion}:${sourcefile}:${moduleCode === code ? codeHash : memoizedHashText(moduleCode)}:${vitePluginsCacheKey(vitePlugins)}`;
     return await importAppRouterSourceModule({
         cacheKey,
         code: moduleCode,
@@ -1719,10 +1738,12 @@ async function loadServerModule(code, sourcefile, serverModules, serverModuleCac
                     dev: serverModuleCacheVersion === undefined,
                     serverModules,
                     serverOutput: "string",
+                    vitePlugins,
                 },
             }
             : {}),
         sourcefile,
+        vitePlugins,
     });
 }
 function prebuiltServerComponentModuleCode(artifact, code, codeHash) {
@@ -1747,8 +1768,8 @@ async function importBuiltServerModuleFile(options) {
         file: options.file,
     });
 }
-async function loadServerComponent(code, sourcefile, serverModules, serverModuleCacheVersion) {
-    const module = await loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion);
+async function loadServerComponent(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins) {
+    const module = await loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins);
     return selectServerComponent(module);
 }
 function selectServerComponent(module) {
@@ -1775,8 +1796,9 @@ function runServerStreamModule(code, options) {
             props: options.props,
             serverModules: options.serverModules,
             serverModuleCacheVersion: options.serverModuleCacheVersion,
+            vitePlugins: options.vitePlugins,
         });
-        const layoutShells = await layoutShellsForPage(options.appDir, options.pageFile, options.props, slots, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache);
+        const layoutShells = await layoutShellsForPage(options.appDir, options.pageFile, options.props, slots, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache, options.vitePlugins);
         const marker = options.clientRoute
             ? hydrationMarkerParts({
                 assetBaseUrl: options.assetBaseUrl,
@@ -1800,7 +1822,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);
+        await appendServerStreamModule(code, sink, options.props, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins);
         sink.append(marker?.suffix ?? "");
         for (const shell of [...layoutShells].reverse()) {
             sink.append(shell.suffix);
@@ -1909,8 +1931,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);
-    const loadingHtml = await renderServerFileToHtml(options.loadingFile, loadingProps, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles);
+    const layoutShells = await layoutShellsForPage(options.appDir, options.pageFile, loadingProps, {}, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache, options.vitePlugins);
+    const loadingHtml = await renderServerFileToHtml(options.loadingFile, loadingProps, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.vitePlugins);
     const marker = options.clientRoute
         ? hydrationMarkerParts({
             assetBaseUrl: options.assetBaseUrl,
@@ -1940,7 +1962,7 @@ async function runServerStreamModuleWithLoading(code, options) {
                 params: options.params,
                 queryClient: options.queryClient,
                 request: options.request,
-            }, options.pageFile, options.serverModules, options.serverModuleCacheVersion);
+            }, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins);
         }, {
             placeholder(boundarySink) {
                 boundarySink.append(loadingHtml);
@@ -1979,8 +2001,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) {
-    const module = await loadServerStreamModule(code, sourcefile, serverModules, serverModuleCacheVersion);
+async function appendServerStreamModule(code, sink, props, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins) {
+    const module = await loadServerStreamModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins);
     const component = selectStreamComponent(module);
     await component(sink, props);
 }
@@ -1988,7 +2010,7 @@ async function renderServerStreamSlots(code, options) {
     if (!hasRouteSlotsExport(code)) {
         return {};
     }
-    const module = await loadServerStreamModule(code, options.pageFile, options.serverModules, options.serverModuleCacheVersion);
+    const module = await loadServerStreamModule(code, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins);
     if (module.slots === undefined) {
         return {};
     }
@@ -2008,7 +2030,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) {
+async function loadServerStreamModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins) {
     const artifactCode = serverModules?.get(sourcefile)?.stream;
     const codeHash = memoizedHashText(code);
     const prebuiltCode = prebuiltServerComponentModuleCode(artifactCode, code, codeHash);
@@ -2024,7 +2046,7 @@ 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)}`;
+        : `server-stream-component:${serverModuleCacheVersion}:${sourcefile}:${moduleCode === code ? codeHash : memoizedHashText(moduleCode)}:${vitePluginsCacheKey(vitePlugins)}`;
     return await importAppRouterSourceModule({
         cacheKey,
         code: moduleCode,
@@ -2036,10 +2058,12 @@ async function loadServerStreamModule(code, sourcefile, serverModules, serverMod
                     dev: serverModuleCacheVersion === undefined,
                     serverModules,
                     serverOutput: "stream",
+                    vitePlugins,
                 },
             }
             : {}),
         sourcefile,
+        vitePlugins,
     });
 }
 function selectStreamComponent(module) {
@@ -2074,12 +2098,12 @@ async function applyLayouts(options) {
     await sink.drain();
     return sink.toString();
 }
-async function layoutShellsForPage(appDir, pageFile, props, slots, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache) {
+async function layoutShellsForPage(appDir, pageFile, props, slots, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, vitePlugins) {
     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));
+        shells.push(await renderShellPrefixSuffix(appDir, shell, props, slotContext, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, undefined, vitePlugins));
     }
     warnUnconsumedRouteSlots({
         appDir,
@@ -2093,7 +2117,7 @@ async function renderShellPrefixSuffix(appDir, shell, props, slotContext, server
     const hasNamedSlots = Object.keys(slotContext.namedSlots).length > 0;
     const cacheKey = serverModuleCacheVersion === undefined || hasNamedSlots || shell.kind === "template"
         ? undefined
-        : `${appDir}\0${shell.file}\0${serverModuleCacheVersion}`;
+        : `${appDir}\0${shell.file}\0${serverModuleCacheVersion}\0${vitePluginsCacheKey(vitePlugins)}`;
     if (cacheKey !== undefined) {
         const cached = readRouterRuntimeCacheEntry(renderedShellCache, cacheKey, renderedShellCacheCounters);
         if (cached !== undefined && cached !== "impure") {
@@ -2137,8 +2161,8 @@ async function renderShellPrefixSuffix(appDir, shell, props, slotContext, server
     }
     phaseStartedAt = renderTimingPhaseStartedAt(timing);
     const component = shellUsesAwait
-        ? selectStreamComponent(await loadServerStreamModule(output.code, shell.file, serverModules, serverModuleCacheVersion))
-        : await loadServerComponent(output.code, shell.file, serverModules, serverModuleCacheVersion);
+        ? selectStreamComponent(await loadServerStreamModule(output.code, shell.file, serverModules, serverModuleCacheVersion, vitePlugins))
+        : await loadServerComponent(output.code, shell.file, serverModules, serverModuleCacheVersion, vitePlugins);
     addRenderTimingPhaseDuration(timing, phaseStartedAt, "layoutModuleLoadMs");
     phaseStartedAt = renderTimingPhaseStartedAt(timing);
     const layoutHtml = shellUsesAwait
@@ -2607,32 +2631,6 @@ function importPolicyCacheKey(policy) {
         projectRoot: policy.projectRoot ?? "",
     });
 }
-function vitePluginsCacheKey(plugins) {
-    if (plugins === undefined || plugins.length === 0) {
-        return "";
-    }
-    return flattenVitePluginOptions(plugins)
-        .map((plugin, index) => `${index}:${plugin.name ?? "<anonymous>"}`)
-        .join("\0");
-}
-function flattenVitePluginOptions(options) {
-    const plugins = [];
-    for (const option of options) {
-        if (Array.isArray(option)) {
-            plugins.push(...flattenVitePluginOptions(option));
-            continue;
-        }
-        if (option === false || option === null || option === undefined || typeof option === "string") {
-            continue;
-        }
-        if (typeof option === "object" && "then" in option) {
-            plugins.push({ name: "<async>" });
-            continue;
-        }
-        plugins.push(option);
-    }
-    return plugins;
-}
 async function loadRouteMetadata(options) {
     if (!hasMetadataExport(options.code)) {
         return undefined;