@reckona/mreact-router 0.0.90 → 0.0.92

package/dist/render.js

@@ -626,7 +626,7 @@ async function renderAppRequestInternal(options) {
                     params: matched.params,
                     queryClient,
                     request: options.request,
-                }, matched.route.file, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins));
+                }, matched.route.file, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins, undefined, options.importPolicy));
                 const pageHtml = renderedPage.html;
                 const pageHtmlForLayout = clientRoute
                     ? withHydrationMarkers({
@@ -664,6 +664,7 @@ async function renderAppRequestInternal(options) {
                     clientRouteInferenceCache,
                     timing,
                     vitePlugins: options.vitePlugins,
+                    importPolicy: options.importPolicy,
                 }));
                 const metadata = await loadComposedRouteMetadata({
                     appDir: options.appDir,
@@ -750,6 +751,7 @@ async function renderAppRequestInternal(options) {
                     serverSourceFiles: options.serverSourceFiles,
                     vitePlugins: options.vitePlugins,
                     clientRouteInferenceCache,
+                    importPolicy: options.importPolicy,
                     script: clientScript,
                     clientReferenceManifest: output.metadata.clientReferenceManifest,
                 });
@@ -780,6 +782,7 @@ async function renderAppRequestInternal(options) {
                 serverSourceFiles: options.serverSourceFiles,
                 vitePlugins: options.vitePlugins,
                 clientRouteInferenceCache,
+                importPolicy: options.importPolicy,
                 clientRoute,
                 script: clientScript,
                 clientReferenceManifest: output.metadata.clientReferenceManifest,
@@ -827,7 +830,7 @@ async function renderAppRequestInternal(options) {
             params: matched.params,
             queryClient,
             request: options.request,
-        }, matched.route.file, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins, timing));
+        }, matched.route.file, options.serverModules, options.serverModuleCacheVersion, 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
@@ -1670,9 +1673,9 @@ async function runServerModule(code, props, sourcefile, serverModules, serverMod
     const component = await loadServerComponent(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins);
     return component(props);
 }
-async function runServerModuleWithSlots(code, props, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, timing) {
+async function runServerModuleWithSlots(code, props, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, timing, importPolicy) {
     const moduleLoadStartedAt = renderTimingPhaseStartedAt(timing);
-    const module = await loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins);
+    const module = await loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy);
     finishRenderTimingPhase(timing, moduleLoadStartedAt, "pageModuleLoadMs");
     const component = selectServerComponent(module);
     const componentStartedAt = renderTimingPhaseStartedAt(timing);
@@ -1686,7 +1689,7 @@ async function runServerModuleWithSlots(code, props, sourcefile, serverModules,
         slots,
     };
 }
