veryfront 0.1.826 → 0.1.828

package/esm/deno.js

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

package/esm/src/build/production-build/build/output-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/build/production-build/build/output-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAY1F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAEvF,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;CACpD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED;;GAEG;AACH,wBAAsB,gCAAgC,CACpD,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAgCf;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAEhD;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBvF"}
+{"version":3,"file":"output-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/build/production-build/build/output-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAe1F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAEvF,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;CACpD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAwBf;AAED;;GAEG;AACH,wBAAsB,gCAAgC,CACpD,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAgCf;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAEhD;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBvF"}

package/esm/src/build/production-build/build/output-generator.js

@@ -11,7 +11,7 @@
 import { serverLogger as logger } from "../../../utils/index.js";
 import { join } from "../../../platform/compat/path/index.js";
 import { generateServiceWorker } from "../../../server/build-service-worker.js";
-import { generateProdHydrationModule } from "../../../html/hydration-script-builder/prod-scripts.js";
+import { generateProdHydrationModule, getProdHydrationModulePath, } from "../../../html/hydration-script-builder/prod-scripts.js";
 import { copyStaticAssets } from "../asset-generation.js";
 import { generateAppModule, generateClientModule, generatePrefetchScript, generateRouterScript, } from "../client-runtime.js";
 import { generateLocalReleaseAssetManifest } from "../local-release-assets.js";
