veryfront 0.1.1239 → 0.1.1241

package/esm/src/rendering/orchestrator/html.js

@@ -9,14 +9,15 @@ import { computeSourceHash } from "../../studio/hash-utils.js";
 import { extractRelativePath } from "../../utils/route-path-utils.js";
 import { hasUseClientDirective } from "../rsc/page-island.js";
 import { getReadyManifestForRenderAsync } from "../../release-assets/manifest-cache.js";
-import { resolveAppComponentPath } from "../layouts/utils/app-resolver.js";
 import { resolveProjectReactVersion } from "../../transforms/esm/package-registry.js";
-import { StreamTimeoutError, streamToString } from "../utils/stream-utils.js";
 import { profilePhase, profileSyncPhase } from "../../observability/index.js";
+import { NOT_SUPPORTED } from "../../errors/index.js";
+import { hasImmutableReleaseHydrationRuntime, resolveProdHydrationModulePath, } from "../../html/hydration-script-builder/prod-runtime-selection.js";
+import { resolveAppComponentPath } from "../layouts/utils/app-resolver.js";
+import { StreamTimeoutError, streamToString } from "../utils/stream-utils.js";
 import { extractProjectClassesForRoute, startPreparedCSSWarmup, startProjectCSSPreparation, } from "./html-project-css.js";
 import { buildCollectedHeadDescriptors, buildHeadElements as buildCollectedHeadElements, mergeCollectedHeadWithShell, mergeFrontmatter as mergeCollectedFrontmatter, resolveCommittedHeadFromHTML, } from "./html-head.js";
 import { mergeImportedCSS as mergeImportedProjectCss } from "./html-imported-css.js";
-import { NOT_SUPPORTED } from "../../errors/index.js";
 const logger = rendererLogger.component("html-generator");
 function hasCollectedHeadEntries(head) {
     return head !== undefined && (head.title !== undefined ||
@@ -31,7 +32,8 @@ function toShellFrontmatter(frontmatter) {
     // frontmatter index, while the HTML pipeline supports structured meta/link/
     // script/style fields. This boundary narrows only the type view; the shell
     // immediately validates and snapshots every structured value before use.
-    return frontmatter;
+    const record = frontmatter;
+    return record;
 }
 function injectHeadScriptsAfterImportMap(html, scripts) {
     const headOpen = html.indexOf("<head>");
@@ -212,7 +214,7 @@ export class HTMLGenerator {
             });
         }
         const mergedFrontmatter = mergeCollectedFrontmatter(fullContext);
-        const htmlOptions = await profilePhase("html.build_options", () => this.buildHTMLOptions(fullContext, mergedFrontmatter));
+        const htmlOptions = await profilePhase("html.build_options", () => this.buildHTMLOptions(fullContext, mergedFrontmatter, true));
         const projectCSSPromise = startProjectCSSPreparation(fullContext, htmlOptions);
         startPreparedCSSWarmup(this.config, fullContext, htmlOptions);
         const { start, end } = await profilePhase("html.generate_shell_parts", () => this.generateShellParts(fullContext, mergedFrontmatter, htmlOptions, reactContent, projectCSSPromise));
@@ -232,7 +234,8 @@ export class HTMLGenerator {
             });
         }
         const mergedFrontmatter = mergeCollectedFrontmatter(context);
-        const htmlOptions = await profilePhase("html.build_options", () => this.buildHTMLOptions(context, mergedFrontmatter));
+        const hasReleaseIdentity = hasImmutableReleaseHydrationRuntime(resolveReleaseId(context.options));
+        const htmlOptions = await profilePhase("html.build_options", () => this.buildHTMLOptions(context, mergedFrontmatter, hasReleaseIdentity));
         const projectCSSPromise = startProjectCSSPreparation(context, htmlOptions);
         const metadata = extractHTMLMetadata(mergedFrontmatter, (context.layoutBundle?.frontmatter || {}));
         // Full-document placeholders use the same bounded structured-head contract
@@ -269,6 +272,7 @@ export class HTMLGenerator {
             projectStylesheetHref,
             dependencyPinningCacheKey: context.options?.dependencyPinningCacheKey,
             releaseAssetManifest,
+            prodHydrationModulePath: htmlOptions.prodHydrationModulePath,
             directories: this.config.config.directories,
         });
         if (injectedHtml.trimStart().toLowerCase().startsWith("<!doctype"))
@@ -305,7 +309,7 @@ export class HTMLGenerator {
     }
     async wrapHTMLFragment(context) {
         const mergedFrontmatter = mergeCollectedFrontmatter(context);
-        const htmlOptions = await profilePhase("html.build_options", () => this.buildHTMLOptions(context, mergedFrontmatter));
+        const htmlOptions = await profilePhase("html.build_options", () => this.buildHTMLOptions(context, mergedFrontmatter, true));
         const projectCSSPromise = startProjectCSSPreparation(context, htmlOptions);
         startPreparedCSSWarmup(this.config, context, htmlOptions);
         const reactContent = context.html.trim();
@@ -436,7 +440,7 @@ export class HTMLGenerator {
             });
             const { computeContentSourceId } = await import("../../cache/keys.js");
             const contentSourceId = computeContentSourceId(this.config.isLocalProject === true, context.options?.environment ?? "preview", null, context.options?.releaseId);
