veryfront 0.1.1239 → 0.1.1241

package/esm/src/rendering/layouts/layout-applicator.d.ts.map

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

package/esm/src/rendering/layouts/layout-applicator.js

@@ -165,7 +165,7 @@ export class LayoutApplicator {
             if (useESMWrap) {
                 return await applyLayoutsESM(pageElement, layoutBundle, nestedLayouts, this.projectDir, this.mergedComponents, this.layoutCache, this.adapter, layoutDataMap, this.projectId, this.projectSlug, this.contentSourceId, this.preloadedImportMap ?? undefined, reactVersion, this.dependencyPinningCacheKey, this.dependencyPinningDependencies, this.dependencyPinningSource, this.requestUrl?.origin, this.config, this.isLocalProject);
             }
-            return await applyLayoutsFunctionBody(pageElement, layoutBundle, nestedLayouts, this.mergedComponents, this.layoutCache, this.projectDir, this.adapter, layoutDataMap, this.projectId, this.projectSlug, this.contentSourceId, reactVersion, this.dependencyPinningCacheKey, this.dependencyPinningDependencies, this.dependencyPinningSource, this.requestUrl?.origin);
+            return await applyLayoutsFunctionBody(pageElement, layoutBundle, nestedLayouts, this.mergedComponents, this.layoutCache, this.projectDir, this.adapter, layoutDataMap, this.projectId, this.projectSlug, this.contentSourceId, reactVersion, this.dependencyPinningCacheKey, this.dependencyPinningDependencies, this.dependencyPinningSource, this.requestUrl?.origin, this.config);
         }, {
             "layout.nested_count": nestedLayouts.length,
             "layout.has_bundle": !!layoutBundle,
@@ -244,6 +244,7 @@ export class LayoutApplicator {
                         dependencyPinningCacheKey: this.dependencyPinningCacheKey,
                         dependencyPinningDependencies: this.dependencyPinningDependencies,
                         dependencyPinningSource: this.dependencyPinningSource,
+                        serverExternalPackages: this.config?.build?.serverExternalPackages,
                     });
                 }
                 if (!App)
