veryfront 0.1.95 → 0.1.97

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "veryfront",
-    "version": "0.1.95",
+    "version": "0.1.97",
     "license": "Apache-2.0",
     "nodeModulesDir": "auto",
     "exclude": [

package/esm/src/html/schemas/html.schema.d.ts

@@ -64,6 +64,7 @@ export declare const HTMLGenerationOptionsSchema: z.ZodObject<{
         id: string;
     }[] | undefined;
     frontmatter?: Record<string, unknown> | undefined;
+    isLocalProject?: boolean | undefined;
     nestedLayouts?: {
         kind: string;
         path?: string | undefined;
@@ -82,7 +83,6 @@ export declare const HTMLGenerationOptionsSchema: z.ZodObject<{
     colorSchemeFromParam?: boolean | undefined;
     colorSchemeFromHeader?: boolean | undefined;
     projectClasses?: Set<string> | undefined;
-    isLocalProject?: boolean | undefined;
     noHmr?: boolean | undefined;
 }, {
     mode: "production" | "development";
@@ -97,6 +97,7 @@ export declare const HTMLGenerationOptionsSchema: z.ZodObject<{
         id: string;
     }[] | undefined;
     frontmatter?: Record<string, unknown> | undefined;
+    isLocalProject?: boolean | undefined;
     nestedLayouts?: {
         kind: string;
         path?: string | undefined;
@@ -115,7 +116,6 @@ export declare const HTMLGenerationOptionsSchema: z.ZodObject<{
     colorSchemeFromParam?: boolean | undefined;
     colorSchemeFromHeader?: boolean | undefined;
     projectClasses?: Set<string> | undefined;
-    isLocalProject?: boolean | undefined;
     noHmr?: boolean | undefined;
 }>;
 export declare const HydrationDataSchema: z.ZodObject<{

package/esm/src/jobs/runtime-env.d.ts

@@ -0,0 +1,5 @@
+export declare const INJECTED_TASK_ENV_JSON = "VERYFRONT_TASK_ENV_JSON";
+export declare function readInjectedProjectEnv(allEnv: Record<string, string>): Record<string, string>;
+export declare function buildTaskContextEnv(allEnv: Record<string, string>, envAllowlist?: string[]): Record<string, string>;
+export declare function mergeInjectedWorkflowEnv(existingEnv: Record<string, string> | undefined, allEnv: Record<string, string>): Record<string, string> | undefined;
+//# sourceMappingURL=runtime-env.d.ts.map

package/esm/src/jobs/runtime-env.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime-env.d.ts","sourceRoot":"","sources":["../../../src/src/jobs/runtime-env.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,sBAAsB,4BAA4B,CAAC;AAyDhE,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BxB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,YAAY,CAAC,EAAE,MAAM,EAAE,GACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAsBxB;AAED,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC/C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAOpC"}

package/esm/src/jobs/runtime-env.js

@@ -0,0 +1,101 @@
+import { logger as baseLogger } from "../utils/index.js";
+const logger = baseLogger.component("job-runtime-env");
+export const INJECTED_TASK_ENV_JSON = "VERYFRONT_TASK_ENV_JSON";
+const UNSAFE_INJECTED_ENV_KEYS = new Set(["__proto__", "constructor", "prototype"]);
+const HIDDEN_TASK_CONTEXT_ENV_KEYS = new Set([
+    "VERYFRONT_API_TOKEN",
+    "VERYFRONT_API_URL",
+    "VERYFRONT_PROJECT_API_URL",
+    "VERYFRONT_API_BASE_URL",
+    "VERYFRONT_PROJECT_ID",
+    "VERYFRONT_PROJECT_SLUG",
+    "VERYFRONT_BRANCH_REF",
+    "VERYFRONT_API_USER",
+    "VERYFRONT_API_PASS",
+    "VERYFRONT_JOB_RESULT_PATH",
+    INJECTED_TASK_ENV_JSON,
+]);
+const DISALLOWED_INJECTED_ENV_KEYS = new Set([
+    "VERYFRONT_API_TOKEN",
+    "VERYFRONT_API_URL",
+    "VERYFRONT_PROJECT_API_URL",
+    "VERYFRONT_API_BASE_URL",
+    "VERYFRONT_PROJECT_ID",
+    "VERYFRONT_PROJECT_SLUG",
+    "VERYFRONT_BRANCH_REF",
+    "VERYFRONT_API_USER",
+    "VERYFRONT_API_PASS",
+    "VERYFRONT_JOB_RESULT_PATH",
+    INJECTED_TASK_ENV_JSON,
+]);
+function isHiddenTaskContextEnvKey(key) {
+    return key.startsWith("TENANT_") || HIDDEN_TASK_CONTEXT_ENV_KEYS.has(key);
+}
+function isDisallowedInjectedEnvKey(key) {
+    return key.startsWith("TENANT_") || DISALLOWED_INJECTED_ENV_KEYS.has(key);
+}
+function filterExistingProjectEnv(env) {
+    const filtered = {};
+    for (const [key, value] of Object.entries(env ?? {})) {
+        if (UNSAFE_INJECTED_ENV_KEYS.has(key) ||
+            isDisallowedInjectedEnvKey(key) ||
+            typeof value !== "string") {
+            continue;
+        }
+        filtered[key] = value;
+    }
+    return filtered;
+}
+export function readInjectedProjectEnv(allEnv) {
+    const raw = allEnv[INJECTED_TASK_ENV_JSON];
+    if (!raw) {
+        return {};
+    }
+    try {
+        const parsed = JSON.parse(raw);
+        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+            return {};
+        }
+        const injectedEnv = Object.create(null);
+        for (const [key, value] of Object.entries(parsed)) {
+            if (UNSAFE_INJECTED_ENV_KEYS.has(key) ||
+                isDisallowedInjectedEnvKey(key) ||
+                typeof value !== "string") {
+                continue;
+            }
+            injectedEnv[key] = value;
+        }
+        return injectedEnv;
+    }
+    catch {
+        logger.warn(`Ignoring invalid ${INJECTED_TASK_ENV_JSON}`);
+        return {};
+    }
+}
+export function buildTaskContextEnv(allEnv, envAllowlist) {
+    const allowlistedEnvKeys = envAllowlist ? new Set(envAllowlist) : null;
+    const env = {};
+    for (const [key, value] of Object.entries(allEnv)) {
+        if (isHiddenTaskContextEnvKey(key)) {
+            continue;
+        }
+        if (allowlistedEnvKeys && !allowlistedEnvKeys.has(key)) {
+            continue;
+        }
+        env[key] = value;
+    }
+    for (const [key, value] of Object.entries(readInjectedProjectEnv(allEnv))) {
+        if (allowlistedEnvKeys && !allowlistedEnvKeys.has(key)) {
+            continue;
+        }
+        env[key] = value;
+    }
+    return env;
+}
+export function mergeInjectedWorkflowEnv(existingEnv, allEnv) {
+    const mergedEnv = {
+        ...filterExistingProjectEnv(existingEnv),
+        ...readInjectedProjectEnv(allEnv),
+    };
+    return Object.keys(mergedEnv).length > 0 ? mergedEnv : undefined;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/loader.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAiCpC,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,YAAY,CAAC;AA0B3E;;;;;GAKG;AACH,qBAAa,eAAe;IAKd,OAAO,CAAC,OAAO;IAJ3B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,cAAc,CAA2B;IACjD,OAAO,CAAC,YAAY,CAAyB;gBAEzB,OAAO,EAAE,sBAAsB;IAWnD,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,4BAA4B;YAetB,qBAAqB;YAuCrB,0BAA0B;IA2FxC,UAAU,CACR,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;YA+C1C,2BAA2B;IAYzC,OAAO,CAAC,yBAAyB;YAiBnB,2BAA2B;CA0V1C"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/loader.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAiCpC,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,YAAY,CAAC;AA2B3E;;;;;GAKG;AACH,qBAAa,eAAe;IAKd,OAAO,CAAC,OAAO;IAJ3B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,cAAc,CAA2B;IACjD,OAAO,CAAC,YAAY,CAAyB;gBAEzB,OAAO,EAAE,sBAAsB;IAWnD,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,4BAA4B;YAetB,qBAAqB;YAuCrB,0BAA0B;IAwHxC,UAAU,CACR,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;YA+C1C,2BAA2B;IAYzC,OAAO,CAAC,yBAAyB;YAiBnB,2BAA2B;CA8V1C"}

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

@@ -32,6 +32,7 @@ import { preflightLocalImports } from "./preflight-imports.js";
 import { resolveVfModuleImports } from "./vf-module-resolver.js";
 import { registerCSSImport } from "../css-import-collector.js";
 import { injectNodePositions } from "../../../transforms/plugins/babel-node-positions.js";
+import { ensureMdxModuleDependencies } from "../../../transforms/mdx/esm-module-loader/module-fetcher/dependency-recovery.js";
 const logger = rendererLogger.component("ssr-module-loader");
 const MISSING_HTTP_BUNDLE_PATTERN = /veryfront-http-bundle\/http-([a-f0-9]+)\.mjs/;
 /**
@@ -145,6 +146,33 @@ export class SSRModuleLoader {
                 throw importError;
             }
             if (classifiedError.type === "module-not-found") {
+                if (this.options.contentSourceId) {
+                    try {
+                        const cachedCode = await this.cache.getFs().readTextFile(cacheEntry.tempPath);
+                        const recovered = await ensureMdxModuleDependencies(cachedCode, {
+                            projectId: this.options.projectId,
+                            contentSourceId: this.options.contentSourceId,
+                            log: logger,
+                        });
+                        if (recovered.missing.length === 0 && recovered.recovered.length > 0) {
+                            const retryTempPath = cacheEntry.tempPath.replace(/\.mjs$/, "") +
+                                `-recovered-${cacheEntry.contentHash}.mjs`;
+                            await this.cache.getFs().writeTextFile(retryTempPath, cachedCode);
+                            logger.info("Recovered vfmod dependencies for cached SSR module, retrying import", {
+                                file: filePath.slice(-40),
+                                recovered: recovered.recovered.slice(0, 5),
+                                retryTempPath,
+                            });
+                            return (await import(`file://${retryTempPath}?v=${cacheEntry.contentHash}&retry=1`));
+                        }
+                    }
+                    catch (recoveryError) {
+                        logger.debug("Failed to recover vfmod dependencies for cached SSR module", {
+                            file: filePath.slice(-40),
+                            error: recoveryError instanceof Error ? recoveryError.message : String(recoveryError),
+                        });
+                    }
+                }
                 logger.error("[SSR-MODULE-LOADER] Cached module has missing dependency, invalidating cache", {
                     file: filePath.slice(-40),
                     tempPath: cacheEntry.tempPath,
@@ -267,7 +295,10 @@ export class SSRModuleLoader {
             const projectKey = hashCodeHex(this.options.projectId);
             const sourceKey = this.options.contentSourceId;
             const mdxCacheDir = join(baseCacheDir, projectKey, sourceKey);
-            const mdxCacheResult = await lookupMdxEsmCache(filePath, mdxCacheDir, this.options.projectDir, contentHash);
+            const mdxCacheResult = await lookupMdxEsmCache(filePath, mdxCacheDir, this.options.projectDir, contentHash, {
+                projectId: this.options.projectId,
+                contentSourceId: this.options.contentSourceId,
+            });
             if (mdxCacheResult.status === "hit") {
                 const entry = { tempPath: mdxCacheResult.path, contentHash };
                 globalModuleCache.set(contentCacheKey, entry);

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;AAYlE,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAU3E;;;;;;;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;IAK1E,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;IAOnF,oCAAoC,CAClC,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,EACxB,UAAU,CAAC,EAAE,gBAAgB,GAC5B,IAAI;IAQP,wDAAwD;IACxD,KAAK,IAAI,UAAU,CAAC,OAAO,gBAAgB,CAAC;IAI5C,OAAO,CAAC,4BAA4B;YAItB,qBAAqB;YAsBrB,oBAAoB;YAqBpB,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;AAYlE,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAW3E;;;;;;;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;IAK1E,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;IAOnF,oCAAoC,CAClC,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,EACxB,UAAU,CAAC,EAAE,gBAAgB,GAC5B,IAAI;IAQP,wDAAwD;IACxD,KAAK,IAAI,UAAU,CAAC,OAAO,gBAAgB,CAAC;IAI5C,OAAO,CAAC,4BAA4B;YAItB,qBAAqB;YAsBrB,oBAAoB;YAoDpB,YAAY;CA2B3B"}

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

@@ -19,6 +19,7 @@ import { getHttpBundleCacheDir, getMdxEsmCacheDir } from "../../../utils/cache-d
 import { globalModuleCache, globalTmpDirs } from "./cache/index.js";
 import { extractAllFilePaths, extractHttpBundlePaths, verifiedHttpBundlePaths, } from "./http-bundle-helpers.js";
 import { buildTempModulePath, buildTmpDirPath, getTmpDirCacheKey } from "./tmp-paths.js";
+import { ensureMdxModuleDependencies } from "../../../transforms/mdx/esm-module-loader/module-fetcher/dependency-recovery.js";
 const logger = rendererLogger.component("ssr-module-loader");
 /** Content length threshold: below this, use fast sync hash; above, use async SHA-256 */
 const SYNC_HASH_THRESHOLD = 10_000;
@@ -122,7 +123,7 @@ export class SSRCacheManager {
         try {
             const cachedCode = await this.fs.readTextFile(cachedEntry.tempPath);
             const isValid = await this.validateCachedCode(cachedCode, filePath, "memory-cache", {
-                checkLocalPaths: false,
+                checkLocalPaths: true,
                 checkInvalidEsmShPath: false,
             });
             if (!isValid) {
@@ -177,11 +178,13 @@ export class SSRCacheManager {
     }
     async hasMissingLocalPaths(code, filePath) {
         const allPaths = extractAllFilePaths(code);
+        let hasMissingPath = false;
         for (const path of allPaths) {
             try {
                 const stat = await this.fs.stat(path);
                 if (!stat.isFile) {
-                    return true;
+                    hasMissingPath = true;
+                    break;
                 }
             }
             catch (error) {
@@ -190,6 +193,32 @@ export class SSRCacheManager {
                     missingPath: path.slice(-60),
                     error,
                 });
+                hasMissingPath = true;
+                break;
+            }
+        }
+        if (hasMissingPath &&
+            this.options.projectId &&
+            this.options.contentSourceId) {
+            const recovered = await ensureMdxModuleDependencies(code, {
+                projectId: this.options.projectId,
+                contentSourceId: this.options.contentSourceId,
+                log: logger,
+            });
+            if (recovered.recovered.length > 0) {
+                logger.debug("Recovered missing local vfmod dependencies for SSR cache entry", {
+                    file: filePath.slice(-40),
+                    recovered: recovered.recovered.slice(0, 5),
+                });
+            }
+        }
+        for (const path of allPaths) {
+            try {
+                const stat = await this.fs.stat(path);
+                if (!stat.isFile)
+                    return true;
+            }
+            catch (_) {
                 return true;
             }
         }

package/esm/src/modules/react-loader/ssr-module-loader/vf-module-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vf-module-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/vf-module-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAWzE,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,6BAA6B;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,EAAE,CAelE;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,MAAM,CAAC,CAuDjB"}
+{"version":3,"file":"vf-module-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/vf-module-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAWzE,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,6BAA6B;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,EAAE,CAelE;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,MAAM,CAAC,CAwDjB"}

package/esm/src/modules/react-loader/ssr-module-loader/vf-module-resolver.js

@@ -44,6 +44,7 @@ export async function resolveVfModuleImports(code, options) {
     const projectKey = hashCodeHex(options.projectId);
     const esmCacheDir = join(baseCacheDir, projectKey, options.contentSourceId);
     const fetcherContext = createModuleFetcherContext(esmCacheDir, options.adapter, options.projectDir, options.projectId, {
+        contentSourceId: options.contentSourceId,
         reactVersion: options.reactVersion,
         projectSlug: options.projectId,
         strictMissingModules: false,

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AA2BzE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAkJpE,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,cAAc,EAC5B,MAAM,EAAE,kBAAkB,EAC1B,eAAe,UAAQ,GACtB,OAAO,CAAC,MAAM,CAAC,CA4RjB;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAyBD;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAqClC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AA2BzE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAkJpE,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,cAAc,EAC5B,MAAM,EAAE,kBAAkB,EAC1B,eAAe,UAAQ,GACtB,OAAO,CAAC,MAAM,CAAC,CAuSjB;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAyBD;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAqClC"}

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

@@ -162,7 +162,12 @@ export async function transformModuleWithDeps(filePath, tmpDir, localAdapter, co
         const projectKey = encodeURIComponent(projectId);
         const sourceKey = encodeURIComponent(contentSourceId);
         const mdxCacheDir = join(baseCacheDir, projectKey, sourceKey);
-        const mdxCacheResult = await lookupMdxEsmCache(filePath, mdxCacheDir, projectDir);
+        const mdxCacheResult = await lookupMdxEsmCache(filePath, mdxCacheDir, projectDir, undefined, contentSourceId
+            ? {
+                projectId,
+                contentSourceId,
+            }
+            : undefined);
         if (mdxCacheResult.status === "hit") {
             moduleCache.set(cacheKey, mdxCacheResult.path);
             return mdxCacheResult.path;

package/esm/src/rendering/page-rendering.d.ts

@@ -6,6 +6,14 @@ interface MDXPageResult {
     pageBundle: PageBundle;
     collectedMetadata: Record<string, unknown>;
 }
+interface PreparedMDXPageBundles {
+    pageBundle: PageBundle;
+    serverModuleCode: string;
+}
+export declare function prepareMDXPageBundles(pageInfo: EntityInfo, projectDir: string, options?: {
+    precompiledModule?: string;
+    studioEmbed?: boolean;
+}): Promise<PreparedMDXPageBundles>;
 export declare function handleMDXPage(pageInfo: EntityInfo, slug: string, projectDir: string, mergedComponents: MDXComponents, _compileMDX: (content: string, frontmatter?: Record<string, unknown>, filePath?: string) => Promise<MdxBundle>, adapter: RuntimeAdapter, options?: {
     params?: Record<string, string | string[]>;
     precompiledModule?: string;

package/esm/src/rendering/page-rendering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page-rendering.d.ts","sourceRoot":"","sources":["../../../src/src/rendering/page-rendering.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,YAAY,MAAM,OAAO,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAa,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAOrG,UAAU,aAAa;IACrB,WAAW,EAAE,YAAY,CAAC,YAAY,CAAC;IACvC,UAAU,EAAE,UAAU,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC5C;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,UAAU,EACpB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,aAAa,EAC/B,WAAW,EAAE,CACX,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,QAAQ,CAAC,EAAE,MAAM,KACd,OAAO,CAAC,SAAS,CAAC,EACvB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0DAA0D;IAC1D,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gFAAgF;IAChF,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GACA,OAAO,CAAC,aAAa,CAAC,CAiHxB"}
+{"version":3,"file":"page-rendering.d.ts","sourceRoot":"","sources":["../../../src/src/rendering/page-rendering.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,YAAY,MAAM,OAAO,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAa,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAOrG,UAAU,aAAa;IACrB,WAAW,EAAE,YAAY,CAAC,YAAY,CAAC;IACvC,UAAU,EAAE,UAAU,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC5C;AAED,UAAU,sBAAsB;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,UAAU,EACpB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;IACR,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,GACA,OAAO,CAAC,sBAAsB,CAAC,CA4CjC;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,UAAU,EACpB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,aAAa,EAC/B,WAAW,EAAE,CACX,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,QAAQ,CAAC,EAAE,MAAM,KACd,OAAO,CAAC,SAAS,CAAC,EACvB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0DAA0D;IAC1D,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gFAAgF;IAChF,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GACA,OAAO,CAAC,aAAa,CAAC,CAgFxB"}

package/esm/src/rendering/page-rendering.js

@@ -5,28 +5,39 @@ import { getProjectReact } from "../react/index.js";
 import { compileContent } from "../transforms/mdx/compiler/index.js";
 import { ensureError, getErrorMessage } from "../errors/veryfront-error.js";
 import { withSpan } from "../observability/tracing/otlp-setup.js";
+export async function prepareMDXPageBundles(pageInfo, projectDir, options) {
+    const { frontmatter, content, path } = pageInfo.entity;
+    const fmArg = frontmatter && Object.keys(frontmatter).length > 0 ? frontmatter : undefined;
+    const ssrBundle = await compileContent("development", projectDir, content, fmArg, path, "server", undefined, options?.studioEmbed);
+    const pageBundle = ssrBundle;
+    if (options?.precompiledModule) {
+        pageBundle.clientModuleCode = options.precompiledModule;
+    }
+    else {
+        const browserBundle = await compileContent("development", projectDir, content, fmArg, path, "browser", undefined, options?.studioEmbed);
+        pageBundle.clientModuleCode = browserBundle.compiledCode;
+    }
+    const clientModuleCode = pageBundle.clientModuleCode;
+    if (!clientModuleCode) {
+        throw RENDER_ERROR.create({
+            detail: "MDX compilation produced no client module code",
+        });
+    }
+    return {
+        pageBundle,
+        serverModuleCode: ssrBundle.compiledCode,
+    };
+}
 export function handleMDXPage(pageInfo, slug, projectDir, mergedComponents, _compileMDX, adapter, options) {
     return withSpan("rendering.handleMDXPage", async () => {
-        const { frontmatter, content, path } = pageInfo.entity;
-        const fmArg = frontmatter && Object.keys(frontmatter).length > 0 ? frontmatter : undefined;
-        const ssrBundle = await compileContent("development", projectDir, content, fmArg, path, "server", undefined, options?.studioEmbed);
-        const pageBundle = ssrBundle;
+        const { frontmatter, path } = pageInfo.entity;
+        const { pageBundle, serverModuleCode } = await prepareMDXPageBundles(pageInfo, projectDir, {
+            precompiledModule: options?.precompiledModule,
+            studioEmbed: options?.studioEmbed,
+        });
         let collectedMetadata = {};
         try {
-            if (options?.precompiledModule) {
-                pageBundle.clientModuleCode = options.precompiledModule;
-            }
-            else {
-                const browserBundle = await compileContent("development", projectDir, content, fmArg, path, "browser", undefined, options?.studioEmbed);
-                pageBundle.clientModuleCode = browserBundle.compiledCode;
-            }
-            const clientModuleCode = pageBundle.clientModuleCode;
-            if (!clientModuleCode) {
-                throw RENDER_ERROR.create({
-                    detail: "MDX compilation produced no client module code",
-                });
-            }
-            const mod = (await mdxRenderer.loadModuleESM(clientModuleCode, adapter, options?.projectId, projectDir, options?.projectSlug, options?.contentSourceId));
+            const mod = (await mdxRenderer.loadModuleESM(serverModuleCode, adapter, options?.projectId, projectDir, options?.projectSlug, options?.contentSourceId));
             const MDXComp = mod.MDXContent || mod.default;
             if (!MDXComp) {
                 throw RENDER_ERROR.create({

package/esm/src/task/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/src/task/runner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKrD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,iCAAiC;IACjC,IAAI,EAAE,cAAc,CAAC;IAErB,4CAA4C;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEjC,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,+DAA+D;IAC/D,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAExB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,8CAA8C;IAC9C,OAAO,EAAE,OAAO,CAAC;IAEjB,yCAAyC;IACzC,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,wBAAsB,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAyC7E"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/src/task/runner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKrD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,iCAAiC;IACjC,IAAI,EAAE,cAAc,CAAC;IAErB,4CAA4C;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEjC,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,+DAA+D;IAC/D,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAExB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,8CAA8C;IAC9C,OAAO,EAAE,OAAO,CAAC;IAEjB,yCAAyC;IACzC,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,wBAAsB,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAkC7E"}

package/esm/src/task/runner.js

@@ -6,6 +6,7 @@
  */
 import { logger as baseLogger } from "../utils/index.js";
 import { env as getProcessEnv } from "../platform/compat/process.js";
+import { buildTaskContextEnv } from "../jobs/runtime-env.js";
 const logger = baseLogger.component("task-runner");
 /**
  * Run a task with the given options
@@ -17,12 +18,7 @@ export async function runTask(options) {
         logger.info(`Running task "${task.id}" (${task.name})`);
     }
     const allEnv = getProcessEnv();
-    const env = envAllowlist
-        ? Object.fromEntries(envAllowlist.flatMap((k) => {
-            const value = allEnv[k];
-            return value === undefined ? [] : [[k, value]];
-        }))
-        : { ...allEnv };
+    const env = buildTaskContextEnv(allEnv, envAllowlist);
     const ctx = {
         env,
         config,

package/esm/src/transforms/mdx/esm-module-loader/cache/index.d.ts

@@ -32,5 +32,9 @@ export declare function clearHttpBundleCache(): Promise<void>;
  * Call this on server startup to prevent stale module issues.
  */
 export declare function clearAllLocalCaches(): Promise<void>;
-export declare function lookupMdxEsmCache(filePath: string, cacheDir: string, projectDir?: string, _contentHash?: string): Promise<CacheLookupResult>;
+export declare function lookupMdxEsmCache(filePath: string, cacheDir: string, projectDir?: string, _contentHash?: string, // Intentionally unused - kept for API compatibility
+recoveryOptions?: {
+    projectId: string;
+    contentSourceId: string;
+}): Promise<CacheLookupResult>;
 //# sourceMappingURL=index.d.ts.map

package/esm/src/transforms/mdx/esm-module-loader/cache/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/cache/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,OAAO,EAEL,KAAK,UAAU,EAEhB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAG5D,MAAM,MAAM,iBAAiB,GACzB;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAClB;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAI9D,eAAO,MAAM,kBAAkB,wBAE7B,CAAC;AA0GH,wBAAgB,UAAU,IAAI,UAAU,CAGvC;AAKD,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsBvF;AAED,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAezE;AAED,wBAAgB,oBAAoB,IAAI,IAAI,CAK3C;AAQD,2DAA2D;AAC3D,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAElD;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CA0ElE;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAevD;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAc1D;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAIzD;AAeD,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,iBAAiB,CAAC,CAyG5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/cache/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,OAAO,EAEL,KAAK,UAAU,EAEhB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAI5D,MAAM,MAAM,iBAAiB,GACzB;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAClB;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAI9D,eAAO,MAAM,kBAAkB,wBAE7B,CAAC;AA0GH,wBAAgB,UAAU,IAAI,UAAU,CAGvC;AAKD,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsBvF;AAED,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAezE;AAED,wBAAgB,oBAAoB,IAAI,IAAI,CAK3C;AAQD,2DAA2D;AAC3D,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAElD;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CA0ElE;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAevD;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAc1D;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAIzD;AAeD,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,EAAE,oDAAoD;AAC3E,eAAe,CAAC,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAC/D,OAAO,CAAC,iBAAiB,CAAC,CAwH5B"}

package/esm/src/transforms/mdx/esm-module-loader/cache/index.js

@@ -12,6 +12,7 @@ import { createFileSystem, isNotFoundError, } from "../../../../platform/compat/
 import { LOG_PREFIX_MDX_LOADER } from "../constants.js";
 import { LRUCache } from "../../../../utils/lru-wrapper.js";
 import { buildMdxEsmPathCacheKey, MDX_ESM_ALL_FILE_URL_PATTERN_SOURCE } from "../cache-format.js";
+import { ensureMdxModuleDependencies } from "../module-fetcher/dependency-recovery.js";
 const MAX_VERIFIED_MODULE_DEPS = 2_000;
 export const verifiedModuleDeps = new LRUCache({
     maxEntries: MAX_VERIFIED_MODULE_DEPS,
@@ -285,7 +286,8 @@ function toMdxEsmCacheKey(filePath, projectDir) {
     const jsPath = relativePath.replace(/\.(tsx?|jsx|mdx)$/, ".js");
     return buildMdxEsmPathCacheKey(`_vf_modules/${jsPath}`);
 }
-export async function lookupMdxEsmCache(filePath, cacheDir, projectDir, _contentHash) {
+export async function lookupMdxEsmCache(filePath, cacheDir, projectDir, _contentHash, // Intentionally unused - kept for API compatibility
+recoveryOptions) {
     const cache = await getModulePathCache(cacheDir);
     const cacheKey = toMdxEsmCacheKey(filePath, projectDir);
     const cachedPath = cache.get(cacheKey);
@@ -339,7 +341,21 @@ export async function lookupMdxEsmCache(filePath, cacheDir, projectDir, _content
         // CRITICAL: Check that all file:// dependencies actually exist on disk.
         // The distributed cache may contain code referencing file:// paths from other pods
         // that don't exist locally (e.g., HTTP bundles, MDX-ESM modules).
-        const missingDeps = await findMissingFileDependencies(cachedCode);
+        let missingDeps = await findMissingFileDependencies(cachedCode);
+        if (missingDeps.length > 0 && recoveryOptions) {
+            const recovered = await ensureMdxModuleDependencies(cachedCode, {
+                ...recoveryOptions,
+                log: logger,
+            });
+            if (recovered.recovered.length > 0) {
+                logger.debug(`${LOG_PREFIX_MDX_LOADER} Recovered cached MDX-ESM dependencies`, {
+                    filePath,
+                    cachedPath,
+                    recovered: recovered.recovered.slice(0, 5),
+                });
+            }
+            missingDeps = await findMissingFileDependencies(cachedCode);
+        }
         if (missingDeps.length > 0) {
             logger.warn(`${LOG_PREFIX_MDX_LOADER} Cached module has ${missingDeps.length} missing file dependencies, invalidating`, { filePath, cachedPath, missingDeps: missingDeps.slice(0, 5) });
             cache.delete(cacheKey);

package/esm/src/transforms/mdx/esm-module-loader/cache-format.d.ts

@@ -2,9 +2,10 @@ export declare const MDX_ESM_ALL_FILE_URL_PATTERN_SOURCE: string;
 export declare const MDX_ESM_MJS_FILE_URL_PATTERN_SOURCE: string;
 export declare const MDX_ESM_CACHE_NAMESPACE: string;
 export declare const FRAMEWORK_VF_MODULE_CACHE_NAMESPACE: string;
-export declare function buildMdxEsmTransformCacheKey(projectId: string, normalizedPath: string, contentHash: string): string;
+export declare function buildMdxEsmTransformCacheKey(projectId: string, contentSourceId: string, normalizedPath: string, contentHash: string): string;
 export declare function buildMdxEsmPathCacheKey(normalizedPath: string): string;
 export declare function buildMdxEsmModuleFileName(contentHash: string): string;
+export declare function buildMdxEsmModuleRecoveryCacheKey(projectId: string, contentSourceId: string, fileName: string): string;
 export declare function buildMdxJsxCacheFileName(filePath: string): string;
 export declare function buildFrameworkVfModuleCacheFileName(pathHash: string, envKey: string, contentHash: string): string;
 //# sourceMappingURL=cache-format.d.ts.map

package/esm/src/transforms/mdx/esm-module-loader/cache-format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache-format.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/cache-format.ts"],"names":[],"mappings":"AAuEA,eAAO,MAAM,mCAAmC,QAA8B,CAAC;AAC/E,eAAO,MAAM,mCAAmC,QAA8B,CAAC;AAE/E,eAAO,MAAM,uBAAuB,QAGnC,CAAC;AAEF,eAAO,MAAM,mCAAmC,QAG/C,CAAC;AAEF,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB,MAAM,CAOR;AAED,wBAAgB,uBAAuB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAEtE;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAErE;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,MAAM,CAOR"}
+{"version":3,"file":"cache-format.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/cache-format.ts"],"names":[],"mappings":"AAwFA,eAAO,MAAM,mCAAmC,QAA8B,CAAC;AAC/E,eAAO,MAAM,mCAAmC,QAA8B,CAAC;AAE/E,eAAO,MAAM,uBAAuB,QAGnC,CAAC;AAEF,eAAO,MAAM,mCAAmC,QAG/C,CAAC;AAEF,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB,MAAM,CAQR;AAED,wBAAgB,uBAAuB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAEtE;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAErE;AAED,wBAAgB,iCAAiC,CAC/C,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,GACf,MAAM,CAOR;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,MAAM,CAOR"}

package/esm/src/transforms/mdx/esm-module-loader/cache-format.js

@@ -5,8 +5,8 @@ import { hashString } from "./utils/hash.js";
 const ALL_FILE_URL_PATTERN_SOURCE = /file:\/\/([^"'\s]+)/.source;
 const MJS_FILE_URL_PATTERN_SOURCE = /file:\/\/([^"'\s]+\.mjs)/.source;
 const CACHE_NAMESPACE_SENTINEL = "__vf_cache_namespace__";
-function formatMdxEsmTransformCacheKey(namespace, projectId, normalizedPath, contentHash) {
-    return `${namespace}:${projectId}:${normalizedPath}:${contentHash}:ssr`;
+function formatMdxEsmTransformCacheKey(namespace, projectId, contentSourceId, normalizedPath, contentHash) {
+    return `${namespace}:${projectId}:${contentSourceId}:${normalizedPath}:${contentHash}:ssr`;
 }
 function formatMdxEsmPathCacheKey(namespace, normalizedPath) {
     return `${namespace}:${normalizedPath}`;
@@ -14,6 +14,9 @@ function formatMdxEsmPathCacheKey(namespace, normalizedPath) {
 function formatMdxEsmModuleFileName(namespace, contentHash) {
     return `vfmod-${namespace}-${contentHash}.mjs`;
 }
+function formatMdxEsmModuleRecoveryCacheKey(namespace, projectId, contentSourceId, fileName) {
+    return `${namespace}:${projectId}:${contentSourceId}:${fileName}:vfmod`;
+}
 function formatMdxJsxCacheFileName(namespace, filePath) {
     return `jsx-${namespace}-${hashString(filePath)}.mjs`;
 }
@@ -22,9 +25,10 @@ function formatFrameworkVfModuleCacheFileName(namespace, pathHash, envKey, conte
 }
 function buildMdxEsmCacheSchemaSample() {
     return {
-        transformKey: formatMdxEsmTransformCacheKey(CACHE_NAMESPACE_SENTINEL, "__vf_project__", "_vf_modules/pages/index.js", "deadbeef"),
+        transformKey: formatMdxEsmTransformCacheKey(CACHE_NAMESPACE_SENTINEL, "__vf_project__", "preview-main", "_vf_modules/pages/index.js", "deadbeef"),
         pathKey: formatMdxEsmPathCacheKey(CACHE_NAMESPACE_SENTINEL, "_vf_modules/pages/index.js"),
         moduleFile: formatMdxEsmModuleFileName(CACHE_NAMESPACE_SENTINEL, "deadbeef"),
+        moduleRecoveryKey: formatMdxEsmModuleRecoveryCacheKey(CACHE_NAMESPACE_SENTINEL, "__vf_project__", "preview-main", formatMdxEsmModuleFileName(CACHE_NAMESPACE_SENTINEL, "deadbeef")),
         jsxFile: formatMdxJsxCacheFileName(CACHE_NAMESPACE_SENTINEL, "/tmp/project/Button.tsx"),
         unresolvedVfModulesPattern: UNRESOLVED_VF_MODULES_PATTERN.source,
         allFileUrlPattern: ALL_FILE_URL_PATTERN_SOURCE,
@@ -44,8 +48,8 @@ export const MDX_ESM_ALL_FILE_URL_PATTERN_SOURCE = ALL_FILE_URL_PATTERN_SOURCE;
 export const MDX_ESM_MJS_FILE_URL_PATTERN_SOURCE = MJS_FILE_URL_PATTERN_SOURCE;
 export const MDX_ESM_CACHE_NAMESPACE = createCacheNamespace("mdx-esm", buildMdxEsmCacheSchemaSample());
 export const FRAMEWORK_VF_MODULE_CACHE_NAMESPACE = createCacheNamespace("vf-framework", buildFrameworkVfModuleCacheSchemaSample());
-export function buildMdxEsmTransformCacheKey(projectId, normalizedPath, contentHash) {
-    return formatMdxEsmTransformCacheKey(MDX_ESM_CACHE_NAMESPACE, projectId, normalizedPath, contentHash);
+export function buildMdxEsmTransformCacheKey(projectId, contentSourceId, normalizedPath, contentHash) {
+    return formatMdxEsmTransformCacheKey(MDX_ESM_CACHE_NAMESPACE, projectId, contentSourceId, normalizedPath, contentHash);
 }
 export function buildMdxEsmPathCacheKey(normalizedPath) {
     return formatMdxEsmPathCacheKey(MDX_ESM_CACHE_NAMESPACE, normalizedPath);
@@ -53,6 +57,9 @@ export function buildMdxEsmPathCacheKey(normalizedPath) {
 export function buildMdxEsmModuleFileName(contentHash) {
     return formatMdxEsmModuleFileName(MDX_ESM_CACHE_NAMESPACE, contentHash);
 }
+export function buildMdxEsmModuleRecoveryCacheKey(projectId, contentSourceId, fileName) {
+    return formatMdxEsmModuleRecoveryCacheKey(MDX_ESM_CACHE_NAMESPACE, projectId, contentSourceId, fileName);
+}
 export function buildMdxJsxCacheFileName(filePath) {
     return formatMdxJsxCacheFileName(MDX_ESM_CACHE_NAMESPACE, filePath);
 }

package/esm/src/transforms/mdx/esm-module-loader/loader-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader-helpers.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/loader-helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAcH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAapF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAWnE;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAgCnF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAW3F;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EAClD,OAAO,EAAE,gBAAgB,EACzB,UAAU,EAAE,MAAM,EAClB,oBAAoB,EAAE,OAAO,GAC5B,OAAO,CAAC,MAAM,CAAC,CAuGjB"}
+{"version":3,"file":"loader-helpers.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/loader-helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAcH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAapF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAWnE;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAgCnF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAW3F;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EAClD,OAAO,EAAE,gBAAgB,EACzB,UAAU,EAAE,MAAM,EAClB,oBAAoB,EAAE,OAAO,GAC5B,OAAO,CAAC,MAAM,CAAC,CAwGjB"}

package/esm/src/transforms/mdx/esm-module-loader/loader-helpers.js

@@ -126,6 +126,7 @@ export async function processVfModuleImports(code, imports, context, projectDir,
         });
     }
     const fetcherContext = createModuleFetcherContext(context.esmCacheDir, adapter, projectDir, context.projectId, {
+        contentSourceId: context.contentSourceId,
         reactVersion: context.reactVersion,
         projectSlug: context.projectSlug,
         logger: logger.child({

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/cache-keys.d.ts

@@ -10,6 +10,6 @@
  * CRITICAL: The :ssr suffix is required to avoid cache collisions with browser-mode transforms
  * that use relative paths (../lib/utils.js) instead of absolute paths (/_vf_modules/lib/utils.js).
  */
-export declare function getTransformCacheKey(projectId: string, normalizedPath: string, contentHash: string): string;
+export declare function getTransformCacheKey(projectId: string, contentSourceId: string, normalizedPath: string, contentHash: string): string;
 export declare function getVersionedPathCacheKey(normalizedPath: string): string;
 //# sourceMappingURL=cache-keys.d.ts.map

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/cache-keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache-keys.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/cache-keys.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB,MAAM,CAER;AAED,wBAAgB,wBAAwB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAEvE"}
+{"version":3,"file":"cache-keys.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/cache-keys.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB,MAAM,CAER;AAED,wBAAgB,wBAAwB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAEvE"}

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/cache-keys.js

@@ -11,8 +11,8 @@ import { buildMdxEsmPathCacheKey, buildMdxEsmTransformCacheKey } from "../cache-
  * CRITICAL: The :ssr suffix is required to avoid cache collisions with browser-mode transforms
  * that use relative paths (../lib/utils.js) instead of absolute paths (/_vf_modules/lib/utils.js).
  */
-export function getTransformCacheKey(projectId, normalizedPath, contentHash) {
-    return buildMdxEsmTransformCacheKey(projectId, normalizedPath, contentHash);
+export function getTransformCacheKey(projectId, contentSourceId, normalizedPath, contentHash) {
+    return buildMdxEsmTransformCacheKey(projectId, contentSourceId, normalizedPath, contentHash);
 }
 export function getVersionedPathCacheKey(normalizedPath) {
     return buildMdxEsmPathCacheKey(normalizedPath);