@@ -27,7 +27,9 @@ export async function generateClientScripts(adapter, outputDir, dryRun) {
     await adapter.fs.writeFile(join(outputDir, "_veryfront/client.js"), await generateClientModule());
     await adapter.fs.writeFile(join(outputDir, "_veryfront/router.js"), await generateRouterScript(adapter));
     await adapter.fs.writeFile(join(outputDir, "_veryfront/prefetch.js"), await generatePrefetchScript(adapter));
-    await adapter.fs.writeFile(join(outputDir, "_veryfront/hydration-runtime.js"), generateProdHydrationModule());
+    const hydrationRuntime = generateProdHydrationModule();
+    await adapter.fs.writeFile(join(outputDir, "_veryfront/hydration-runtime.js"), hydrationRuntime);
+    await adapter.fs.writeFile(join(outputDir, getProdHydrationModulePath().slice(1)), hydrationRuntime);
 }
 /**
  * Generate manifest and service worker

package/esm/src/html/html-shell-generator.js

@@ -9,7 +9,7 @@ import { getReadyManifestForRenderAsync } from "../release-assets/manifest-cache
 import { resolveManifestModuleUrl, resolveManifestRoutePreloadUrls, } from "../release-assets/html-consumption.js";
 import { routeForPage } from "../release-assets/route-path.js";
 import { buildNonceAttribute, escapeHTML } from "./html-escape.js";
-import { generateHydrationData, getDevScripts, getProdScripts, PROD_HYDRATION_MODULE_PATH, } from "./hydration-script-builder/index.js";
+import { generateHydrationData, getDevScripts, getProdHydrationModulePath, getProdScripts, } from "./hydration-script-builder/index.js";
 import { getPreviewStylesheetLink, getStudioScripts } from "./dev-scripts.js";
 import { processMetadata } from "./metadata-builder.js";
 import { extractCandidates, getDevStyles as getErrorOverlayStyles, getProjectCSS, } from "./styles-builder/index.js";
@@ -169,7 +169,7 @@ async function generateHTMLShellPartsImpl(meta, options, params, props, contentF
         : "";
     const prodHydrationModulePreload = useDevScripts
         ? ""
-        : `<link rel="modulepreload" href="${PROD_HYDRATION_MODULE_PATH}">`;
+        : `<link rel="modulepreload" href="${getProdHydrationModulePath()}">`;
     const nonceAttr = buildNonceAttribute(nonce);
     // Expose project slug for runtime error overlay "Fix in Veryfront" button
     const overlaySlug = options.projectId || meta.slug;

package/esm/src/html/hydration-script-builder/index.d.ts

@@ -9,6 +9,6 @@ export { getDevScripts } from "./dev-scripts.js";
 export { generateDevErrorLoggerScript } from "./dev-error-logger.js";
 export { generateDevComponentManifestScript } from "./dev-component-manifest.js";
 export { generateDevClientRendererScript } from "./dev-client-renderer.js";
-export { generateProdHydrationModule, getProdScripts, PROD_HYDRATION_MODULE_PATH, } from "./prod-scripts.js";
+export { generateProdHydrationModule, getProdHydrationModulePath, getProdScripts, isVersionedProdHydrationModulePath, PROD_HYDRATION_MODULE_PATH, PROD_HYDRATION_MODULE_VERSIONED_PATH_PATTERN, } from "./prod-scripts.js";
 export { generateProdHydrationScript } from "./prod-hydration.js";
 //# sourceMappingURL=index.d.ts.map

package/esm/src/html/hydration-script-builder/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/src/html/hydration-script-builder/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,kCAAkC,EAAE,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EACL,2BAA2B,EAC3B,cAAc,EACd,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/src/html/hydration-script-builder/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,kCAAkC,EAAE,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EACL,2BAA2B,EAC3B,0BAA0B,EAC1B,cAAc,EACd,kCAAkC,EAClC,0BAA0B,EAC1B,4CAA4C,GAC7C,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC"}

package/esm/src/html/hydration-script-builder/index.js

@@ -8,5 +8,5 @@ export { getDevScripts } from "./dev-scripts.js";
 export { generateDevErrorLoggerScript } from "./dev-error-logger.js";
 export { generateDevComponentManifestScript } from "./dev-component-manifest.js";
 export { generateDevClientRendererScript } from "./dev-client-renderer.js";
-export { generateProdHydrationModule, getProdScripts, PROD_HYDRATION_MODULE_PATH, } from "./prod-scripts.js";
+export { generateProdHydrationModule, getProdHydrationModulePath, getProdScripts, isVersionedProdHydrationModulePath, PROD_HYDRATION_MODULE_PATH, PROD_HYDRATION_MODULE_VERSIONED_PATH_PATTERN, } from "./prod-scripts.js";
 export { generateProdHydrationScript } from "./prod-hydration.js";

package/esm/src/html/hydration-script-builder/prod-scripts.d.ts

@@ -1,4 +1,7 @@
 export declare const PROD_HYDRATION_MODULE_PATH = "/_veryfront/hydration-runtime.js";
+export declare const PROD_HYDRATION_MODULE_VERSIONED_PATH_PATTERN: RegExp;
 export declare function generateProdHydrationModule(): string;
+export declare function getProdHydrationModulePath(): string;
+export declare function isVersionedProdHydrationModulePath(pathname: string): boolean;
 export declare function getProdScripts(_slug: string, _params?: Record<string, string | string[]>, _props?: Record<string, unknown>, nonce?: string): string;
 //# sourceMappingURL=prod-scripts.d.ts.map

package/esm/src/html/hydration-script-builder/prod-scripts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prod-scripts.d.ts","sourceRoot":"","sources":["../../../../src/src/html/hydration-script-builder/prod-scripts.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,0BAA0B,qCAAqC,CAAC;AAE7E,wBAAgB,2BAA2B,IAAI,MAAM,CAUpD;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EAC3C,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,KAAK,CAAC,EAAE,MAAM,GACb,MAAM,CAGR"}
+{"version":3,"file":"prod-scripts.d.ts","sourceRoot":"","sources":["../../../../src/src/html/hydration-script-builder/prod-scripts.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,0BAA0B,qCAAqC,CAAC;AAC7E,eAAO,MAAM,4CAA4C,QACH,CAAC;AAIvD,wBAAgB,2BAA2B,IAAI,MAAM,CAUpD;AAED,wBAAgB,0BAA0B,IAAI,MAAM,CAMnD;AAED,wBAAgB,kCAAkC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE5E;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EAC3C,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,KAAK,CAAC,EAAE,MAAM,GACb,MAAM,CAGR"}

package/esm/src/html/hydration-script-builder/prod-scripts.js

@@ -1,6 +1,9 @@
 import { getLoaderScript, getRendererScript, getRouterScript } from "./templates/index.js";
 import { buildNonceAttribute } from "../html-escape.js";
+import { fnv1aHash } from "../../utils/hash-utils.js";
 export const PROD_HYDRATION_MODULE_PATH = "/_veryfront/hydration-runtime.js";
+export const PROD_HYDRATION_MODULE_VERSIONED_PATH_PATTERN = /^\/_veryfront\/hydration-runtime\.[0-9a-f]{8}\.js$/;
+let cachedProdHydrationModulePath = null;
 export function generateProdHydrationModule() {
     return [
         `import * as React from 'react';`,
@@ -12,7 +15,17 @@ export function generateProdHydrationModule() {
         getRendererScript().trim(),
     ].join("\n\n");
 }
+export function getProdHydrationModulePath() {
+    if (cachedProdHydrationModulePath)
+        return cachedProdHydrationModulePath;
+    const hash = fnv1aHash(generateProdHydrationModule()).padStart(8, "0");
+    cachedProdHydrationModulePath = `/_veryfront/hydration-runtime.${hash}.js`;
+    return cachedProdHydrationModulePath;
+}
+export function isVersionedProdHydrationModulePath(pathname) {
+    return PROD_HYDRATION_MODULE_VERSIONED_PATH_PATTERN.test(pathname);
+}
 export function getProdScripts(_slug, _params, _props, nonce) {
     const nonceAttr = buildNonceAttribute(nonce);
-    return `\n  <script type="module" src="${PROD_HYDRATION_MODULE_PATH}"${nonceAttr}></script>`;
+    return `\n  <script type="module" src="${getProdHydrationModulePath()}"${nonceAttr}></script>`;
 }

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

@@ -9,10 +9,10 @@
 /**
  * Rewrite a cross-project import specifier to use a local temp path.
  */
