veryfront 0.1.1149 → 0.1.1151

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "veryfront",
-    "version": "0.1.1149",
+    "version": "0.1.1151",
     "license": "Apache-2.0",
     "nodeModulesDir": "auto",
     "minimumDependencyAge": {

package/esm/src/cache/config-hash.d.ts

@@ -12,6 +12,12 @@ interface TransformConfig {
     reactVersion?: string;
     /** JSX import source */
     jsxImportSource?: string;
+    /** Module server URL for rewritten browser imports */
+    moduleServerUrl?: string;
+    /** Vendor bundle hash for rewritten vendor imports */
+    vendorBundleHash?: string;
+    /** API base URL for rewritten cross-project imports */
+    apiBaseUrl?: string;
     /** Enable Studio Navigator embed */
     studioEmbed?: boolean;
     /** Development mode */

package/esm/src/cache/config-hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-hash.d.ts","sourceRoot":"","sources":["../../../src/src/cache/config-hash.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH;;GAEG;AACH,UAAU,eAAe;IACvB,oCAAoC;IACpC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wBAAwB;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oCAAoC;IACpC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB;IACvB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAY1E;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,CAUrE"}
+{"version":3,"file":"config-hash.d.ts","sourceRoot":"","sources":["../../../src/src/cache/config-hash.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH;;GAEG;AACH,UAAU,eAAe;IACvB,oCAAoC;IACpC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wBAAwB;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sDAAsD;IACtD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sDAAsD;IACtD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oCAAoC;IACpC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB;IACvB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAe1E;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,CAarE"}

package/esm/src/cache/config-hash.js

@@ -17,6 +17,9 @@ export function computeConfigHash(config) {
         transformVersion: VERSION,
         reactVersion: config.reactVersion ?? DEFAULT_REACT_VERSION,
         jsxImportSource: config.jsxImportSource ?? "react",
+        moduleServerUrl: config.moduleServerUrl ?? null,
+        vendorBundleHash: config.vendorBundleHash ?? null,
+        apiBaseUrl: config.apiBaseUrl ?? null,
         studioEmbed: config.studioEmbed ?? false,
         dev: config.dev ?? false,
         csstype: CSSTYPE_VERSION,
@@ -34,8 +37,16 @@ export function computeConfigHashSync(config) {
         `v${VERSION}`,
         config.reactVersion ?? DEFAULT_REACT_VERSION,
         config.jsxImportSource ?? "react",
+        encodeConfigPart("modules", config.moduleServerUrl),
+        encodeConfigPart("vendor", config.vendorBundleHash),
+        encodeConfigPart("api", config.apiBaseUrl),
         config.studioEmbed ? "studio" : "",
         config.dev ? "dev" : "",
     ].filter(Boolean);
     return parts.join(":");
 }
+function encodeConfigPart(label, value) {
+    if (!value)
+        return "";
+    return `${label}:${value.length}:${value}`;
+}

package/esm/src/modules/react-loader/ssr-module-loader/cross-project-import-loader.d.ts

@@ -20,6 +20,13 @@ interface TransformCrossProjectImportFlowOptions {
     loggerImpl?: Pick<typeof logger, "debug" | "error">;
     fetchTimeoutMs?: number;
 }
+interface CrossProjectImportCacheKeyOptions {
+    specifier: string;
+    projectId: string;
+    reactVersion?: string;
+    registryBaseUrl: string;
+}
+export declare function buildCrossProjectImportCacheKey(options: CrossProjectImportCacheKeyOptions): string;
 export declare function transformCrossProjectImportFlow(flowOptions: TransformCrossProjectImportFlowOptions): Promise<string>;
 export {};
 //# sourceMappingURL=cross-project-import-loader.d.ts.map

package/esm/src/modules/react-loader/ssr-module-loader/cross-project-import-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cross-project-import-loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/cross-project-import-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAInF,OAAO,EAAE,cAAc,IAAI,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAGzD,UAAU,uBAAuB;IAC/B,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACrE,KAAK,IAAI,UAAU,CAAC;CACrB;AAED,UAAU,sCAAsC;IAC9C,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,IAAI,CACX,sBAAsB,EACtB,WAAW,GAAG,YAAY,GAAG,KAAK,GAAG,YAAY,GAAG,cAAc,GAAG,SAAS,CAC/E,CAAC;IACF,KAAK,EAAE,uBAAuB,CAAC;IAC/B,qBAAqB,EAAE,CAAC,CAAC,EACvB,iBAAiB,EAAE,MAAM,EACzB,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KACxB,OAAO,CAAC,CAAC,CAAC,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,cAAc,CAAC;IAC3C,iBAAiB,CAAC,EAAE,OAAO,aAAa,CAAC;IACzC,UAAU,CAAC,EAAE,IAAI,CAAC,OAAO,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IACpD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAOD,wBAAsB,+BAA+B,CACnD,WAAW,EAAE,sCAAsC,GAClD,OAAO,CAAC,MAAM,CAAC,CA0GjB"}
+{"version":3,"file":"cross-project-import-loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/cross-project-import-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAInF,OAAO,EAAE,cAAc,IAAI,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAIzD,UAAU,uBAAuB;IAC/B,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACrE,KAAK,IAAI,UAAU,CAAC;CACrB;AAED,UAAU,sCAAsC;IAC9C,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,IAAI,CACX,sBAAsB,EACtB,WAAW,GAAG,YAAY,GAAG,KAAK,GAAG,YAAY,GAAG,cAAc,GAAG,SAAS,CAC/E,CAAC;IACF,KAAK,EAAE,uBAAuB,CAAC;IAC/B,qBAAqB,EAAE,CAAC,CAAC,EACvB,iBAAiB,EAAE,MAAM,EACzB,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KACxB,OAAO,CAAC,CAAC,CAAC,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,cAAc,CAAC;IAC3C,iBAAiB,CAAC,EAAE,OAAO,aAAa,CAAC;IACzC,UAAU,CAAC,EAAE,IAAI,CAAC,OAAO,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IACpD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAOD,UAAU,iCAAiC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,iCAAiC,GACzC,MAAM,CAIR;AAED,wBAAsB,+BAA+B,CACnD,WAAW,EAAE,sCAAsC,GAClD,OAAO,CAAC,MAAM,CAAC,CA8GjB"}

package/esm/src/modules/react-loader/ssr-module-loader/cross-project-import-loader.js

@@ -7,19 +7,29 @@ import { writeCacheFile } from "../../../utils/cache-file-ops.js";
 import { rendererLogger as logger } from "../../../utils/index.js";
 import { globalCrossProjectCache } from "./cache/index.js";
 import { readLimitedCrossProjectSource } from "../../server/cross-project-source-limit.js";
+import { base64urlEncode } from "../../../utils/base64url.js";
 function getRegistryBaseUrl(apiBaseUrl) {
     const resolvedApiBaseUrl = apiBaseUrl || getApiBaseUrlEnv();
     return resolvedApiBaseUrl.replace(/\/api\/?$/, "");
 }
+export function buildCrossProjectImportCacheKey(options) {
+    const reactVersion = options.reactVersion ?? "default";
+    const registryKey = base64urlEncode(options.registryBaseUrl);
+    return `${options.specifier}:${options.projectId}:${reactVersion}:registry:${registryKey}`;
+}
 export async function transformCrossProjectImportFlow(flowOptions) {
     const { crossProjectImport, options, cache, withTransformCapacity, fetchImpl = fetch, transformToESMImpl = transformToESM, injectContextImpl = injectContext, loggerImpl = logger, fetchTimeoutMs = HTTP_FETCH_TIMEOUT_MS, } = flowOptions;
     const { specifier, projectSlug, version, path } = crossProjectImport;
-    const reactVersion = options.reactVersion ?? "default";
-    const cacheKey = `${specifier}:${options.projectId}:${reactVersion}`;
+    const registryBaseUrl = getRegistryBaseUrl(options.apiBaseUrl);
+    const cacheKey = buildCrossProjectImportCacheKey({
+        specifier,
+        projectId: options.projectId,
+        reactVersion: options.reactVersion,
+        registryBaseUrl,
+    });
     const cachedEntry = globalCrossProjectCache.get(cacheKey);
     if (cachedEntry)
         return cachedEntry.tempPath;
-    const registryBaseUrl = getRegistryBaseUrl(options.apiBaseUrl);
     const projectRef = `${projectSlug}@${version}`;
     const registryUrl = `${registryBaseUrl}/${projectRef}/@/${path}`;
     loggerImpl.debug("[SSR-MODULE-LOADER] Fetching cross-project import", {

package/esm/src/modules/react-loader/ssr-module-loader/ssr-cache-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-cache-manager.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/ssr-cache-manager.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAalE,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAQ3E;;;;;;;GAOG;AACH,qBAAa,eAAe;IAId,OAAO,CAAC,OAAO;IAH3B,OAAO,CAAC,EAAE,CAAsB;IAChC,OAAO,CAAC,gBAAgB,CAAqB;gBAEzB,OAAO,EAAE,sBAAsB;IAEnD,4DAA4D;IAC5D,aAAa,IAAI,MAAM;IAUvB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAkB/B,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBlD,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAW1E,yBAAyB,IAAI,OAAO;IAoB9B,kBAAkB,CACtB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GAAG,aAAa,EACtC,OAAO,EAAE;QAAE,eAAe,EAAE,OAAO,CAAC;QAAC,qBAAqB,EAAE,OAAO,CAAA;KAAE,GACpE,OAAO,CAAC,OAAO,CAAC;IAgCb,wBAAwB,CAC5B,WAAW,EAAE,gBAAgB,EAC7B,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;IAuBnB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,gBAAgB,GAAG,IAAI;IAQnF,oCAAoC,CAClC,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,EACxB,UAAU,CAAC,EAAE,gBAAgB,GAC5B,IAAI;IAQP,OAAO,CAAC,8BAA8B;IAgBtC,wDAAwD;IACxD,KAAK,IAAI,UAAU,CAAC,OAAO,gBAAgB,CAAC;YAI9B,4BAA4B;YAW5B,qBAAqB;YAsBrB,oBAAoB;YAuDpB,YAAY;CA2B3B"}
+{"version":3,"file":"ssr-cache-manager.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/ssr-cache-manager.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAalE,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAQ3E;;;;;;;GAOG;AACH,qBAAa,eAAe;IAId,OAAO,CAAC,OAAO;IAH3B,OAAO,CAAC,EAAE,CAAsB;IAChC,OAAO,CAAC,gBAAgB,CAAqB;gBAEzB,OAAO,EAAE,sBAAsB;IAEnD,4DAA4D;IAC5D,aAAa,IAAI,MAAM;IAWvB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAkB/B,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBlD,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAW1E,yBAAyB,IAAI,OAAO;IAoB9B,kBAAkB,CACtB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GAAG,aAAa,EACtC,OAAO,EAAE;QAAE,eAAe,EAAE,OAAO,CAAC;QAAC,qBAAqB,EAAE,OAAO,CAAA;KAAE,GACpE,OAAO,CAAC,OAAO,CAAC;IAgCb,wBAAwB,CAC5B,WAAW,EAAE,gBAAgB,EAC7B,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;IAuBnB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,gBAAgB,GAAG,IAAI;IAQnF,oCAAoC,CAClC,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,EACxB,UAAU,CAAC,EAAE,gBAAgB,GAC5B,IAAI;IAQP,OAAO,CAAC,8BAA8B;IAgBtC,wDAAwD;IACxD,KAAK,IAAI,UAAU,CAAC,OAAO,gBAAgB,CAAC;YAI9B,4BAA4B;YAW5B,qBAAqB;YAsBrB,oBAAoB;YAuDpB,YAAY;CA2B3B"}

package/esm/src/modules/react-loader/ssr-module-loader/ssr-cache-manager.js

@@ -45,6 +45,7 @@ export class SSRCacheManager {
             this.cachedConfigHash = computeConfigHashSync({
                 reactVersion: this.options.reactVersion,
                 dev: this.options.dev,
+                apiBaseUrl: this.options.apiBaseUrl,
             });
         }
         return this.cachedConfigHash;

package/esm/src/rendering/component-handling.d.ts

@@ -8,6 +8,15 @@ interface ComponentPageResult {
     pageElement: BundledReact.ReactElement;
     pageBundle: PageBundle;
 }
+interface BundleComponentForClientDeps {
+    transformToESM: (source: string, filePath: string, projectDir: string, adapter: RuntimeAdapter, options: {
+        projectId: string;
+        dev: boolean;
+        jsxImportSource: string;
+        moduleServerUrl?: string;
+        reactVersion?: string;
+    }) => Promise<string>;
+}
 /**
  * Load and render a TSX/JSX component page
  */
@@ -26,5 +35,6 @@ export declare function handleComponentPage(pageInfo: EntityInfo, slug: string,
     /** React version for transforms (from project config) */
     reactVersion?: string;
 }): Promise<ComponentPageResult>;
+export declare function bundleComponentForClient(source: string, filePath: string, projectDir: string, adapter: RuntimeAdapter, moduleServerUrl?: string, projectId?: string, reactVersion?: string, injectedDeps?: BundleComponentForClientDeps): Promise<string>;
 export {};
 //# sourceMappingURL=component-handling.d.ts.map

package/esm/src/rendering/component-handling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-handling.d.ts","sourceRoot":"","sources":["../../../src/src/rendering/component-handling.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,KAAK,YAAY,MAAM,OAAO,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAMhE,UAAU,mBAAmB;IAC3B,WAAW,EAAE,YAAY,CAAC,YAAY,CAAC;IACvC,UAAU,EAAE,UAAU,CAAC;CACxB;AAgBD;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,UAAU,EACpB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,kBAAkB,EAAE,OAAO,EAC3B,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE;IACR,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0DAA0D;IAC1D,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,kEAAkE;IAClE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,wEAAwE;IACxE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GACA,OAAO,CAAC,mBAAmB,CAAC,CAwE9B"}
+{"version":3,"file":"component-handling.d.ts","sourceRoot":"","sources":["../../../src/src/rendering/component-handling.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,KAAK,YAAY,MAAM,OAAO,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAQhE,UAAU,mBAAmB;IAC3B,WAAW,EAAE,YAAY,CAAC,YAAY,CAAC;IACvC,UAAU,EAAE,UAAU,CAAC;CACxB;AAeD,UAAU,4BAA4B;IACpC,cAAc,EAAE,CACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE;QACP,SAAS,EAAE,MAAM,CAAC;QAClB,GAAG,EAAE,OAAO,CAAC;QACb,eAAe,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,KACE,OAAO,CAAC,MAAM,CAAC,CAAC;CACtB;AAyBD;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,UAAU,EACpB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,kBAAkB,EAAE,OAAO,EAC3B,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE;IACR,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0DAA0D;IAC1D,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,kEAAkE;IAClE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,wEAAwE;IACxE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GACA,OAAO,CAAC,mBAAmB,CAAC,CAwE9B;AAED,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,eAAe,CAAC,EAAE,MAAM,EACxB,SAAS,CAAC,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,4BAA4B,GAC1C,OAAO,CAAC,MAAM,CAAC,CAqDjB"}

package/esm/src/rendering/component-handling.js

@@ -7,18 +7,36 @@ import { getProjectReact } from "../react/index.js";
 import { buildComponentCacheKey } from "../cache/keys.js";
 import { LRUCache } from "../utils/lru-wrapper.js";
 import { registerLRUCache } from "../cache/index.js";
+import { Singleflight } from "../utils/singleflight.js";
+import { DEFAULT_REACT_VERSION } from "../transforms/import-rewriter/url-builder.js";
 /**
  * Cache for transformed component hydration bundles.
- * Keys are content-addressed: `component:${projectId}:${filePath}:${sha256(source)}`.
- * Safe for multi-tenant use (project-scoped + content-hashed).
+ * Keys are content-addressed and scoped to transform-affecting inputs.
+ * Safe for multi-tenant use (project-scoped + content/transform-hashed).
  * Evicted when exceeding MAX_COMPONENT_CACHE_SIZE to prevent unbounded memory growth.
  */
 const MAX_COMPONENT_CACHE_SIZE = 5_000;
 const componentHydrationCache = new LRUCache({
     maxEntries: MAX_COMPONENT_CACHE_SIZE,
 });
+const componentHydrationFlights = new Singleflight();
+const COMPONENT_HYDRATION_FLIGHT_STALE_EVICTION_MS = 5 * 60_000;
+async function getBundleComponentForClientDeps() {
+    const { transformToESM } = await import("../transforms/esm-transform.js");
+    return { transformToESM };
+}
 // Register cache for monitoring
 registerLRUCache("component-hydration-cache", componentHydrationCache);
+async function buildComponentHydrationCacheHash(source, moduleServerUrl, reactVersion) {
+    const sourceHash = await computeHash(source);
+    const effectiveReactVersion = reactVersion ?? DEFAULT_REACT_VERSION;
+    const cacheIdentity = JSON.stringify([
+        sourceHash,
+        moduleServerUrl ?? null,
+        effectiveReactVersion,
+    ]);
+    return (await computeHash(cacheIdentity)).slice(0, 16);
+}
 /**
  * Load and render a TSX/JSX component page
  */
@@ -70,22 +88,35 @@ export async function handleComponentPage(pageInfo, slug, projectDir, _component
         });
     }
 }
-async function bundleComponentForClient(source, filePath, projectDir, adapter, moduleServerUrl, projectId, reactVersion) {
+export async function bundleComponentForClient(source, filePath, projectDir, adapter, moduleServerUrl, projectId, reactVersion, injectedDeps) {
     try {
-        const contentHash = (await computeHash(source)).slice(0, 16);
-        const cacheKey = buildComponentCacheKey(projectId ?? projectDir, filePath, contentHash);
+        const cacheHash = await buildComponentHydrationCacheHash(source, moduleServerUrl, reactVersion);
+        const cacheKey = buildComponentCacheKey(projectId ?? projectDir, filePath, cacheHash);
         const cached = componentHydrationCache.get(cacheKey);
         if (cached)
             return cached;
-        const { transformToESM } = await import("../transforms/esm-transform.js");
-        const transformed = await transformToESM(source, filePath, projectDir, adapter, {
-            projectId: projectId ?? projectDir,
-            dev: true,
-            jsxImportSource: "react",
-            moduleServerUrl,
-            reactVersion,
+        const transformed = await componentHydrationFlights.do(cacheKey, async (control) => {
+            const cachedDuringFlight = componentHydrationCache.get(cacheKey);
+            if (cachedDuringFlight)
+                return cachedDuringFlight;
+            const { transformToESM } = injectedDeps ?? await getBundleComponentForClientDeps();
+            const transformed = await transformToESM(source, filePath, projectDir, adapter, {
+                projectId: projectId ?? projectDir,
+                dev: true,
+                jsxImportSource: "react",
+                moduleServerUrl,
+                reactVersion,
+            });
+            if (control.isCurrent()) {
+                componentHydrationCache.set(cacheKey, transformed);
+            }
+            return transformed;
+        }, {
+            staleAfterMs: COMPONENT_HYDRATION_FLIGHT_STALE_EVICTION_MS,
+            onStaleEvicted: () => {
+                logger.warn("Evicted stale component hydration transform flight", { filePath });
+            },
         });
-        componentHydrationCache.set(cacheKey, transformed);
         return transformed;
     }
     catch (error) {

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

@@ -7,7 +7,7 @@ import { resolve as resolveContract } from "../../extensions/contracts.js";
 import { applyLayoutsESM, applyLayoutsFunctionBody } from "./utils/applicator.js";
 import { resolveAppComponentPath } from "./utils/app-resolver.js";
 import { collectAncestorDirs, createErrorBoundary, tryLoadReservedInDirs, } from "../app-reserved.js";
-import { detectAppRouter } from "../router-detection.js";
+import { resolveRouterModeForPage } from "../router-detection.js";
 import { getProjectReact } from "../../react/index.js";
 import { extract } from "../../platform/compat/std/front-matter-yaml.js";
 import { createFileSystem } from "../../platform/compat/fs.js";
@@ -15,6 +15,7 @@ import { resolveFrameworkSourcePath } from "../../platform/compat/framework-sour
 import { loadModuleFromSource } from "../../modules/react-loader/index.js";
 import { resolveProjectReactVersion } from "../../transforms/esm/package-registry.js";
 import { CLIENT_PAGE_ISLAND_ID } from "../rsc/page-island.js";
+import { isDotPath } from "../orchestrator/path-helpers.js";
 const logger = rendererLogger.component("layout-applicator");
 export class LayoutApplicator {
     projectDir;
@@ -75,17 +76,17 @@ export class LayoutApplicator {
             else {
                 wrappedElement = await this.applyLayoutsOnly(pageElement, layoutBundle, nestedLayouts, layoutDataMap, reactVersion);
             }
-            const useAppRouter = await detectAppRouter(this.projectDir, this.config, this.adapter, {
-                projectId: this.projectId,
-            });
             const pageFilePath = pageInfo.entity.path;
-            const isDotPath = pageFilePath
-                .split("/")
-                .some((s) => s.startsWith(".") && s !== "." && s !== "..");
-            if (useAppRouter) {
+            const routerMode = resolveRouterModeForPage(this.projectDir, pageFilePath, this.config);
+            const dotPath = isDotPath({
+                slug: pageInfo.entity.slug ?? "",
+                filePath: pageFilePath,
+                projectDir: this.projectDir,
+            });
+            if (routerMode === "app") {
                 wrappedElement = await this.wrapWithReservedComponents(wrappedElement, pageFilePath);
             }
-            else if (isDotPath) {
+            else if (dotPath) {
                 logger.debug("Skipping wrapWithAppComponent - dot-prefixed path");
             }
             else {

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;AAyBD;;;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;YAWpB,qBAAqB;IAmCnC;;;;;;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;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"}

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

@@ -1,8 +1,8 @@
-import { join } from "../../platform/compat/path/index.js";
+import { isAbsolute, join, normalize } from "../../platform/compat/path/index.js";
 import { rendererLogger } from "../../utils/index.js";
 import { getLayoutEntity } from "../../types/entities/getEntityInfo.js";
 import { discoverNestedLayouts } from "./utils/discovery.js";
-import { detectAppRouter } from "../router-detection.js";
+import { resolveRouterModeForPage } from "../router-detection.js";
 import { LAYOUT_EXTENSIONS } from "./types.js";
 import { SpanNames } from "../../observability/index.js";
 import { withSpan } from "../../observability/tracing/otlp-setup.js";
@@ -14,6 +14,9 @@ export function resolveLayoutRouterRootDir(projectDir, useAppRouter, config) {
         : config.directories?.pages ?? "pages";
     return join(projectDir, directory);
 }
+function resolvePagePath(pageFilePath, projectDir) {
+    return normalize(isAbsolute(pageFilePath) ? pageFilePath : join(projectDir, pageFilePath));
+}
 function getLayoutKind(path) {
     return path.endsWith(".mdx") || path.endsWith(".md") ? "mdx" : "tsx";
 }
@@ -187,19 +190,14 @@ export class LayoutCollector {
         return null;
     }
     async collectNestedLayouts(pageInfo) {
-        const pageFilePath = pageInfo.entity.path;
-        const useAppRouter = await detectAppRouter(this.projectDir, this.config, this.adapter, {
-            projectId: this.projectId,
-        });
-        // Unified path for ALL adapters - discoverNestedLayouts uses adapter.fs.stat()
-        // which works for both filesystem and API adapters
-        return this.collectLayoutsUnified(pageFilePath, useAppRouter);
+        const pageFilePath = resolvePagePath(pageInfo.entity.path, this.projectDir);
+        const routerMode = resolveRouterModeForPage(this.projectDir, pageInfo.entity.path, this.config);
+        const rootDir = resolveLayoutRouterRootDir(this.projectDir, routerMode === "app", this.config);
+        return this.collectLayoutsUnified(pageFilePath, rootDir);
     }
-    async collectLayoutsUnified(pageFilePath, useAppRouter) {
-        const rootDir = resolveLayoutRouterRootDir(this.projectDir, useAppRouter, this.config);
+    async collectLayoutsUnified(pageFilePath, rootDir) {
         logger.debug("collectLayoutsUnified", {
             pageFilePath,
-            useAppRouter,
             rootDir,
             projectDir: this.projectDir,
         });

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

@@ -2,6 +2,7 @@ import * as BundledReact from "react";
 import type { RuntimeAdapter } from "../../../platform/adapters/base.js";
 import type { LayoutItem, MdxBundle, MDXComponents } from "../../../types/index.js";
 import type { ImportMapConfig } from "../../../modules/import-map/types.js";
+import { loadComponentFromSource } from "../../../modules/react-loader/component-loader.js";
 type AppRouterDocumentLayoutFunction = (props: {
     children?: BundledReact.ReactNode;
 }) => BundledReact.ReactNode;
@@ -12,12 +13,15 @@ export interface LayoutComponentCache {
     clear(): void;
     clearForProject?(projectId: string): void;
 }
+interface LoadTSXComponentDeps {
+    loadComponentFromSource: typeof loadComponentFromSource;
+}
 export declare function createLayoutComponentCache(maxEntries?: number, perProjectMaxEntries?: number): LayoutComponentCache;
 export declare function shouldUnwrapAppRouterDocumentLayout(componentPath: string | undefined, projectDir: string, appDirectory?: string): boolean;
 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): 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): 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): Promise<BundledReact.ComponentType<{
     components?: MDXComponents;

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

@@ -10,10 +10,21 @@ import { getProjectReact } from "../../../react/index.js";
 import { ensureValidChild } from "./ensure-valid-child.js";
 import { buildLayoutComponentCacheKey, CacheKeyPrefix } from "../../../cache/keys.js";
 import { LAYOUT_EXTENSIONS } from "../types.js";
+import { Singleflight } from "../../../utils/singleflight.js";
 const loadMdxLayoutLog = logger.component("load-mdx-layout");
 const applyTsxLayoutLog = logger.component("apply-tsx-layout");
 const applyMdxLayoutLog = logger.component("apply-mdx-layout");
 const APP_ROUTER_SCRIPT_LAYOUT_EXTENSIONS = LAYOUT_EXTENSIONS.filter((extension) => extension !== "md" && extension !== "mdx");
+const TSX_COMPONENT_FLIGHT_STALE_EVICTION_MS = 5 * 60_000;
+const tsxComponentFlights = new WeakMap();
+function getTSXComponentFlights(cache) {
+    let flights = tsxComponentFlights.get(cache);
+    if (!flights) {
+        flights = new Singleflight();
+        tsxComponentFlights.set(cache, flights);
+    }
+    return flights;
+}
 class InMemoryLayoutComponentCache {
     maxEntries;
     entries = new Map();
@@ -159,7 +170,7 @@ export function unwrapAppRouterDocumentLayout(React, LayoutComponent) {
         return body?.props?.children ?? props.children ?? null;
     };
 }
-export async function loadTSXComponent(componentPath, projectDir, cache, adapter, projectId, projectSlug, contentSourceId, reactVersion) {
+export async function loadTSXComponent(componentPath, projectDir, cache, adapter, projectId, projectSlug, contentSourceId, reactVersion, deps = { loadComponentFromSource }) {
     const source = await adapter.fs.readFile(componentPath);
     const hash = await computeHash(source);
     const cacheKey = buildLayoutComponentCacheKey(projectId, componentPath, hash, contentSourceId) +
@@ -167,21 +178,36 @@ export async function loadTSXComponent(componentPath, projectDir, cache, adapter
     const cached = cache.get(cacheKey);
     if (cached)
         return cached;
-    const loaded = await loadComponentFromSource(source, componentPath, projectDir, adapter, {
-        dev: true,
-        projectId,
-        projectSlug,
-        ssr: true,
-        contentSourceId,
-        reactVersion,
+    const loaded = await getTSXComponentFlights(cache).do(cacheKey, async (control) => {
+        const cachedDuringFlight = cache.get(cacheKey);
+        if (cachedDuringFlight)
+            return cachedDuringFlight;
+        const loaded = await deps.loadComponentFromSource(source, componentPath, projectDir, adapter, {
+            dev: true,
+            projectId,
+            projectSlug,
+            ssr: true,
+            contentSourceId,
+            reactVersion,
+        });
+        if (!loaded) {
+            throw toError(createError({
+                type: "render",
+                message: "Component loading failed",
+            }));
+        }
+        if (control.isCurrent()) {
+            cache.set(cacheKey, loaded);
+        }
+        return loaded;
+    }, {
+        staleAfterMs: TSX_COMPONENT_FLIGHT_STALE_EVICTION_MS,
+        onStaleEvicted: () => {
+            applyTsxLayoutLog.warn("Evicted stale TSX layout component load flight", {
+                componentPath,
+            });
+        },
     });
-    if (!loaded) {
-        throw toError(createError({
-            type: "render",
-            message: "Component loading failed",
-        }));
-    }
-    cache.set(cacheKey, loaded);
     return loaded;
 }
 /** Load an MDX layout module from a bundle. */

package/esm/src/rendering/orchestrator/path-helpers.d.ts

@@ -8,8 +8,19 @@
 import type { LayoutItem } from "../../types/index.js";
 /** Check if a path segment is a hidden dot-directory (not . or ..) */
 export declare function isHiddenSegment(segment: string): boolean;
-/** Check if a path contains dot-prefixed segments (e.g., .veryfront, .hidden) */
-export declare function isDotPath(slug: string, filePath?: string): boolean;
+/** Inputs used to determine whether a resolved route is hidden. */
+export interface DotPathOptions {
+    slug: string;
+    filePath?: string;
+    projectDir: string;
+}
+/**
+ * Check whether a route contains a dot-prefixed segment.
+ *
+ * Absolute filesystem ancestors are outside the route namespace and must not
+ * make a project hidden (for example, a project checked out under `.worktrees`).
+ */
+export declare function isDotPath({ slug, filePath, projectDir }: DotPathOptions): boolean;
 /** Empty layout result for dot-prefixed paths */
 export declare const EMPTY_LAYOUT_RESULT: {
     layoutBundle: undefined;

package/esm/src/rendering/orchestrator/path-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"path-helpers.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/path-helpers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,sEAAsE;AACtE,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAExD;AAED,iFAAiF;AACjF,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAGlE;AAED,iDAAiD;AACjD,eAAO,MAAM,mBAAmB,EAAE;IAChC,YAAY,EAAE,SAAS,CAAC;IACxB,aAAa,EAAE,UAAU,EAAE,CAAC;CACoB,CAAC"}
+{"version":3,"file":"path-helpers.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/path-helpers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGvD,sEAAsE;AACtE,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAExD;AAED,mEAAmE;AACnE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAcD;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,cAAc,GAAG,OAAO,CAMjF;AAED,iDAAiD;AACjD,eAAO,MAAM,mBAAmB,EAAE;IAChC,YAAY,EAAE,SAAS,CAAC;IACxB,aAAa,EAAE,UAAU,EAAE,CAAC;CACoB,CAAC"}

package/esm/src/rendering/orchestrator/path-helpers.js

@@ -5,14 +5,31 @@
  *
  * @module rendering/orchestrator/path-helpers
  */
+import { isAbsolute, relative } from "../../platform/compat/path/index.js";
 /** Check if a path segment is a hidden dot-directory (not . or ..) */
 export function isHiddenSegment(segment) {
     return segment.startsWith(".") && segment !== "." && segment !== "..";
 }
-/** Check if a path contains dot-prefixed segments (e.g., .veryfront, .hidden) */
-export function isDotPath(slug, filePath) {
-    const hasDotSegment = (path) => path.split("/").some(isHiddenSegment);
-    return hasDotSegment(slug) || (filePath ? hasDotSegment(filePath) : false);
+function getProjectPath(filePath, projectDir) {
+    if (!filePath || !isAbsolute(filePath))
+        return filePath;
+    const projectPath = relative(projectDir, filePath);
+    const normalizedProjectPath = projectPath.replaceAll("\\", "/");
+    const isOutsideProject = normalizedProjectPath === ".." ||
+        normalizedProjectPath.startsWith("../") ||
+        isAbsolute(projectPath);
+    return isOutsideProject ? undefined : projectPath;
+}
+/**
+ * Check whether a route contains a dot-prefixed segment.
+ *
+ * Absolute filesystem ancestors are outside the route namespace and must not
+ * make a project hidden (for example, a project checked out under `.worktrees`).
+ */
+export function isDotPath({ slug, filePath, projectDir }) {
+    const hasDotSegment = (path) => path.replaceAll("\\", "/").split("/").some(isHiddenSegment);
+    const projectPath = getProjectPath(filePath, projectDir);
+    return hasDotSegment(slug) || (projectPath ? hasDotSegment(projectPath) : false);
 }
 /** Empty layout result for dot-prefixed paths */
 export const EMPTY_LAYOUT_RESULT = { layoutBundle: undefined, nestedLayouts: [] };

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":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,iCAAiC,CAAC;AASzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA6DhF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE1D;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxE,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrF;AAED,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAC;IACjC,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,yEAAyE;IACzE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2EAA2E;IAC3E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,wEAAwE;IACxE,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,6CAA6C;IAC7C,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,OAAO,qBAAqB,EAAE,sBAAsB,CAAC;CAC1E;AAqCD,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,mBAAmB,CAAgC;gBAE/C,MAAM,EAAE,oBAAoB;IAcxC,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,oBAAoB;IA0B5B;;;;OAIG;YACW,yBAAyB;IAWvC;;;OAGG;IACH,gBAAgB,IAAI,IAAI;IAKxB,OAAO,CAAC,UAAU;YAOJ,0BAA0B;IAaxC;;;;;;;;;OASG;YACW,qBAAqB;IAiFnC;;;OAGG;YACW,mBAAmB;IAqHjC,OAAO,CAAC,uBAAuB;IAkCzB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAuU9E,+EAA+E;IACzE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAwIzE,kBAAkB;YA2ClB,cAAc;IAW5B,OAAO,CAAC,uBAAuB;YAYjB,kBAAkB;IA6FhC,OAAO,CAAC,kBAAkB;YAQZ,uBAAuB;IAmBrC;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;CAStB"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,iCAAiC,CAAC;AASzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA6DhF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE1D;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxE,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrF;AAED,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAC;IACjC,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,yEAAyE;IACzE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2EAA2E;IAC3E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,wEAAwE;IACxE,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,6CAA6C;IAC7C,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,OAAO,qBAAqB,EAAE,sBAAsB,CAAC;CAC1E;AAqCD,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,mBAAmB,CAAgC;gBAE/C,MAAM,EAAE,oBAAoB;IAcxC,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,oBAAoB;IA0B5B;;;;OAIG;YACW,yBAAyB;IAWvC;;;OAGG;IACH,gBAAgB,IAAI,IAAI;IAKxB,OAAO,CAAC,UAAU;YAOJ,0BAA0B;IAaxC;;;;;;;;;OASG;YACW,qBAAqB;IAiFnC;;;OAGG;YACW,mBAAmB;IAqHjC,OAAO,CAAC,uBAAuB;IAkCzB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IA2U9E,+EAA+E;IACzE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;YA4IzE,kBAAkB;YA2ClB,cAAc;IAW5B,OAAO,CAAC,uBAAuB;YAYjB,kBAAkB;IA6FhC,OAAO,CAAC,kBAAkB;YAQZ,uBAAuB;IAmBrC;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;CAStB"}

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

@@ -334,7 +334,11 @@ export class RenderPipeline {
                 timing.pageResolve = Math.round(performance.now() - pageResolveStart);
                 const sourceFile = extractRelativePathShared(pageInfo.entity.path, this.config.projectDir);
                 try {
-                    const skipLayouts = isDotPath(slug, pageInfo.entity.path);
+                    const skipLayouts = isDotPath({
+                        slug,
+                        filePath: pageInfo.entity.path,
+                        projectDir: this.config.projectDir,
+                    });
                     const layoutCollectStart = performance.now();
                     const layoutResult = skipLayouts ? EMPTY_LAYOUT_RESULT : await profilePhase("render.collect_layouts", () => withSpan("render.collect_layouts", () => this.config.layoutOrchestrator.collectLayouts(pageInfo), { "render.slug": slug }));
                     timing.layoutCollect = Math.round(performance.now() - layoutCollectStart);
@@ -514,7 +518,11 @@ export class RenderPipeline {
             clearSSRModuleCacheForProject(projectId, { preserveActiveTransforms: true });
         }
         const pageInfo = await profilePhase("page_data.resolve_page", () => this.config.pageResolver.resolvePage(slug));
-        const skipLayouts = isDotPath(slug, pageInfo.entity.path);
+        const skipLayouts = isDotPath({
+            slug,
+            filePath: pageInfo.entity.path,
+            projectDir: this.config.projectDir,
+        });
         const layoutResult = skipLayouts ? EMPTY_LAYOUT_RESULT : await profilePhase("page_data.collect_layouts", () => this.config.layoutOrchestrator.collectLayouts(pageInfo));
         const pagePath = extractRelativePathShared(pageInfo.entity.path, this.config.projectDir);
         const fileExtension = getExtensionName(pageInfo.entity.path);

package/esm/src/rendering/router-detection.d.ts

@@ -26,6 +26,18 @@ export interface DetectAppRouterOptions {
     /** Project ID for cache isolation in multi-tenant deployments */
     projectId?: string;
 }
+/**
+ * Resolve the router that owns an already-resolved page.
+ *
+ * Auto-detection decides which router to try first, but mixed projects can
+ * legitimately fall back to the other router. Per-page rendering must follow
+ * the route that actually resolved instead of the project-wide preference.
+ *
+ * Pages routes can also resolve from the project root. App routes cannot
+ * resolve outside their configured root, so an unmatched resolved path belongs
+ * to the Pages router.
+ */
+export declare function resolveRouterModeForPage(projectDir: string, pagePath: string, config: VeryfrontConfig): "app" | "pages";
 /**
  * Detect if app router should be used based on config and directory structure.
  *

package/esm/src/rendering/router-detection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router-detection.d.ts","sourceRoot":"","sources":["../../../src/src/rendering/router-detection.ts"],"names":[],"mappings":"AAAA;;;;;;;4BAO4B;AAK5B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAQ1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAY5D;;;GAGG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD;AAED;;;;;GAKG;AACH,wBAAgB,mCAAmC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAE3E;AAED,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,KAAK,GAAG,OAAO,GACpB,IAAI,CAEN;AAED,MAAM,WAAW,sBAAsB;IACrC,iEAAiE;IACjE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,OAAO,CAAC,CA6BlB"}
+{"version":3,"file":"router-detection.d.ts","sourceRoot":"","sources":["../../../src/src/rendering/router-detection.ts"],"names":[],"mappings":"AAAA;;;;;;;4BAO4B;AAK5B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAQ1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAY5D;;;GAGG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD;AAED;;;;;GAKG;AACH,wBAAgB,mCAAmC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAE3E;AAED,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,KAAK,GAAG,OAAO,GACpB,IAAI,CAEN;AAED,MAAM,WAAW,sBAAsB;IACrC,iEAAiE;IACjE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAcD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,eAAe,GACtB,KAAK,GAAG,OAAO,CA0BjB;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,OAAO,CAAC,CA6BlB"}

package/esm/src/rendering/router-detection.js

@@ -6,7 +6,7 @@
  * - Directory structure analysis
  * - Route file presence detection
  **************************/
-import { join } from "../platform/compat/path/index.js";
+import { isAbsolute, join, normalize, relative } from "../platform/compat/path/index.js";
 import { createFileSystem } from "../platform/compat/fs.js";
 import { rendererLogger } from "../utils/index.js";
 import { LRUCache } from "../utils/lru-wrapper.js";
@@ -41,6 +41,46 @@ export function clearRouterDetectionCacheForProject(projectId) {
 export function primeRouterDetectionCache(projectKey, mode) {
     routerDetectionCache.set(projectKey, mode === "app");
 }
+function isPathInside(path, directory) {
+    const relativePath = relative(directory, path).replaceAll("\\", "/");
+    return relativePath === "" ||
+        (relativePath !== ".." &&
+            !relativePath.startsWith("../") &&
+            !isAbsolute(relativePath));
+}
+function resolveProjectPath(projectDir, path) {
+    return normalize(isAbsolute(path) ? path : join(projectDir, path));
+}
+/**
+ * Resolve the router that owns an already-resolved page.
+ *
+ * Auto-detection decides which router to try first, but mixed projects can
+ * legitimately fall back to the other router. Per-page rendering must follow
+ * the route that actually resolved instead of the project-wide preference.
+ *
+ * Pages routes can also resolve from the project root. App routes cannot
+ * resolve outside their configured root, so an unmatched resolved path belongs
+ * to the Pages router.
+ */
+export function resolveRouterModeForPage(projectDir, pagePath, config) {
+    if (config.router === "app")
+        return "app";
+    if (config.router === "pages")
+        return "pages";
+    const resolvedPagePath = resolveProjectPath(projectDir, pagePath);
+    const appRoot = resolveProjectPath(projectDir, config.directories?.app ?? "app");
+    const pagesRoot = resolveProjectPath(projectDir, config.directories?.pages ?? "pages");
+    const isAppRoute = isPathInside(resolvedPagePath, appRoot);
+    const isPagesRoute = isPathInside(resolvedPagePath, pagesRoot);
+    if (isAppRoute && isPagesRoute) {
+        const appDistance = relative(appRoot, resolvedPagePath).split(/[\\/]/).filter(Boolean).length;
+        const pagesDistance = relative(pagesRoot, resolvedPagePath).split(/[\\/]/).filter(Boolean).length;
+        return pagesDistance < appDistance ? "pages" : "app";
+    }
+    if (isAppRoute)
+        return "app";
+    return "pages";
+}
 /**
  * Detect if app router should be used based on config and directory structure.
  *

package/esm/src/transforms/pipeline/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/src/transforms/pipeline/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAYH,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAEhB,eAAe,EAChB,MAAM,YAAY,CAAC;AAoHpB,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,gBAAgB,EACzB,MAAM,CAAC,EAAE,cAAc,GACtB,OAAO,CAAC,eAAe,CAAC,CA+I1B;AAqBD,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,MAAM,CAAC,CASjB;AAmCD,YAAY,EACV,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EACL,sBAAsB,EACtB,0BAA0B,EAC1B,SAAS,EACT,KAAK,EACL,KAAK,EACL,YAAY,GACb,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/src/transforms/pipeline/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAYH,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAEhB,eAAe,EAChB,MAAM,YAAY,CAAC;AAoHpB,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,gBAAgB,EACzB,MAAM,CAAC,EAAE,cAAc,GACtB,OAAO,CAAC,eAAe,CAAC,CAkJ1B;AAqBD,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,MAAM,CAAC,CASjB;AAmCD,YAAY,EACV,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EACL,sBAAsB,EACtB,0BAA0B,EAC1B,SAAS,EACT,KAAK,EACL,KAAK,EACL,YAAY,GACb,MAAM,cAAc,CAAC"}

package/esm/src/transforms/pipeline/index.js

@@ -107,6 +107,9 @@ export function runPipeline(source, filePath, projectDir, options, config) {
         const configHash = await computeConfigHash({
             reactVersion: ctx.reactVersion,
             jsxImportSource: ctx.jsxImportSource,
+            moduleServerUrl: ctx.moduleServerUrl,
+            vendorBundleHash: ctx.vendorBundleHash,
+            apiBaseUrl: ctx.apiBaseUrl,
             studioEmbed: ctx.studioEmbed,
             dev: ctx.dev,
         });

package/esm/src/utils/version-constant.d.ts

@@ -1,3 +1,3 @@
 /** Shared version value. */
-export declare const VERSION = "0.1.1149";
+export declare const VERSION = "0.1.1151";
 //# sourceMappingURL=version-constant.d.ts.map

package/esm/src/utils/version-constant.js

@@ -1,4 +1,4 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
 /** Shared version value. */
-export const VERSION = "0.1.1149";
+export const VERSION = "0.1.1151";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.1149",
+  "version": "0.1.1151",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",
@@ -332,10 +332,10 @@
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
     "ws": "8.21.0",
-    "@veryfront/ext-bundler-esbuild": "0.1.1149",
-    "@veryfront/ext-content-mdx": "0.1.1149",
-    "@veryfront/ext-css-tailwind": "0.1.1149",
-    "@veryfront/ext-parser-babel": "0.1.1149"
+    "@veryfront/ext-bundler-esbuild": "0.1.1151",
+    "@veryfront/ext-content-mdx": "0.1.1151",
+    "@veryfront/ext-css-tailwind": "0.1.1151",
+    "@veryfront/ext-parser-babel": "0.1.1151"
   },
   "devDependencies": {
     "@types/node": "20.9.0"