-            const loaded = await loadReservedWithPath(dirs, "error", this.config.projectDir, this.config.mode, this.config.adapter, context.options?.projectId, contentSourceId, reactVersion, context.options?.dependencyPinningCacheKey, context.options?.dependencyPinningDependencies, context.options?.dependencyPinningSource, context.options?.url?.origin);
+            const loaded = await loadReservedWithPath(dirs, "error", this.config.projectDir, this.config.mode, this.config.adapter, context.options?.projectId, contentSourceId, reactVersion, context.options?.dependencyPinningCacheKey, context.options?.dependencyPinningDependencies, context.options?.dependencyPinningSource, context.options?.url?.origin, this.config.config?.build?.serverExternalPackages);
             if (!loaded)
                 return null;
             return { component: loaded.component, path: loaded.filePath };
@@ -461,7 +465,7 @@ export class HTMLGenerator {
             return undefined;
         }
     }
-    async buildHTMLOptions(context, mergedFrontmatter) {
+    async buildHTMLOptions(context, mergedFrontmatter, includeProdHydrationRuntime) {
         const stylesheetPath = this.config.config?.tailwind?.stylesheet || "globals.css";
         const [appComponentPathOrNull, globalCSS] = await Promise.all([
             profilePhase("html.resolve_app_path", () => this.resolveAppPath()),
@@ -492,6 +496,17 @@ export class HTMLGenerator {
         const sourceHash = context.options?.studioEmbed && context.pageInfo.entity.content
             ? computeSourceHash(context.pageInfo.entity.content)
             : undefined;
+        const releaseId = resolveReleaseId(context.options);
+        const usesProductionScripts = context.options?.forceProductionScripts === true ||
+            !(this.config.isLocalProject === true || context.options?.environment === "preview");
+        const prodHydrationModulePath = includeProdHydrationRuntime && usesProductionScripts
+            ? await profilePhase("html.release_hydration_runtime", () => resolveProdHydrationModulePath({
+                fs: this.config.adapter.fs,
+                projectDir: this.config.projectDir,
+                buildOutDir: this.config.config?.build?.outDir,
+                releaseId,
+            }))
+            : undefined;
         return profileSyncPhase("html.build_options.finalize", () => ({
             mode: this.config.mode,
             config: this.config.config,
@@ -516,7 +531,8 @@ export class HTMLGenerator {
             studioEmbed: context.options?.studioEmbed,
             projectId: context.options?.projectId,
             projectSlug: context.options?.projectSlug,
-            releaseId: resolveReleaseId(context.options),
+            releaseId,
+            prodHydrationModulePath,
             pageId: context.options?.pageId,
             sourceHash,
             colorScheme: context.options?.colorScheme,

package/esm/src/rendering/orchestrator/layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/layout.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC7F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAGzE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAMjF,OAAO,EACL,KAAK,4BAA4B,EAElC,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAItE,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,oBAAoB,CAAC;IAClC,iBAAiB,EAAE,aAAa,GAAG,iBAAiB,CAAC;IACrD,6CAA6C;IAC7C,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AASD,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,aAAa,EAAE,UAAU,EAAE,CAAC;CAC7B;AASD,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,mBAAmB,CAAgC;gBAE/C,MAAM,EAAE,wBAAwB;IAI5C,OAAO,CAAC,eAAe;IAuBvB,qBAAqB,IAAI,eAAe,GAAG,IAAI;IAI/C,UAAU,IAAI,IAAI;IAWlB,cAAc,CAAC,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAYrE,oBAAoB,CAClB,aAAa,EAAE,UAAU,EAAE,EAC3B,yBAAyB,CAAC,EAAE,MAAM,EAClC,6BAA6B,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAChE,uBAAuB,CAAC,EAAE,4BAA4B,EACtD,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,oBAAoB,CAAC;IA8LhC,uBAAuB,CACrB,WAAW,EAAE,KAAK,CAAC,YAAY,EAC/B,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACpD,UAAU,CAAC,EAAE,GAAG,EAChB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EAC1C,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,QAAQ,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,EAC7D,WAAW,CAAC,EAAE,MAAM,EACpB,gBAAgB,CAAC,EAAE;QAAE,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,EAC3D,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,yBAAyB,CAAC,EAAE,MAAM,EAClC,6BAA6B,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAChE,uBAAuB,CAAC,EAAE,4BAA4B,GACrD,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC;CA2E/B"}

package/esm/src/rendering/orchestrator/layout.js

@@ -106,7 +106,7 @@ export class LayoutOrchestrator {
                 const componentPath = layout.componentPath;
                 preloadPromises.push((async () => {
                     try {
-                        await loadTSXComponent(componentPath, this.config.projectDir, this.config.layoutCache, this.config.adapter, this.config.projectId, this.config.projectSlug, this.config.contentSourceId, reactVersion, undefined, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin);
+                        await loadTSXComponent(componentPath, this.config.projectDir, this.config.layoutCache, this.config.adapter, this.config.projectId, this.config.projectSlug, this.config.contentSourceId, reactVersion, undefined, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin, this.config.config.build?.serverExternalPackages);
                         return { type: "tsx", path: componentPath, success: true };
                     }
                     catch (error) {
@@ -180,7 +180,7 @@ export class LayoutOrchestrator {
         return withSpan("layout.applyLayoutsAndWrappers", async () => {
             const reactVersion = await this.getReactVersion(dependencyPinningCacheKey, dependencyPinningDependencies);
             const registryComponents = isSnapshotAwareComponentRegistry(this.config.componentRegistry)
-                ? this.config.componentRegistry.getAllAsComponents(await this.config.componentRegistry.prepareDependencySnapshot(dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, requestUrl?.origin))
+                ? this.config.componentRegistry.getAllAsComponents(await this.config.componentRegistry.prepareDependencySnapshot(dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, requestUrl?.origin, this.config.config.build?.serverExternalPackages))
                 : this.config.componentRegistry;
             const mergedComponents = {
                 ...createDefaultMDXComponents(),

package/esm/src/rendering/orchestrator/module-loader/dependency-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependency-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/dependency-resolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAsDzE,sEAAsE;AACtE,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,6EAA6E;IAC7E,SAAS,EAAE,OAAO,CAAC;IACnB,6DAA6D;IAC7D,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,uFAAuF;AACvF,MAAM,MAAM,2BAA2B,GAAG,wBAAwB,GAAG;IACnE,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,sEAAsE;AACtE,MAAM,WAAW,8BAA8B;IAC7C,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,cAAc,CAAC;CACzB;AAyID,yEAAyE;AACzE,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,8BAA8B,GACpC,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAuBrC;AAED,2EAA2E;AAC3E,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,2BAA2B,EAAE,GAC7C,MAAM,CAiBR"}
+{"version":3,"file":"dependency-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/dependency-resolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAsDzE,sEAAsE;AACtE,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,6EAA6E;IAC7E,SAAS,EAAE,OAAO,CAAC;IACnB,6DAA6D;IAC7D,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,uFAAuF;AACvF,MAAM,MAAM,2BAA2B,GAAG,wBAAwB,GAAG;IACnE,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,sEAAsE;AACtE,MAAM,WAAW,8BAA8B;IAC7C,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,cAAc,CAAC;CACzB;AAgKD,yEAAyE;AACzE,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,8BAA8B,GACpC,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAuBrC;AAED,2EAA2E;AAC3E,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,2BAA2B,EAAE,GAC7C,MAAM,CAiBR"}

package/esm/src/rendering/orchestrator/module-loader/dependency-resolver.js

@@ -49,8 +49,26 @@ function collectRelativeImports(fileContent, fileDir) {
 }
 async function resolveAliasImport(imp, projectDir, adapter) {
     const relativePath = imp.path.substring(2); // Remove @/ prefix.
-    const depFilePath = (await findSourceFile(relativePath, projectDir, adapter)) ??
-        (await findSourceFile(`components/${relativePath}`, projectDir, adapter));
+    const warnLegacyFallback = (suggestedSpecifier) => {
+        logger.warn("The @/ alias resolved through the deprecated components/ fallback. Update the import to match the project-relative file path.", { specifier: imp.path, suggestedSpecifier });
+    };
+    const directPath = await findSourceFile(relativePath, projectDir, adapter, {
+        onLegacyComponentsFallback: () => {
+            warnLegacyFallback(`@/${relativePath.replace(/^components\//, "")}`);
+        },
+    });
+    let depFilePath = directPath;
+    if (!depFilePath) {
+        let resolvedThroughStripFallback = false;
+        depFilePath = await findSourceFile(`components/${relativePath}`, projectDir, adapter, {
+            onLegacyComponentsFallback: () => {
+                resolvedThroughStripFallback = true;
+            },
+        });
+        if (depFilePath && !resolvedThroughStripFallback) {
+            warnLegacyFallback(`@/components/${relativePath}`);
+        }
+    }
     return { ...imp, relativePath, depFilePath, isLocalLib: false };
 }
 async function resolveRelativeImport(imp, adapter) {

package/esm/src/rendering/orchestrator/module-loader/index.d.ts

@@ -35,6 +35,8 @@ export interface ModuleLoaderConfig {
     reactVersion?: string;
     /** Absolute request origin used to identify same-origin module URLs. */
     moduleServerOrigin?: string;
+    /** Bare npm package roots that the runtime resolves without bundling. */
+    serverExternalPackages?: readonly string[];
     /** Stable VERYFRONT_DEPENDENCY_PINNING + package dependency-map state. */
     dependencyPinningCacheKey?: string;
     /** Immutable package map paired with dependencyPinningCacheKey. */

package/esm/src/rendering/orchestrator/module-loader/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAsBzE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAKhG,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AA6CpD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAOpE;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,cAAc,EAC5B,MAAM,EAAE,kBAAkB,EAC1B,eAAe,UAAQ,EACvB,OAAO,GAAE,WAAW,CAAC,MAAM,CAAa,EAKxC,YAAY,GAAE,GAAG,CAAC,MAAM,CAAa,EAarC,oBAAoB,GAAE,GAAG,CAAC,MAAM,CAAa,GAC5C,OAAO,CAAC,MAAM,CAAC,CAyLjB;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,0EAA0E;IAC1E,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,mEAAmE;IACnE,6BAA6B,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjE,yEAAyE;IACzE,uBAAuB,CAAC,EAAE,4BAA4B,CAAC;IACvD,0DAA0D;IAC1D,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,yEAAyE;IACzE,UAAU,CAAC,EAAE,yBAAyB,CAAC;CACxC;AAyBD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAI5D;AAkED,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,OAAO,EACd,oBAAoB,EAAE,WAAW,CAAC,MAAM,CAAC,EACzC,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAwBT;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA0JlC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAsBzE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAKhG,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AA6CpD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAOpE;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,cAAc,EAC5B,MAAM,EAAE,kBAAkB,EAC1B,eAAe,UAAQ,EACvB,OAAO,GAAE,WAAW,CAAC,MAAM,CAAa,EAKxC,YAAY,GAAE,GAAG,CAAC,MAAM,CAAa,EAarC,oBAAoB,GAAE,GAAG,CAAC,MAAM,CAAa,GAC5C,OAAO,CAAC,MAAM,CAAC,CA6LjB;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,yEAAyE;IACzE,sBAAsB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3C,0EAA0E;IAC1E,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,mEAAmE;IACnE,6BAA6B,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjE,yEAAyE;IACzE,uBAAuB,CAAC,EAAE,4BAA4B,CAAC;IACvD,0DAA0D;IAC1D,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,yEAAyE;IACzE,UAAU,CAAC,EAAE,yBAAyB,CAAC;CACxC;AAyBD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAI5D;AAkED,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,OAAO,EACd,oBAAoB,EAAE,WAAW,CAAC,MAAM,CAAC,EACzC,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAwBT;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA4JlC"}

package/esm/src/rendering/orchestrator/module-loader/index.js

@@ -94,7 +94,7 @@ cycleTargets = new Set(),
 unresolvedSpecifiers = new Set()) {
     throwIfModuleLoadAborted(config);
     const { moduleCache, projectDir, projectId, contentSourceId, adapter, mode } = config;
-    const cacheKey = getModuleCacheKey(filePath, projectId, projectDir, contentSourceId, config.reactVersion, mode, config.dependencyPinningCacheKey, config.moduleServerOrigin);
+    const cacheKey = getModuleCacheKey(filePath, projectId, projectDir, contentSourceId, config.reactVersion, mode, config.dependencyPinningCacheKey, config.moduleServerOrigin, config.serverExternalPackages);
     const cachedPath = await resolveCachedModulePath({
         cacheKey,
         filePath,
@@ -105,6 +105,7 @@ unresolvedSpecifiers = new Set()) {
         reactVersion: config.reactVersion,
         dependencyPinningCacheKey: config.dependencyPinningCacheKey,
         moduleServerOrigin: config.moduleServerOrigin,
+        serverExternalPackages: config.serverExternalPackages,
     });
     if (cachedPath) {
         // Replay the evidence this module produced when it was last resolved. A
@@ -219,6 +220,7 @@ unresolvedSpecifiers = new Set()) {
         adapter,
         reactVersion: config.reactVersion,
         moduleServerOrigin: config.moduleServerOrigin,
+        serverExternalPackages: config.serverExternalPackages,
         dependencyPinningCacheKey: config.dependencyPinningCacheKey,
         dependencyPinningDependencies: config.dependencyPinningDependencies,
         dependencyPinningSource: config.dependencyPinningSource,
@@ -238,6 +240,7 @@ unresolvedSpecifiers = new Set()) {
         reactVersion: config.reactVersion,
         moduleServerOrigin: config.moduleServerOrigin,
         dependencyPinningCacheKey: config.dependencyPinningCacheKey,
+        serverExternalPackages: config.serverExternalPackages,
         isCycleTarget: cycleTargets.has(filePath),
         unresolvedSpecifiers: [...moduleUnresolvedSpecifiers],
     });
@@ -431,11 +434,11 @@ export async function loadModule(filePath, config) {
                 filePath,
                 tempFilePath,
             });
-            config.moduleCache.delete(getModuleCacheKey(filePath, config.projectId, config.projectDir, config.contentSourceId, config.reactVersion, config.mode, config.dependencyPinningCacheKey, config.moduleServerOrigin));
+            config.moduleCache.delete(getModuleCacheKey(filePath, config.projectId, config.projectDir, config.contentSourceId, config.reactVersion, config.mode, config.dependencyPinningCacheKey, config.moduleServerOrigin, config.serverExternalPackages));
             // tmpDir is the exact cache dir this module was registered under, so the
             // invalidation stays scoped to this tenant (the path-cache key is not
             // project-scoped — see invalidateMdxEsmModule).
-            invalidateMdxEsmModule(tmpDir, filePath, config.projectDir, config.reactVersion, buildModuleTransformCacheVariant(config.dependencyPinningCacheKey, config.moduleServerOrigin));
+            invalidateMdxEsmModule(tmpDir, filePath, config.projectDir, config.reactVersion, buildModuleTransformCacheVariant(config.dependencyPinningCacheKey, config.moduleServerOrigin, config.serverExternalPackages));
             // Classification at the retry seam must describe the rebuilt graph, not
             // the artifact that just failed. A dependency may appear between the two
             // transforms, so retaining its earlier dropped-specifier evidence can

package/esm/src/rendering/orchestrator/module-loader/module-cache-lookup.d.ts

@@ -5,8 +5,8 @@
  */
 import { createFileSystem } from "../../../platform/compat/fs.js";
 import { lookupMdxEsmCache } from "../../../transforms/mdx/esm-module-loader/cache/index.js";
-export declare function buildModuleTransformCacheVariant(dependencyPinningCacheKey?: string, moduleServerOrigin?: string): string | undefined;
-export declare function getModuleCacheKey(filePath: string, projectId?: string, projectDir?: string, contentSourceId?: string, reactVersion?: string, mode?: "development" | "production", dependencyPinningCacheKey?: string, moduleServerOrigin?: string): string;
+export declare function buildModuleTransformCacheVariant(dependencyPinningCacheKey?: string, moduleServerOrigin?: string, serverExternalPackages?: readonly string[]): string | undefined;
+export declare function getModuleCacheKey(filePath: string, projectId?: string, projectDir?: string, contentSourceId?: string, reactVersion?: string, mode?: "development" | "production", dependencyPinningCacheKey?: string, moduleServerOrigin?: string, serverExternalPackages?: readonly string[]): string;
 type LookupMdxCache = typeof lookupMdxEsmCache;
 type FileSystemReader = Pick<ReturnType<typeof createFileSystem>, "readTextFile">;
 export interface ResolveCachedModulePathInput {
@@ -18,6 +18,7 @@ export interface ResolveCachedModulePathInput {
     reactVersion?: string;
     dependencyPinningCacheKey?: string;
     moduleServerOrigin?: string;
+    serverExternalPackages?: readonly string[];
     moduleCache: Map<string, string>;
     readTextFile?: (path: string) => Promise<string>;
     fileSystem?: FileSystemReader;

package/esm/src/rendering/orchestrator/module-loader/module-cache-lookup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-cache-lookup.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/module-cache-lookup.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAEL,iBAAiB,EAClB,MAAM,0DAA0D,CAAC;AASlE,wBAAgB,gCAAgC,CAC9C,yBAAyB,CAAC,EAAE,MAAM,EAClC,kBAAkB,CAAC,EAAE,MAAM,GAC1B,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,MAAM,EACxB,YAAY,CAAC,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,aAAa,GAAG,YAAY,EACnC,yBAAyB,CAAC,EAAE,MAAM,EAClC,kBAAkB,CAAC,EAAE,MAAM,GAC1B,MAAM,CAcR;AAED,KAAK,cAAc,GAAG,OAAO,iBAAiB,CAAC;AAC/C,KAAK,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,gBAAgB,CAAC,EAAE,cAAc,CAAC,CAAC;AAElF,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AA2ED,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,4BAA4B,GAClC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAK7B"}
+{"version":3,"file":"module-cache-lookup.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/module-cache-lookup.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAEL,iBAAiB,EAClB,MAAM,0DAA0D,CAAC;AASlE,wBAAgB,gCAAgC,CAC9C,yBAAyB,CAAC,EAAE,MAAM,EAClC,kBAAkB,CAAC,EAAE,MAAM,EAC3B,sBAAsB,CAAC,EAAE,SAAS,MAAM,EAAE,GACzC,MAAM,GAAG,SAAS,CAMpB;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,MAAM,EACxB,YAAY,CAAC,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,aAAa,GAAG,YAAY,EACnC,yBAAyB,CAAC,EAAE,MAAM,EAClC,kBAAkB,CAAC,EAAE,MAAM,EAC3B,sBAAsB,CAAC,EAAE,SAAS,MAAM,EAAE,GACzC,MAAM,CAeR;AAED,KAAK,cAAc,GAAG,OAAO,iBAAiB,CAAC;AAC/C,KAAK,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,gBAAgB,CAAC,EAAE,cAAc,CAAC,CAAC;AAElF,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sBAAsB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3C,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AA4ED,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,4BAA4B,GAClC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAK7B"}

package/esm/src/rendering/orchestrator/module-loader/module-cache-lookup.js

@@ -10,12 +10,12 @@ import { getMdxEsmCacheDir } from "../../../utils/cache-dir.js";
 import { rendererLogger } from "../../../utils/index.js";
 import { REACT_DEFAULT_VERSION } from "../../../utils/constants/cdn.js";
 import { UNRESOLVED_VF_MODULES_RE } from "./module-transform-cache.js";
-import { buildDependencyPinningCacheVariant } from "../../../cache/keys/dependency-pinning.js";
+import { getMdxModuleCacheVariant } from "../../../transforms/mdx/esm-module-loader/module-fetcher/cache-keys.js";
 const logger = rendererLogger.component("module-loader");
-export function buildModuleTransformCacheVariant(dependencyPinningCacheKey, moduleServerOrigin) {
-    return buildDependencyPinningCacheVariant(dependencyPinningCacheKey, moduleServerOrigin);
+export function buildModuleTransformCacheVariant(dependencyPinningCacheKey, moduleServerOrigin, serverExternalPackages) {
+    return getMdxModuleCacheVariant(dependencyPinningCacheKey, moduleServerOrigin, serverExternalPackages);
 }
-export function getModuleCacheKey(filePath, projectId, projectDir, contentSourceId, reactVersion, mode, dependencyPinningCacheKey, moduleServerOrigin) {
+export function getModuleCacheKey(filePath, projectId, projectDir, contentSourceId, reactVersion, mode, dependencyPinningCacheKey, moduleServerOrigin, serverExternalPackages) {
     const base = projectId ?? projectDir ?? "default";
     const source = contentSourceId ?? "default";
     const fields = [
@@ -24,7 +24,7 @@ export function getModuleCacheKey(filePath, projectId, projectDir, contentSource
         reactVersion ?? REACT_DEFAULT_VERSION,
         mode ?? "default",
     ];
-    const cacheVariant = buildModuleTransformCacheVariant(dependencyPinningCacheKey, moduleServerOrigin);
+    const cacheVariant = buildModuleTransformCacheVariant(dependencyPinningCacheKey, moduleServerOrigin, serverExternalPackages);
     return JSON.stringify(cacheVariant ? [...fields, cacheVariant, filePath] : [...fields, filePath]);
 }
 async function resolveInMemoryCachedPath(input) {
@@ -60,7 +60,7 @@ async function resolveMdxEsmCachedPath(input) {
     const mdxCacheResult = await lookup(input.filePath, mdxCacheDir, input.projectDir, undefined, {
         projectId: input.projectId,
         contentSourceId: input.contentSourceId,
-    }, input.reactVersion, buildModuleTransformCacheVariant(input.dependencyPinningCacheKey, input.moduleServerOrigin));
+    }, input.reactVersion, buildModuleTransformCacheVariant(input.dependencyPinningCacheKey, input.moduleServerOrigin, input.serverExternalPackages));
     if (mdxCacheResult.status === "hit") {
         input.moduleCache.set(input.cacheKey, mdxCacheResult.path);
         return mdxCacheResult.path;

package/esm/src/rendering/orchestrator/module-loader/module-persistence.d.ts

@@ -16,6 +16,7 @@ export interface PersistTransformedModuleInput {
     reactVersion?: string;
     dependencyPinningCacheKey?: string;
     moduleServerOrigin?: string;
+    serverExternalPackages?: readonly string[];
     /** Tenant-authored imports left unresolved in this module subtree. */
     unresolvedSpecifiers?: readonly string[];
     /**

package/esm/src/rendering/orchestrator/module-loader/module-persistence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-persistence.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/module-persistence.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AA6DzE,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,cAAc,CAAC;IAC7B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sEAAsE;IACtE,oBAAoB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,4EAA4E;AAC5E,wBAAsB,iCAAiC,CACrD,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,cAAc,GAC3B,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAmB5B;AA4ZD,uEAAuE;AACvE,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,6BAA6B,GACnC,OAAO,CAAC,MAAM,CAAC,CAgHjB"}
+{"version":3,"file":"module-persistence.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/module-persistence.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AA6DzE,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,cAAc,CAAC;IAC7B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sBAAsB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3C,sEAAsE;IACtE,oBAAoB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,4EAA4E;AAC5E,wBAAsB,iCAAiC,CACrD,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,cAAc,GAC3B,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAmB5B;AA4ZD,uEAAuE;AACvE,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,6BAA6B,GACnC,OAAO,CAAC,MAAM,CAAC,CAkHjB"}

package/esm/src/rendering/orchestrator/module-loader/module-persistence.js

@@ -445,7 +445,7 @@ export async function persistTransformedModule(input) {
     const relativePath = input.filePath.startsWith(input.projectDir)
         ? input.filePath.slice(input.projectDir.length).replace(/^\/+/, "")
         : input.filePath.replace(/^\/+/, "");
-    const cacheVariant = buildModuleTransformCacheVariant(input.dependencyPinningCacheKey, input.moduleServerOrigin);
+    const cacheVariant = buildModuleTransformCacheVariant(input.dependencyPinningCacheKey, input.moduleServerOrigin, input.serverExternalPackages);
     const outputRelativePath = cacheVariant
         ? join("_pins", encodeURIComponent(cacheVariant), relativePath)
         : relativePath;
@@ -502,7 +502,7 @@ export async function persistTransformedModule(input) {
     }
     if (shouldPublishReusableCache && input.contentSourceId) {
         const normalizedPath = `_vf_modules/${relativePath.replace(/\.(tsx?|jsx|mdx)$/, ".js")}`;
-        const mdxCacheKey = buildMdxEsmPathCacheKey(normalizedPath, input.reactVersion, buildModuleTransformCacheVariant(input.dependencyPinningCacheKey, input.moduleServerOrigin));
+        const mdxCacheKey = buildMdxEsmPathCacheKey(normalizedPath, input.reactVersion, buildModuleTransformCacheVariant(input.dependencyPinningCacheKey, input.moduleServerOrigin, input.serverExternalPackages));
         const cache = await getModulePathCache(input.tmpDir);
         cache.set(mdxCacheKey, tempFilePath);
         saveModulePathCache(input.tmpDir).catch((err) => {

package/esm/src/rendering/orchestrator/module-loader/module-transform-cache.d.ts

@@ -34,6 +34,7 @@ interface TransformOptions {
     ssr: boolean;
     reactVersion?: string;
     moduleServerOrigin?: string;
+    serverExternalPackages?: readonly string[];
     dependencyPinningCacheKey?: string;
     dependencyPinningDependencies?: Readonly<Record<string, string>>;
     dependencyPinningSource?: DependencyPinningSourceInput;
@@ -63,6 +64,7 @@ export interface TransformModuleCodeWithCacheInput {
     adapter: RuntimeAdapter;
     reactVersion?: string;
     moduleServerOrigin?: string;
+    serverExternalPackages?: readonly string[];
     dependencyPinningCacheKey?: string;
     dependencyPinningDependencies?: Readonly<Record<string, string>>;
     dependencyPinningSource?: DependencyPinningSourceInput;

package/esm/src/rendering/orchestrator/module-loader/module-transform-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-transform-cache.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/module-transform-cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module-transform-cache.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/module-transform-cache.ts"],"names":[],"mappings":"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"}

package/esm/src/rendering/orchestrator/module-loader/module-transform-cache.js

@@ -16,6 +16,7 @@ import { REACT_DEFAULT_VERSION } from "../../../utils/constants/cdn.js";
 import { validateDependencyResolutionObservations, } from "../../../transforms/import-rewriter/dependency-resolution.js";
 import { replaySSRDependencyResolutionObservations } from "../../../transforms/import-rewriter/ssr-adapter.js";
 import { buildDependencyPinningCacheVariant } from "../../../cache/keys/dependency-pinning.js";
+import { buildServerExternalPackagesIdentity } from "../../../config/server-external-packages.js";
 const logger = rendererLogger.component("module-loader");
 /** Pattern to detect unresolved /_vf_modules/ imports that will fail at runtime. */
 export const UNRESOLVED_VF_MODULES_RE = /from\s*["']((?:file:\/\/)?\/?\/?_vf_modules\/[^"']+)["']/;
@@ -81,7 +82,11 @@ export async function transformModuleCodeWithCache(input) {
         input.mode,
         reactVersion,
     ];
-    const configHash = hashCodeHex(JSON.stringify(cacheVariant ? [...legacyConfig, cacheVariant] : legacyConfig));
+    const serverExternalPackagesIdentity = buildServerExternalPackagesIdentity(input.serverExternalPackages);
+    const extendedConfig = serverExternalPackagesIdentity
+        ? [...legacyConfig, `server-externals:${serverExternalPackagesIdentity}`]
+        : legacyConfig;
+    const configHash = hashCodeHex(JSON.stringify(cacheVariant ? [...extendedConfig, cacheVariant] : extendedConfig));
     const cacheKey = generateTransformCacheKey(scopedPath, contentHash, true, false, { configHash });
     const dependencyResolutionObservations = new Map();
     const transformOptions = {
@@ -90,6 +95,7 @@ export async function transformModuleCodeWithCache(input) {
         ssr: true,
         reactVersion,
         moduleServerOrigin,
+        serverExternalPackages: input.serverExternalPackages,
         dependencyPinningCacheKey: input.dependencyPinningCacheKey,
         dependencyPinningDependencies: input.dependencyPinningDependencies,
         dependencyPinningSource: input.dependencyPinningSource,

package/esm/src/rendering/orchestrator/pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/pipeline.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/pipeline.ts"],"names":[],"mappings":"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"}

package/esm/src/rendering/orchestrator/pipeline.js

@@ -27,6 +27,7 @@ import { extractRenderedCssHash, hasRenderedReleaseAssetCss, serializeLayoutProp
 import { join } from "../../platform/compat/path/index.js";
 import { isExtendedFSAdapter } from "../../platform/adapters/fs/wrapper.js";
 import { DataFetcher } from "../../data/index.js";
+import { attachDataResponseMetadata, mergeDataResponseMetadata, unwrapDataResponseMetadataError, wrapDataResponseMetadataError, } from "../../data/response-metadata.js";
 import { clearSSRModuleCacheForProject } from "../../modules/react-loader/index.js";
 import { setupSSRGlobals } from "../ssr-globals.js";
 import { LAYOUT_EXTENSIONS } from "../layouts/types.js";
@@ -139,6 +140,7 @@ export class RenderPipeline {
             moduleServerOrigin: dependencySnapshot.cacheKey.startsWith("on:")
                 ? options?.url?.origin
                 : undefined,
+            serverExternalPackages: this.config.config?.build?.serverExternalPackages,
             dependencyPinningCacheKey: dependencySnapshot.cacheKey,
             dependencyPinningDependencies: dependencySnapshot.dependencies,
             dependencyPinningSource,
@@ -318,8 +320,8 @@ export class RenderPipeline {
                 return { ...job, result: null, error: error };
             }
         })), DATA_FETCH_TIMEOUT_MS, `Data fetch for ${slug}`), { "render.data_job_count": dataJobs.length }));
-        this.applyFetchedDataResults(slug, dataResults, pageProps, layoutProps);
-        return { params, pageProps, layoutProps };
+        const responseMetadata = this.applyFetchedDataResults(slug, dataResults, pageProps, layoutProps);
+        return { params, pageProps, layoutProps, ...responseMetadata };
     }
     /**
      * Build a host-owned worker generation for raw local data modules.
@@ -358,22 +360,34 @@ export class RenderPipeline {
         };
     }
     applyFetchedDataResults(slug, dataResults, pageProps, layoutProps) {
+        // Layouts are collected outermost to innermost. Apply them in that order,
+        // then the page, so the closest owner wins a duplicate custom header.
+        // Cookies remain distinct and preserve the same outer-to-inner-to-page order.
+        const responseMetadata = mergeDataResponseMetadata([
+            ...dataResults.filter(({ type }) => type === "layout"),
+            ...dataResults.filter(({ type }) => type === "page"),
+        ]
+            .flatMap(({ result }) => result ? [result] : []));
         for (const { type, id, result, error } of dataResults) {
-            if (error)
+            if (error) {
+                if (responseMetadata.headers || responseMetadata.cookies) {
+                    throw wrapDataResponseMetadataError(error, responseMetadata);
+                }
                 throw error;
+            }
             if (!result)
                 continue;
             if (result.notFound) {
-                throw FILE_NOT_FOUND.create({
+                throw attachDataResponseMetadata(FILE_NOT_FOUND.create({
                     detail: "Page/Layout returned notFound",
                     context: { slug, component: id },
-                });
+                }), responseMetadata);
             }
             if (result.redirect) {
-                throw RENDER_ERROR.create({
+                throw attachDataResponseMetadata(RENDER_ERROR.create({
                     detail: `Redirect to ${result.redirect.destination}`,
                     context: { slug, redirect: result.redirect },
-                });
+                }), responseMetadata);
             }
             if (!result.props)
                 continue;
@@ -384,6 +398,7 @@ export class RenderPipeline {
                 layoutProps.set(id, result.props);
             }
         }
+        return responseMetadata;
     }
     async renderPage(slug, options) {
         const pipelineStartTime = performance.now();
@@ -424,6 +439,8 @@ export class RenderPipeline {
                 }), { "render.slug": slug }));
                 timing.pageResolve = Math.round(performance.now() - pageResolveStart);
                 const sourceFile = extractRelativePathShared(pageInfo.entity.path, this.config.projectDir);
+                let responseHeaders;
+                let responseCookies;
                 try {
                     const skipLayouts = isDotPath({
                         slug,
@@ -452,6 +469,8 @@ export class RenderPipeline {
                             ? internalPreResolvedData.pageProps
                             : undefined;
                         layoutDataMap = internalPreResolvedData.layoutProps;
+                        responseHeaders = internalPreResolvedData.headers;
+                        responseCookies = internalPreResolvedData.cookies;
                     }
                     else if (options?.url && (options.request || options.staticDataOnly)) {
                         await profilePhase("render.data_fetching", () => withSpan("render.data_fetching", async () => {
@@ -462,6 +481,8 @@ export class RenderPipeline {
                                     ? dataResolution.pageProps
                                     : undefined;
                                 layoutDataMap = dataResolution.layoutProps;
+                                responseHeaders = dataResolution.headers;
+                                responseCookies = dataResolution.cookies;
                             }
                             catch (error) {
                                 if (error instanceof VeryfrontError)
@@ -488,8 +509,23 @@ export class RenderPipeline {
                     const bundlePrepStart = performance.now();
                     const pageBundleResult = await profilePhase("render.prepare_bundles", () => withSpan("render.prepare_bundles", () => this.config.pageRenderer.preparePageBundles(pageInfo, slug, cacheResult?.cachedModule, mergedOptions), { "render.slug": slug }));
                     timing.bundlePrep = Math.round(performance.now() - bundlePrepStart);
-                    if (pageBundleResult.scriptResult)
-                        return pageBundleResult.scriptResult;
+                    if (pageBundleResult.scriptResult) {
+                        const scriptResponseMetadata = mergeDataResponseMetadata([
+                            {
+                                ...(pageBundleResult.scriptResult.headers
+                                    ? { headers: pageBundleResult.scriptResult.headers }
+                                    : {}),
+                                ...(pageBundleResult.scriptResult.cookies
+                                    ? { cookies: pageBundleResult.scriptResult.cookies }
+                                    : {}),
+                            },
+                            {
+                                ...(responseHeaders ? { headers: responseHeaders } : {}),
+                                ...(responseCookies ? { cookies: responseCookies } : {}),
+                            },
+                        ]);
+                        return { ...pageBundleResult.scriptResult, ...scriptResponseMetadata };
+                    }
                     if (!pageBundleResult.pageElement || !pageBundleResult.pageBundle) {
                         throw RENDER_ERROR.create({
                             detail: "Failed to prepare page bundle",
@@ -557,6 +593,8 @@ export class RenderPipeline {
                         cacheCoordinator: this.config.cacheCoordinator,
                         logger: renderPipelineLog,
                         nonce: renderOptions.nonce,
+                        headers: responseHeaders,
+                        cookies: responseCookies,
                     });
                     timing.total = Math.round(performance.now() - pipelineStartTime);
                     renderPipelineLog.debug("Complete", { slug, timing });
@@ -564,7 +602,17 @@ export class RenderPipeline {
                 }
                 catch (error) {
                     if (error instanceof Error) {
-                        error.sourceFile = sourceFile;
+                        const classifiedError = unwrapDataResponseMetadataError(error);
+                        const sourceError = classifiedError instanceof Error ? classifiedError : error;
+                        sourceError.sourceFile = sourceFile;
+                    }
+                    if (responseHeaders || responseCookies) {
+                        throw wrapDataResponseMetadataError(error, mergeDataResponseMetadata([
+                            {
+                                ...(responseHeaders ? { headers: responseHeaders } : {}),
+                                ...(responseCookies ? { cookies: responseCookies } : {}),
+                            },
+                        ]));
                     }
                     throw error;
                 }

package/esm/src/rendering/orchestrator/render-result-assembly.d.ts

@@ -1,4 +1,5 @@
 import type { PageBundle, RenderResult } from "../../types/index.js";
+import type { ResponseCookie } from "../../data/types.js";
 interface RenderResultAssemblyCache {
     persistResult(result: RenderResult, slug: string, cacheKey?: string, nonce?: string): Promise<void>;
 }
@@ -22,6 +23,8 @@ export interface AssembleRenderResultOptions {
     cacheCoordinator?: RenderResultAssemblyCache;
     logger?: RenderResultAssemblyLogger;
     nonce?: string;
+    headers?: Record<string, string>;
+    cookies?: ResponseCookie[];
 }
 export declare function assembleRenderResult(options: AssembleRenderResultOptions): RenderResult;
 export {};

package/esm/src/rendering/orchestrator/render-result-assembly.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-result-assembly.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/render-result-assembly.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAErE,UAAU,yBAAyB;IACjC,aAAa,CACX,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAED,UAAU,0BAA0B;IAClC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAClE;AAED,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,KAAK,GAAG,WAAW,CAAC;IACrC,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAC7C,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,YAAY,CAqCvF"}
+{"version":3,"file":"render-result-assembly.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/render-result-assembly.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,UAAU,yBAAyB;IACjC,aAAa,CACX,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAED,UAAU,0BAA0B;IAClC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAClE;AAED,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,KAAK,GAAG,WAAW,CAAC;IACrC,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAC7C,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;CAC5B;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,YAAY,CAuCvF"}