-export declare function rewriteCrossProjectImport(transformed: string, specifier: string, tempPath: string): string;
+export declare function rewriteCrossProjectImport(transformed: string, specifier: string, tempPath: string): Promise<string>;
 /**
  * Rewrite local imports to use hashed temp paths.
  * This ensures each content version uses its own cached module file.
  */
-export declare function rewriteLocalImports(transformed: string, localImportPaths: Map<string, string>, fromFilePath: string, projectDir: string): string;
+export declare function rewriteLocalImports(transformed: string, localImportPaths: Map<string, string>, fromFilePath: string, projectDir: string): Promise<string>;
 //# sourceMappingURL=import-rewriter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"import-rewriter.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/import-rewriter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAUH;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,MAAM,CAUR;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GACjB,MAAM,CA8BR"}
+{"version":3,"file":"import-rewriter.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/import-rewriter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH;;GAEG;AACH,wBAAsB,yBAAyB,CAC7C,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAYjB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CA2BjB"}

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

@@ -6,27 +6,24 @@
  *
  * @module module-system/react-loader/ssr-module-loader/import-rewriter
  */
-const IMPORT_FROM_PREFIX = "from\\s*[\"']";
-const IMPORT_FROM_SUFFIX = "[\"']";
-const REGEX_ESCAPE = /[.*+?^${}()|[\]\\]/g;
-function escapeRegExp(value) {
-    return value.replace(REGEX_ESCAPE, "\\$&");
-}
+import { replaceSpecifiers } from "../../../transforms/esm/lexer.js";
 /**
  * Rewrite a cross-project import specifier to use a local temp path.
  */