@@ -283,6 +284,7 @@ export class LayoutApplicator {
                 dependencyPinningCacheKey: this.dependencyPinningCacheKey,
                 dependencyPinningDependencies: this.dependencyPinningDependencies,
                 dependencyPinningSource: this.dependencyPinningSource,
+                serverExternalPackages: this.config?.build?.serverExternalPackages,
             });
         }
         catch (error) {

package/esm/src/rendering/layouts/layout-collector.d.ts

@@ -2,6 +2,7 @@ import type { RuntimeAdapter } from "../../platform/adapters/base.js";
 import type { EntityInfo, LayoutItem, MdxBundle } from "../../types/index.js";
 import type { VeryfrontConfig } from "../../config/index.js";
 export declare function resolveLayoutRouterRootDir(projectDir: string, useAppRouter: boolean, config: VeryfrontConfig): string;
+export declare function extractTsxLayoutSignal(source: string, filePath: string): Promise<boolean | string | undefined>;
 /**
  * FileExistenceChecker is a pure interface for checking file existence.
  * This allows unit testing without mocking the full adapter.

package/esm/src/rendering/layouts/layout-collector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout-collector.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/layouts/layout-collector.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAW7D,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,eAAe,GACtB,MAAM,CAKR;AA+BD;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACxC;AAED;;;;;GAKG;AACH,wBAAsB,4BAA4B,CAChD,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQxB;AAUD,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,aAAa,EAAE,UAAU,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,CACV,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,QAAQ,CAAC,EAAE,MAAM,KACd,OAAO,CAAC,SAAS,CAAC,CAAC;CACzB;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,UAAU,CAIM;gBAEZ,OAAO,EAAE,sBAAsB;IAQrC,cAAc,CAAC,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;YAsD7D,mBAAmB;YAyDnB,0BAA0B;IAkExC,OAAO,CAAC,iBAAiB;YAoBX,oBAAoB;YAgBpB,qBAAqB;IA4BnC;;;;;;OAMG;YACW,6BAA6B;IAiC3C;;OAEG;YACW,0BAA0B;CASzC"}
+{"version":3,"file":"layout-collector.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/layouts/layout-collector.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAc7D,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,eAAe,GACtB,MAAM,CAKR;AA2HD,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC,CA4EvC;AAgDD;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACxC;AAED;;;;;GAKG;AACH,wBAAsB,4BAA4B,CAChD,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQxB;AAUD,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,aAAa,EAAE,UAAU,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,CACV,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,QAAQ,CAAC,EAAE,MAAM,KACd,OAAO,CAAC,SAAS,CAAC,CAAC;CACzB;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,UAAU,CAIM;gBAEZ,OAAO,EAAE,sBAAsB;IAQrC,cAAc,CAAC,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;YA0D7D,mBAAmB;YAyDnB,0BAA0B;IAkExC,OAAO,CAAC,iBAAiB;YAoBX,oBAAoB;YAgBpB,qBAAqB;IA4BnC;;;;;;OAMG;YACW,6BAA6B;IAiC3C;;OAEG;YACW,0BAA0B;CASzC"}

package/esm/src/rendering/layouts/layout-collector.js

@@ -7,6 +7,8 @@ import { LAYOUT_EXTENSIONS } from "./types.js";
 import { SpanNames } from "../../observability/index.js";
 import { withSpan } from "../../observability/tracing/otlp-setup.js";
 import { LAYOUT_NOT_FOUND } from "../../errors/index.js";
+import { tryResolve } from "../../extensions/contracts.js";
+import { ensureDefaultParserContracts } from "../../extensions/parser/defaults.js";
 const logger = rendererLogger.component("layout-collector");
 export function resolveLayoutRouterRootDir(projectDir, useAppRouter, config) {
     const directory = useAppRouter
@@ -20,6 +22,200 @@ function resolvePagePath(pageFilePath, projectDir) {
 function getLayoutKind(path) {
     return path.endsWith(".mdx") || path.endsWith(".md") ? "mdx" : "tsx";
 }
+function isAstNode(value) {
+    return typeof value === "object" && value !== null &&
+        typeof value.type === "string";
+}
+function getProgramBody(ast) {
+    const program = isAstNode(ast.program) ? ast.program : ast;
+    return Array.isArray(program.body) ? program.body.filter(isAstNode) : [];
+}
+function getIdentifierName(node) {
+    if (!isAstNode(node) || node.type !== "Identifier")
+        return undefined;
+    return typeof node.name === "string" ? node.name : undefined;
+}
+function getExportedName(node) {
+    const identifier = getIdentifierName(node);
+    if (identifier)
+        return identifier;
+    if (!isAstNode(node))
+        return undefined;
+    return (node.type === "StringLiteral" || node.type === "Literal") &&
+        typeof node.value === "string"
+        ? node.value
+        : undefined;
+}
+function unwrapTsExpression(node) {
+    let current = node;
+    while (current.type === "TSAsExpression" ||
+        current.type === "TSSatisfiesExpression" ||
+        current.type === "TSTypeAssertion" ||
+        current.type === "TSNonNullExpression" ||
+        current.type === "TypeCastExpression" ||
+        current.type === "ParenthesizedExpression") {
+        if (!isAstNode(current.expression))
+            break;
+        current = current.expression;
+    }
+    return current;
+}
+function getLiteralLayoutValue(node) {
+    if (!isAstNode(node))
+        return undefined;
+    const literal = unwrapTsExpression(node);
+    if (literal.type === "TemplateLiteral" && Array.isArray(literal.expressions) &&
+        literal.expressions.length === 0 && Array.isArray(literal.quasis) &&
+        literal.quasis.length === 1) {
+        const quasi = literal.quasis[0];
+        const value = isAstNode(quasi) && typeof quasi.value === "object" && quasi.value !== null
+            ? quasi.value
+            : undefined;
+        if (value) {
+            return typeof value.cooked === "string"
+                ? value.cooked
+                : typeof value.raw === "string"
+                    ? value.raw
+                    : undefined;
+        }
+    }
+    if (literal.type !== "BooleanLiteral" && literal.type !== "StringLiteral" &&
+        literal.type !== "Literal") {
+        return undefined;
+    }
+    return typeof literal.value === "boolean" || typeof literal.value === "string"
+        ? literal.value
+        : undefined;
+}
+function getObjectLayoutValue(node) {
+    if (!isAstNode(node))
+        return undefined;
+    const object = unwrapTsExpression(node);
+    if (object.type !== "ObjectExpression" || !Array.isArray(object.properties))
+        return undefined;
+    let layoutValue;
+    for (const property of object.properties) {
+        if (isAstNode(property) && property.type === "SpreadElement") {
+            layoutValue = undefined;
+            continue;
+        }
+        if (!isAstNode(property) ||
+            (property.type !== "ObjectProperty" && property.type !== "Property" &&
+                property.type !== "ObjectMethod")) {
+            layoutValue = undefined;
+            continue;
+        }
+        const literalKey = isAstNode(property.key) && typeof property.key.value === "string"
+            ? property.key.value
+            : undefined;
+        const key = property.computed === true
+            ? literalKey
+            : getIdentifierName(property.key) ?? literalKey;
+        if (property.computed === true && key === undefined) {
+            layoutValue = undefined;
+            continue;
+        }
+        if (key !== "layout")
+            continue;
+        layoutValue = property.type === "ObjectMethod"
+            ? undefined
+            : getLiteralLayoutValue(property.value);
+    }
+    return layoutValue;
+}
+export async function extractTsxLayoutSignal(source, filePath) {
+    await ensureDefaultParserContracts();
+    const parser = tryResolve("CodeParser");
+    if (!parser)
+        return undefined;
+    let ast;
+    try {
+        ast = await parser.parse({ code: source, filePath });
+    }
+    catch {
+        return undefined;
+    }
+    const constBindings = new Map();
+    const exportedBindings = new Map();
+    for (const statement of getProgramBody(ast)) {
+        let declaration = statement;
+        let isInlineExport = false;
+        if (statement.type === "ExportNamedDeclaration") {
+            if (statement.exportKind !== "type" && statement.source == null &&
+                Array.isArray(statement.specifiers)) {
+                for (const specifier of statement.specifiers) {
+                    if (!isAstNode(specifier) || specifier.type !== "ExportSpecifier" ||
+                        specifier.exportKind === "type") {
+                        continue;
+                    }
+                    const exportedName = getExportedName(specifier.exported);
+                    const localName = getIdentifierName(specifier.local);
+                    if ((exportedName === "layout" || exportedName === "frontmatter") &&
+                        localName && !exportedBindings.has(exportedName)) {
+                        exportedBindings.set(exportedName, localName);
+                    }
+                }
+            }
+            if (!isAstNode(statement.declaration))
+                continue;
+            declaration = statement.declaration;
+            isInlineExport = true;
+        }
+        if (declaration.type !== "VariableDeclaration" || declaration.kind !== "const" ||
+            !Array.isArray(declaration.declarations)) {
+            continue;
+        }
+        for (const declarator of declaration.declarations) {
+            if (!isAstNode(declarator) || declarator.type !== "VariableDeclarator")
+                continue;
+            const name = getIdentifierName(declarator.id);
+            if (!name)
+                continue;
+            if (!constBindings.has(name))
+                constBindings.set(name, declarator.init);
+            if (isInlineExport && (name === "layout" || name === "frontmatter") &&
+                !exportedBindings.has(name)) {
+                exportedBindings.set(name, name);
+            }
+        }
+    }
+    const frontmatterBinding = exportedBindings.get("frontmatter");
+    const directBinding = exportedBindings.get("layout");
+    const frontmatterLayout = frontmatterBinding
+        ? getObjectLayoutValue(constBindings.get(frontmatterBinding))
+        : undefined;
+    const directLayout = directBinding
+        ? getLiteralLayoutValue(constBindings.get(directBinding))
+        : undefined;
+    return frontmatterLayout ?? directLayout;
+}
+/**
+ * Merges the per-page layout signal of a tsx/jsx/ts/js page into its
+ * frontmatter. Md/mdx pages carry the signal in their YAML frontmatter, which
+ * is already parsed onto the entity. Tsx pages cannot start with a YAML block,
+ * so their signal is read from top-level module exports instead:
+ * `export const layout = false | "Name"` or
+ * `export const frontmatter = { layout: … }`.
+ */
+async function withModuleLayoutSignal(pageInfo) {
+    if (pageInfo.entity.frontmatter.layout !== undefined)
+        return pageInfo;
+    if (getLayoutKind(pageInfo.entity.path) !== "tsx")
+        return pageInfo;
+    const source = pageInfo.entity.content;
+    if (!source)
+        return pageInfo;
+    const layout = await extractTsxLayoutSignal(source, pageInfo.entity.path);
+    if (layout === undefined)
+        return pageInfo;
+    return {
+        ...pageInfo,
+        entity: {
+            ...pageInfo.entity,
+            frontmatter: { ...pageInfo.entity.frontmatter, layout },
+        },
+    };
+}
 /**
  * Creates a LayoutItem from a path. For tsx/jsx/ts/js files, creates a tsx kind item.
  * For mdx/md files, creates an mdx kind item with optional bundle.
@@ -77,7 +273,8 @@ export class LayoutCollector {
                 logger.debug("Skipping layouts for .veryfront path", { pagePath });
                 return { layoutBundle: undefined, nestedLayouts: [] };
             }
-            const layoutValue = pageInfo.entity.frontmatter.layout;
+            const resolvedPageInfo = await withModuleLayoutSignal(pageInfo);
+            const layoutValue = resolvedPageInfo.entity.frontmatter.layout;
             if (layoutValue === false || layoutValue === "false") {
                 logger.debug("Layout explicitly disabled via frontmatter", {
                     pagePath,
@@ -87,11 +284,11 @@ export class LayoutCollector {
             }
             const hasExplicitFrontmatterLayout = typeof layoutValue === "string" &&
                 layoutValue.length > 0;
-            const { layoutBundle, layoutPath, layoutName } = await withSpan(SpanNames.LAYOUT_COLLECT_NAMED, () => this.collectNamedLayoutWithPath(pageInfo), {
+            const { layoutBundle, layoutPath, layoutName } = await withSpan(SpanNames.LAYOUT_COLLECT_NAMED, () => this.collectNamedLayoutWithPath(resolvedPageInfo), {
                 "layout.page_path": pagePath,
                 "layout.config_layout": this.config?.layout || "none",
             });
-            return this.processLayoutResult(pageInfo, hasExplicitFrontmatterLayout, layoutBundle, layoutPath, layoutName);
+            return this.processLayoutResult(resolvedPageInfo, hasExplicitFrontmatterLayout, layoutBundle, layoutPath, layoutName);
         }, {
             "layout.page_path": pageInfo.entity.path,
             "layout.project_dir": this.projectDir,
@@ -151,7 +348,7 @@ export class LayoutCollector {
         const layoutInfo = await withSpan(SpanNames.LAYOUT_GET_ENTITY, () => getLayoutEntity(this.projectDir, layoutName, this.adapter), { "layout.name": layoutName, "layout.project_dir": this.projectDir });
         logger.debug("Layout entity found:", { found: !!layoutInfo, layoutName });
         if (!layoutInfo) {
-            const source = typeof layoutValue === "string" ? "frontmatter" : "config";
+            const source = typeof layoutValue === "string" ? "page metadata" : "config";
             throw LAYOUT_NOT_FOUND.create({
                 detail: `Layout "${layoutName}" not found. Specified in ${source} for page "${pageInfo.entity.path}". Check that the layout file exists.`,
             });

package/esm/src/rendering/layouts/utils/applicator.d.ts

@@ -6,5 +6,5 @@ import type { ImportMapConfig } from "../../../modules/import-map/types.js";
 import type { LayoutComponentCache } from "./component-loader.js";
 import type { DependencyPinningSourceInput } from "../../../transforms/esm/package-registry.js";
 export declare function applyLayoutsESM(pageElement: BundledReact.ReactElement, layoutBundle: MdxBundle | undefined, nestedLayouts: LayoutItem[], projectDir: string, mergedComponents: MDXComponents, tsxLayoutModuleCache: LayoutComponentCache, adapter: RuntimeAdapter, layoutDataMap: Map<string, Record<string, unknown>> | undefined, projectId: string, projectSlug: string, contentSourceId: string, preloadedImportMap?: ImportMapConfig, reactVersion?: string, dependencyPinningCacheKey?: string, dependencyPinningDependencies?: Readonly<Record<string, string>>, dependencyPinningSource?: DependencyPinningSourceInput, moduleServerOrigin?: string, config?: VeryfrontConfig, isLocalProject?: boolean): Promise<BundledReact.ReactElement>;
-export declare function applyLayoutsFunctionBody(pageElement: BundledReact.ReactElement, layoutBundle: MdxBundle | undefined, nestedLayouts: LayoutItem[], mergedComponents: MDXComponents, tsxLayoutModuleCache: LayoutComponentCache, projectDir: string, adapter: RuntimeAdapter, layoutDataMap: Map<string, Record<string, unknown>> | undefined, projectId: string, projectSlug: string, contentSourceId: string, reactVersion?: string, dependencyPinningCacheKey?: string, dependencyPinningDependencies?: Readonly<Record<string, string>>, dependencyPinningSource?: DependencyPinningSourceInput, moduleServerOrigin?: string): Promise<BundledReact.ReactElement>;
+export declare function applyLayoutsFunctionBody(pageElement: BundledReact.ReactElement, layoutBundle: MdxBundle | undefined, nestedLayouts: LayoutItem[], mergedComponents: MDXComponents, tsxLayoutModuleCache: LayoutComponentCache, projectDir: string, adapter: RuntimeAdapter, layoutDataMap: Map<string, Record<string, unknown>> | undefined, projectId: string, projectSlug: string, contentSourceId: string, reactVersion?: string, dependencyPinningCacheKey?: string, dependencyPinningDependencies?: Readonly<Record<string, string>>, dependencyPinningSource?: DependencyPinningSourceInput, moduleServerOrigin?: string, config?: VeryfrontConfig): Promise<BundledReact.ReactElement>;
 //# sourceMappingURL=applicator.d.ts.map

package/esm/src/rendering/layouts/utils/applicator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"applicator.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/layouts/utils/applicator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,YAAY,MAAM,OAAO,CAAC;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAG5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAMlE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAIhG,wBAAgB,eAAe,CAC7B,WAAW,EAAE,YAAY,CAAC,YAAY,EACtC,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,aAAa,EAC/B,oBAAoB,EAAE,oBAAoB,EAC1C,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,EAC/D,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,eAAe,EACpC,YAAY,CAAC,EAAE,MAAM,EACrB,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,EAC3B,MAAM,CAAC,EAAE,eAAe,EACxB,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAiIpC;AAED,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,YAAY,CAAC,YAAY,EACtC,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,gBAAgB,EAAE,aAAa,EAC/B,oBAAoB,EAAE,oBAAoB,EAC1C,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,EAC/D,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,MAAM,EACrB,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,YAAY,CAAC,YAAY,CAAC,CAiFpC"}
+{"version":3,"file":"applicator.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/layouts/utils/applicator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,YAAY,MAAM,OAAO,CAAC;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAG5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAMlE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAIhG,wBAAgB,eAAe,CAC7B,WAAW,EAAE,YAAY,CAAC,YAAY,EACtC,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,aAAa,EAC/B,oBAAoB,EAAE,oBAAoB,EAC1C,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,EAC/D,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,eAAe,EACpC,YAAY,CAAC,EAAE,MAAM,EACrB,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,EAC3B,MAAM,CAAC,EAAE,eAAe,EACxB,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAkIpC;AAED,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,YAAY,CAAC,YAAY,EACtC,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,gBAAgB,EAAE,aAAa,EAC/B,oBAAoB,EAAE,oBAAoB,EAC1C,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,EAC/D,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,MAAM,EACrB,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,EAC3B,MAAM,CAAC,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAkFpC"}

package/esm/src/rendering/layouts/utils/applicator.js

@@ -39,7 +39,7 @@ export function applyLayoutsESM(pageElement, layoutBundle, nestedLayouts, projec
                 if (item.kind !== "tsx")
                     continue;
                 const props = item.componentPath ? layoutDataMap?.get(item.componentPath) : undefined;
-                element = await withSpan(SpanNames.LAYOUT_APPLY_TSX, () => applyTSXLayout(element, item, tsxLayoutModuleCache, projectDir, adapter, props, projectId, projectSlug, contentSourceId, reactVersion, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin), spanAttrs);
+                element = await withSpan(SpanNames.LAYOUT_APPLY_TSX, () => applyTSXLayout(element, item, tsxLayoutModuleCache, projectDir, adapter, props, projectId, projectSlug, contentSourceId, reactVersion, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin, config?.build?.serverExternalPackages), spanAttrs);
             }
             catch (e) {
                 logger.error("Failed to apply nested layout:", e);
@@ -61,7 +61,7 @@ export function applyLayoutsESM(pageElement, layoutBundle, nestedLayouts, projec
         "layout.project_slug": projectSlug || "",
     });
 }
-export async function applyLayoutsFunctionBody(pageElement, layoutBundle, nestedLayouts, mergedComponents, tsxLayoutModuleCache, projectDir, adapter, layoutDataMap, projectId, projectSlug, contentSourceId, reactVersion, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin) {
+export async function applyLayoutsFunctionBody(pageElement, layoutBundle, nestedLayouts, mergedComponents, tsxLayoutModuleCache, projectDir, adapter, layoutDataMap, projectId, projectSlug, contentSourceId, reactVersion, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin, config) {
     const React = await getProjectReact(reactVersion);
     let element = pageElement;
     logger.debug("Using function-body wrapping for layouts");
@@ -91,7 +91,7 @@ export async function applyLayoutsFunctionBody(pageElement, layoutBundle, nested
         if (item.kind !== "tsx" || !item.componentPath)
             continue;
         try {
-            const LayoutComponent = await loadTSXComponent(item.componentPath, projectDir, tsxLayoutModuleCache, adapter, projectId, projectSlug, contentSourceId, reactVersion, undefined, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin);
+            const LayoutComponent = await loadTSXComponent(item.componentPath, projectDir, tsxLayoutModuleCache, adapter, projectId, projectSlug, contentSourceId, reactVersion, undefined, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin, config?.build?.serverExternalPackages);
             const child = ensureValidChild(element, React);
             logger.debug("Applying TSX layout:", {
                 layoutName: LayoutComponent.name || "Anonymous",

package/esm/src/rendering/layouts/utils/component-loader.d.ts

@@ -23,14 +23,14 @@ export declare function shouldUnwrapAppRouterDocumentLayout(componentPath: strin
 export declare function unwrapAppRouterDocumentLayout(React: typeof BundledReact, LayoutComponent: AppRouterDocumentLayoutFunction): BundledReact.FunctionComponent<{
     children?: BundledReact.ReactNode;
 }>;
-export declare function loadTSXComponent(componentPath: string, projectDir: string, cache: LayoutComponentCache, adapter: RuntimeAdapter, projectId: string, projectSlug: string, contentSourceId: string, reactVersion?: string, deps?: LoadTSXComponentDeps, dependencyPinningCacheKey?: string, dependencyPinningDependencies?: Readonly<Record<string, string>>, dependencyPinningSource?: DependencyPinningSourceInput, moduleServerOrigin?: string): Promise<BundledReact.ComponentType>;
+export declare function loadTSXComponent(componentPath: string, projectDir: string, cache: LayoutComponentCache, adapter: RuntimeAdapter, projectId: string, projectSlug: string, contentSourceId: string, reactVersion?: string, deps?: LoadTSXComponentDeps, dependencyPinningCacheKey?: string, dependencyPinningDependencies?: Readonly<Record<string, string>>, dependencyPinningSource?: DependencyPinningSourceInput, moduleServerOrigin?: string, serverExternalPackages?: readonly string[]): Promise<BundledReact.ComponentType>;
 /** Load an MDX layout module from a bundle. */
 export declare function loadMDXLayout(bundle: MdxBundle, projectDir: string, adapter: RuntimeAdapter, projectId: string, projectSlug: string, contentSourceId: string, preloadedImportMap?: ImportMapConfig, reactVersion?: string, dependencyPinningCacheKey?: string, dependencyPinningDependencies?: Readonly<Record<string, string>>, dependencyPinningSource?: DependencyPinningSourceInput, moduleServerOrigin?: string, config?: VeryfrontConfig, isLocalProject?: boolean): Promise<BundledReact.ComponentType<{
     components?: MDXComponents;
 }> | undefined>;
 /** Preload an MDX layout module into cache for faster subsequent loads. */
 export declare function preloadMDXLayoutModule(bundle: MdxBundle, projectDir: string, adapter: RuntimeAdapter, projectId: string, projectSlug: string, contentSourceId: string, reactVersion?: string, dependencyPinningCacheKey?: string, dependencyPinningDependencies?: Readonly<Record<string, string>>, dependencyPinningSource?: DependencyPinningSourceInput, moduleServerOrigin?: string, config?: VeryfrontConfig, isLocalProject?: boolean): Promise<void>;
-export declare function applyTSXLayout(element: BundledReact.ReactElement, item: LayoutItem, tsxLayoutModuleCache: LayoutComponentCache, projectDir: string, adapter: RuntimeAdapter, props: Record<string, unknown> | undefined, projectId: string, projectSlug: string, contentSourceId: string, reactVersion?: string, dependencyPinningCacheKey?: string, dependencyPinningDependencies?: Readonly<Record<string, string>>, dependencyPinningSource?: DependencyPinningSourceInput, moduleServerOrigin?: string): Promise<BundledReact.ReactElement>;
+export declare function applyTSXLayout(element: BundledReact.ReactElement, item: LayoutItem, tsxLayoutModuleCache: LayoutComponentCache, projectDir: string, adapter: RuntimeAdapter, props: Record<string, unknown> | undefined, projectId: string, projectSlug: string, contentSourceId: string, reactVersion?: string, dependencyPinningCacheKey?: string, dependencyPinningDependencies?: Readonly<Record<string, string>>, dependencyPinningSource?: DependencyPinningSourceInput, moduleServerOrigin?: string, serverExternalPackages?: readonly string[]): Promise<BundledReact.ReactElement>;
 export declare function applyMDXLayout(element: BundledReact.ReactElement, bundle: MdxBundle, projectDir: string, mergedComponents: MDXComponents, adapter: RuntimeAdapter, projectId: string, projectSlug: string, contentSourceId: string, preloadedImportMap?: ImportMapConfig, reactVersion?: string, dependencyPinningCacheKey?: string, dependencyPinningDependencies?: Readonly<Record<string, string>>, dependencyPinningSource?: DependencyPinningSourceInput, moduleServerOrigin?: string, config?: VeryfrontConfig, isLocalProject?: boolean): Promise<BundledReact.ReactElement>;
 export {};
 //# sourceMappingURL=component-loader.d.ts.map

package/esm/src/rendering/layouts/utils/component-loader.d.ts.map

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

package/esm/src/rendering/layouts/utils/component-loader.js

@@ -13,6 +13,8 @@ import { LAYOUT_EXTENSIONS } from "../types.js";
 import { resolveDependencyPinningSnapshot, } from "../../../transforms/esm/package-registry.js";
 import { buildDependencyPinningCacheVariant } from "../../../cache/keys/dependency-pinning.js";
 import { Singleflight } from "../../../utils/singleflight.js";
+import { buildServerExternalPackagesIdentity } from "../../../config/server-external-packages.js";
+import { hashString } from "../../../cache/hash.js";
 const loadMdxLayoutLog = logger.component("load-mdx-layout");
 const applyTsxLayoutLog = logger.component("apply-tsx-layout");
 const applyMdxLayoutLog = logger.component("apply-mdx-layout");
@@ -172,14 +174,18 @@ export function unwrapAppRouterDocumentLayout(React, LayoutComponent) {
         return body?.props?.children ?? props.children ?? null;
     };
 }
