veryfront 0.1.131 → 0.1.136

package/esm/src/react/router/index.d.ts

@@ -1,3 +1,12 @@
+/**
+ * React router exports for client navigation and route context.
+ *
+ * @module
+ * @example
+ * ```tsx
+ * import { Link, RouterProvider, useRouter } from "veryfront/router";
+ * ```
+ */
 import "../../../_dnt.polyfills.js";
 export { Link, Router, RouterProvider, useRouter } from "../runtime/core.js";
 export type { LinkProps, RouterProviderProps, RouterValue } from "../runtime/core.js";

package/esm/src/react/router/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/src/react/router/index.tsx"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7E,YAAY,EAAE,SAAS,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/src/react/router/index.tsx"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,4BAA4B,CAAC;AAEpC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7E,YAAY,EAAE,SAAS,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC"}

package/esm/src/react/router/index.js

@@ -1,2 +1,11 @@
+/**
+ * React router exports for client navigation and route context.
+ *
+ * @module
+ * @example
+ * ```tsx
+ * import { Link, RouterProvider, useRouter } from "veryfront/router";
+ * ```
+ */
 import "../../../_dnt.polyfills.js";
 export { Link, Router, RouterProvider, useRouter } from "../runtime/core.js";

package/esm/src/rendering/orchestrator/html.d.ts

