veryfront 0.1.783 → 0.1.785

package/esm/deno.js

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

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

@@ -142,7 +142,7 @@ async function generateHTMLShellPartsImpl(meta, options, params, props, contentF
         pretty: useDevScripts,
         releaseAssetManifest: releaseManifest,
     });
-    const hydrationDataJson = generateHydrationData(meta.slug || "", params ?? {}, props ?? {}, options, { pretty: useDevScripts });
+    const hydrationDataJson = generateHydrationData(meta.slug || "", params ?? {}, props ?? {}, { ...options, releaseAssetManifest: releaseManifest }, { pretty: useDevScripts });
     const nonce = options.nonce ?? "";
     const modeScripts = useDevScripts
         ? getDevScripts(meta.slug || "", options.config, params, props, nonce, {

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

@@ -1,6 +1,11 @@
 import type { ComponentProps } from "../../types/index.js";
+import type { ReleaseAssetManifest } from "../../release-assets/manifest-schema.js";
 import type { HTMLGenerationOptions } from "../types.js";
-export declare function generateHydrationData(slug: string, params: Record<string, string | string[]>, props: ComponentProps, options: HTMLGenerationOptions, serializeOptions?: {
+type HydrationOptions = HTMLGenerationOptions & {
+    releaseAssetManifest?: ReleaseAssetManifest | null;
+};
+export declare function generateHydrationData(slug: string, params: Record<string, string | string[]>, props: ComponentProps, options: HydrationOptions, serializeOptions?: {
     pretty?: boolean;
 }): string;
+export {};
 //# sourceMappingURL=hydration-data-generator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"hydration-data-generator.d.ts","sourceRoot":"","sources":["../../../../src/src/html/hydration-script-builder/hydration-data-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAK3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AA8BzD,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EACzC,KAAK,EAAE,cAAc,EACrB,OAAO,EAAE,qBAAqB,EAC9B,gBAAgB,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GACtC,MAAM,CAgDR"}
+{"version":3,"file":"hydration-data-generator.d.ts","sourceRoot":"","sources":["../../../../src/src/html/hydration-script-builder/hydration-data-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAM3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AACpF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AA8BzD,KAAK,gBAAgB,GAAG,qBAAqB,GAAG;IAC9C,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;CACpD,CAAC;AAcF,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EACzC,KAAK,EAAE,cAAc,EACrB,OAAO,EAAE,gBAAgB,EACzB,gBAAgB,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GACtC,MAAM,CAiDR"}

package/esm/src/html/hydration-script-builder/hydration-data-generator.js

@@ -2,6 +2,7 @@ import { resolveRelativePath } from "../../modules/react-loader/path-resolver.js
 import { getExtensionName } from "../../utils/path-utils.js";
 import { determineClientModuleStrategy } from "../../rendering/rsc/client-module-strategy.js";
 import { jsonForInlineScript } from "../../security/client/html-sanitizer.js";
+import { releaseAssetUrl } from "../../release-assets/constants.js";
 function toProjectRelativePath(absolutePath, projectDir) {
     if (!absolutePath)
         return "";
@@ -19,6 +20,15 @@ function inferPageType(pagePath) {
         return undefined;
     return PAGE_TYPE_EXTENSIONS.has(ext) ? ext : undefined;
 }
+function buildReleaseAssetModules(manifest) {
+    if (!manifest)
+        return undefined;
+    const modules = {};
+    for (const [path, entry] of Object.entries(manifest.modules)) {
+        modules[path] = releaseAssetUrl(entry.contentHash, "js");
+    }
+    return Object.keys(modules).length > 0 ? modules : undefined;
+}
 export function generateHydrationData(slug, params, props, options, serializeOptions) {
     const layouts = (options.nestedLayouts ?? [])
         .map((layout) => {
@@ -51,6 +61,7 @@ export function generateHydrationData(slug, params, props, options, serializeOpt
             isLocalProject: options.isLocalProject,
             environment: options.environment,
         }),
+        releaseAssetModules: buildReleaseAssetModules(options.releaseAssetManifest),
         frontmatter: options.frontmatter,
         layoutProps: options.layoutProps,
         // In dev mode, client uses createRoot instead of hydrateRoot to avoid

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

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/html/hydration-script-builder/templates/loader.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,QAAO,MA0GlC,CAAC"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/html/hydration-script-builder/templates/loader.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,QAAO,MA8IlC,CAAC"}

package/esm/src/html/hydration-script-builder/templates/loader.js

@@ -22,7 +22,41 @@ export const getLoaderScript = () => `
       return url + (url.includes('?') ? '&' : '?') + key + '=' + value;
     }
 
+    let __releaseAssetModules = null;
+    function setReleaseAssetModules(value) {
+      __releaseAssetModules =
+        value && typeof value === 'object' && !Array.isArray(value) ? value : null;
+      window.__veryfrontReleaseAssetModules = __releaseAssetModules;
+    }
+    window.__veryfrontSetReleaseAssetModules = setReleaseAssetModules;
+
+    function normalizeReleaseAssetModulePath(path) {
+      return String(path || '')
+        .replace(/^\\/?_vf_modules\\//, '')
+        .replace(/^\\/+/, '')
+        .replace(/[?#].*$/, '');
+    }
+
+    function resolveReleaseAssetModuleUrl(path) {
+      if (!__releaseAssetModules || __studioEmbed || __hmrRefreshTimestamp) return null;
+
+      const key = normalizeReleaseAssetModulePath(path);
+      if (__releaseAssetModules[key]) return __releaseAssetModules[key];
+
+      const withoutExt = key.replace(/\\.(tsx|ts|jsx|mdx|js|mjs)$/, '');
+      const extensions = ['.tsx', '.ts', '.jsx', '.mdx', '.js'];
+      for (const ext of extensions) {
+        const candidate = withoutExt + ext;
+        if (__releaseAssetModules[candidate]) return __releaseAssetModules[candidate];
+      }
+
+      return null;
+    }
+
     function pathToModuleUrl(path, studioEmbed) {
+      const releaseAssetUrl = resolveReleaseAssetModuleUrl(path);
+      if (releaseAssetUrl) return releaseAssetUrl;
+
       const pattern = /(pages|components|app|lib|layouts|shared|features)\\/(.+)\\.(tsx|ts|jsx|mdx)$/;
 
       const match =
@@ -49,12 +83,14 @@ export const getLoaderScript = () => `
     let __studioEmbed = false;
     function setStudioEmbed(value) {
       __studioEmbed = value;
+      window.__veryfrontStudioEmbed = value;
     }
     window.__veryfrontSetStudioEmbed = setStudioEmbed;
 
     let __hmrRefreshTimestamp = null;
     function setHMRRefreshTimestamp(timestamp) {
       __hmrRefreshTimestamp = timestamp;
+      window.__veryfrontHMRRefreshTimestamp = timestamp;
     }
     window.__veryfrontSetHMRRefreshTimestamp = setHMRRefreshTimestamp;
 

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

@@ -1 +1 @@
-{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../../../../src/src/html/hydration-script-builder/templates/renderer.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,cAkN7B,CAAC"}
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../../../../src/src/html/hydration-script-builder/templates/renderer.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,cAqN7B,CAAC"}

package/esm/src/html/hydration-script-builder/templates/renderer.js

@@ -33,6 +33,9 @@ export const getRendererScript = () => `
       if (data.studioEmbed && window.__veryfrontSetStudioEmbed) {
         window.__veryfrontSetStudioEmbed(true);
       }
+      if (data.releaseAssetModules && window.__veryfrontSetReleaseAssetModules) {
+        window.__veryfrontSetReleaseAssetModules(data.releaseAssetModules);
+      }
 
       try {
         let pageModule;

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

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../../../src/src/html/hydration-script-builder/templates/router.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,cA+qB3B,CAAC"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../../../src/src/html/hydration-script-builder/templates/router.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,cAmrB3B,CAAC"}

package/esm/src/html/hydration-script-builder/templates/router.js

@@ -401,6 +401,10 @@ export const getRouterScript = () => `
     // Render page from page data
     // ============================================
     async function renderPageFromData(pageData, targetPath) {
+      if (pageData.releaseAssetModules && window.__veryfrontSetReleaseAssetModules) {
+        window.__veryfrontSetReleaseAssetModules(pageData.releaseAssetModules);
+      }
+
       perfStart('render:loadAll');
       const layoutPaths = (pageData.layouts || []).map((l) => l.path);
       const allPaths = [pageData.pagePath, ...layoutPaths];

package/esm/src/html/hydration-script-builder/templates/spa-renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spa-renderer.d.ts","sourceRoot":"","sources":["../../../../../src/src/html/hydration-script-builder/templates/spa-renderer.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,QAAO,MAgEvC,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAO,MAoCrC,CAAC"}
+{"version":3,"file":"spa-renderer.d.ts","sourceRoot":"","sources":["../../../../../src/src/html/hydration-script-builder/templates/spa-renderer.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,QAAO,MAmEvC,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAO,MAoCrC,CAAC"}

package/esm/src/html/hydration-script-builder/templates/spa-renderer.js

@@ -19,6 +19,9 @@ export const getSpaRendererScript = () => `
       if (initialData.studioEmbed && window.__veryfrontSetStudioEmbed) {
         window.__veryfrontSetStudioEmbed(true);
       }
+      if (initialData.releaseAssetModules && window.__veryfrontSetReleaseAssetModules) {
+        window.__veryfrontSetReleaseAssetModules(initialData.releaseAssetModules);
+      }
 
       try {
         const pageComponent = await loadComponent(initialData.pagePath);

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

@@ -12,6 +12,8 @@ export interface HydrationDataStructure {
     pagePath?: string;
     pageType?: "mdx" | "md" | "tsx" | "jsx" | "ts" | "js";
     clientModuleStrategy?: ClientModuleStrategy;
+    /** Production release asset URLs keyed by logical source path. */
+    releaseAssetModules?: Record<string, string>;
     frontmatter?: Record<string, unknown>;
     layoutProps?: Record<string, Record<string, unknown>>;
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/src/html/hydration-script-builder/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AAE1F,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,KAAK,GAAG,KAAK,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC1C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI,CAAC;IACtD,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACtD;;;;OAIG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9D,6EAA6E;IAC7E,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/src/html/hydration-script-builder/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AAE1F,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,KAAK,GAAG,KAAK,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC1C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI,CAAC;IACtD,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,kEAAkE;IAClE,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACtD;;;;OAIG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9D,6EAA6E;IAC7E,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB"}

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

@@ -20,6 +20,7 @@ import { createFileSystem } from "../platform/compat/fs.js";
 import { dirname, join } from "../platform/compat/path/index.js";
 import { resolveFrameworkSourcePath } from "../platform/compat/framework-source-resolver.js";
 import { transformToESM } from "../transforms/esm-transform.js";
+import { parseImports, replaceSpecifiers } from "../transforms/esm/lexer.js";
 import { PLATFORM_UTILITIES } from "../html/utils.js";
 import { extractCandidatesFromFiles } from "../html/styles-builder/candidate-extractor.js";
 import { sha256HexBytes } from "./hash.js";
@@ -122,10 +123,10 @@ function resolveStaticImports(source, moduleLogicalPath, knownPaths) {
     return results;
 }
 function resolveKnownModulePath(path, knownPaths) {
-    const normalized = path
+    const normalized = normalizeLogicalPath(path
         .replace(/^\/?_vf_modules\//, "")
         .replace(/^\/+/, "")
-        .replace(/[?#].*$/, "");
+        .replace(/[?#].*$/, ""));
     if (normalized.startsWith("_veryfront/"))
         return null;
     if (knownPaths.has(normalized))
@@ -138,29 +139,75 @@ function resolveKnownModulePath(path, knownPaths) {
     }
     return null;
 }
-function collectVfModuleImports(code, knownPaths) {
+function normalizeLogicalPath(path) {
+    const parts = [];
+    for (const part of path.split("/")) {
+        if (!part || part === ".")
+            continue;
+        if (part === "..") {
+            parts.pop();
+            continue;
+        }
+        parts.push(part);
+    }
+    return parts.join("/");
+}
+function normalizeProjectSpecifier(specifier, logicalPath) {
+    if (specifier.startsWith("http://") ||
+        specifier.startsWith("https://") ||
+        specifier.startsWith("data:") ||
+        specifier.startsWith("blob:") ||
+        specifier.startsWith("#")) {
+        return null;
+    }
+    if (specifier.startsWith("/_vf_modules/_veryfront/"))
+        return null;
+    if (specifier.startsWith("/_vf_modules/"))
+        return specifier;
+    if (specifier.startsWith("_veryfront/"))
+        return null;
+    if (specifier.startsWith("./") || specifier.startsWith("../")) {
+        const dir = logicalPath.includes("/")
+            ? logicalPath.slice(0, logicalPath.lastIndexOf("/"))
+            : ".";
+        return `${dir}/${specifier}`;
+    }
+    if (specifier.startsWith("/"))
+        return specifier;
+    if (BROWSER_MODULE_DIRS.some((dir) => specifier.startsWith(dir)))
+        return specifier;
+    return null;
+}
+function resolveProjectModuleSpecifier(specifier, logicalPath, knownPaths) {
+    const normalized = normalizeProjectSpecifier(specifier, logicalPath);
+    if (!normalized)
+        return null;
+    return resolveKnownModulePath(normalized, knownPaths);
+}
+async function collectProjectModuleImports(code, logicalPath, knownPaths) {
     const imports = new Map();
-    const re = /(["'])(\/_vf_modules\/[^"']+)\1/g;
-    let match;
-    while ((match = re.exec(code)) !== null) {
-        const specifier = match[2];
-        const logicalPath = resolveKnownModulePath(specifier, knownPaths);
-        if (logicalPath)
-            imports.set(specifier, logicalPath);
+    for (const imp of await parseImports(code)) {
+        if (!imp.n)
+            continue;
+        const specifier = imp.n;
+        const importedPath = resolveProjectModuleSpecifier(specifier, logicalPath, knownPaths);
+        if (importedPath)
+            imports.set(specifier, importedPath);
     }
     return imports;
 }
-function rewriteVfModuleImports(code, moduleAssets, knownPaths, dependencyUrls) {
-    return code.replace(/(["'])(\/_vf_modules\/[^"']+)\1/g, (full, quote, specifier) => {
-        const dependencyUrl = dependencyUrls.get(specifier.replace(/[?#].*$/, ""));
-        if (dependencyUrl)
-            return `${quote}${dependencyUrl}${quote}`;
-        const logicalPath = resolveKnownModulePath(specifier, knownPaths);
-        const asset = logicalPath ? moduleAssets.get(logicalPath) : undefined;
-        if (!asset)
-            return full;
-        return `${quote}${releaseAssetUrl(asset.contentHash, "js")}${quote}`;
-    });
+async function rewriteProjectModuleImports(code, logicalPath, moduleAssets, knownPaths, dependencyUrls) {
+    function rewriteSpecifier(specifier) {
+        if (specifier.startsWith("/_vf_modules/")) {
+            const dependencyUrl = dependencyUrls.get(specifier.replace(/[?#].*$/, ""));
+            if (dependencyUrl)
+                return dependencyUrl;
+        }
+        const importedPath = resolveProjectModuleSpecifier(specifier, logicalPath, knownPaths);
+        const asset = importedPath ? moduleAssets.get(importedPath) : undefined;
+        return asset ? releaseAssetUrl(asset.contentHash, "js") : null;
+    }
+    return await replaceSpecifiers(code, (specifier) => rewriteSpecifier(specifier));
 }
 function buildDependencyUrlMap(_dependencies) {
     // Framework barrels can contain their own relative import closure. Keep those
@@ -171,7 +218,7 @@ function buildDependencyUrlMap(_dependencies) {
 async function finalizeProjectModules(transformedModules, knownPaths, dependencyUrls, uploadQueue, pendingBytes, gaps) {
     const finalized = new Map();
     const unresolvedCycles = new Set();
-    const cyclicModules = collectCyclicProjectModules(transformedModules, knownPaths, gaps);
+    const cyclicModules = await collectCyclicProjectModules(transformedModules, knownPaths, gaps);
     const skippedModules = new Set(cyclicModules);
     async function finalize(logicalPath, stack) {
         const existing = finalized.get(logicalPath);
@@ -192,11 +239,11 @@ async function finalizeProjectModules(transformedModules, knownPaths, dependency
         if (!transformed)
             return null;
         const nextStack = [...stack, logicalPath];
-        const imports = collectVfModuleImports(transformed.code, knownPaths);
+        const imports = await collectProjectModuleImports(transformed.code, logicalPath, knownPaths);
         for (const importedPath of imports.values()) {
             await finalize(importedPath, nextStack);
         }
-        const rewritten = rewriteVfModuleImports(transformed.code, finalized, knownPaths, dependencyUrls);
+        const rewritten = await rewriteProjectModuleImports(transformed.code, logicalPath, finalized, knownPaths, dependencyUrls);
         const entry = await addPreparedJavaScriptAsset(logicalPath, rewritten, uploadQueue, pendingBytes);
         if (!entry)
             return null;
@@ -216,13 +263,13 @@ async function finalizeProjectModules(transformedModules, knownPaths, dependency
     }
     return { modules: Object.fromEntries(finalized), skippedModules };
 }
-function collectCyclicProjectModules(transformedModules, knownPaths, gaps) {
+async function collectCyclicProjectModules(transformedModules, knownPaths, gaps) {
     const cyclic = new Set();
     const visiting = new Set();
     const visited = new Set();
     const stack = [];
     const recordedCycles = new Set();
-    function visit(logicalPath) {
+    async function visit(logicalPath) {
         if (visited.has(logicalPath))
             return;
         if (visiting.has(logicalPath)) {
@@ -244,17 +291,17 @@ function collectCyclicProjectModules(transformedModules, knownPaths, gaps) {
             return;
         visiting.add(logicalPath);
         stack.push(logicalPath);
-        const imports = collectVfModuleImports(transformed.code, knownPaths);
+        const imports = await collectProjectModuleImports(transformed.code, logicalPath, knownPaths);
         for (const importedPath of imports.values()) {
             if (transformedModules.has(importedPath))
-                visit(importedPath);
+                await visit(importedPath);
         }
         stack.pop();
         visiting.delete(logicalPath);
         visited.add(logicalPath);
     }
     for (const logicalPath of transformedModules.keys())
-        visit(logicalPath);
+        await visit(logicalPath);
     return cyclic;
 }
 async function addPreparedJavaScriptAsset(logicalPath, code, uploadQueue, pendingBytes) {

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

@@ -1,3 +1,3 @@
 /** Shared version value. */
-export declare const VERSION = "0.1.783";
+export declare const VERSION = "0.1.785";
 //# 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.783";
+export const VERSION = "0.1.785";

package/package.json

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