veryfront 0.0.103 → 0.0.105

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "veryfront",
-    "version": "0.0.103",
+    "version": "0.0.105",
     "nodeModulesDir": "auto",
     "exclude": [
         "npm/",

package/esm/src/cli/commands/init/config-generator.js

@@ -14,7 +14,7 @@ export async function createPackageJson(projectDir, projectName) {
         dependencies: {
             react: "^19.0.0",
             "react-dom": "^19.0.0",
-            veryfront: "^0.0.97",
+            veryfront: "^0.0.104",
             zod: "^3.24.0",
         },
     };

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

@@ -1 +1 @@
-{"version":3,"file":"component-loader.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/react-loader/component-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AACpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAKtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAMvD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CA0DvD"}
+{"version":3,"file":"component-loader.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/react-loader/component-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AACpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAKtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAMvD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CA2DvD"}

package/esm/src/modules/react-loader/component-loader.js

@@ -16,6 +16,7 @@ export function loadComponentFromSource(source, filePath, projectDir, adapter, o
             const loader = new SSRModuleLoader({
                 projectDir,
                 projectId,
+                projectSlug: options?.projectSlug,
                 adapter,
                 dev,
                 contentSourceId: options?.contentSourceId,

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":"AAWA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAuCpC,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAiC3E;;;;;GAKG;AACH,qBAAa,eAAe;IAId,OAAO,CAAC,OAAO;IAH3B,OAAO,CAAC,EAAE,CAAsB;IAChC,OAAO,CAAC,mBAAmB,CAAuB;gBAE9B,OAAO,EAAE,sBAAsB;IAEnD;;OAEG;IACH,UAAU,CACR,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAsGxD,OAAO,CAAC,mBAAmB;IAiC3B,OAAO,CAAC,wBAAwB;IAwBhC,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,yBAAyB;IAuBjC,OAAO,CAAC,kBAAkB;IAK1B;;OAEG;YACW,2BAA2B;IAmGzC,OAAO,CAAC,yBAAyB;YAiBnB,2BAA2B;IA0TzC;;;OAGG;YACW,mBAAmB;IA2CjC,OAAO,CAAC,yBAAyB;IAYjC;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IA4B3B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,wBAAwB;IAehC,OAAO,CAAC,2BAA2B;IAiBnC,OAAO,CAAC,2BAA2B;IAWnC;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA4B3B;;OAEG;IACH,OAAO,CAAC,aAAa;YAIP,uBAAuB;IAyCrC;;;OAGG;YACW,gBAAgB;YAgBhB,WAAW;YAeX,YAAY;CA4B3B"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/loader.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAuCpC,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAiC3E;;;;;GAKG;AACH,qBAAa,eAAe;IAId,OAAO,CAAC,OAAO;IAH3B,OAAO,CAAC,EAAE,CAAsB;IAChC,OAAO,CAAC,mBAAmB,CAAuB;gBAE9B,OAAO,EAAE,sBAAsB;IAEnD;;OAEG;IACH,UAAU,CACR,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAsGxD,OAAO,CAAC,mBAAmB;IAiC3B,OAAO,CAAC,wBAAwB;IAwBhC,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,yBAAyB;IAuBjC,OAAO,CAAC,kBAAkB;IAK1B;;OAEG;YACW,2BAA2B;IAmGzC,OAAO,CAAC,yBAAyB;YAiBnB,2BAA2B;IAgUzC;;;OAGG;YACW,mBAAmB;IA2CjC,OAAO,CAAC,yBAAyB;IAYjC;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IA4B3B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,wBAAwB;IAehC,OAAO,CAAC,2BAA2B;IAiBnC,OAAO,CAAC,2BAA2B;IAWnC;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA4B3B;;OAEG;IACH,OAAO,CAAC,aAAa;YAIP,uBAAuB;IAyCrC;;;OAGG;YACW,gBAAgB;YAgBhB,WAAW;YAeX,YAAY;CA6B3B"}

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

@@ -385,13 +385,18 @@ export class SSRModuleLoader {
                     }
                 }
                 if (httpBundlesOk) {
-                    const tempPath = await this.getTempPath(filePath, contentHash);
+                    // CRITICAL: Use transformedHash (hash of the transformed code) for temp path,
+                    // NOT contentHash (hash of source). Other modules importing this file use
+                    // transformedHash in their import paths (set during fresh transform at line 703).
+                    // Using contentHash here would create a path mismatch and "Module not found" errors.
+                    const transformedHash = await this.hashContentAsync(redisCode);
+                    const tempPath = await this.getTempPath(filePath, transformedHash);
                     await this.fs.mkdir(tempPath.substring(0, tempPath.lastIndexOf("/")), {
                         recursive: true,
                     });
                     await this.fs.writeTextFile(tempPath, redisCode);
-                    verifiedHttpBundlePaths.set(`${tempPath}:${contentHash}`, true);
-                    const entry = { tempPath, contentHash };
+                    verifiedHttpBundlePaths.set(`${tempPath}:${transformedHash}`, true);
+                    const entry = { tempPath, contentHash: transformedHash };
                     globalModuleCache.set(contentCacheKey, entry);
                     globalModuleCache.set(filePathCacheKey, entry);
                     logger.debug("[SSR-MODULE-LOADER] Redis cache hit", { file: filePath.slice(-40) });
@@ -404,8 +409,9 @@ export class SSRModuleLoader {
         // Check MDX-ESM cache to share modules with MDX loader and avoid duplicate React contexts
         if (this.options.projectId && this.options.contentSourceId) {
             const baseCacheDir = getMdxEsmCacheDir();
-            const projectKey = hashCodeHex(this.options.projectId);
-            const sourceKey = hashCodeHex(this.options.contentSourceId);
+            // Use projectId consistently for stable cache keys (matches MDX loader)
+            const projectKey = encodeURIComponent(this.options.projectId);
+            const sourceKey = this.options.contentSourceId;
             const mdxCacheDir = join(baseCacheDir, projectKey, sourceKey);
             const mdxCachedPath = await lookupMdxEsmCache(filePath, mdxCacheDir, this.options.projectDir, contentHash);
             if (mdxCachedPath) {
@@ -750,8 +756,9 @@ export class SSRModuleLoader {
         // Use the same cache directory as MDX-ESM loader to share module instances.
         // This prevents issues like React context being created twice in separate files.
         const baseCacheDir = getMdxEsmCacheDir();
-        const projectKey = hashCodeHex(projectId);
-        const sourceKey = hashCodeHex(contentSourceId);
+        // Use projectId consistently for stable cache keys (matches MDX loader)
+        const projectKey = encodeURIComponent(projectId);
+        const sourceKey = contentSourceId;
         const cacheKey = `${baseCacheDir}|${projectKey}|${sourceKey}`;
         const existingDir = globalTmpDirs.get(cacheKey);
         if (existingDir)

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

@@ -9,6 +9,8 @@ import type { RuntimeAdapter } from "../../../platform/adapters/base.js";
 export interface SSRModuleLoaderOptions {
     projectDir: string;
     projectId: string;
+    /** Project slug for cache directory (human-readable name) */
+    projectSlug?: string;
     adapter: RuntimeAdapter;
     dev: boolean;
     apiBaseUrl?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEzE,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,cAAc,CAAC;IACxB,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,uEAAuE;IACvE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;CACvB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEzE,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,6DAA6D;IAC7D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,cAAc,CAAC;IACxB,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,uEAAuE;IACvE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;CACvB"}

package/esm/src/modules/react-loader/types.d.ts

@@ -1,6 +1,8 @@
 import type * as React from "react";
 export interface LoadComponentOptions {
     projectId?: string;
+    /** Project slug for cache directory (human-readable name) */
+    projectSlug?: string;
     dev?: boolean;
     moduleServerUrl?: string;
     vendorBundleHash?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/react-loader/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAEpC,MAAM,WAAW,oBAAoB;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mFAAmF;IACnF,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,wEAAwE;IACxE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/react-loader/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAEpC,MAAM,WAAW,oBAAoB;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mFAAmF;IACnF,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,wEAAwE;IACxE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC"}

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":"AAEA,OAAO,KAAK,YAAY,MAAM,OAAO,CAAC;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAGzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAcxE,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAC5C,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,WAAW,EAAE,oBAAoB,CAAC;IAClC,gBAAgB,EAAE,aAAa,CAAC;IAChC,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,QAAQ,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC/D;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,IAAI,CAA+B;IAC3C,OAAO,CAAC,UAAU,CAAC,CAAM;IACzB,OAAO,CAAC,WAAW,CAAC,CAA0B;IAC9C,OAAO,CAAC,QAAQ,CAAC,CAAqD;IACtE,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,kBAAkB,CAAC,CAAyB;gBAExC,OAAO,EAAE,wBAAwB;IAgBvC,YAAY,CAChB,WAAW,EAAE,YAAY,CAAC,YAAY,EACtC,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACnD,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC;YAqFvB,gBAAgB;YAuDhB,oBAAoB;YAsDpB,mBAAmB;YAgDnB,0BAA0B;CAgEzC"}
+{"version":3,"file":"layout-applicator.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/layouts/layout-applicator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,YAAY,MAAM,OAAO,CAAC;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAGzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAcxE,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAC5C,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,WAAW,EAAE,oBAAoB,CAAC;IAClC,gBAAgB,EAAE,aAAa,CAAC;IAChC,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,QAAQ,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC/D;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,IAAI,CAA+B;IAC3C,OAAO,CAAC,UAAU,CAAC,CAAM;IACzB,OAAO,CAAC,WAAW,CAAC,CAA0B;IAC9C,OAAO,CAAC,QAAQ,CAAC,CAAqD;IACtE,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,kBAAkB,CAAC,CAAyB;gBAExC,OAAO,EAAE,wBAAwB;IAgBvC,YAAY,CAChB,WAAW,EAAE,YAAY,CAAC,YAAY,EACtC,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACnD,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC;YAqFvB,gBAAgB;YAuDhB,oBAAoB;YAyDpB,mBAAmB;YAiDnB,0BAA0B;CAgEzC"}

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

@@ -135,13 +135,15 @@ export class LayoutApplicator {
                     const { loadComponentFromSource } = await import("../../modules/react-loader/index.js");
                     App = await loadComponentFromSource(appSource, appPath, this.projectDir, this.adapter, {
                         projectId: this.projectId ?? this.projectDir,
+                        projectSlug: this.projectSlug,
                         dev: this.mode === "development",
                         moduleServerUrl: this.config?.dev?.moduleServerUrl,
                         contentSourceId: this.contentSourceId,
                     });
                 }
-                if (!App)
+                if (!App) {
                     return pageElement;
+                }
                 const React = await getProjectReact();
                 logger.debug("Wrapped page with App component");
                 return React.createElement(App, { children: pageElement });
@@ -178,6 +180,7 @@ export class LayoutApplicator {
             const { loadComponentFromSource } = await import("../../modules/react-loader/index.js");
             return await loadComponentFromSource(String(compiled), appPath.replace(/\.mdx?$/, ".jsx"), this.projectDir, this.adapter, {
                 projectId: this.projectId ?? this.projectDir,
+                projectSlug: this.projectSlug,
                 dev: this.mode === "development",
                 moduleServerUrl: this.config?.dev?.moduleServerUrl,
                 contentSourceId: this.contentSourceId,

package/esm/src/rendering/layouts/utils/app-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/layouts/utils/app-resolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAUhE,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,MAAM,CAAC,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmDxB"}
+{"version":3,"file":"app-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/layouts/utils/app-resolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAUhE,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,MAAM,CAAC,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA4DxB"}

package/esm/src/rendering/layouts/utils/app-resolver.js

@@ -6,6 +6,12 @@ function isValidComponentPath(path) {
     return VALID_EXTENSIONS.includes(ext);
 }
 export async function resolveAppComponentPath(projectDir, adapter, config) {
+    console.log("[AppResolver] Starting resolution", {
+        projectDir,
+        hasAdapter: !!adapter,
+        hasConfig: !!config,
+        configApp: config?.app,
+    });
     logger.debug("[AppResolver] Starting resolution", {
         projectDir,
         hasAdapter: !!adapter,
@@ -35,12 +41,15 @@ export async function resolveAppComponentPath(projectDir, adapter, config) {
     for (const ext of VALID_EXTENSIONS) {
         const appPath = join(projectDir, `components/app.${ext}`);
         const exists = await adapter.fs.exists(appPath);
+        console.log("[AppResolver] Checking default path", { appPath, exists });
         logger.debug("[AppResolver] Checking default path", { appPath, exists });
         if (exists) {
+            console.log("[AppResolver] Found app component via discovery", { path: appPath });
             logger.debug("[AppResolver] Found app component via discovery", { path: appPath });
             return appPath;
         }
     }
+    console.log("[AppResolver] No app component found");
     logger.debug("[AppResolver] No app component found");
     return null;
 }

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

@@ -4,5 +4,5 @@ import type { LayoutItem, MdxBundle, MDXComponents } from "../../../types/index.
 import type { ImportMapConfig } from "../../../modules/import-map/types.js";
 import type { LayoutComponentCache } from "./component-loader.js";
 export declare function applyLayoutsESM(pageElement: BundledReact.ReactElement, layoutBundle: MdxBundle | undefined, nestedLayouts: LayoutItem[], projectDir: string, mergedComponents: MDXComponents, tsxLayoutModuleCache: LayoutComponentCache, adapter: RuntimeAdapter, layoutDataMap: Map<string, Record<string, unknown>> | undefined, projectId: string, projectSlug: string, contentSourceId: string, preloadedImportMap?: ImportMapConfig): Promise<BundledReact.ReactElement>;
-export declare function applyLayoutsFunctionBody(pageElement: BundledReact.ReactElement, layoutBundle: MdxBundle | undefined, nestedLayouts: LayoutItem[], mergedComponents: MDXComponents, tsxLayoutModuleCache: LayoutComponentCache, projectDir: string, adapter: RuntimeAdapter, layoutDataMap: Map<string, Record<string, unknown>> | undefined, projectId: string, _projectSlug: string, contentSourceId: string): Promise<BundledReact.ReactElement>;
+export declare function applyLayoutsFunctionBody(pageElement: BundledReact.ReactElement, layoutBundle: MdxBundle | undefined, nestedLayouts: LayoutItem[], mergedComponents: MDXComponents, tsxLayoutModuleCache: LayoutComponentCache, projectDir: string, adapter: RuntimeAdapter, layoutDataMap: Map<string, Record<string, unknown>> | undefined, projectId: string, projectSlug: string, contentSourceId: string): Promise<BundledReact.ReactElement>;
 //# sourceMappingURL=applicator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"applicator.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/layouts/utils/applicator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,YAAY,MAAM,OAAO,CAAC;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAG5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAOlE,wBAAgB,eAAe,CAC7B,WAAW,EAAE,YAAY,CAAC,YAAY,EACtC,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,aAAa,EAC/B,oBAAoB,EAAE,oBAAoB,EAC1C,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,EAC/D,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,eAAe,GACnC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CA+GpC;AAED,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,YAAY,CAAC,YAAY,EACtC,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,gBAAgB,EAAE,aAAa,EAC/B,oBAAoB,EAAE,oBAAoB,EAC1C,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,EAC/D,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAyEpC"}
+{"version":3,"file":"applicator.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/layouts/utils/applicator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,YAAY,MAAM,OAAO,CAAC;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAG5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAOlE,wBAAgB,eAAe,CAC7B,WAAW,EAAE,YAAY,CAAC,YAAY,EACtC,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,aAAa,EAC/B,oBAAoB,EAAE,oBAAoB,EAC1C,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,EAC/D,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,eAAe,GACnC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAgHpC;AAED,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,YAAY,CAAC,YAAY,EACtC,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,gBAAgB,EAAE,aAAa,EAC/B,oBAAoB,EAAE,oBAAoB,EAC1C,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,EAC/D,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CA0EpC"}

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

@@ -36,7 +36,7 @@ export function applyLayoutsESM(pageElement, layoutBundle, nestedLayouts, projec
                 }
                 if (item.kind === "tsx") {
                     const props = item.componentPath ? layoutDataMap?.get(item.componentPath) : undefined;
-                    element = await withSpan(SpanNames.LAYOUT_APPLY_TSX, () => applyTSXLayout(element, item, tsxLayoutModuleCache, projectDir, adapter, props, projectId, contentSourceId), {
+                    element = await withSpan(SpanNames.LAYOUT_APPLY_TSX, () => applyTSXLayout(element, item, tsxLayoutModuleCache, projectDir, adapter, props, projectId, projectSlug, contentSourceId), {
                         "layout.index": i,
                         "layout.kind": "tsx",
                         "layout.path": item.componentPath || item.path || "",
@@ -63,7 +63,7 @@ export function applyLayoutsESM(pageElement, layoutBundle, nestedLayouts, projec
         "layout.project_slug": projectSlug || "",
     });
 }
-export async function applyLayoutsFunctionBody(pageElement, layoutBundle, nestedLayouts, mergedComponents, tsxLayoutModuleCache, projectDir, adapter, layoutDataMap, projectId, _projectSlug, contentSourceId) {
+export async function applyLayoutsFunctionBody(pageElement, layoutBundle, nestedLayouts, mergedComponents, tsxLayoutModuleCache, projectDir, adapter, layoutDataMap, projectId, projectSlug, contentSourceId) {
     const React = await getProjectReact();
     let element = pageElement;
     logger.debug("Using function-body wrapping for layouts");
@@ -93,7 +93,7 @@ export async function applyLayoutsFunctionBody(pageElement, layoutBundle, nested
         if (item.kind !== "tsx" || !item.componentPath)
             continue;
         try {
-            const LayoutComponent = await loadTSXComponent(item.componentPath, projectDir, tsxLayoutModuleCache, adapter, projectId, contentSourceId);
+            const LayoutComponent = await loadTSXComponent(item.componentPath, projectDir, tsxLayoutModuleCache, adapter, projectId, projectSlug, contentSourceId);
             const child = ensureValidChild(element, React);
             logger.debug("Applying TSX layout:", {
                 layoutName: LayoutComponent.name || "Anonymous",

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

@@ -9,13 +9,13 @@ export interface LayoutComponentCache {
     clear(): void;
 }
 export declare function createLayoutComponentCache(maxEntries?: number): LayoutComponentCache;
-export declare function loadTSXComponent(componentPath: string, projectDir: string, cache: LayoutComponentCache, adapter: RuntimeAdapter, projectId: string, contentSourceId: string): Promise<BundledReact.ComponentType>;
+export declare function loadTSXComponent(componentPath: string, projectDir: string, cache: LayoutComponentCache, adapter: RuntimeAdapter, projectId: string, projectSlug: string, contentSourceId: string): Promise<BundledReact.ComponentType>;
 /** Load an MDX layout module from a bundle. */
 export declare function loadMDXLayout(bundle: MdxBundle, projectDir: string, adapter: RuntimeAdapter, projectId: string, projectSlug: string, contentSourceId: string, preloadedImportMap?: ImportMapConfig): Promise<BundledReact.ComponentType<{
     components?: MDXComponents;
 }> | undefined>;
 /** Preload an MDX layout module into cache for faster subsequent loads. */
 export declare function preloadMDXLayoutModule(bundle: MdxBundle, projectDir: string, adapter: RuntimeAdapter, projectId: string, projectSlug: string, contentSourceId: string): Promise<void>;
-export declare function applyTSXLayout(element: BundledReact.ReactElement, item: LayoutItem, tsxLayoutModuleCache: LayoutComponentCache, projectDir: string, adapter: RuntimeAdapter, props: Record<string, unknown> | undefined, projectId: string, contentSourceId: string): Promise<BundledReact.ReactElement>;
+export declare function applyTSXLayout(element: BundledReact.ReactElement, item: LayoutItem, tsxLayoutModuleCache: LayoutComponentCache, projectDir: string, adapter: RuntimeAdapter, props: Record<string, unknown> | undefined, projectId: string, projectSlug: string, contentSourceId: string): Promise<BundledReact.ReactElement>;
 export declare function applyMDXLayout(element: BundledReact.ReactElement, bundle: MdxBundle, projectDir: string, mergedComponents: MDXComponents, adapter: RuntimeAdapter, projectId: string, projectSlug: string, contentSourceId: string, preloadedImportMap?: ImportMapConfig): Promise<BundledReact.ReactElement>;
 //# sourceMappingURL=component-loader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"component-loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/layouts/utils/component-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,YAAY,MAAM,OAAO,CAAC;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAa,MAAM,yBAAyB,CAAC;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAW5E,MAAM,WAAW,oBAAoB;IACnC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC,aAAa,GAAG,SAAS,CAAC;IACzD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC,aAAa,GAAG,IAAI,CAAC;IAC1D,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,KAAK,IAAI,IAAI,CAAC;CACf;AAwCD,wBAAgB,0BAA0B,CACxC,UAAU,SAAyB,GAClC,oBAAoB,CAEtB;AAED,wBAAsB,gBAAgB,CACpC,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,oBAAoB,EAC3B,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CA+BrC;AAED,+CAA+C;AAC/C,wBAAgB,aAAa,CAC3B,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,eAAe,GACnC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC;IAAE,UAAU,CAAC,EAAE,aAAa,CAAA;CAAE,CAAC,GAAG,SAAS,CAAC,CAgDjF;AAED,2EAA2E;AAC3E,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,YAAY,CAAC,YAAY,EAClC,IAAI,EAAE,UAAU,EAChB,oBAAoB,EAAE,oBAAoB,EAC1C,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC1C,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAwCpC;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,YAAY,CAAC,YAAY,EAClC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,aAAa,EAC/B,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,eAAe,GACnC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAuBpC"}
+{"version":3,"file":"component-loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/layouts/utils/component-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,YAAY,MAAM,OAAO,CAAC;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAa,MAAM,yBAAyB,CAAC;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAW5E,MAAM,WAAW,oBAAoB;IACnC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC,aAAa,GAAG,SAAS,CAAC;IACzD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC,aAAa,GAAG,IAAI,CAAC;IAC1D,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,KAAK,IAAI,IAAI,CAAC;CACf;AAwCD,wBAAgB,0BAA0B,CACxC,UAAU,SAAyB,GAClC,oBAAoB,CAEtB;AAED,wBAAsB,gBAAgB,CACpC,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,oBAAoB,EAC3B,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAgCrC;AAED,+CAA+C;AAC/C,wBAAgB,aAAa,CAC3B,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,eAAe,GACnC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC;IAAE,UAAU,CAAC,EAAE,aAAa,CAAA;CAAE,CAAC,GAAG,SAAS,CAAC,CAgDjF;AAED,2EAA2E;AAC3E,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,YAAY,CAAC,YAAY,EAClC,IAAI,EAAE,UAAU,EAChB,oBAAoB,EAAE,oBAAoB,EAC1C,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC1C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CA6CpC;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,YAAY,CAAC,YAAY,EAClC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,aAAa,EAC/B,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,eAAe,GACnC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAuBpC"}

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

@@ -45,7 +45,7 @@ class InMemoryLayoutComponentCache {
 export function createLayoutComponentCache(maxEntries = TSX_LAYOUT_MAX_ENTRIES) {
     return new InMemoryLayoutComponentCache(maxEntries);
 }
-export async function loadTSXComponent(componentPath, projectDir, cache, adapter, projectId, contentSourceId) {
+export async function loadTSXComponent(componentPath, projectDir, cache, adapter, projectId, projectSlug, contentSourceId) {
     const source = await adapter.fs.readFile(componentPath);
     const hash = await computeHash(source);
     const cacheKey = buildLayoutComponentCacheKey(projectId, componentPath, hash, contentSourceId);
@@ -55,6 +55,7 @@ export async function loadTSXComponent(componentPath, projectDir, cache, adapter
     const loaded = await loadComponentFromSource(source, componentPath, projectDir, adapter, {
         dev: true,
         projectId,
+        projectSlug,
         ssr: true,
         contentSourceId,
     });
@@ -107,14 +108,18 @@ export async function preloadMDXLayoutModule(bundle, projectDir, adapter, projec
     // Just call loadMDXLayout - the module loader will cache the result
     await loadMDXLayout(bundle, projectDir, adapter, projectId, projectSlug, contentSourceId);
 }
-export async function applyTSXLayout(element, item, tsxLayoutModuleCache, projectDir, adapter, props, projectId, contentSourceId) {
+export async function applyTSXLayout(element, item, tsxLayoutModuleCache, projectDir, adapter, props, projectId, projectSlug, contentSourceId) {
     const start = performance.now();
-    logger.debug("[applyTSXLayout] START", { componentPath: item.componentPath, projectId });
+    logger.debug("[applyTSXLayout] START", {
+        componentPath: item.componentPath,
+        projectId,
+        projectSlug,
+    });
     const React = await getProjectReact();
     try {
         logger.debug("[applyTSXLayout] loadTSXComponent START", { componentPath: item.componentPath });
         const loadStart = performance.now();
-        const LayoutComponent = await loadTSXComponent(item.componentPath, projectDir, tsxLayoutModuleCache, adapter, projectId, contentSourceId);
+        const LayoutComponent = await loadTSXComponent(item.componentPath, projectDir, tsxLayoutModuleCache, adapter, projectId, projectSlug, contentSourceId);
         logger.debug("[applyTSXLayout] loadTSXComponent DONE", {
             componentPath: item.componentPath,
             duration: `${(performance.now() - loadStart).toFixed(2)}ms`,

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

@@ -1 +1 @@
-{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC7F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAGzE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAOjF,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,oBAAoB,CAAC;IAClC,iBAAiB,EAAE,aAAa,CAAC;CAClC;AAED,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,aAAa,EAAE,UAAU,EAAE,CAAC;CAC7B;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAA2B;IACzC,sDAAsD;IACtD,OAAO,CAAC,mBAAmB,CAAgC;gBAE/C,MAAM,EAAE,wBAAwB;IAI5C,4CAA4C;IAC5C,qBAAqB,IAAI,eAAe,GAAG,IAAI;IAI/C,UAAU,IAAI,IAAI;IAOlB,cAAc,CAAC,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAYrE,oBAAoB,CAAC,aAAa,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0HhE,uBAAuB,CACrB,WAAW,EAAE,KAAK,CAAC,YAAY,EAC/B,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACpD,UAAU,CAAC,EAAE,GAAG,EAChB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,QAAQ,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,EAC7D,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC;CAkD/B"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC7F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAGzE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAOjF,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,oBAAoB,CAAC;IAClC,iBAAiB,EAAE,aAAa,CAAC;CAClC;AAED,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,aAAa,EAAE,UAAU,EAAE,CAAC;CAC7B;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAA2B;IACzC,sDAAsD;IACtD,OAAO,CAAC,mBAAmB,CAAgC;gBAE/C,MAAM,EAAE,wBAAwB;IAI5C,4CAA4C;IAC5C,qBAAqB,IAAI,eAAe,GAAG,IAAI;IAI/C,UAAU,IAAI,IAAI;IAOlB,cAAc,CAAC,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAYrE,oBAAoB,CAAC,aAAa,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA2HhE,uBAAuB,CACrB,WAAW,EAAE,KAAK,CAAC,YAAY,EAC/B,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACpD,UAAU,CAAC,EAAE,GAAG,EAChB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,QAAQ,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,EAC7D,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC;CAkD/B"}

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

@@ -64,7 +64,7 @@ export class LayoutOrchestrator {
             // 2. Preload TSX layouts
             for (const layout of tsxLayouts) {
                 const componentPath = layout.componentPath;
-                preloadPromises.push(loadTSXComponent(componentPath, this.config.projectDir, this.config.layoutCache, this.config.adapter, this.config.projectId, this.config.contentSourceId)
+                preloadPromises.push(loadTSXComponent(componentPath, this.config.projectDir, this.config.layoutCache, this.config.adapter, this.config.projectId, this.config.projectSlug, this.config.contentSourceId)
                     .then(() => ({ type: "tsx", path: componentPath, success: true }))
                     .catch((error) => {
                     logger.warn("[LayoutOrchestrator] Failed to preload TSX layout (will retry during apply)", {

package/esm/src/transforms/esm/http-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-cache.d.ts","sourceRoot":"","sources":["../../../../src/src/transforms/esm/http-cache.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAezE,KAAK,YAAY,GAAG;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,eAAe,CAAC;IAC3B,uEAAuE;IACvE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAoWF;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOvF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA8D9F;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EAClD,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,EAAE,CAAC,CAiInB"}
+{"version":3,"file":"http-cache.d.ts","sourceRoot":"","sources":["../../../../src/src/transforms/esm/http-cache.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAezE,KAAK,YAAY,GAAG;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,eAAe,CAAC;IAC3B,uEAAuE;IACvE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAoWF;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOvF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAyE9F;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EAClD,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,EAAE,CAAC,CAiInB"}

package/esm/src/transforms/esm/http-cache.js

@@ -368,31 +368,43 @@ export async function recoverHttpBundleByHash(hash, cacheDir) {
         // Strategy 1: Direct code lookup by hash (preferred - no URL needed)
         const cachedCode = await distributed.get(`code:${hash}`);
         if (cachedCode) {
-            logger.info("[HTTP-CACHE] Recovering bundle via direct code lookup", { hash });
-            await fs.mkdir(absoluteCacheDir, { recursive: true });
-            await fs.writeTextFile(cachePath, cachedCode);
-            logger.info("[HTTP-CACHE] Bundle recovery successful (direct)", { hash, path: cachePath });
-            // Proactively recover transitive deps so the import retry doesn't
-            // fail again with a different missing bundle.
-            const BUNDLE_RE = /file:\/\/([^"'\s]+veryfront-http-bundle\/http-([a-f0-9]+)\.mjs)/gi;
-            const transitiveDeps = [];
-            let m;
-            while ((m = BUNDLE_RE.exec(cachedCode)) !== null) {
-                const tHash = m[2];
-                if (tHash !== hash) {
-                    transitiveDeps.push({
-                        path: join(absoluteCacheDir, `http-${tHash}.mjs`),
-                        hash: tHash,
+            // Validate that the cached content is valid JavaScript, not compressed/gzipped.
+            // esm.sh sometimes stores gzip-encoded bundles with "gz:" prefix that need
+            // special decoding. If we see such content in the cache, skip it and re-fetch.
+            if (cachedCode.startsWith("gz:") || cachedCode.startsWith("gzip:")) {
+                logger.warn("[HTTP-CACHE] Cached code is gzip-encoded, skipping and will re-fetch", {
+                    hash,
+                    preview: cachedCode.substring(0, 50),
+                });
+                // Fall through to Strategy 2 (URL re-fetch)
+            }
+            else {
+                logger.info("[HTTP-CACHE] Recovering bundle via direct code lookup", { hash });
+                await fs.mkdir(absoluteCacheDir, { recursive: true });
+                await fs.writeTextFile(cachePath, cachedCode);
+                logger.info("[HTTP-CACHE] Bundle recovery successful (direct)", { hash, path: cachePath });
+                // Proactively recover transitive deps so the import retry doesn't
+                // fail again with a different missing bundle.
+                const BUNDLE_RE = /file:\/\/([^"'\s]+veryfront-http-bundle\/http-([a-f0-9]+)\.mjs)/gi;
+                const transitiveDeps = [];
+                let m;
+                while ((m = BUNDLE_RE.exec(cachedCode)) !== null) {
+                    const tHash = m[2];
+                    if (tHash !== hash) {
+                        transitiveDeps.push({
+                            path: join(absoluteCacheDir, `http-${tHash}.mjs`),
+                            hash: tHash,
+                        });
+                    }
+                }
+                if (transitiveDeps.length > 0) {
+                    logger.info("[HTTP-CACHE] Recovering transitive deps from last-resort recovery", {
+                        count: transitiveDeps.length,
                     });
+                    await ensureHttpBundlesExist(transitiveDeps, cacheDir);
                 }
+                return true;
             }
-            if (transitiveDeps.length > 0) {
-                logger.info("[HTTP-CACHE] Recovering transitive deps from last-resort recovery", {
-                    count: transitiveDeps.length,
-                });
-                await ensureHttpBundlesExist(transitiveDeps, cacheDir);
-            }
-            return true;
         }
         // Strategy 2: URL lookup then re-fetch (fallback for bundles cached before code:{hash} was added)
         const originalUrl = await distributed.get(`hash:${hash}`);

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

@@ -48,5 +48,5 @@ export declare function clearESMDiskCache(): Promise<void>;
  * @param contentHash - Optional content hash to validate cached file freshness
  * @returns The cached file path if found and valid, null otherwise
  */
-export declare function lookupMdxEsmCache(filePath: string, cacheDir: string, projectDir?: string, contentHash?: string): Promise<string | null>;
+export declare function lookupMdxEsmCache(filePath: string, cacheDir: string, projectDir?: string, _contentHash?: string): Promise<string | null>;
 //# 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;AAKH,OAAO,EAEL,KAAK,UAAU,EAEhB,MAAM,mCAAmC,CAAC;AAQ3C;;GAEG;AACH,wBAAgB,UAAU,IAAI,UAAU,CAGvC;AAOD;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsBvF;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAezE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAI3C;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CAgClE;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAevD;AAyBD;;;;;;;;;;;;GAYG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwCxB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/cache/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,EAEL,KAAK,UAAU,EAEhB,MAAM,mCAAmC,CAAC;AAQ3C;;GAEG;AACH,wBAAgB,UAAU,IAAI,UAAU,CAGvC;AAOD;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsBvF;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAezE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAI3C;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CAgClE;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAevD;AAyBD;;;;;;;;;;;;GAYG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmCxB"}

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

@@ -162,7 +162,7 @@ function toMdxEsmCacheKey(filePath, projectDir) {
  * @param contentHash - Optional content hash to validate cached file freshness
  * @returns The cached file path if found and valid, null otherwise
  */
-export async function lookupMdxEsmCache(filePath, cacheDir, projectDir, contentHash) {
+export async function lookupMdxEsmCache(filePath, cacheDir, projectDir, _contentHash) {
     const cache = await getModulePathCache(cacheDir);
     const cacheKey = toMdxEsmCacheKey(filePath, projectDir);
     const cachedPath = cache.get(cacheKey);
@@ -176,16 +176,13 @@ export async function lookupMdxEsmCache(filePath, cacheDir, projectDir, contentH
             cache.delete(cacheKey);
             return null;
         }
-        // If contentHash provided, validate the cached file contains matching hash
-        // The cached filename includes the content hash (e.g., module.abc123.js)
-        if (contentHash) {
-            const filename = cachedPath.split("/").pop() ?? "";
-            if (!filename.includes(contentHash.slice(0, 8))) {
-                logger.debug(`${LOG_PREFIX_MDX_LOADER} Cache hash mismatch, invalidating: ${filePath}`);
-                cache.delete(cacheKey);
-                return null;
-            }
-        }
+        // Note: We intentionally skip contentHash validation for MDX-ESM cached files.
+        // The MDX-ESM cache uses transformed-code hashes in filenames (vfmod-v13-{hash}.mjs),
+        // while the SSR loader provides source-code hashes. These will never match.
+        // The cache version in the key (v13:) provides sufficient staleness protection,
+        // and the file's existence confirms it's a valid transform for this codebase.
+        // This allows both loaders to share the same module instance, preventing
+        // duplicate React contexts which break hooks like useContext.
         logger.debug(`${LOG_PREFIX_MDX_LOADER} SSR reusing MDX-ESM cache: ${filePath} -> ${cachedPath}`);
         return cachedPath;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/loader.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAgBH,OAAO,KAAK,EAAkB,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAmYnD,wBAAsB,aAAa,CACjC,mBAAmB,EAAE,MAAM,EAC3B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,SAAS,CAAC,CAWpB"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/loader.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAgBH,OAAO,KAAK,EAAkB,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAoYnD,wBAAsB,aAAa,CACjC,mBAAmB,EAAE,MAAM,EAC3B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,SAAS,CAAC,CAWpB"}

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

@@ -50,6 +50,7 @@ async function initializeCacheDir(context) {
     }
     const localFs = getLocalFs();
     const baseCacheDir = getMdxEsmCacheDir();
+    // Use projectId consistently for stable cache keys (won't change if slug is renamed)
     const projectKey = encodeURIComponent(context.projectId);
     const sourceKey = encodeURIComponent(context.contentSourceId);
     const persistentCacheDir = join(baseCacheDir, projectKey, sourceKey);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.0.103",
+  "version": "0.0.105",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",

package/src/deno.js

@@ -1,6 +1,6 @@
 export default {
   "name": "veryfront",
-  "version": "0.0.103",
+  "version": "0.0.105",
   "nodeModulesDir": "auto",
   "exclude": [
     "npm/",

package/src/src/cli/commands/init/config-generator.ts

@@ -18,7 +18,7 @@ export async function createPackageJson(
     dependencies: {
       react: "^19.0.0",
       "react-dom": "^19.0.0",
-      veryfront: "^0.0.97",
+      veryfront: "^0.0.104",
       zod: "^3.24.0",
     },
   };

package/src/src/modules/react-loader/component-loader.ts

@@ -31,6 +31,7 @@ export function loadComponentFromSource(
         const loader = new SSRModuleLoader({
           projectDir,
           projectId,
+          projectSlug: options?.projectSlug,
           adapter,
           dev,
           contentSourceId: options?.contentSourceId,

package/src/src/modules/react-loader/ssr-module-loader/loader.ts

@@ -516,14 +516,19 @@ export class SSRModuleLoader {
         }
 
         if (httpBundlesOk) {
-          const tempPath = await this.getTempPath(filePath, contentHash);
+          // CRITICAL: Use transformedHash (hash of the transformed code) for temp path,
+          // NOT contentHash (hash of source). Other modules importing this file use
+          // transformedHash in their import paths (set during fresh transform at line 703).
+          // Using contentHash here would create a path mismatch and "Module not found" errors.
+          const transformedHash = await this.hashContentAsync(redisCode);
+          const tempPath = await this.getTempPath(filePath, transformedHash);
           await this.fs.mkdir(tempPath.substring(0, tempPath.lastIndexOf("/")), {
             recursive: true,
           });
           await this.fs.writeTextFile(tempPath, redisCode);
-          verifiedHttpBundlePaths.set(`${tempPath}:${contentHash}`, true);
+          verifiedHttpBundlePaths.set(`${tempPath}:${transformedHash}`, true);
 
-          const entry: ModuleCacheEntry = { tempPath, contentHash };
+          const entry: ModuleCacheEntry = { tempPath, contentHash: transformedHash };
           globalModuleCache.set(contentCacheKey, entry);
           globalModuleCache.set(filePathCacheKey, entry);
 
@@ -539,8 +544,9 @@ export class SSRModuleLoader {
     // Check MDX-ESM cache to share modules with MDX loader and avoid duplicate React contexts
     if (this.options.projectId && this.options.contentSourceId) {
       const baseCacheDir = getMdxEsmCacheDir();
-      const projectKey = hashCodeHex(this.options.projectId);
-      const sourceKey = hashCodeHex(this.options.contentSourceId);
+      // Use projectId consistently for stable cache keys (matches MDX loader)
+      const projectKey = encodeURIComponent(this.options.projectId);
+      const sourceKey = this.options.contentSourceId;
       const mdxCacheDir = join(baseCacheDir, projectKey, sourceKey);
 
       const mdxCachedPath = await lookupMdxEsmCache(
@@ -1023,8 +1029,9 @@ export class SSRModuleLoader {
     // Use the same cache directory as MDX-ESM loader to share module instances.
     // This prevents issues like React context being created twice in separate files.
     const baseCacheDir = getMdxEsmCacheDir();
-    const projectKey = hashCodeHex(projectId);
-    const sourceKey = hashCodeHex(contentSourceId);
+    // Use projectId consistently for stable cache keys (matches MDX loader)
+    const projectKey = encodeURIComponent(projectId);
+    const sourceKey = contentSourceId;
     const cacheKey = `${baseCacheDir}|${projectKey}|${sourceKey}`;
 
     const existingDir = globalTmpDirs.get(cacheKey);

package/src/src/modules/react-loader/ssr-module-loader/types.ts

@@ -11,6 +11,8 @@ import type { RuntimeAdapter } from "../../../platform/adapters/base.js";
 export interface SSRModuleLoaderOptions {
   projectDir: string;
   projectId: string;
+  /** Project slug for cache directory (human-readable name) */
+  projectSlug?: string;
   adapter: RuntimeAdapter;
   dev: boolean;
   apiBaseUrl?: string;

package/src/src/modules/react-loader/types.ts

@@ -2,6 +2,8 @@ import type * as React from "react";
 
 export interface LoadComponentOptions {
   projectId?: string;
+  /** Project slug for cache directory (human-readable name) */
+  projectSlug?: string;
   dev?: boolean;
   moduleServerUrl?: string;
   vendorBundleHash?: string;

package/src/src/rendering/layouts/layout-applicator.ts

@@ -246,6 +246,7 @@ export class LayoutApplicator {
               this.adapter,
               {
                 projectId: this.projectId ?? this.projectDir,
+                projectSlug: this.projectSlug,
                 dev: this.mode === "development",
                 moduleServerUrl: this.config?.dev?.moduleServerUrl,
                 contentSourceId: this.contentSourceId,
@@ -253,7 +254,9 @@ export class LayoutApplicator {
             );
           }
 
-          if (!App) return pageElement;
+          if (!App) {
+            return pageElement;
+          }
 
           const React = await getProjectReact();
           logger.debug("Wrapped page with App component");
@@ -307,6 +310,7 @@ export class LayoutApplicator {
         this.adapter,
         {
           projectId: this.projectId ?? this.projectDir,
+          projectSlug: this.projectSlug,
           dev: this.mode === "development",
           moduleServerUrl: this.config?.dev?.moduleServerUrl,
           contentSourceId: this.contentSourceId,

package/src/src/rendering/layouts/utils/app-resolver.ts

@@ -15,6 +15,12 @@ export async function resolveAppComponentPath(
   adapter: RuntimeAdapter,
   config?: VeryfrontConfig,
 ): Promise<string | null> {
+  console.log("[AppResolver] Starting resolution", {
+    projectDir,
+    hasAdapter: !!adapter,
+    hasConfig: !!config,
+    configApp: config?.app,
+  });
   logger.debug("[AppResolver] Starting resolution", {
     projectDir,
     hasAdapter: !!adapter,
@@ -55,14 +61,17 @@ export async function resolveAppComponentPath(
   for (const ext of VALID_EXTENSIONS) {
     const appPath = join(projectDir, `components/app.${ext}`);
     const exists = await adapter.fs.exists(appPath);
+    console.log("[AppResolver] Checking default path", { appPath, exists });
     logger.debug("[AppResolver] Checking default path", { appPath, exists });
 
     if (exists) {
+      console.log("[AppResolver] Found app component via discovery", { path: appPath });
       logger.debug("[AppResolver] Found app component via discovery", { path: appPath });
       return appPath;
     }
   }
 
+  console.log("[AppResolver] No app component found");
   logger.debug("[AppResolver] No app component found");
   return null;
 }

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

@@ -87,6 +87,7 @@ export function applyLayoutsESM(
                   adapter,
                   props,
                   projectId,
+                  projectSlug,
                   contentSourceId,
                 ),
               {
@@ -148,7 +149,7 @@ export async function applyLayoutsFunctionBody(
   adapter: RuntimeAdapter,
   layoutDataMap: Map<string, Record<string, unknown>> | undefined,
   projectId: string,
-  _projectSlug: string,
+  projectSlug: string,
   contentSourceId: string,
 ): Promise<BundledReact.ReactElement> {
   const React = await getProjectReact();
@@ -190,6 +191,7 @@ export async function applyLayoutsFunctionBody(
         tsxLayoutModuleCache,
         adapter,
         projectId,
+        projectSlug,
         contentSourceId,
       );
 

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

@@ -70,6 +70,7 @@ export async function loadTSXComponent(
   cache: LayoutComponentCache,
   adapter: RuntimeAdapter,
   projectId: string,
+  projectSlug: string,
   contentSourceId: string,
 ): Promise<BundledReact.ComponentType> {
   const source = await adapter.fs.readFile(componentPath);
@@ -87,6 +88,7 @@ export async function loadTSXComponent(
   const loaded = await loadComponentFromSource(source, componentPath, projectDir, adapter, {
     dev: true,
     projectId,
+    projectSlug,
     ssr: true,
     contentSourceId,
   });
@@ -184,10 +186,15 @@ export async function applyTSXLayout(
   adapter: RuntimeAdapter,
   props: Record<string, unknown> | undefined,
   projectId: string,
+  projectSlug: string,
   contentSourceId: string,
 ): Promise<BundledReact.ReactElement> {
   const start = performance.now();
-  logger.debug("[applyTSXLayout] START", { componentPath: item.componentPath, projectId });
+  logger.debug("[applyTSXLayout] START", {
+    componentPath: item.componentPath,
+    projectId,
+    projectSlug,
+  });
 
   const React = await getProjectReact();
 
@@ -201,6 +208,7 @@ export async function applyTSXLayout(
       tsxLayoutModuleCache,
       adapter,
       projectId,
+      projectSlug,
       contentSourceId,
     );
 

package/src/src/rendering/orchestrator/layout.ts

@@ -123,6 +123,7 @@ export class LayoutOrchestrator {
               this.config.layoutCache,
               this.config.adapter,
               this.config.projectId,
+              this.config.projectSlug,
               this.config.contentSourceId,
             )
               .then(() => ({ type: "tsx", path: componentPath, success: true }))

package/src/src/transforms/esm/http-cache.ts

@@ -456,33 +456,44 @@ export async function recoverHttpBundleByHash(hash: string, cacheDir: string): P
     // Strategy 1: Direct code lookup by hash (preferred - no URL needed)
     const cachedCode = await distributed.get(`code:${hash}`);
     if (cachedCode) {
-      logger.info("[HTTP-CACHE] Recovering bundle via direct code lookup", { hash });
-      await fs.mkdir(absoluteCacheDir, { recursive: true });
-      await fs.writeTextFile(cachePath, cachedCode);
-      logger.info("[HTTP-CACHE] Bundle recovery successful (direct)", { hash, path: cachePath });
-
-      // Proactively recover transitive deps so the import retry doesn't
-      // fail again with a different missing bundle.
-      const BUNDLE_RE = /file:\/\/([^"'\s]+veryfront-http-bundle\/http-([a-f0-9]+)\.mjs)/gi;
-      const transitiveDeps: Array<{ path: string; hash: string }> = [];
-      let m;
-      while ((m = BUNDLE_RE.exec(cachedCode)) !== null) {
-        const tHash = m[2]!;
-        if (tHash !== hash) {
-          transitiveDeps.push({
-            path: join(absoluteCacheDir, `http-${tHash}.mjs`),
-            hash: tHash,
+      // Validate that the cached content is valid JavaScript, not compressed/gzipped.
+      // esm.sh sometimes stores gzip-encoded bundles with "gz:" prefix that need
+      // special decoding. If we see such content in the cache, skip it and re-fetch.
+      if (cachedCode.startsWith("gz:") || cachedCode.startsWith("gzip:")) {
+        logger.warn("[HTTP-CACHE] Cached code is gzip-encoded, skipping and will re-fetch", {
+          hash,
+          preview: cachedCode.substring(0, 50),
+        });
+        // Fall through to Strategy 2 (URL re-fetch)
+      } else {
+        logger.info("[HTTP-CACHE] Recovering bundle via direct code lookup", { hash });
+        await fs.mkdir(absoluteCacheDir, { recursive: true });
+        await fs.writeTextFile(cachePath, cachedCode);
+        logger.info("[HTTP-CACHE] Bundle recovery successful (direct)", { hash, path: cachePath });
+
+        // Proactively recover transitive deps so the import retry doesn't
+        // fail again with a different missing bundle.
+        const BUNDLE_RE = /file:\/\/([^"'\s]+veryfront-http-bundle\/http-([a-f0-9]+)\.mjs)/gi;
+        const transitiveDeps: Array<{ path: string; hash: string }> = [];
+        let m;
+        while ((m = BUNDLE_RE.exec(cachedCode)) !== null) {
+          const tHash = m[2]!;
+          if (tHash !== hash) {
+            transitiveDeps.push({
+              path: join(absoluteCacheDir, `http-${tHash}.mjs`),
+              hash: tHash,
+            });
+          }
+        }
+        if (transitiveDeps.length > 0) {
+          logger.info("[HTTP-CACHE] Recovering transitive deps from last-resort recovery", {
+            count: transitiveDeps.length,
           });
+          await ensureHttpBundlesExist(transitiveDeps, cacheDir);
         }
-      }
-      if (transitiveDeps.length > 0) {
-        logger.info("[HTTP-CACHE] Recovering transitive deps from last-resort recovery", {
-          count: transitiveDeps.length,
-        });
-        await ensureHttpBundlesExist(transitiveDeps, cacheDir);
-      }
 
-      return true;
+        return true;
+      }
     }
 
     // Strategy 2: URL lookup then re-fetch (fallback for bundles cached before code:{hash} was added)

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

@@ -192,7 +192,7 @@ export async function lookupMdxEsmCache(
   filePath: string,
   cacheDir: string,
   projectDir?: string,
-  contentHash?: string,
+  _contentHash?: string, // Intentionally unused - kept for API compatibility
 ): Promise<string | null> {
   const cache = await getModulePathCache(cacheDir);
   const cacheKey = toMdxEsmCacheKey(filePath, projectDir);
@@ -210,18 +210,13 @@ export async function lookupMdxEsmCache(
       return null;
     }
 
-    // If contentHash provided, validate the cached file contains matching hash
-    // The cached filename includes the content hash (e.g., module.abc123.js)
-    if (contentHash) {
-      const filename = cachedPath.split("/").pop() ?? "";
-      if (!filename.includes(contentHash.slice(0, 8))) {
-        logger.debug(
-          `${LOG_PREFIX_MDX_LOADER} Cache hash mismatch, invalidating: ${filePath}`,
-        );
-        cache.delete(cacheKey);
-        return null;
-      }
-    }
+    // Note: We intentionally skip contentHash validation for MDX-ESM cached files.
+    // The MDX-ESM cache uses transformed-code hashes in filenames (vfmod-v13-{hash}.mjs),
+    // while the SSR loader provides source-code hashes. These will never match.
+    // The cache version in the key (v13:) provides sufficient staleness protection,
+    // and the file's existence confirms it's a valid transform for this codebase.
+    // This allows both loaders to share the same module instance, preventing
+    // duplicate React contexts which break hooks like useContext.
 
     logger.debug(
       `${LOG_PREFIX_MDX_LOADER} SSR reusing MDX-ESM cache: ${filePath} -> ${cachedPath}`,

package/src/src/transforms/mdx/esm-module-loader/loader.ts

@@ -74,6 +74,7 @@ async function initializeCacheDir(context: ESMLoaderContext): Promise<string> {
 
   const localFs = getLocalFs();
   const baseCacheDir = getMdxEsmCacheDir();
+  // Use projectId consistently for stable cache keys (won't change if slug is renamed)
   const projectKey = encodeURIComponent(context.projectId);
   const sourceKey = encodeURIComponent(context.contentSourceId);
   const persistentCacheDir = join(baseCacheDir, projectKey, sourceKey);