veryfront 0.1.827 → 0.1.828

package/esm/deno.js

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

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"}

package/esm/src/rendering/rsc/component-analyzer.js

@@ -12,10 +12,11 @@ export async function analyzeComponent(filePath, fs) {
     const hasUseServer = detectDirective(content, "use server");
     // Determine component type: directive takes precedence over file naming convention
     const type = hasUseClient || filePath.includes(".client.") ? "client" : "server";
+    const exports = await extractExportNames(content, filePath);
     return {
         type,
         filePath,
-        exports: extractExportNames(content),
+        exports,
         id: generateComponentId(filePath),
         hasUseClient,
         hasUseServer,

package/esm/src/rendering/rsc/export-extractor.d.ts

@@ -1,6 +1,8 @@
 /**
- * Extract all export names from source code.
- * Handles export function/class/const, named exports, and default exports.
+ * Extract runtime export names from source code.
+ *
+ * Uses the CodeParser AST contract so export-looking strings, comments, and
+ * type-only exports do not enter RSC manifests.
  */
-export declare function extractExportNames(source: string): string[];
+export declare function extractExportNames(source: string, filePath?: string): Promise<string[]>;
 //# sourceMappingURL=export-extractor.d.ts.map

package/esm/src/rendering/rsc/export-extractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"export-extractor.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/rsc/export-extractor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAuC3D"}
+{"version":3,"file":"export-extractor.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/rsc/export-extractor.ts"],"names":[],"mappings":"AAiEA;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,SAAkB,GACzB,OAAO,CAAC,MAAM,EAAE,CAAC,CAwBnB"}

package/esm/src/rendering/rsc/export-extractor.js

@@ -1,42 +1,65 @@
+import { resolve } from "../../extensions/contracts.js";
+function readName(node) {
+    if (typeof node?.name === "string")
+        return node.name;
+    if (typeof node?.value === "string")
+        return node.value;
+    return null;
+}
+function isTypeOnlyDeclaration(declaration) {
+    if (!declaration)
+        return false;
+    if (declaration.declare === true)
+        return true;
+    return declaration.type === "TSInterfaceDeclaration" ||
+        declaration.type === "TSTypeAliasDeclaration";
+}
+function addDeclarationNames(names, declaration) {
+    if (!declaration || isTypeOnlyDeclaration(declaration))
+        return;
+    if (declaration.type === "FunctionDeclaration" ||
+        declaration.type === "ClassDeclaration" ||
+        declaration.type === "TSEnumDeclaration") {
+        const name = readName(declaration.id);
+        if (name)
+            names.add(name);
+        return;
+    }
+    if (declaration.type !== "VariableDeclaration")
+        return;
+    for (const declarator of declaration.declarations ?? []) {
+        const name = readName(declarator.id);
+        if (name)
+            names.add(name);
+    }
+}
 /**
- * Extract all export names from source code.
- * Handles export function/class/const, named exports, and default exports.
+ * Extract runtime export names from source code.
+ *
+ * Uses the CodeParser AST contract so export-looking strings, comments, and
+ * type-only exports do not enter RSC manifests.
  */
