veryfront 0.1.826 → 0.1.828

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/server/handlers/request/prod-hydration-module.handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prod-hydration-module.handler.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/request/prod-hydration-module.handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAmB,aAAa,EAAE,MAAM,aAAa,CAAC;AAqBnG,qBAAa,0BAA2B,SAAQ,WAAW;IACzD,QAAQ,EAAE,eAAe,CAOvB;IAEI,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;CA2BxE"}
+{"version":3,"file":"prod-hydration-module.handler.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/request/prod-hydration-module.handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAmB,aAAa,EAAE,MAAM,aAAa,CAAC;AAuBnG,qBAAa,0BAA2B,SAAQ,WAAW;IACzD,QAAQ,EAAE,eAAe,CASvB;IAEI,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;CAgCxE"}

package/esm/src/server/handlers/request/prod-hydration-module.handler.js

@@ -1,5 +1,5 @@
 import { BaseHandler } from "../response/base.js";
-import { generateProdHydrationModule, PROD_HYDRATION_MODULE_PATH, } from "../../../html/hydration-script-builder/prod-scripts.js";
+import { generateProdHydrationModule, isVersionedProdHydrationModulePath, PROD_HYDRATION_MODULE_PATH, PROD_HYDRATION_MODULE_VERSIONED_PATH_PATTERN, } from "../../../html/hydration-script-builder/prod-scripts.js";
 import { computeStrongEtag, hasMatchingEtag } from "../utils/etag.js";
 import { HTTP_OK, PRIORITY_HIGH_DEV } from "../../../utils/constants/index.js";
 let cachedModule = null;
@@ -20,6 +20,8 @@ export class ProdHydrationModuleHandler extends BaseHandler {
         patterns: [
             { pattern: PROD_HYDRATION_MODULE_PATH, exact: true, method: "GET" },
             { pattern: PROD_HYDRATION_MODULE_PATH, exact: true, method: "HEAD" },
+            { pattern: PROD_HYDRATION_MODULE_VERSIONED_PATH_PATTERN, method: "GET" },
+            { pattern: PROD_HYDRATION_MODULE_VERSIONED_PATH_PATTERN, method: "HEAD" },
         ],
     };
     async handle(req, ctx) {
@@ -27,14 +29,19 @@ export class ProdHydrationModuleHandler extends BaseHandler {
             return this.continue();
         }
         const method = req.method.toUpperCase();
+        const pathname = new URL(req.url).pathname;
+        const cacheStrategy = isVersionedProdHydrationModulePath(pathname) ? "immutable" : "no-cache";
         const { js, etag } = getProdHydrationModuleBundle();
         const builder = this.createResponseBuilder(ctx).withCORS(req, ctx.securityConfig?.cors);
         if (hasMatchingEtag(req, etag)) {
-            return this.respond(builder.withSecurity(ctx.securityConfig ?? undefined, req).notModified(etag));
+            return this.respond(builder
+                .withSecurity(ctx.securityConfig ?? undefined, req)
+                .withCache(cacheStrategy)
+                .notModified(etag));
         }
         return this.respond(builder
             .withSecurity(ctx.securityConfig ?? undefined, req)
-            .withCache("no-cache")
+            .withCache(cacheStrategy)
             .withETag(etag)
             .withContentType("application/javascript; charset=utf-8", method === "HEAD" ? null : js, HTTP_OK));
     }

package/esm/src/server/handlers/request/static.handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"static.handler.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/request/static.handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAmB,aAAa,EAAE,MAAM,aAAa,CAAC;AAkCnG,qBAAa,aAAc,SAAQ,WAAW;IAC5C,QAAQ,EAAE,eAAe,CAOvB;IAEF,OAAO,CAAC,aAAa,CAA2B;IAEhD,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;IAejE,OAAO,CAAC,cAAc;CAwEvB"}
+{"version":3,"file":"static.handler.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/request/static.handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAmB,aAAa,EAAE,MAAM,aAAa,CAAC;AAoCnG,qBAAa,aAAc,SAAQ,WAAW;IAC5C,QAAQ,EAAE,eAAe,CAOvB;IAEF,OAAO,CAAC,aAAa,CAA2B;IAEhD,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;IAejE,OAAO,CAAC,cAAc;CAwEvB"}

package/esm/src/server/handlers/request/static.handler.js

@@ -15,6 +15,7 @@ import { withSpan } from "../../../observability/tracing/otlp-setup.js";
 import { StaticFileService } from "../../services/static/index.js";
 import { addNonceToHtmlTags } from "../../../html/nonce-injection.js";
 import { computeEtag } from "../utils/etag.js";
+import { isVersionedProdHydrationModulePath } from "../../../html/hydration-script-builder/prod-scripts.js";
 function isHtmlResponse(contentType) {
     return /\btext\/html\b/i.test(contentType);
 }
@@ -24,6 +25,7 @@ function isProductionBuildAssetPath(pathname) {
         pathname === "/_veryfront/router.js" ||
         pathname === "/_veryfront/prefetch.js" ||
         pathname === "/_veryfront/hydration-runtime.js" ||
+        isVersionedProdHydrationModulePath(pathname) ||
         pathname === "/_veryfront/manifest.json" ||
         pathname.startsWith("/_veryfront/chunks/") ||
         pathname.startsWith("/_veryfront/pages/") ||

package/esm/src/server/runtime-handler/request-utils.js

@@ -50,7 +50,7 @@ export const LIGHTWEIGHT_PATH_PREFIXES = [
     "/_vf_modules/",
     "/_vf_styles/",
     "/_veryfront/modules/",
-    "/_veryfront/hydration-runtime.js",
+    "/_veryfront/hydration-runtime",
     "/_veryfront/preview-hmr.js",
     "/_veryfront/studio-bridge.js",
     "/_vf/css/",

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