-export async function loadTSXComponent(componentPath, projectDir, cache, adapter, projectId, projectSlug, contentSourceId, reactVersion, deps = { loadComponentFromSource }, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin) {
+export async function loadTSXComponent(componentPath, projectDir, cache, adapter, projectId, projectSlug, contentSourceId, reactVersion, deps = { loadComponentFromSource }, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin, serverExternalPackages) {
     const source = await adapter.fs.readFile(componentPath);
     const dependencySnapshot = await resolveDependencyPinningSnapshot(dependencyPinningSource ?? projectDir, dependencyPinningCacheKey, dependencyPinningDependencies);
     const hash = await computeHash(source);
     const legacyCacheKey = buildLayoutComponentCacheKey(projectId, componentPath, hash, contentSourceId) +
         ":" + (reactVersion ?? "default");
     const cacheVariant = buildDependencyPinningCacheVariant(dependencySnapshot.cacheKey, moduleServerOrigin);
-    const cacheKey = cacheVariant ? `${legacyCacheKey}:pins:${cacheVariant}` : legacyCacheKey;
+    const serverExternalPackagesIdentity = buildServerExternalPackagesIdentity(serverExternalPackages);
+    let cacheKey = cacheVariant ? `${legacyCacheKey}:pins:${cacheVariant}` : legacyCacheKey;
+    if (serverExternalPackagesIdentity) {
+        cacheKey += `:server-externals:${hashString(serverExternalPackagesIdentity)}`;
+    }
     const cached = cache.get(cacheKey);
     if (cached)
         return cached;
@@ -194,6 +200,7 @@ export async function loadTSXComponent(componentPath, projectDir, cache, adapter
             ssr: true,
             contentSourceId,
             reactVersion,
+            serverExternalPackages,
             moduleServerOrigin,
             dependencyPinningCacheKey: dependencySnapshot.cacheKey,
             dependencyPinningDependencies: dependencySnapshot.dependencies,
@@ -251,6 +258,7 @@ export function loadMDXLayout(bundle, projectDir, adapter, projectId, projectSlu
             dependencyPinningSource,
             moduleServerOrigin,
             isLocalProject,
+            serverExternalPackages: config?.build?.serverExternalPackages,
         }));
         loadMdxLayoutLog.debug("loadModuleESM DONE", {
             projectSlug,
@@ -267,7 +275,7 @@ export function loadMDXLayout(bundle, projectDir, adapter, projectId, projectSlu
 export async function preloadMDXLayoutModule(bundle, projectDir, adapter, projectId, projectSlug, contentSourceId, reactVersion, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin, config, isLocalProject) {
     await loadMDXLayout(bundle, projectDir, adapter, projectId, projectSlug, contentSourceId, undefined, reactVersion, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin, config, isLocalProject);
 }
-export async function applyTSXLayout(element, item, tsxLayoutModuleCache, projectDir, adapter, props, projectId, projectSlug, contentSourceId, reactVersion, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin) {
+export async function applyTSXLayout(element, item, tsxLayoutModuleCache, projectDir, adapter, props, projectId, projectSlug, contentSourceId, reactVersion, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin, serverExternalPackages) {
     const start = performance.now();
     applyTsxLayoutLog.debug("START", {
         componentPath: item.componentPath,
@@ -278,7 +286,7 @@ export async function applyTSXLayout(element, item, tsxLayoutModuleCache, projec
     try {
         applyTsxLayoutLog.debug("loadTSXComponent START", { componentPath: item.componentPath });
         const loadStart = performance.now();
-        const LayoutComponent = await loadTSXComponent(item.componentPath, projectDir, tsxLayoutModuleCache, adapter, projectId, projectSlug, contentSourceId, reactVersion, undefined, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin);
+        const LayoutComponent = await loadTSXComponent(item.componentPath, projectDir, tsxLayoutModuleCache, adapter, projectId, projectSlug, contentSourceId, reactVersion, undefined, dependencyPinningCacheKey, dependencyPinningDependencies, dependencyPinningSource, moduleServerOrigin, serverExternalPackages);
         applyTsxLayoutLog.debug("loadTSXComponent DONE", {
             componentPath: item.componentPath,
             duration: `${(performance.now() - loadStart).toFixed(2)}ms`,

package/esm/src/rendering/orchestrator/file-resolver/index.d.ts

@@ -9,5 +9,7 @@ import type { RuntimeAdapter } from "../../../platform/adapters/base.js";
 export { buildCandidatePaths, findFirstExisting } from "./candidates.js";
 export declare function getLocalLibDir(): string;
 export declare function findLocalLibFile(relativePath: string, localAdapter: RuntimeAdapter): Promise<string | null>;
-export declare function findSourceFile(basePath: string, projectDir: string, adapter: RuntimeAdapter): Promise<string | null>;
+export declare function findSourceFile(basePath: string, projectDir: string, adapter: RuntimeAdapter, options?: {
+    onLegacyComponentsFallback?: () => void;
+}): Promise<string | null>;
 //# sourceMappingURL=index.d.ts.map

package/esm/src/rendering/orchestrator/file-resolver/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/file-resolver/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGzE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAYzE,wBAAgB,cAAc,IAAI,MAAM,CASvC;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,cAAc,GAC3B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAYxB;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmDxB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/file-resolver/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGzE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAYzE,wBAAgB,cAAc,IAAI,MAAM,CASvC;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,cAAc,GAC3B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAYxB;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,OAAO,GAAE;IAAE,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAA;CAAO,GACxD,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA2DxB"}

package/esm/src/rendering/orchestrator/file-resolver/index.js

@@ -32,7 +32,7 @@ export async function findLocalLibFile(relativePath, localAdapter) {
     logger.debug(result ? "[FileResolver] Found local lib file:" : "[FileResolver] Local lib file not found:", result ?? relativePath);
     return result;
 }
-export async function findSourceFile(basePath, projectDir, adapter) {
+export async function findSourceFile(basePath, projectDir, adapter, options = {}) {
     // When the specifier already carries an explicit source extension
     // (e.g. `@/components/Welcome.tsx`), the literal on-disk path must be a
     // candidate. `buildCandidatePaths` only produces `${fileName}${ext}` and
@@ -44,18 +44,22 @@ export async function findSourceFile(basePath, projectDir, adapter) {
         if (hasExplicitExt)
             directBases.push(join(projectDir, basePath));
         directBases.push(join(projectDir, stem));
+        const legacyBases = [];
         const stemWithoutComponents = stem.replace(/^components\//, "");
         if (stemWithoutComponents !== stem) {
             if (hasExplicitExt) {
-                directBases.push(join(projectDir, basePath.replace(/^components\//, "")));
+                legacyBases.push(join(projectDir, basePath.replace(/^components\//, "")));
             }
-            directBases.push(join(projectDir, stemWithoutComponents));
+            legacyBases.push(join(projectDir, stemWithoutComponents));
+            directBases.push(...legacyBases);
         }
         for (const candidateBase of directBases) {
             const resolved = await adapter.fs.resolveFile(candidateBase, {
                 allowPagesPrefix: false,
             });
             if (resolved) {
+                if (legacyBases.includes(candidateBase))
+                    options.onLegacyComponentsFallback?.();
                 logger.debug("[FileResolver] Found file via resolveFile:", resolved);
                 return resolved;
             }
@@ -65,14 +69,18 @@ export async function findSourceFile(basePath, projectDir, adapter) {
     if (hasExplicitExt)
         candidates.push(join(projectDir, basePath));
     candidates.push(...buildCandidatePaths(projectDir, stem, SOURCE_EXTENSIONS));
+    const legacyCandidates = [];
     const stemWithoutComponents = stem.replace(/^components\//, "");
     if (stemWithoutComponents !== stem) {
         if (hasExplicitExt) {
-            candidates.push(join(projectDir, basePath.replace(/^components\//, "")));
+            legacyCandidates.push(join(projectDir, basePath.replace(/^components\//, "")));
         }
-        candidates.push(...buildCandidatePaths(projectDir, stemWithoutComponents, SOURCE_EXTENSIONS));
+        legacyCandidates.push(...buildCandidatePaths(projectDir, stemWithoutComponents, SOURCE_EXTENSIONS));
+        candidates.push(...legacyCandidates);
     }
     const result = await findFirstExisting(candidates, (p) => adapter.fs.stat(p));
+    if (result && legacyCandidates.includes(result))
+        options.onLegacyComponentsFallback?.();
     logger.debug(result ? "[FileResolver] Found file:" : "[FileResolver] File not found:", result ?? basePath);
     return result;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/html.ts"],"names":[],"mappings":"AA8CA,OAAO,KAAK,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAElF,YAAY,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAuLlF,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAsB;gBAExB,MAAM,EAAE,mBAAmB;IAIjC,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBjE,kBAAkB,CACtB,WAAW,EAAE,cAAc,EAC3B,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,cAAc,CAAC;YAiEZ,sBAAsB;YA6EtB,4BAA4B;YAiB5B,wBAAwB;YAmBxB,gBAAgB;YAyBhB,kBAAkB;IAgHhC,OAAO,CAAC,cAAc;IAQtB;;;;;;OAMG;IACG,qBAAqB,CACzB,OAAO,EAAE,qBAAqB,EAC9B,KAAK,EAAE,KAAK,GACX,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IA2B/C,yBAAyB,CAC7B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;YA4DzC,eAAe;YAkBf,gBAAgB;IAkH9B;;;;OAIG;YACW,gBAAgB;CAc/B"}
+{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/html.ts"],"names":[],"mappings":"AAmDA,OAAO,KAAK,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAElF,YAAY,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAwLlF,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAsB;gBAExB,MAAM,EAAE,mBAAmB;IAIjC,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBjE,kBAAkB,CACtB,WAAW,EAAE,cAAc,EAC3B,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,cAAc,CAAC;YAiEZ,sBAAsB;YAiFtB,4BAA4B;YAiB5B,wBAAwB;YAmBxB,gBAAgB;YAyBhB,kBAAkB;IAgHhC,OAAO,CAAC,cAAc;IAQtB;;;;;;OAMG;IACG,qBAAqB,CACzB,OAAO,EAAE,qBAAqB,EAC9B,KAAK,EAAE,KAAK,GACX,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IA2B/C,yBAAyB,CAC7B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;YA6DzC,eAAe;YAkBf,gBAAgB;IAmI9B;;;;OAIG;YACW,gBAAgB;CAc/B"}