-export function extractExportNames(source) {
+export async function extractExportNames(source, filePath = "component.tsx") {
+    const parser = resolve("CodeParser");
+    const ast = await parser.parse({ code: source, filePath });
     const names = new Set();
-    if (/export\s+default\s+/m.test(source)) {
-        names.add("default");
-    }
-    for (const match of source.matchAll(/export\s+function\s+([A-Za-z0-9_]+)/g)) {
-        if (match[1])
-            names.add(match[1]);
-    }
-    for (const match of source.matchAll(/export\s+class\s+([A-Za-z0-9_]+)/g)) {
-        if (match[1])
-            names.add(match[1]);
-    }
-    for (const match of source.matchAll(/export\s+(?:const|let|var)\s+([A-Za-z0-9_]+)/g)) {
-        if (match[1])
-            names.add(match[1]);
-    }
-    for (const match of source.matchAll(/export\s*\{([^}]+)\}/g)) {
-        const innerRaw = match[1];
-        if (!innerRaw)
-            continue;
-        const inner = innerRaw.split(",");
-        for (const seg of inner) {
-            const part = seg.trim();
-            if (!part)
-                continue;
-            const asMatch = part.match(/([A-Za-z0-9_]+)\s+as\s+([A-Za-z0-9_]+)/i);
-            if (asMatch?.[2]) {
-                names.add(asMatch[2]);
-                continue;
+    parser.traverse(ast, {
+        ExportDefaultDeclaration() {
+            names.add("default");
+        },
+        ExportNamedDeclaration(path) {
+            const node = path.node;
+            if (node.exportKind === "type")
+                return;
+            addDeclarationNames(names, node.declaration);
+            for (const specifier of node.specifiers ?? []) {
+                if (specifier.exportKind === "type")
+                    continue;
+                const name = readName(specifier.exported) ?? readName(specifier.local);
+                if (name)
+                    names.add(name);
             }
-            const plain = part.match(/^([A-Za-z0-9_]+)/);
-            if (plain?.[1])
-                names.add(plain[1]);
-        }
-    }
+        },
+    });
     return [...names];
 }

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;AAYH,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAI5D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,MAAM,MAAM,iBAAiB,GACzB;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAClB;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAK9D,eAAO,MAAM,kBAAkB,wBAE7B,CAAC;AA6IH,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsBvF;AAED,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAezE;AAED,wBAAgB,oBAAoB,IAAI,IAAI,CAK3C;AAQD,2DAA2D;AAC3D,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAElD;AAuBD,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CA0ElE;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,SAAwB,GACnC,IAAI,CAgBN;AAOD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAevD;AAED,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAwCf;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAc1D;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAIzD;AAmBD,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,EAAE,oDAAoD;AAC3E,eAAe,CAAC,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,EAChE,YAAY,SAAwB,GACnC,OAAO,CAAC,iBAAiB,CAAC,CA+J5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/cache/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAYH,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAK5D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,MAAM,MAAM,iBAAiB,GACzB;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAClB;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAK9D,eAAO,MAAM,kBAAkB,wBAE7B,CAAC;AAsIH,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsBvF;AAED,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAezE;AAED,wBAAgB,oBAAoB,IAAI,IAAI,CAK3C;AAQD,2DAA2D;AAC3D,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAElD;AAuBD,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CA0ElE;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,SAAwB,GACnC,IAAI,CAgBN;AAOD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAevD;AAED,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAwCf;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAc1D;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAIzD;AAmBD,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,EAAE,oDAAoD;AAC3E,eAAe,CAAC,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,EAChE,YAAY,SAAwB,GACnC,OAAO,CAAC,iBAAiB,CAAC,CA+J5B"}

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

@@ -15,6 +15,7 @@ import { LRUCache } from "../../../../utils/lru-wrapper.js";
 import { registerCache } from "../../../../utils/memory/index.js";
 import { buildMdxEsmPathCacheKey, MDX_ESM_ALL_FILE_URL_PATTERN_SOURCE } from "../cache-format.js";
 import { ensureMdxModuleDependencies } from "../module-fetcher/dependency-recovery.js";
+import { findStaticImportFromSpans } from "../utils/source-spans.js";
 export { getLocalFs } from "./local-fs.js";
 import { getLocalFs } from "./local-fs.js";
 const MAX_VERIFIED_MODULE_DEPS = 2_000;
@@ -105,27 +106,20 @@ async function findMissingFileDependencies(code) {
     }
     return missing;
 }