-export function rewriteCrossProjectImport(transformed, specifier, tempPath) {
+export async function rewriteCrossProjectImport(transformed, specifier, tempPath) {
     const jsSpecifier = toJsExtension(specifier);
-    const escapedSpecifier = escapeRegExp(specifier);
-    const escapedJsSpecifier = escapeRegExp(jsSpecifier);
-    const pattern = new RegExp(`${IMPORT_FROM_PREFIX}(${escapedSpecifier}|${escapedJsSpecifier})${IMPORT_FROM_SUFFIX}`, "g");
-    return transformed.replace(pattern, `from "file://${tempPath}"`);
+    const replacement = `file://${tempPath}`;
+    const replacements = new Map([
+        [specifier, replacement],
+        [jsSpecifier, replacement],
+    ]);
+    return await replaceSpecifiers(transformed, (importSpecifier) => replacements.get(importSpecifier) ?? null);
 }
 /**
  * Rewrite local imports to use hashed temp paths.
  * This ensures each content version uses its own cached module file.
  */
-export function rewriteLocalImports(transformed, localImportPaths, fromFilePath, projectDir) {
+export async function rewriteLocalImports(transformed, localImportPaths, fromFilePath, projectDir) {
     if (localImportPaths.size === 0)
         return transformed;
     const normalizedProjectDir = projectDir.replace(/\/$/, "");
@@ -34,23 +31,18 @@ export function rewriteLocalImports(transformed, localImportPaths, fromFilePath,
     const fromRelativeDir = fromFileDir.startsWith(normalizedProjectDir)
         ? fromFileDir.substring(normalizedProjectDir.length + 1)
         : fromFileDir;
-    const replacementByPattern = new Map();
+    const replacements = new Map();
     for (const [specifierOrPath, tempPath] of localImportPaths) {
         const patterns = buildImportPatterns(specifierOrPath, fromRelativeDir, normalizedProjectDir);
         for (const pattern of patterns) {
-            if (!replacementByPattern.has(pattern)) {
-                replacementByPattern.set(pattern, tempPath);
+            if (!replacements.has(pattern)) {
+                replacements.set(pattern, `file://${tempPath}`);
             }
         }
     }
-    if (replacementByPattern.size === 0)
+    if (replacements.size === 0)
         return transformed;
-    const importPattern = Array.from(replacementByPattern.keys()).map(escapeRegExp).join("|");
-    const regex = new RegExp(`${IMPORT_FROM_PREFIX}(${importPattern})${IMPORT_FROM_SUFFIX}`, "g");
-    return transformed.replace(regex, (match, specifier) => {
-        const tempPath = replacementByPattern.get(specifier);
-        return tempPath === undefined ? match : `from "file://${tempPath}"`;
-    });
+    return await replaceSpecifiers(transformed, (importSpecifier) => replacements.get(importSpecifier) ?? null);
 }
 /**
  * Build import patterns for a given specifier to match in transformed code.

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

@@ -397,9 +397,9 @@ export class SSRModuleLoader {
                 };
                 let transformed = await withSpan(SpanNames.SSR_TRANSFORM_SINGLE, () => transformToESM(code, filePath, this.options.projectDir, this.options.adapter, transformOpts), { "ssr.file": filePath.split("/").pop() || filePath });
                 for (const [specifier, tempPath] of crossProjectPaths.entries()) {
-                    transformed = rewriteCrossProjectImport(transformed, specifier, tempPath);
+                    transformed = await rewriteCrossProjectImport(transformed, specifier, tempPath);
                 }
-                transformed = rewriteLocalImports(transformed, localImportPaths, filePath, this.options.projectDir);
+                transformed = await rewriteLocalImports(transformed, localImportPaths, filePath, this.options.projectDir);
                 transformed = await resolveVfModuleImports(transformed, {
                     filePath,
                     projectId: this.options.projectId,

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;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;YAuDpB,YAAY;CA2B3B"}
+{"version":3,"file":"ssr-cache-manager.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/ssr-cache-manager.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAalE,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAQ3E;;;;;;;GAOG;AACH,qBAAa,eAAe;IAId,OAAO,CAAC,OAAO;IAH3B,OAAO,CAAC,EAAE,CAAsB;IAChC,OAAO,CAAC,gBAAgB,CAAqB;gBAEzB,OAAO,EAAE,sBAAsB;IAEnD,4DAA4D;IAC5D,aAAa,IAAI,MAAM;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;YAI9B,4BAA4B;YAW5B,qBAAqB;YAsBrB,oBAAoB;YAuDpB,YAAY;CA2B3B"}

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

@@ -15,6 +15,7 @@ import { createFileSystem } from "../../../platform/compat/fs.js";
 import { rendererLogger } from "../../../utils/index.js";
 import { hashCodeHex } from "../../../utils/hash-utils.js";
 import { ensureHttpBundlesExist } from "../../../transforms/esm/http-cache.js";
+import { parseImports } from "../../../transforms/esm/lexer.js";
 import { getHttpBundleCacheDir, getMdxEsmCacheDir } from "../../../utils/cache-dir.js";
 import { globalModuleCache, globalTmpDirs } from "./cache/index.js";
 import { extractAllFilePathsRecursive, extractAllHttpBundlePathsRecursive, verifiedHttpBundlePaths, } from "./http-bundle-helpers.js";
@@ -23,7 +24,6 @@ import { ensureMdxModuleDependencies } from "../../../transforms/mdx/esm-module-
 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;
-const UNRESOLVED_VF_MODULE_IMPORT_PATTERN = /from\s*["']((?:file:\/\/)?\/?\/?_vf_modules\/[^"']+)["']/;
 /**
  * Manages caching concerns for SSR module loading:
  * - Cache key computation and config hashing
@@ -108,7 +108,7 @@ export class SSRCacheManager {
         if (options.checkLocalPaths && await this.hasMissingLocalPaths(code, filePath)) {
             return false;
         }
-        if (this.hasUnresolvedVfModuleImports(code)) {
+        if (await this.hasUnresolvedVfModuleImports(code)) {
             logger.warn(source === "memory-cache"
                 ? "[SSR-MODULE-LOADER] Memory cache has unresolved _vf_modules imports, invalidating"
                 : "[SSR-MODULE-LOADER] Redis cache has unresolved _vf_modules imports, re-transforming", { file: filePath.slice(-40) });
@@ -156,8 +156,15 @@ export class SSRCacheManager {
     getFs() {
         return this.fs;
     }
-    hasUnresolvedVfModuleImports(code) {
-        return UNRESOLVED_VF_MODULE_IMPORT_PATTERN.test(code);
+    async hasUnresolvedVfModuleImports(code) {
+        const imports = await parseImports(code);
+        return imports.some((importSpecifier) => {
+            const rawPath = importSpecifier.n;
+            if (!rawPath)
+                return false;
+            const path = rawPath.replace(/^(?:file:\/\/)?\/+/, "");
+            return path.startsWith("_vf_modules/");
+        });
     }
     async hasMissingHttpBundles(code, filePath, source) {
         const bundlePaths = await extractAllHttpBundlePathsRecursive(code);

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

@@ -5,7 +5,7 @@
  */
 import type { RuntimeAdapter } from "../../../platform/adapters/base.js";
 interface VfModuleImport {
-    original: string;
+    specifier: string;
     path: string;
 }
 interface ResolveVfModuleImportsOptions {
@@ -20,7 +20,7 @@ interface ResolveVfModuleImportsOptions {
  * Find /_vf_modules/ imports in transformed code.
  * Matches both /_vf_modules/... and file:///_vf_modules/... forms.
  */
-export declare function findVfModuleImports(code: string): VfModuleImport[];
+export declare function findVfModuleImports(code: string): Promise<VfModuleImport[]>;
 /**
  * Resolve /_vf_modules/ imports to local cached modules and rewrite code.
  */

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,CAwDjB"}
+{"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,SAAS,EAAE,MAAM,CAAC;IAClB,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,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAoBjF;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,MAAM,CAAC,CAyDjB"}

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

@@ -7,24 +7,29 @@ import { join } from "../../../platform/compat/path/index.js";
 import { hashCodeHex } from "../../../utils/hash-utils.js";
 import { rendererLogger } from "../../../utils/index.js";
 import { getMdxEsmCacheDir } from "../../../utils/cache-dir.js";
+import { parseImports, replaceSpecifiers } from "../../../transforms/esm/lexer.js";
 import { createModuleFetcherContext, fetchAndCacheModule, } from "../../../transforms/mdx/esm-module-loader/module-fetcher/index.js";
-import { VF_MODULE_IMPORT_PATTERN } from "../../../transforms/mdx/esm-module-loader/constants.js";
 const logger = rendererLogger.component("ssr-module-loader");
 /**
  * Find /_vf_modules/ imports in transformed code.
  * Matches both /_vf_modules/... and file:///_vf_modules/... forms.
  */
-export function findVfModuleImports(code) {
+export async function findVfModuleImports(code) {
     const imports = [];
-    const pattern = new RegExp(VF_MODULE_IMPORT_PATTERN.source, "g");
-    let match;
-    while ((match = pattern.exec(code)) !== null) {
-        const rawPath = match[1];
+    const parsedImports = await parseImports(code);
+    for (const importSpecifier of parsedImports) {
+        const rawPath = importSpecifier.n;
         if (!rawPath)
             continue;
         // Normalize "file:///_vf_modules/..." and "/_vf_modules/..." to "_vf_modules/..."
         const path = rawPath.replace(/^(?:file:\/\/)?\/+/, "");
-        imports.push({ original: match[0], path });
+        if (!path.startsWith("_vf_modules/"))
+            continue;
+        const queryStart = path.indexOf("?");
+        imports.push({
+            specifier: rawPath,
+            path: queryStart === -1 ? path : path.slice(0, queryStart),
+        });
     }
     return imports;
 }
@@ -32,7 +37,7 @@ export function findVfModuleImports(code) {
  * Resolve /_vf_modules/ imports to local cached modules and rewrite code.
  */
 export async function resolveVfModuleImports(code, options) {
-    const imports = findVfModuleImports(code);
+    const imports = await findVfModuleImports(code);
     if (imports.length === 0)
         return code;
     logger.debug("Processing _vf_modules imports", {
@@ -49,10 +54,10 @@ export async function resolveVfModuleImports(code, options) {
         projectSlug: options.projectId,
         strictMissingModules: false,
     });
-    const results = await Promise.all(imports.map(async ({ original, path }) => {
+    const results = await Promise.all(imports.map(async ({ specifier, path }) => {
         try {
             const cachedFilePath = await fetchAndCacheModule(path, fetcherContext);
-            return { original, path, cachedFilePath };
+            return { specifier, path, cachedFilePath };
         }
         catch (error) {
             logger.warn("Failed to fetch _vf_modules import", {
@@ -60,13 +65,13 @@ export async function resolveVfModuleImports(code, options) {
                 path,
                 error: error instanceof Error ? error.message : String(error),
             });
-            return { original, path, cachedFilePath: null };
+            return { specifier, path, cachedFilePath: null };
         }
     }));
-    let transformed = code;
-    for (const { original, path, cachedFilePath } of results) {
+    const replacements = new Map();
+    for (const { specifier, path, cachedFilePath } of results) {
         if (cachedFilePath) {
-            transformed = transformed.replace(original, `from "file://${cachedFilePath}"`);
+            replacements.set(specifier, `file://${cachedFilePath}`);
         }
         else {
             logger.warn("Failed to resolve _vf_modules import", {
@@ -75,5 +80,7 @@ export async function resolveVfModuleImports(code, options) {
             });
         }
     }
-    return transformed;
+    if (replacements.size === 0)
+        return code;
+    return await replaceSpecifiers(code, (specifier) => replacements.get(specifier) ?? null);
 }

package/esm/src/release-assets/build-executor.d.ts.map

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

package/esm/src/release-assets/build-executor.js

@@ -16,6 +16,7 @@
  */
 import { serverLogger } from "../utils/index.js";
 import { VERSION } from "../utils/version.js";
+import { resolve } from "../extensions/contracts.js";
 import { createFileSystem } from "../platform/compat/fs.js";
 import { getHostEnv } from "../platform/compat/process.js";
 import { dirname, join, normalize } from "../platform/compat/path/index.js";
@@ -88,66 +89,44 @@ function isBrowserModule(path) {
     return BROWSER_MODULE_DIRS.some((dir) => path.startsWith(dir));
 }
 /**
- * Statically resolve relative imports in a source file to logical paths.
- *
- * Parses `import/export ... from "..."` and bare `import "..."` statements.
- * Only relative specifiers (`./` or `../`) are resolved; package imports and
- * absolute URLs are skipped. Extension-less specifiers try each browser module
- * extension in order.
+ * Statically resolve runtime imports in a TS/JSX source file to logical paths.
+ * Uses the CodeParser AST contract so type-only imports do not enter route
+ * preload closure.
  */
-function resolveStaticImports(source, moduleLogicalPath, knownPaths) {
-    const importRe = /(?:^|;|\n)\s*(?:import|export)\s+(?:[^'"]+\s+from\s+)?['"]([^'"]+)['"]/gm;
-    const results = [];
-    let m;
-    while ((m = importRe.exec(source)) !== null) {
-        const specifier = m[1];
-        const isAlias = specifier.startsWith("@/");
-        if (!isAlias && !specifier.startsWith("./") && !specifier.startsWith("../"))
-            continue;
-        const dir = moduleLogicalPath.includes("/")
-            ? moduleLogicalPath.slice(0, moduleLogicalPath.lastIndexOf("/"))
-            : ".";
-        // `@/x` is a project-root alias (mirrors transforms/esm/path-resolver.ts).
-        // Resolve the path segments manually (no path library needed for simple cases).
-        const segments = (isAlias ? specifier.substring(2) : `${dir}/${specifier}`)
-            .split("/").filter((s) => s !== "");
-        const resolved = [];
-        for (const seg of segments) {
-            if (seg === "..") {
-                resolved.pop();
-            }
-            else if (seg !== ".") {
-                resolved.push(seg);
-            }
-        }
-        const candidate = resolved.join("/");
-        // If the specifier already has a known extension and exists, use it.
-        if (knownPaths.has(candidate)) {
-            results.push(candidate);
-            continue;
-        }
-        // Try appending each browser module extension.
-        let found = false;
-        for (const ext of BROWSER_MODULE_EXTENSIONS) {
-            const withExt = `${candidate}${ext}`;
-            if (knownPaths.has(withExt)) {
-                results.push(withExt);
-                found = true;
-                break;
-            }
-        }
-        // Also try /index variants for directory imports.
-        if (!found) {
-            for (const ext of BROWSER_MODULE_EXTENSIONS) {
-                const indexPath = `${candidate}/index${ext}`;
-                if (knownPaths.has(indexPath)) {
-                    results.push(indexPath);
-                    break;
-                }
-            }
-        }
-    }
-    return results;
+async function collectStaticProjectModuleImports(source, moduleLogicalPath, knownPaths) {
+    return await collectAstStaticProjectModuleImports(source, moduleLogicalPath, knownPaths);
+}
+function readModuleSource(node) {
+    return typeof node.source?.value === "string" ? node.source.value : null;
+}
+function isTypeOnlyModuleDeclaration(node) {
+    if (node.importKind === "type" || node.exportKind === "type")
+        return true;
+    if (!node.specifiers?.length)
+        return false;
+    return node.specifiers.every((specifier) => specifier.importKind === "type" || specifier.exportKind === "type");
+}
+async function collectAstStaticProjectModuleImports(source, moduleLogicalPath, knownPaths) {
+    const parser = resolve("CodeParser");
+    const ast = await parser.parse({ code: source, filePath: moduleLogicalPath });
+    const results = new Set();
+    const visit = (path) => {
+        const node = path.node;
+        if (isTypeOnlyModuleDeclaration(node))
+            return;
+        const specifier = readModuleSource(node);
+        if (!specifier)
+            return;
+        const importedPath = resolveProjectModuleSpecifier(specifier, moduleLogicalPath, knownPaths);
+        if (importedPath)
+            results.add(importedPath);
+    };
+    parser.traverse(ast, {
+        ImportDeclaration: visit,
+        ExportNamedDeclaration: visit,
+        ExportAllDeclaration: visit,
+    });
+    return [...results];
 }
 function resolveKnownModulePath(path, knownPaths) {
     const normalized = normalizeLogicalPath(path
@@ -193,6 +172,8 @@ function normalizeProjectSpecifier(specifier, logicalPath) {
         return specifier;
     if (specifier.startsWith("_veryfront/"))
         return null;
+    if (specifier.startsWith("@/"))
+        return specifier.slice(2);
     if (specifier.startsWith("./") || specifier.startsWith("../")) {
         const dir = logicalPath.includes("/")
             ? logicalPath.slice(0, logicalPath.lastIndexOf("/"))
@@ -949,7 +930,7 @@ function addFrameworkDependencyUrlAliases(urls, dependencies) {
  * Returns all reachable logical paths (entries included).
  * Modules not in `sourceByPath` are recorded as closure gaps.
  */
-function collectClosure(entrypoints, sourceByPath, knownPaths) {
+async function collectClosure(entrypoints, sourceByPath, knownPaths) {
     const visited = new Set();
     const queue = [...entrypoints];
     const gaps = [];
@@ -964,7 +945,7 @@ function collectClosure(entrypoints, sourceByPath, knownPaths) {
             gaps.push(`closure-missing:${current}`);
             continue;
         }
-        const imports = resolveStaticImports(source, current, knownPaths);
+        const imports = await collectStaticProjectModuleImports(source, current, knownPaths);
         for (const imp of imports) {
             if (!visited.has(imp))
                 queue.push(imp);
@@ -1261,7 +1242,7 @@ async function runBuildInner(input, tempDir, client, transform) {
         const route = routeForPage(logicalPath);
         if (!route)
             continue;
-        const { modules: closureModules, gaps: closureGaps } = collectClosure([logicalPath], sourceByPath, knownPaths);
+        const { modules: closureModules, gaps: closureGaps } = await collectClosure([logicalPath], sourceByPath, knownPaths);
         // Include only modules we actually have in the manifest (transformed +
         // within size limit). Framework lib/* modules are excluded per contract
         // (they are embedded by the runtime, not shipped as release assets).

package/esm/src/release-assets/html-consumption.d.ts

@@ -15,7 +15,8 @@ import type { ReleaseAssetManifest } from "./manifest-schema.js";
  * The HTML shell works with relative source paths like `pages/index.tsx` and
  * `/_vf_modules/pages/index.js` URLs. Manifest module keys use the logical
  * source path (e.g. `pages/index.tsx`). This strips a leading `/_vf_modules/`
- * and any `.js` URL extension so both forms resolve.
+ * prefix and URL query/hash data before the resolver compares source
+ * extensions.
  */
 export declare function normalizeManifestModuleKey(path: string): string;
 /**

package/esm/src/release-assets/html-consumption.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html-consumption.d.ts","sourceRoot":"","sources":["../../../src/src/release-assets/html-consumption.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAIjE;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI/D;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,oBAAoB,EAC9B,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAcf;AAED,iFAAiF;AACjF,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,oBAAoB,EAC9B,KAAK,EAAE,MAAM,GACZ,MAAM,EAAE,CAcV"}
+{"version":3,"file":"html-consumption.d.ts","sourceRoot":"","sources":["../../../src/src/release-assets/html-consumption.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAIjE;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAK/D;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,oBAAoB,EAC9B,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAcf;AAED,iFAAiF;AACjF,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,oBAAoB,EAC9B,KAAK,EAAE,MAAM,GACZ,MAAM,EAAE,CAcV"}

package/esm/src/release-assets/html-consumption.js

@@ -17,11 +17,13 @@ const logger = serverLogger.component("release-asset-consume");
  * The HTML shell works with relative source paths like `pages/index.tsx` and
  * `/_vf_modules/pages/index.js` URLs. Manifest module keys use the logical
  * source path (e.g. `pages/index.tsx`). This strips a leading `/_vf_modules/`
- * and any `.js` URL extension so both forms resolve.
+ * prefix and URL query/hash data before the resolver compares source
+ * extensions.
  */
 export function normalizeManifestModuleKey(path) {
-    let key = path.replace(/^\/?_vf_modules\//, "");
+    let key = String(path || "").replace(/^\/?_vf_modules\//, "");
     key = key.replace(/^\/+/, "");
+    key = key.replace(/[?#].*$/, "");
     return key;
 }
 /**

package/esm/src/rendering/rsc/component-analyzer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-analyzer.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/rsc/component-analyzer.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAiB,MAAM,YAAY,CAAC;AACxF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAIzE,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,iBAAiB,GACpB,OAAO,CAAC,iBAAiB,CAAC,CAiB5B;AAuBD,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAAc,EACtB,EAAE,CAAC,EAAE,iBAAiB,GACrB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAiC3C"}
+{"version":3,"file":"component-analyzer.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/rsc/component-analyzer.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAiB,MAAM,YAAY,CAAC;AACxF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAIzE,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,iBAAiB,GACpB,OAAO,CAAC,iBAAiB,CAAC,CAkB5B;AAuBD,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAAc,EACtB,EAAE,CAAC,EAAE,iBAAiB,GACrB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAiC3C"}