@@ -29,6 +29,7 @@ export declare class HTMLGenerator {
     generateFullHTML(context: HTMLGenerationContext): Promise<string>;
     generateHTMLStream(reactStream: ReadableStream, context: Omit<HTMLGenerationContext, "html">): Promise<ReadableStream>;
     private handleFullHTMLDocument;
+    private resolveProjectStylesheetHref;
     private detectUseClientDirective;
     private wrapHTMLFragment;
     private generateShellParts;

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

@@ -1 +1 @@
-{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/html.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAS7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,SAAS,EAET,UAAU,EACX,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AA2HhD,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;CACpC;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,UAAU,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,2FAA2F;IAC3F,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAsB;gBAExB,MAAM,EAAE,mBAAmB;IAIjC,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAajE,kBAAkB,CACtB,WAAW,EAAE,cAAc,EAC3B,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,cAAc,CAAC;YAgDZ,sBAAsB;YAiCtB,wBAAwB;YAmBxB,gBAAgB;YAyBhB,kBAAkB;IAwDhC,OAAO,CAAC,0BAA0B;IAsBlC,OAAO,CAAC,sBAAsB;IAgD9B,OAAO,CAAC,iBAAiB;IA4DzB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,cAAc;YAQR,eAAe;YAaf,gBAAgB;IAgF9B;;;;OAIG;YACW,gBAAgB;IA2D9B,OAAO,CAAC,wBAAwB;IAqBhC,OAAO,CAAC,qBAAqB;YAOf,6BAA6B;CAyD5C"}
+{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/html.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAS7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,SAAS,EAET,UAAU,EACX,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AA6EhD,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;CACpC;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,UAAU,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,2FAA2F;IAC3F,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAsB;gBAExB,MAAM,EAAE,mBAAmB;IAIjC,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IA0BjE,kBAAkB,CACtB,WAAW,EAAE,cAAc,EAC3B,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,cAAc,CAAC;YAqEZ,sBAAsB;YAqDtB,4BAA4B;YAiB5B,wBAAwB;YAmBxB,gBAAgB;YAyBhB,kBAAkB;IAwDhC,OAAO,CAAC,0BAA0B;IAsBlC,OAAO,CAAC,sBAAsB;IAgD9B,OAAO,CAAC,iBAAiB;IA4DzB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,cAAc;YAQR,eAAe;YAaf,gBAAgB;IAgF9B;;;;OAIG;YACW,gBAAgB;IA2D9B,OAAO,CAAC,wBAAwB;IAqBhC,OAAO,CAAC,qBAAqB;YAOf,6BAA6B;CAyD5C"}

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

@@ -2,7 +2,7 @@ import { join } from "../../platform/compat/path/index.js";
 import { getExtensionName } from "../../utils/path-utils.js";
 import { buildImportMapJson, extractHTMLMetadata, generateHTMLShellParts, injectHTMLContent, isFullHTMLDocument, } from "../../html/index.js";
 import { DEFAULT_DASHBOARD_PORT, rendererLogger } from "../../utils/index.js";
-import { escapeHtml } from "../../utils/html-escape.js";
+import { addNonceToHtmlTags } from "../../html/nonce-injection.js";
 import { injectElementSelectors } from "../../studio/element-selector-injector.js";
 import { computeSourceHash } from "../../studio/hash-utils.js";
 import { extractRelativePath } from "../../utils/route-path-utils.js";
@@ -16,91 +16,44 @@ import { getRouteCandidates } from "./css-candidate-manifest.js";
 import { resolveStyleContentVersion } from "../../html/styles-builder/content-version.js";
 import { createStyleScopeProfile } from "../../html/styles-builder/style-scope-profile.js";
 const logger = rendererLogger.component("html-generator");
-function findTagEnd(html, start) {
-    let activeQuote = null;
-    for (let index = start + 1; index < html.length; index++) {
-        const char = html[index];
-        if (activeQuote) {
-            if (char === activeQuote)
-                activeQuote = null;
-            continue;
-        }
-        if (char === '"' || char === "'") {
-            activeQuote = char;
-            continue;
-        }
-        if (char === ">")
-            return index;
-    }
-    return -1;
-}
-function getOpeningTagName(tag) {
-    const match = /^<\s*([a-zA-Z][\w:-]*)/u.exec(tag);
-    const tagName = match?.[1]?.toLowerCase();
-    if (tagName === "script" || tagName === "style")
-        return tagName;
-    return undefined;
-}
-function injectNonceIntoOpeningTag(tag, escapedNonce) {
-    if (/\bnonce\s*=/iu.test(tag))
-        return tag;
-    const closeIndex = tag.lastIndexOf(">");
-    if (closeIndex === -1)
-        return tag;
-    const insertAt = /\/\s*>$/u.test(tag) ? closeIndex - 1 : closeIndex;
-    return `${tag.slice(0, insertAt)} nonce="${escapedNonce}"${tag.slice(insertAt)}`;
-}
-function addNonceToRenderedTags(html, nonce) {
-    if (!nonce)
+function applyExplicitThemeToDocument(html, colorScheme, enabled) {
+    if (!enabled || !colorScheme)
         return html;
-    const escapedNonce = escapeHtml(nonce);
-    const lowerHtml = html.toLowerCase();
-    let result = "";
-    let index = 0;
-    let rawTextTag = null;
-    while (index < html.length) {
-        if (rawTextTag) {
-            const closingIndex = lowerHtml.indexOf(`</${rawTextTag}`, index);
-            if (closingIndex === -1) {
-                result += html.slice(index);
-                break;
-            }
-            result += html.slice(index, closingIndex);
-            index = closingIndex;
-            rawTextTag = null;
-            continue;
+    return html.replace(/<html\b([^>]*)>/i, (_match, attrs) => {
+        let nextAttrs = attrs;
+        if (/\sdata-theme\s*=/i.test(nextAttrs)) {
+            nextAttrs = nextAttrs.replace(/\sdata-theme\s*=\s*(["']).*?\1/i, "");
         }
-        if (html.startsWith("<!--", index)) {
-            const commentEnd = html.indexOf("-->", index + 4);
-            const endIndex = commentEnd === -1 ? html.length : commentEnd + 3;
-            result += html.slice(index, endIndex);
-            index = endIndex;
-            continue;
-        }
-        if (html[index] !== "<") {
-            result += html[index];
-            index++;
-            continue;
-        }
-        const tagEnd = findTagEnd(html, index);
-        if (tagEnd === -1) {
-            result += html.slice(index);
-            break;
-        }
-        const tag = html.slice(index, tagEnd + 1);
-        const tagName = getOpeningTagName(tag);
-        if (!tagName) {
-            result += tag;
-            index = tagEnd + 1;
-            continue;
+        nextAttrs += ` data-theme="${colorScheme}"`;
+        const styleMatch = nextAttrs.match(/\sstyle\s*=\s*(["'])(.*?)\1/i);
+        if (styleMatch) {
+            let styleValue = (styleMatch[2] ?? "").trim();
+            if (/color-scheme\s*:/i.test(styleValue)) {
+                styleValue = styleValue.replace(/color-scheme\s*:\s*[^;]+/i, `color-scheme: ${colorScheme}`);
+            }
+            else {
+                styleValue = styleValue
+                    ? `${styleValue.replace(/;?\s*$/, ";")} color-scheme: ${colorScheme};`
+                    : `color-scheme: ${colorScheme};`;
+            }
+            nextAttrs = nextAttrs.replace(styleMatch[0], ` style="${styleValue}"`);
         }
-        result += injectNonceIntoOpeningTag(tag, escapedNonce);
-        index = tagEnd + 1;
-        if (!/\/\s*>$/u.test(tag)) {
-            rawTextTag = tagName;
+        else {
+            nextAttrs += ` style="color-scheme: ${colorScheme};"`;
         }
-    }
-    return result;
+        return `<html${nextAttrs}>`;
+    });
+}
+function injectThemePersistenceScript(html, colorScheme, enabled, nonce) {
+    if (!enabled || !colorScheme || !/<\/head>/i.test(html))
+        return html;
+    if (html.includes(`localStorage.setItem('theme','${colorScheme}')`))
+        return html;
+    const nonceAttr = nonce ? ` nonce="${nonce}"` : "";
+    const script = `<script${nonceAttr}>
+(function(){try{localStorage.setItem('theme','${colorScheme}')}catch(e){/* SILENT: localStorage may be unavailable */}})();
+</script>`;
+    return html.replace(/<\/head>/i, `${script}\n</head>`);
 }
 export class HTMLGenerator {
     config;
@@ -108,14 +61,24 @@ export class HTMLGenerator {
         this.config = config;
     }
     async generateFullHTML(context) {
-        const html = isFullHTMLDocument(context.html)
-            ? await this.handleFullHTMLDocument(context)
-            : await this.wrapHTMLFragment(context);
+        let html;
+        if (isFullHTMLDocument(context.html)) {
+            let projectCSSPromise;
+            if (this.config.mode === "production" && context.options?.environment === "production") {
+                const mergedFrontmatter = this.mergeFrontmatter(context);
+                const htmlOptions = await profilePhase("html.build_options", () => this.buildHTMLOptions(context, mergedFrontmatter));
+                projectCSSPromise = this.startProjectCSSPreparation(context, htmlOptions);
+            }
+            html = await this.handleFullHTMLDocument(context, projectCSSPromise);
+        }
+        else {
+            html = await this.wrapHTMLFragment(context);
+        }
         const finalHtml = context.options?.studioEmbed ? injectElementSelectors(html) : html;
         if (context.options?.studioEmbed) {
             logger.debug("Injected element selectors for Studio");
         }
-        return addNonceToRenderedTags(finalHtml, context.options?.nonce);
+        return addNonceToHtmlTags(finalHtml, context.options?.nonce);
     }
     async generateHTMLStream(reactStream, context) {
         const fullContext = context;
@@ -135,9 +98,22 @@ export class HTMLGenerator {
             });
             reactContent = error.partialContent.trim();
         }
+        if (isFullHTMLDocument(reactContent)) {
+            const encoder = new TextEncoder();
+            const fullHtml = addNonceToHtmlTags(await this.handleFullHTMLDocument({
+                ...fullContext,
+                html: reactContent,
+            }, projectCSSPromise), context.options?.nonce);
+            return new ReadableStream({
+                start(controller) {
+                    controller.enqueue(encoder.encode(fullHtml));
+                    controller.close();
+                },
+            });
+        }
         const { start, end } = await profilePhase("html.generate_shell_parts", () => this.generateShellParts(fullContext, mergedFrontmatter, htmlOptions, reactContent, projectCSSPromise));
         const encoder = new TextEncoder();
-        const fullHtml = addNonceToRenderedTags(`${start}${reactContent}${end}`, context.options?.nonce);
+        const fullHtml = addNonceToHtmlTags(`${start}${reactContent}${end}`, context.options?.nonce);
         return new ReadableStream({
             start(controller) {
                 controller.enqueue(encoder.encode(fullHtml));
@@ -145,7 +121,7 @@ export class HTMLGenerator {
             },
         });
     }
-    async handleFullHTMLDocument(context) {
+    async handleFullHTMLDocument(context, projectCSSPromise) {
         const metadata = extractHTMLMetadata((context.pageInfo.entity.frontmatter || {}), (context.layoutBundle?.frontmatter || {}));
         const pagePath = context.pageInfo.entity.path;
         const [isClientPage, importMapJson] = await Promise.all([
@@ -155,7 +131,9 @@ export class HTMLGenerator {
                 config: this.config.config,
             }),
         ]);
-        const injectedHtml = injectHTMLContent(context.html, "", metadata, {
+        const themedHtml = injectThemePersistenceScript(applyExplicitThemeToDocument(context.html, context.options?.colorScheme, context.options?.colorSchemeFromParam), context.options?.colorScheme, context.options?.colorSchemeFromParam, context.options?.nonce);
+        const projectStylesheetHref = await this.resolveProjectStylesheetHref(context, projectCSSPromise);
+        const injectedHtml = injectHTMLContent(themedHtml, "", metadata, {
             mode: this.config.mode,
             slug: context.slug,
             devPort: this.config.config?.dev?.port || DEFAULT_DASHBOARD_PORT,
@@ -166,11 +144,25 @@ export class HTMLGenerator {
             isLocalProject: this.config.mode === "development",
             nonce: context.options?.nonce,
             importMapJson,
+            projectStylesheetHref,
         });
         if (injectedHtml.trimStart().toLowerCase().startsWith("<!doctype"))
             return injectedHtml;
         return `<!DOCTYPE html>\n${injectedHtml}`;
     }
+    async resolveProjectStylesheetHref(context, projectCSSPromise) {
+        if (!projectCSSPromise)
+            return undefined;
+        const projectCSS = await profilePhase("html.project_css", () => projectCSSPromise);
+        const cssHash = projectCSS?.hash ?? "";
+        if (cssHash)
+            return `/_vf/css/${cssHash}.css`;
+        logger.error("Project CSS hash is empty for full-document HTML", {
+            slug: context.slug,
+            environment: context.options?.environment,
+        });
+        return undefined;
+    }
     async detectUseClientDirective(pagePath) {
         try {
             const pageContent = await this.config.adapter.fs.readFile(pagePath);

package/esm/src/rendering/script-page-handling.js

@@ -152,6 +152,7 @@ async function generateFullHtml(htmlBody, context) {
             mode: options.mode,
             slug,
             devPort: options.config?.dev?.port ?? DEFAULT_DASHBOARD_PORT,
+            nonce: options.nonce,
         });
     }
     const htmlOptions = {

package/esm/src/server/handlers/dev/framework-candidates.generated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"framework-candidates.generated.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/dev/framework-candidates.generated.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,eAAO,MAAM,oBAAoB,EAAE,SAAS,MAAM,EA2wKjD,CAAC"}
+{"version":3,"file":"framework-candidates.generated.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/dev/framework-candidates.generated.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,eAAO,MAAM,oBAAoB,EAAE,SAAS,MAAM,EAoxKjD,CAAC"}

package/esm/src/server/handlers/dev/framework-candidates.generated.js

@@ -1040,6 +1040,7 @@ export const FRAMEWORK_CANDIDATES = [
     "Hover",
     "HydratingChatRootFixture():",
     "HydratingChatStyleProviderFixture():",
+    "HydratingColorModeScriptFixture():",
     "HydratingHeadStyleFixture():",
     "I",
     "IconElementSpec",
@@ -2039,6 +2040,7 @@ export const FRAMEWORK_CANDIDATES = [
     "as",
     "asking",
     "assert(root,",
+    "assert(script,",
     "assert(style,",
     "assert,",
     "assertEquals",
@@ -3156,6 +3158,7 @@ export const FRAMEWORK_CANDIDATES = [
     "hover:underline",
     "href={doc.url}",
     "href={props.href}",
+    "html",
     "html.replaceAll(",
     "html:",
     "html>",
@@ -3169,6 +3172,8 @@ export const FRAMEWORK_CANDIDATES = [
     "https://example.com/",
     "hydrateAndReadManagedHeadStyleNonce(",
     "hydrateAndReadManagedHeadStyleNonce(<HydratingHeadStyleFixture",
+    "hydrateAndReadScriptNonce(<HydratingColorModeScriptFixture",
+    "hydrateAndReadScriptNonce(element:",
     "hydrateAndReadStyleNonce(<HydratingChatRootFixture",
     "hydrateAndReadStyleNonce(<HydratingChatStyleProviderFixture",
     "hydrateAndReadStyleNonce(element:",
@@ -3237,6 +3242,8 @@ export const FRAMEWORK_CANDIDATES = [
     "initialContent:",
     "initialContent={content}",
     "initialize(config:",
+    "injectNonceIntoInlineTags(html:",
+    "injectNonceIntoInlineTags(renderToString(element),",
     "injectNonceIntoStyleTags(html:",
     "injectNonceIntoStyleTags(renderToString(element),",
     "injected",
@@ -4380,6 +4387,7 @@ export const FRAMEWORK_CANDIDATES = [
     "replace(",
     "replace(/",
     "replace(/:",
+    "replaceAll(",
     "requestAnimationFrame(()",
     "requestAnimationFrame:",
     "reset",
@@ -4456,6 +4464,7 @@ export const FRAMEWORK_CANDIDATES = [
     "score:",
     "score?:",
     "script",
+    "script.getAttribute(",
     "script[nonce],",
     "script}",
     "scrollAreaRef",

package/esm/src/server/handlers/request/ssr/ssr-response-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-response-builder.d.ts","sourceRoot":"","sources":["../../../../../../src/src/server/handlers/request/ssr/ssr-response-builder.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,OAAO,MAAM,8BAA8B,CAAC;AAGxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAElF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AAWrF;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAuD3B"}
+{"version":3,"file":"ssr-response-builder.d.ts","sourceRoot":"","sources":["../../../../../../src/src/server/handlers/request/ssr/ssr-response-builder.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,OAAO,MAAM,8BAA8B,CAAC;AAGxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAElF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AAGrF;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CA2D3B"}

package/esm/src/server/handlers/request/ssr/ssr-response-builder.js

@@ -10,11 +10,7 @@ import * as dntShim from "../../../../../_dnt.shims.js";
 import { hasMatchingEtag } from "../../utils/etag.js";
 import { getContentType } from "../../utils/content-types.js";
 import { ErrorPages } from "../../../utils/error-html.js";
-import { escapeHtml } from "../../../../html/html-escape.js";
-function addNonceToInlineTags(html, nonce) {
-    const escapedNonce = escapeHtml(nonce);
-    return html.replace(/<(script|style)\b(?![^>]*\bnonce\s*=)([^>]*)>/giu, `<$1$2 nonce="${escapedNonce}">`);
-}
+import { addNonceToHtmlStream, addNonceToHtmlTags } from "../../../../html/nonce-injection.js";
 /**
  * Build an HTTP response from an SSR render result.
  *
@@ -31,7 +27,7 @@ export async function buildSSRResponse(req, ctx, result, builder) {
             .withSecurity(ctx.securityConfig ?? undefined, req)
             .withClientHints()
             .withCache("no-cache")
-            .withContentType(getContentType(".html"), result.stream, result.status);
+            .withContentType(getContentType(".html"), addNonceToHtmlStream(result.stream, builder.nonce), result.status);
         if (!isHeadRequest)
             return response;
         await response.body?.cancel().catch(() => { });
@@ -51,7 +47,7 @@ export async function buildSSRResponse(req, ctx, result, builder) {
         : typeof result.stream === "string"
             ? result.stream
             : ErrorPages.serverError();
-    const html = addNonceToInlineTags(content, builder.nonce);
+    const html = addNonceToHtmlTags(content, builder.nonce);
     const body = isHeadRequest ? null : html;
     let response = builder
         .withCORS(req, ctx.securityConfig?.cors)

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;AACH,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AAGrD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAmB,aAAa,EAAE,MAAM,aAAa,CAAC;AAUnG,qBAAa,aAAc,SAAQ,WAAW;IAC5C,QAAQ,EAAE,eAAe,CAOvB;IAEF,OAAO,CAAC,aAAa,CAA2B;IAEhD,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;IAazE,OAAO,CAAC,cAAc;CAiEvB"}
+{"version":3,"file":"static.handler.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/request/static.handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AAGrD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAmB,aAAa,EAAE,MAAM,aAAa,CAAC;AAgBnG,qBAAa,aAAc,SAAQ,WAAW;IAC5C,QAAQ,EAAE,eAAe,CAOvB;IAEF,OAAO,CAAC,aAAa,CAA2B;IAEhD,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;IAazE,OAAO,CAAC,cAAc;CAuEvB"}

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

@@ -3,6 +3,11 @@ import { hasMatchingEtag } from "../utils/etag.js";
 import { HTTP_NOT_FOUND, HTTP_OK, PRIORITY_MEDIUM_STATIC, } from "../../../utils/constants/index.js";
 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";
+function isHtmlResponse(contentType) {
+    return /\btext\/html\b/i.test(contentType);
+}
 export class StaticHandler extends BaseHandler {
     metadata = {
         name: "StaticHandler",
@@ -31,6 +36,8 @@ export class StaticHandler extends BaseHandler {
             const isHead = method === "HEAD";
             const isLocal = !!ctx.isLocalProject;
             const isPreviewMode = ctx.requestContext?.mode === "preview" && !isLocal;
+            const builder = this.createResponseBuilder(ctx)
+                .withCORS(req, ctx.securityConfig?.cors);
             const result = await this.staticService.resolveFile(pathname, {
                 projectDir: ctx.projectDir,
                 adapter: ctx.adapter,
@@ -40,24 +47,25 @@ export class StaticHandler extends BaseHandler {
             if (!result) {
                 if (!this.staticService.isAssetRequest(pathname))
                     return null;
-                return this.createResponseBuilder(ctx)
-                    .withCORS(req, ctx.securityConfig?.cors)
+                return builder
                     .withSecurity(ctx.securityConfig ?? undefined, req)
                     .withCache("no-cache")
                     .withContentType("text/plain; charset=utf-8", isHead ? null : "Not Found", HTTP_NOT_FOUND);
             }
-            if (hasMatchingEtag(req, result.etag)) {
-                return this.createResponseBuilder(ctx)
-                    .withCORS(req, ctx.securityConfig?.cors)
+            const responseData = isHtmlResponse(result.contentType)
+                ? new TextEncoder().encode(addNonceToHtmlTags(new TextDecoder().decode(result.data), builder.nonce))
+                : result.data;
+            const etag = computeEtag(responseData);
+            if (hasMatchingEtag(req, etag)) {
+                return builder
                     .withSecurity(ctx.securityConfig ?? undefined, req)
-                    .notModified(result.etag);
+                    .notModified(etag);
             }
-            const body = isHead ? null : result.data.slice();
-            const response = this.createResponseBuilder(ctx)
-                .withCORS(req, ctx.securityConfig?.cors)
+            const body = isHead ? null : responseData.slice();
+            const response = builder
                 .withSecurity(ctx.securityConfig ?? undefined, req)
                 .withCache(result.cacheStrategy)
-                .withETag(result.etag)
+                .withETag(etag)
                 .withContentType(result.contentType, body, HTTP_OK);
             this.logDebug(`Served static file: ${result.path}`, {
                 contentType: result.contentType,

package/esm/src/tool/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/src/tool/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAiIzE,wBAAgB,IAAI,CAAC,MAAM,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,EACtD,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAkCvB;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IACxF,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC;IAC7C,GAAG,CAAC,EAAE;QACJ,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,WAAW,CAAC,EAAE,UAAU,GAAG,OAAO,GAAG,aAAa,CAAC;KACpD,CAAC;CACH;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAwB7E"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/src/tool/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAwIzE,wBAAgB,IAAI,CAAC,MAAM,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,EACtD,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAqCvB;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IACxF,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC;IAC7C,GAAG,CAAC,EAAE;QACJ,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,WAAW,CAAC,EAAE,UAAU,GAAG,OAAO,GAAG,aAAa,CAAC;KACpD,CAAC;CACH;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CA2B7E"}

package/esm/src/tool/factory.js

@@ -68,10 +68,17 @@ let toolIdCounter = 0;
 function generateToolId() {
     return `tool_${Date.now()}_${toolIdCounter++}`;
 }
+function markGeneratedToolId(tool) {
+    return {
+        ...tool,
+        __veryfrontGeneratedId: tool.id,
+    };
+}
 export function tool(config) {
-    const id = config.id || generateToolId();
+    const explicitId = typeof config.id === "string" && config.id.length > 0 ? config.id : undefined;
+    const id = explicitId ?? generateToolId();
     const inputSchemaJson = convertSchemaToJson(config.inputSchema, id, "TOOL", config.allowUnknownSchema ?? false);
-    return {
+    const createdTool = {
         id,
         type: "function",
         description: config.description,
@@ -93,11 +100,13 @@ export function tool(config) {
         },
         mcp: config.mcp,
     };
+    return explicitId ? createdTool : markGeneratedToolId(createdTool);
 }
 export function dynamicTool(config) {
-    const id = config.id || generateToolId();
+    const explicitId = typeof config.id === "string" && config.id.length > 0 ? config.id : undefined;
+    const id = explicitId ?? generateToolId();
     const inputSchemaJson = convertSchemaToJson(config.inputSchema, id, "DYNAMIC_TOOL", true);
-    return {
+    const createdTool = {
         id,
         type: "dynamic",
         description: config.description,
@@ -118,4 +127,5 @@ export function dynamicTool(config) {
         },
         mcp: config.mcp,
     };
+    return explicitId ? createdTool : markGeneratedToolId(createdTool);
 }

package/esm/src/tool/types.d.ts

@@ -60,6 +60,8 @@ type ToolType = "function" | "dynamic";
 export interface Tool<TInput = any, TOutput = any> {
     /** Tool ID */
     id: string;
+    /** Internal marker used to distinguish autogenerated placeholder ids from explicit ids. */
+    __veryfrontGeneratedId?: string;
     /**
      * Tool type discriminator
      * - 'function': Standard tool with known types (default)

package/esm/src/tool/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/src/tool/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE7D;;GAEG;AAEH,MAAM,WAAW,UAAU,CAAC,MAAM,GAAG,GAAG,EAAE,OAAO,GAAG,GAAG;IACrD,yDAAyD;IACzD,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,wCAAwC;IACxC,WAAW,EAAE,MAAM,CAAC;IAEpB,gCAAgC;IAChC,WAAW,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAEjC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;OAEG;IACH,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAEvF,wBAAwB;IACxB,GAAG,CAAC,EAAE;QACJ,qBAAqB;QACrB,OAAO,CAAC,EAAE,OAAO,CAAC;QAElB,6BAA6B;QAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;QAEvB,mBAAmB;QACnB,WAAW,CAAC,EAAE,UAAU,GAAG,OAAO,GAAG,aAAa,CAAC;KACpD,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4DAA4D;IAC5D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yBAAyB;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,sDAAsD;IACtD,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED;;;;GAIG;AACH,KAAK,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;AAEvC;;GAEG;AAEH,MAAM,WAAW,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE,OAAO,GAAG,GAAG;IAC/C,cAAc;IACd,EAAE,EAAE,MAAM,CAAC;IAEX;;;;OAIG;IACH,IAAI,EAAE,QAAQ,CAAC;IAEf,uBAAuB;IACvB,WAAW,EAAE,MAAM,CAAC;IAEpB,yBAAyB;IACzB,WAAW,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAEjC;;;OAGG;IACH,eAAe,CAAC,EAAE,UAAU,CAAC;IAE7B;;OAEG;IACH,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAE7E,wBAAwB;IACxB,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CACxB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/src/tool/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE7D;;GAEG;AAEH,MAAM,WAAW,UAAU,CAAC,MAAM,GAAG,GAAG,EAAE,OAAO,GAAG,GAAG;IACrD,yDAAyD;IACzD,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,wCAAwC;IACxC,WAAW,EAAE,MAAM,CAAC;IAEpB,gCAAgC;IAChC,WAAW,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAEjC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;OAEG;IACH,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAEvF,wBAAwB;IACxB,GAAG,CAAC,EAAE;QACJ,qBAAqB;QACrB,OAAO,CAAC,EAAE,OAAO,CAAC;QAElB,6BAA6B;QAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;QAEvB,mBAAmB;QACnB,WAAW,CAAC,EAAE,UAAU,GAAG,OAAO,GAAG,aAAa,CAAC;KACpD,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4DAA4D;IAC5D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yBAAyB;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,sDAAsD;IACtD,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED;;;;GAIG;AACH,KAAK,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;AAEvC;;GAEG;AAEH,MAAM,WAAW,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE,OAAO,GAAG,GAAG;IAC/C,cAAc;IACd,EAAE,EAAE,MAAM,CAAC;IACX,2FAA2F;IAC3F,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,IAAI,EAAE,QAAQ,CAAC;IAEf,uBAAuB;IACvB,WAAW,EAAE,MAAM,CAAC;IAEpB,yBAAyB;IACzB,WAAW,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAEjC;;;OAGG;IACH,eAAe,CAAC,EAAE,UAAU,CAAC;IAE7B;;OAEG;IACH,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAE7E,wBAAwB;IACxB,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CACxB"}

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

@@ -9,6 +9,7 @@ export declare const FRAMEWORK_ROOT: string;
 export declare const EMBEDDED_SRC_DIR: string;
 export declare const FRAMEWORK_LOOKUPS: Array<[prefix: string, frameworkDir: string]>;
 export declare const frameworkWriteFlight: Singleflight<string>;
+export declare const frameworkTransformFlight: Singleflight<string>;
 export declare const veryfrontTransformCache: Map<string, string>;
 export declare const frameworkFileCache: Map<string, string>;
 export declare const transformingFiles: Set<string>;

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/pipeline/stages/ssr-vf-modules/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEjE,eAAO,MAAM,UAAU,qBAAqB,CAAC;AAG7C,eAAO,MAAM,UAAU,UAAiC,CAAC;AASzD,eAAO,MAAM,cAAc,QAAyB,CAAC;AAKrD,eAAO,MAAM,gBAAgB,QAAwD,CAAC;AAKtF,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,CAK3E,CAAC;AAGF,eAAO,MAAM,oBAAoB,sBAA6B,CAAC;AAG/D,eAAO,MAAM,uBAAuB,qBAA4B,CAAC;AAGjE,eAAO,MAAM,kBAAkB,qBAA4B,CAAC;AAG5D,eAAO,MAAM,iBAAiB,aAAoB,CAAC;AAGnD,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAE5C,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,EAAE,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;CACzC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/pipeline/stages/ssr-vf-modules/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEjE,eAAO,MAAM,UAAU,qBAAqB,CAAC;AAG7C,eAAO,MAAM,UAAU,UAAiC,CAAC;AASzD,eAAO,MAAM,cAAc,QAAyB,CAAC;AAKrD,eAAO,MAAM,gBAAgB,QAAwD,CAAC;AAKtF,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,CAK3E,CAAC;AAGF,eAAO,MAAM,oBAAoB,sBAA6B,CAAC;AAI/D,eAAO,MAAM,wBAAwB,sBAA6B,CAAC;AAGnE,eAAO,MAAM,uBAAuB,qBAA4B,CAAC;AAGjE,eAAO,MAAM,kBAAkB,qBAA4B,CAAC;AAG5D,eAAO,MAAM,iBAAiB,aAAoB,CAAC;AAGnD,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAE5C,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,EAAE,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;CACzC"}

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

@@ -29,6 +29,9 @@ export const FRAMEWORK_LOOKUPS = [
 ];
 // Singleflight for framework module file writes to prevent race conditions
 export const frameworkWriteFlight = new Singleflight();
+// Singleflight for top-level framework source transforms so concurrent user
+// modules importing the same veryfront/* module do not receive cycle placeholders.
+export const frameworkTransformFlight = new Singleflight();
 // Cache for already-transformed #veryfront/ dependencies to avoid cycles and redundant work
 export const veryfrontTransformCache = new Map();
 // Cache for transformed framework files by absolute path to prevent cycles and redundant work

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,CAY1D;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;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"}

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

@@ -8,8 +8,10 @@
 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
-    const pattern = /from\s*["'](\/\_vf\_modules\/_veryfront\/[^"']+)["']/g;
+    // 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]);

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

@@ -15,7 +15,7 @@ import { resolveAndTransformVeryfrontImport } from "./transform.js";
 export { findRelativeImports, findVfModuleImports } from "./import-finder.js";
 export { resolveFrameworkFile, resolveRelativeFrameworkImport, resolveVeryfrontSourcePath, tryReadWithExtensions, } from "./path-resolver.js";
 export { cacheTransformedCode, isCyclePlaceholder, resolveAndTransformVeryfrontImport, transformFrameworkCode, transformFrameworkSource, } from "./transform.js";
-export { EMBEDDED_SRC_DIR, EXTENSIONS, FRAMEWORK_LOOKUPS, FRAMEWORK_ROOT, frameworkFileCache, frameworkWriteFlight, LOG_PREFIX, MAX_RELATIVE_IMPORT_DEPTH, type TransformContext, transformingFiles, veryfrontTransformCache, } from "./constants.js";
+export { EMBEDDED_SRC_DIR, EXTENSIONS, FRAMEWORK_LOOKUPS, FRAMEWORK_ROOT, frameworkFileCache, frameworkTransformFlight, frameworkWriteFlight, LOG_PREFIX, MAX_RELATIVE_IMPORT_DEPTH, type TransformContext, transformingFiles, veryfrontTransformCache, } from "./constants.js";
 export declare const _testExports: {
     findVfModuleImports: typeof findVfModuleImports;
     findRelativeImports: typeof findRelativeImports;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/pipeline/stages/ssr-vf-modules/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAMtD,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EACL,oBAAoB,EACpB,8BAA8B,EAC9B,0BAA0B,EAC3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAGL,kCAAkC,EAEnC,MAAM,gBAAgB,CAAC;AAUxB,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EACL,oBAAoB,EACpB,8BAA8B,EAC9B,0BAA0B,EAC1B,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,kCAAkC,EAClC,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,oBAAoB,EACpB,UAAU,EACV,yBAAyB,EACzB,KAAK,gBAAgB,EACrB,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,gBAAgB,CAAC;AAexB,eAAO,MAAM,YAAY;;;;;;;;;;CAUxB,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,eA+EhC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/pipeline/stages/ssr-vf-modules/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAMtD,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EACL,oBAAoB,EACpB,8BAA8B,EAC9B,0BAA0B,EAC3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAGL,kCAAkC,EAEnC,MAAM,gBAAgB,CAAC;AAWxB,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EACL,oBAAoB,EACpB,8BAA8B,EAC9B,0BAA0B,EAC1B,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,kCAAkC,EAClC,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,EACpB,UAAU,EACV,yBAAyB,EACzB,KAAK,gBAAgB,EACrB,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,gBAAgB,CAAC;AAexB,eAAO,MAAM,YAAY;;;;;;;;;;CAUxB,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,eAgFhC,CAAC"}