-/**
- * Pattern to match unresolved /_vf_modules/ imports that weren't converted to proper file:// paths.
- * Matches both:
- * - `from "/_vf_modules/..."` or `from "_vf_modules/..."` (unresolved)
- * - `from "file:///_vf_modules/..."` (malformed - points to non-existent root /_vf_modules/)
- * Note: Uses \s* instead of \s+ because minified code may have no space after `from`.
- * These imports will fail at runtime because they can't be resolved by Deno's dynamic import.
- */
-const UNRESOLVED_VF_MODULES_PATTERN = /from\s*["']((?:file:\/\/)?\/?\/?_vf_modules\/[^"']+)["']/g;
+function matchUnresolvedVfModuleSpecifier(specifier) {
+    return specifier.match(/^((?:file:\/\/)?\/?\/?_vf_modules\/[^?]+)(?:\?.*)?$/)?.[1] ?? null;
+}
 /**
  * Check if cached code has unresolved or malformed /_vf_modules/ imports.
  * These should have been resolved to proper file:// paths (e.g., file:///Users/.cache/...).
  * Returns true if any unresolved or malformed imports are found.
  */
 function hasUnresolvedVfModules(code) {
-    const pattern = new RegExp(UNRESOLVED_VF_MODULES_PATTERN.source, "g");
-    let match;
-    while ((match = pattern.exec(code)) !== null) {
-        const importPath = match[1];
+    const matches = findStaticImportFromSpans(code, matchUnresolvedVfModuleSpecifier);
+    const first = matches[0];
+    if (first) {
         logger.debug(`${LOG_PREFIX_MDX_LOADER} Cached module has unresolved _vf_modules import`, {
-            importPath,
+            importPath: first.path,
         });
         return true;
     }

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

@@ -11,7 +11,7 @@ import type { ESMLoaderContext } from "./types.js";
 /**
  * Rewrite @/ aliased imports to /_vf_modules/ paths.
  */
-export declare function rewriteProjectAliasImports(code: string): string;
+export declare function rewriteProjectAliasImports(code: string): Promise<string>;
 /**
  * Transform bare React specifiers to local file:// paths for Bun/Node.
  * This ensures the same React instance as react-dom-server.

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

@@ -1 +1 @@
-{"version":3,"file":"import-transformer.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/import-transformer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAe5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAK/D;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK9E;AAyBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,GAAG,MAAM,CAIjF;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,EACpC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CA6HjB"}
+{"version":3,"file":"import-transformer.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/import-transformer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAa5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO9E;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK9E;AAyBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,GAAG,MAAM,CAIjF;AAOD;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,EACpC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAwHjB"}

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

@@ -9,9 +9,9 @@
 import { join } from "../../../platform/compat/path/index.js";
 import { rendererLogger as logger } from "../../../utils/index.js";
 import { transformImportsWithMap } from "../../../modules/import-map/index.js";
-import { replaceSpecifiers } from "../../esm/lexer.js";
+import { parseImports, replaceSpecifiers } from "../../esm/lexer.js";
 import { getLocalReactPaths, isReactSpecifier } from "../../../platform/compat/react-paths.js";
-import { ESBUILD_JSX_FACTORY, ESBUILD_JSX_FRAGMENT, FRAMEWORK_ROOT, JSX_IMPORT_PATTERN, LOG_PREFIX_MDX_LOADER, REACT_IMPORT_PATTERN, } from "./constants.js";
+import { ESBUILD_JSX_FACTORY, ESBUILD_JSX_FRAGMENT, FRAMEWORK_ROOT, LOG_PREFIX_MDX_LOADER, } from "./constants.js";
 import { getLocalFs } from "./cache/index.js";
 import { buildMdxJsxCacheFileName } from "./cache-format.js";
 import { rewriteDntImports } from "./module-fetcher/index.js";
@@ -19,10 +19,13 @@ import { ensureCachedJsxModulePatched } from "./jsx-cache.js";
 /**
  * Rewrite @/ aliased imports to /_vf_modules/ paths.
  */
-export function rewriteProjectAliasImports(code) {
-    return code.replace(/from\s*["']@\/([^"']+)["']/g, (_match, path) => {
+export async function rewriteProjectAliasImports(code) {
+    return await replaceSpecifiers(code, (specifier) => {
+        if (!specifier.startsWith("@/"))
+            return null;
+        const path = specifier.slice(2);
         const jsPath = path.endsWith(".js") ? path : `${path}.js`;
-        return `from "/_vf_modules/${jsPath}"`;
+        return `/_vf_modules/${jsPath}`;
     });
 }
 /**
@@ -65,6 +68,10 @@ export function transformImports(code, importMap) {
         resolveBare: true,
     });
 }
+async function hasReactImport(code) {
+    const imports = await parseImports(code);
+    return imports.some((importSpecifier) => importSpecifier.n === "react");
+}
 /**
  * Transform JSX/TSX imports using esbuild.
  * Optimized to process all imports in parallel batches for better performance.
@@ -72,25 +79,22 @@ export function transformImports(code, importMap) {
 export async function transformJsxImports(code, adapter, esmCacheDir) {
     const { transform } = await import("../../../extensions/bundler/index.js");
     const importsToProcess = [];
-    let jsxMatch;
-    while ((jsxMatch = JSX_IMPORT_PATTERN.exec(code)) !== null) {
-        const [fullMatch, importClause, filePath, ext] = jsxMatch;
-        if (!filePath || !importClause || !ext) {
-            logger.warn(`${LOG_PREFIX_MDX_LOADER} Skipping JSX import with undefined fields`, {
-                fullMatch,
-                hasFilePath: !!filePath,
-                hasImportClause: !!importClause,
-                hasExt: !!ext,
-            });
+    const imports = await parseImports(code);
+    for (const importSpecifier of imports) {
+        const specifier = importSpecifier.n;
+        if (!specifier?.startsWith("file://"))
             continue;
-        }
-        importsToProcess.push({ fullMatch, importClause, filePath, ext });
+        const filePath = specifier.slice("file://".length);
+        const ext = filePath.match(/\.(tsx?|jsx?)$/)?.[1];
+        if (!ext)
+            continue;
+        importsToProcess.push({ specifier, filePath, ext });
     }
     if (importsToProcess.length === 0)
         return code;
     const transformStart = performance.now();
     logger.debug(`${LOG_PREFIX_MDX_LOADER} Transforming ${importsToProcess.length} JSX imports in parallel`);
-    const transformResults = await Promise.all(importsToProcess.map(async ({ fullMatch, importClause, filePath, ext }) => {
+    const transformResults = await Promise.all(importsToProcess.map(async ({ specifier, filePath, ext }) => {
         try {
             const isFrameworkFile = filePath.startsWith(FRAMEWORK_ROOT);
             let jsxCode;
@@ -115,8 +119,8 @@ export async function transformJsxImports(code, adapter, esmCacheDir) {
                     const useCached = await ensureCachedJsxModulePatched(transformedPath, filePath);
                     if (useCached) {
                         return {
-                            original: fullMatch,
-                            transformed: `import ${importClause} from "file://${transformedPath}";`,
+                            specifier,
+                            replacement: `file://${transformedPath}`,
                             cached: true,
                         };
                     }
@@ -140,7 +144,7 @@ export async function transformJsxImports(code, adapter, esmCacheDir) {
                 format: "esm",
             });
             let transformed = result.code;
-            if (!REACT_IMPORT_PATTERN.test(transformed)) {
+            if (!(await hasReactImport(transformed))) {
                 transformed = `import React from 'react';\n${transformed}`;
             }
             // Rewrite _dnt.polyfills.js / _dnt.shims.js relative imports to absolute file:// paths.
@@ -149,8 +153,8 @@ export async function transformJsxImports(code, adapter, esmCacheDir) {
             transformed = await rewriteDntImports(transformed, filePath);
             await getLocalFs().writeTextFile(transformedPath, transformed);
             return {
-                original: fullMatch,
-                transformed: `import ${importClause} from "file://${transformedPath}";`,
+                specifier,
+                replacement: `file://${transformedPath}`,
                 cached: false,
             };
         }
@@ -165,10 +169,12 @@ export async function transformJsxImports(code, adapter, esmCacheDir) {
         cached: transformResults.filter((r) => r?.cached).length,
         durationMs: (performance.now() - transformStart).toFixed(1),
     });
-    let result = code;
+    const replacements = new Map();
     for (const t of transformResults) {
         if (t)
-            result = result.replace(t.original, t.transformed);
+            replacements.set(t.specifier, t.replacement);
     }
-    return result;
+    if (replacements.size === 0)
+        return code;
+    return await replaceSpecifiers(code, (specifier) => replacements.get(specifier) ?? null);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"nested-imports.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/nested-imports.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAQtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAEjE;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,GACjB;IACD,SAAS,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjF,QAAQ,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACjF,CAkCA;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAO3F;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,kBAAkB,EAAE,EAC7B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,CAAC,EAAE,MAAM,EACzB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,CAqCjB;AAED,MAAM,WAAW,+BAA+B;IAC9C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/E,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,+BAA+B,GACrC,OAAO,CAAC,MAAM,CAAC,CAuDjB"}
+{"version":3,"file":"nested-imports.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/nested-imports.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAQtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAMjE;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,GACjB;IACD,SAAS,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjF,QAAQ,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACjF,CAkCA;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAM3F;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,kBAAkB,EAAE,EAC7B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,CAAC,EAAE,MAAM,EACzB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,CAqCjB;AAED,MAAM,WAAW,+BAA+B;IAC9C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/E,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,+BAA+B,GACrC,OAAO,CAAC,MAAM,CAAC,CAuDjB"}

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/nested-imports.js

@@ -3,10 +3,13 @@
  *
  * @module transforms/mdx/esm-module-loader/module-fetcher/nested-imports
  */
-import { LOG_PREFIX_MDX_LOADER, UNRESOLVED_VF_MODULES_PATTERN } from "../constants.js";
+import { LOG_PREFIX_MDX_LOADER } from "../constants.js";
 import { createStubModule } from "../utils/stub-module.js";
 import { findStaticImportFromSpans, replaceSourceSpans, } from "../utils/source-spans.js";
 import { buildMissingModuleError } from "../missing-module.js";
+function matchUnresolvedVfModuleSpecifier(specifier) {
+    return specifier.match(/^((?:file:\/\/)?\/?\/?_vf_modules\/[^?]+)(?:\?.*)?$/)?.[1] ?? null;
+}
 /**
  * Find nested module imports in code.
  * Matches both /_vf_modules/... and file:///_vf_modules/... patterns.
@@ -14,7 +17,7 @@ import { buildMissingModuleError } from "../missing-module.js";
 export function findNestedImports(moduleCode) {
     const vfModules = [];
     const relative = [];
-    for (const { original, path: rawPath, start, end } of findStaticImportFromSpans(moduleCode, (specifier) => specifier.match(/^((?:file:\/\/)?\/?\/?_vf_modules\/[^?]+)(?:\?.*)?$/)?.[1])) {
+    for (const { original, path: rawPath, start, end } of findStaticImportFromSpans(moduleCode, matchUnresolvedVfModuleSpecifier)) {
         // Strip file:// prefix and leading slashes to get clean _vf_modules/... path
         vfModules.push({
             original,
@@ -37,11 +40,10 @@ export function findNestedImports(moduleCode) {
  * Check for unresolved /_vf_modules/ imports.
  */
 export function hasUnresolvedImports(moduleCode) {
-    const pattern = new RegExp(UNRESOLVED_VF_MODULES_PATTERN.source, "g");
-    const matches = [...moduleCode.matchAll(pattern)];
+    const matches = findStaticImportFromSpans(moduleCode, matchUnresolvedVfModuleSpecifier);
     return {
         count: matches.length,
-        paths: matches.map((m) => m[1]).filter((p) => p !== undefined).slice(0, 5),
+        paths: matches.map((match) => match.path).slice(0, 5),
     };
 }
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"module-writer.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/module-writer.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAyBH,OAAO,KAAK,EAAkB,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAiDnD,wBAAsB,eAAe,CACnC,mBAAmB,EAAE,MAAM,EAC3B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,SAAS,CAAC,CA4VpB"}
+{"version":3,"file":"module-writer.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/module-writer.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAyBH,OAAO,KAAK,EAAkB,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AA8CnD,wBAAsB,eAAe,CACnC,mBAAmB,EAAE,MAAM,EAC3B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,SAAS,CAAC,CA2VpB"}

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

@@ -20,7 +20,7 @@ import { loadImportMap } from "../../../modules/import-map/index.js";
 import { cacheHttpImportsToLocal, ensureHttpBundlesExist } from "../../esm/http-cache.js";
 import { extractAllHttpBundlePathsRecursive, extractHttpBundlePaths, } from "../../../modules/react-loader/ssr-module-loader/http-bundle-helpers.js";
 import { setupSSRGlobals } from "../../../rendering/ssr-globals.js";
-import { LOG_PREFIX_MDX_LOADER, LOG_PREFIX_MDX_RENDERER, UNRESOLVED_VF_MODULES_PATTERN, } from "./constants.js";
+import { LOG_PREFIX_MDX_LOADER, LOG_PREFIX_MDX_RENDERER } from "./constants.js";
 import { getLocalFs } from "./cache/index.js";
 import { hashString } from "./utils/hash.js";
 import { ssrVfModulesPlugin } from "../../pipeline/stages/ssr-vf-modules.js";
@@ -28,6 +28,7 @@ import { REACT_DEFAULT_VERSION } from "../../../utils/constants/cdn.js";
 import { extractFrameworkBundlePaths } from "../../shared/framework-bundle-paths.js";
 import { rewriteProjectAliasImports, transformImports, transformJsxImports, transformReactToLocalPaths, } from "./import-transformer.js";
 import { findMissingFrameworkBundles, findVfModuleImports, initializeCacheDir, processVfModuleImports, resolveProjectDir, } from "./loader-helpers.js";
+import { hasUnresolvedImports } from "./module-fetcher/nested-imports.js";
 /** Singleflight for MDX module file writes to prevent race conditions */
 const mdxWriteFlight = new Singleflight();
 /**
@@ -64,7 +65,7 @@ export async function doLoadModuleESM(compiledProgramCode, context) {
         logger.debug(`${LOG_PREFIX_MDX_LOADER} Step: initializeCacheDir START`, { projectSlug });
         const esmCacheDir = await initializeCacheDir(context);
         logger.debug(`${LOG_PREFIX_MDX_LOADER} Step: initializeCacheDir DONE`, { projectSlug });
-        let rewritten = rewriteProjectAliasImports(compiledProgramCode);
+        let rewritten = await rewriteProjectAliasImports(compiledProgramCode);
         const projectDir = resolveProjectDir(context);
         logger.debug(`${LOG_PREFIX_MDX_LOADER} Step: loadImportMap START`, { projectSlug });
         const importMap = await loadImportMap(projectDir, adapter);
@@ -103,12 +104,11 @@ export async function doLoadModuleESM(compiledProgramCode, context) {
             return cached;
         }
         logger.debug(`${LOG_PREFIX_MDX_LOADER} Module cache miss`, { projectSlug, compositeKey });
-        const unresolvedMatches = [
-            ...rewritten.matchAll(new RegExp(UNRESOLVED_VF_MODULES_PATTERN.source, "g")),
-        ];
-        if (unresolvedMatches.length > 0) {
-            const unresolvedPaths = unresolvedMatches.map((m) => m[1]).slice(0, 5);
-            const errorMsg = `MDX has ${unresolvedMatches.length} unresolved module imports: ${unresolvedPaths.join(", ")}`;
+        const unresolved = hasUnresolvedImports(rewritten);
+        if (unresolved.count > 0) {
+            const errorMsg = `MDX has ${unresolved.count} unresolved module imports: ${unresolved.paths
+                .slice(0, 5)
+                .join(", ")}`;
             logger.error(`${LOG_PREFIX_MDX_RENDERER} ${errorMsg}`);
             throw IMPORT_RESOLUTION_ERROR.create({ detail: errorMsg });
         }

package/esm/src/transforms/pipeline/stages/ssr-vf-modules/import-finder.d.ts

@@ -5,10 +5,10 @@
  * Find all /_vf_modules/_veryfront/ imports in the code.
  * Only matches framework modules, not user project files.
  */
-export declare function findVfModuleImports(code: string): string[];
+export declare function findVfModuleImports(code: string): Promise<string[]>;
 /**
  * Find all relative imports (./foo, ../bar) in the code.
  * Returns array of specifiers.
  */
-export declare function findRelativeImports(code: string): string[];
+export declare function findRelativeImports(code: string): Promise<string[]>;
 //# sourceMappingURL=import-finder.d.ts.map

package/esm/src/transforms/pipeline/stages/ssr-vf-modules/import-finder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-finder.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/pipeline/stages/ssr-vf-modules/import-finder.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAc1D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAiB1D"}
+{"version":3,"file":"import-finder.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/pipeline/stages/ssr-vf-modules/import-finder.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAUzE;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAUzE"}

package/esm/src/transforms/pipeline/stages/ssr-vf-modules/import-finder.js

@@ -1,39 +1,29 @@
 /**
  * Import discovery functions for the SSR VF Modules stage.
  */
+import { parseImports } from "../../../esm/lexer.js";
+function unique(values) {
+    return [...new Set(values)];
+}
 /**
  * Find all /_vf_modules/_veryfront/ imports in the code.
  * Only matches framework modules, not user project files.
  */
-export function findVfModuleImports(code) {
-    const imports = [];
-    // Note: \s* allows zero whitespace (minified code: from"..." has no space)
-    // Only match _veryfront/ framework modules, not user project files.
-    // Handle both raw "/_vf_modules/..." specifiers and malformed
-    // "file:///_vf_modules/..." variants that can leak out of stale caches.
-    const pattern = /from\s*["']((?:file:\/\/)?\/_vf_modules\/_veryfront\/[^"']+)["']/g;
-    let match;
-    while ((match = pattern.exec(code)) !== null) {
-        imports.push(match[1]);
-    }
-    return [...new Set(imports)];
+export async function findVfModuleImports(code) {
+    const imports = await parseImports(code);
+    return unique(imports
+        .map((imp) => imp.n)
+        .filter((specifier) => specifier?.startsWith("/_vf_modules/_veryfront/") === true ||
+        specifier?.startsWith("file:///_vf_modules/_veryfront/") === true));
 }
 /**
  * Find all relative imports (./foo, ../bar) in the code.
  * Returns array of specifiers.
  */
-export function findRelativeImports(code) {
-    const imports = [];
-    // Match: from "./foo" or from "../bar"
-    const fromPattern = /from\s*["'](\.\.?\/[^"']+)["']/g;
-    // Match side-effect imports: import "./foo" or import "../bar" (no `from`)
-    const sideEffectPattern = /import\s*["'](\.\.?\/[^"']+)["']/g;
-    let match;
-    while ((match = fromPattern.exec(code)) !== null) {
-        imports.push(match[1]);
-    }
-    while ((match = sideEffectPattern.exec(code)) !== null) {
-        imports.push(match[1]);
-    }
-    return [...new Set(imports)];
+export async function findRelativeImports(code) {
+    const imports = await parseImports(code);
+    return unique(imports
+        .map((imp) => imp.n)
+        .filter((specifier) => specifier?.startsWith("./") === true ||
+        specifier?.startsWith("../") === true));
 }

package/esm/src/transforms/pipeline/stages/ssr-vf-modules/index.js

@@ -52,7 +52,7 @@ export const ssrVfModulesPlugin = {
     condition: (ctx) => ctx.target === "ssr",
     async transform(ctx) {
         logInitOnce();
-        const vfModuleImports = findVfModuleImports(ctx.code);
+        const vfModuleImports = await findVfModuleImports(ctx.code);
         logger.debug(`${LOG_PREFIX} Transform called`, {
             file: ctx.filePath?.slice(-60) ?? "<unknown>",
             count: vfModuleImports.length,

package/esm/src/transforms/pipeline/stages/ssr-vf-modules/transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/pipeline/stages/ssr-vf-modules/transform.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAmBrE,OAAO,EAOL,KAAK,gBAAgB,EAGtB,MAAM,gBAAgB,CAAC;AAKxB;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAExD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,EAAE,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,CA2BjB;AAgBD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAwMhE;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,gBAAgB,EACrB,oBAAoB,UAAQ,EAC5B,KAAK,SAAI,GACR,OAAO,CAAC,MAAM,CAAC,CA8OjB;AAED;;;GAGG;AACH,wBAAsB,kCAAkC,CACtD,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA4CxB;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,CAEjB"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/pipeline/stages/ssr-vf-modules/transform.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAmBrE,OAAO,EAOL,KAAK,gBAAgB,EAGtB,MAAM,gBAAgB,CAAC;AAKxB;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAExD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,EAAE,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,CA2BjB;AAgBD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAwMhE;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,gBAAgB,EACrB,oBAAoB,UAAQ,EAC5B,KAAK,SAAI,GACR,OAAO,CAAC,MAAM,CAAC,CAgPjB;AAED;;;GAGG;AACH,wBAAsB,kCAAkC,CACtD,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA4CxB;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,CAEjB"}

package/esm/src/transforms/pipeline/stages/ssr-vf-modules/transform.js

@@ -8,7 +8,7 @@ import { join } from "../../../../platform/compat/path/index.js";
 import denoConfig from "../../../../../deno.js";
 import { rendererLogger as logger } from "../../../../utils/index.js";
 import { IMPORT_RESOLUTION_ERROR } from "../../../../errors/index.js";
-import { replaceSpecifiers } from "../../../esm/lexer.js";
+import { parseImports, replaceSpecifiers } from "../../../esm/lexer.js";
 import { hashCodeHex } from "../../../../utils/hash-utils.js";
 import { LRUCache } from "../../../../utils/lru-wrapper.js";
 import { getHttpBundleCacheDir, getMdxEsmCacheDir } from "../../../../utils/cache-dir.js";
@@ -187,7 +187,7 @@ async function rewriteFallbackRelativeImports(code, sourcePath, ctx, visited = n
     visited.add(sourcePath);
     // Note: we do not early-return when there are no relative imports, because
     // react/react-dom specifiers still need rewriting below.
-    const relativeImports = findRelativeImports(code);
+    const relativeImports = await findRelativeImports(code);
     // Built once and reused for both the relative-import loop (React re-export
     // rewriting) and the final specifier pass below.
     const reactImportMap = getReactImportMap(ctx.reactVersion);
@@ -312,8 +312,11 @@ export async function transformFrameworkCode(content, sourcePath, ctx, throwOnMi
         let transformed = result.code;
         // Collect and recursively resolve all #veryfront/ imports
         const veryfrontReplacements = new Map();
-        for (const match of transformed.matchAll(/from\s+["'](#veryfront\/[^"']+)["']/g)) {
-            const specifier = match[1];
+        const transformedImports = await parseImports(transformed);
+        for (const importSpecifier of transformedImports) {
+            const specifier = importSpecifier.n;
+            if (!specifier?.startsWith("#veryfront/"))
+                continue;
             if (veryfrontReplacements.has(specifier))
                 continue;
             const resolved = await resolveAndTransformVeryfrontImport(specifier, ctx);
@@ -344,7 +347,7 @@ export async function transformFrameworkCode(content, sourcePath, ctx, throwOnMi
         const frameworkSrcDir = join(FRAMEWORK_ROOT, "src") + "/";
         const embeddedSrcDirPrefix = EMBEDDED_SRC_DIR + "/";
         {
-            const relativeImports = findRelativeImports(transformed);
+            const relativeImports = await findRelativeImports(transformed);
             for (const specifier of relativeImports) {
                 // Skip non-code imports (like deno.json, package.json, etc.)
                 if (/\.(json|css|svg|png|jpg|jpeg|gif|ico|woff2?|ttf|eot)$/.test(specifier)) {

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

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

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

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

package/package.json

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