-async function loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins) {
+async function loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy) {
     const artifact = serverModules?.get(sourcefile)?.string;
     const codeHash = memoizedHashText(code);
     const prebuiltCode = prebuiltServerComponentModuleCode(artifact, code, codeHash);
@@ -1702,11 +1705,20 @@ 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)}:${vitePluginsCacheKey(vitePlugins)}`;
+        : `server-component:${serverModuleCacheVersion}:${sourcefile}:${moduleCode === code ? codeHash : memoizedHashText(moduleCode)}:${importPolicyCacheKey(importPolicy)}:${vitePluginsCacheKey(vitePlugins)}`;
     return await importAppRouterSourceModule({
         cacheKey,
         code: moduleCode,
         label: `server-component:${sourcefile}`,
+        plugins: importPolicy === undefined
+            ? undefined
+            : [
+                createAppRouterImportPolicyPlugin({
+                    appDir: dirname(sourcefile),
+                    importPolicy,
+                    label: "Server component",
+                }),
+            ],
         ...(prebuiltCode === undefined
             ? {
                 resolveDir: dirname(sourcefile),
@@ -1732,8 +1744,8 @@ async function importBuiltServerModuleFile(options) {
         file: options.file,
     });
 }
-async function loadServerComponent(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins) {
-    const module = await loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins);
+async function loadServerComponent(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy) {
+    const module = await loadServerModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy);
     return selectServerComponent(module);
 }
 function selectServerComponent(module) {
@@ -1761,8 +1773,9 @@ function runServerStreamModule(code, options) {
             serverModules: options.serverModules,
             serverModuleCacheVersion: options.serverModuleCacheVersion,
             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);
+        const layoutShells = await layoutShellsForPage(options.appDir, options.pageFile, options.props, slots, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache, options.vitePlugins, options.importPolicy);
         const marker = options.clientRoute
             ? hydrationMarkerParts({
                 assetBaseUrl: options.assetBaseUrl,
@@ -1786,7 +1799,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);
+        await appendServerStreamModule(code, sink, options.props, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins, options.importPolicy);
         sink.append(marker?.suffix ?? "");
         for (const shell of [...layoutShells].reverse()) {
             sink.append(shell.suffix);
@@ -1895,7 +1908,7 @@ 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);
+    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 marker = options.clientRoute
         ? hydrationMarkerParts({
@@ -1926,7 +1939,7 @@ async function runServerStreamModuleWithLoading(code, options) {
                 params: options.params,
                 queryClient: options.queryClient,
                 request: options.request,
-            }, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins);
+            }, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins, options.importPolicy);
         }, {
             placeholder(boundarySink) {
                 boundarySink.append(loadingHtml);
@@ -1965,8 +1978,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) {
-    const module = await loadServerStreamModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins);
+async function appendServerStreamModule(code, sink, props, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy) {
+    const module = await loadServerStreamModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy);
     const component = selectStreamComponent(module);
     await component(sink, props);
 }
@@ -1974,7 +1987,7 @@ async function renderServerStreamSlots(code, options) {
     if (!hasRouteSlotsExport(code)) {
         return {};
     }
-    const module = await loadServerStreamModule(code, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins);
+    const module = await loadServerStreamModule(code, options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.vitePlugins, options.importPolicy);
     if (module.slots === undefined) {
         return {};
     }
@@ -1994,7 +2007,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) {
+async function loadServerStreamModule(code, sourcefile, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy) {
     const artifactCode = serverModules?.get(sourcefile)?.stream;
     const codeHash = memoizedHashText(code);
     const prebuiltCode = prebuiltServerComponentModuleCode(artifactCode, code, codeHash);
@@ -2010,11 +2023,20 @@ 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)}:${vitePluginsCacheKey(vitePlugins)}`;
+        : `server-stream-component:${serverModuleCacheVersion}:${sourcefile}:${moduleCode === code ? codeHash : memoizedHashText(moduleCode)}:${importPolicyCacheKey(importPolicy)}:${vitePluginsCacheKey(vitePlugins)}`;
     return await importAppRouterSourceModule({
         cacheKey,
         code: moduleCode,
         label: `server-stream-component:${sourcefile}`,
+        plugins: importPolicy === undefined
+            ? undefined
+            : [
+                createAppRouterImportPolicyPlugin({
+                    appDir: dirname(sourcefile),
+                    importPolicy,
+                    label: "Server stream component",
+                }),
+            ],
         ...(prebuiltCode === undefined
             ? {
                 resolveDir: dirname(sourcefile),
@@ -2043,7 +2065,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);
+        const rendered = await renderShellPrefixSuffix(options.appDir, shell, options.props, slotContext, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache, options.timing, options.vitePlugins, options.importPolicy);
         shellHasOutOfOrderBoundary ||= rendered.hasOutOfOrderBoundary;
         html = `${rendered.prefix}${html}${rendered.suffix}`;
     }
@@ -2062,12 +2084,12 @@ async function applyLayouts(options) {
     await sink.drain();
     return sink.toString();
 }
-async function layoutShellsForPage(appDir, pageFile, props, slots, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, vitePlugins) {
+async function layoutShellsForPage(appDir, pageFile, props, slots, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, 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));
+        shells.push(await renderShellPrefixSuffix(appDir, shell, props, slotContext, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, undefined, vitePlugins, importPolicy));
     }
     warnUnconsumedRouteSlots({
         appDir,
@@ -2077,11 +2099,11 @@ async function layoutShellsForPage(appDir, pageFile, props, slots, serverModules
     });
     return shells;
 }
-async function renderShellPrefixSuffix(appDir, shell, props, slotContext, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, timing, vitePlugins) {
+async function renderShellPrefixSuffix(appDir, shell, props, slotContext, serverModules, serverModuleCacheVersion, serverSourceFiles, clientRouteInferenceCache, timing, 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${vitePluginsCacheKey(vitePlugins)}`;
+        : `${appDir}\0${shell.file}\0${serverModuleCacheVersion}\0${importPolicyCacheKey(importPolicy)}\0${vitePluginsCacheKey(vitePlugins)}`;
     if (cacheKey !== undefined) {
         const cached = readRouterRuntimeCacheEntry(renderedShellCache, cacheKey, renderedShellCacheCounters);
         if (cached !== undefined && cached !== "impure") {
@@ -2125,8 +2147,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))
-        : await loadServerComponent(output.code, shell.file, serverModules, serverModuleCacheVersion, vitePlugins);
+        ? selectStreamComponent(await loadServerStreamModule(output.code, shell.file, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy))
+        : await loadServerComponent(output.code, shell.file, serverModules, serverModuleCacheVersion, vitePlugins, importPolicy);
     addRenderTimingPhaseDuration(timing, phaseStartedAt, "layoutModuleLoadMs");
     phaseStartedAt = renderTimingPhaseStartedAt(timing);
     const layoutHtml = shellUsesAwait