veryfront 0.1.26 → 0.1.28

package/esm/src/rendering/orchestrator/css-candidate-manifest.js

@@ -0,0 +1,132 @@
+import { extractCandidates } from "../../html/styles-builder/tailwind-compiler.js";
+import { getRouteModulePaths } from "../../modules/manifest/route-module-manifest.js";
+import { rendererLogger } from "../../utils/index.js";
+const logger = rendererLogger.component("css-candidate-manifest");
+const SOURCE_EXTENSIONS = [".tsx", ".jsx", ".mdx", ".ts", ".js"];
+const DEV_MANIFEST_TTL_MS = 2000;
+const manifestCache = new Map();
+const routeCandidateCache = new Map();
+function normalizePath(path) {
+    return path.replace(/\\/g, "/").replace(/\/{2,}/g, "/");
+}
+function toRelativeProjectPath(path, projectDir) {
+    const normalized = normalizePath(path);
+    const normalizedProjectDir = normalizePath(projectDir).replace(/\/+$/, "");
+    if (normalized.startsWith(normalizedProjectDir)) {
+        return normalized.slice(normalizedProjectDir.length).replace(/^\/+/, "");
+    }
+    return normalized.replace(/^\/+/, "");
+}
+function buildManifestCacheKey(projectScope, projectVersion) {
+    return `${projectScope}:${projectVersion}`;
+}
+function shouldRebuildManifest(existing, developmentMode) {
+    if (!existing)
+        return true;
+    if (!developmentMode)
+        return false;
+    return (Date.now() - existing.builtAt) > DEV_MANIFEST_TTL_MS;
+}
+function buildSourceCandidatePaths(modulePath) {
+    const normalized = normalizePath(modulePath).replace(/^\/+/, "").replace(/^_vf_modules\//, "");
+    if (!normalized.endsWith(".js"))
+        return [normalized];
+    const withoutJs = normalized.slice(0, -3);
+    return [
+        `${withoutJs}.tsx`,
+        `${withoutJs}.ts`,
+        `${withoutJs}.jsx`,
+        `${withoutJs}.mdx`,
+        `${withoutJs}.js`,
+    ];
+}
+function buildCandidateManifest(files, projectDir) {
+    const fileCandidates = new Map();
+    const allCandidates = new Set();
+    for (const file of files) {
+        if (!file.content)
+            continue;
+        if (!SOURCE_EXTENSIONS.some((ext) => file.path.endsWith(ext)))
+            continue;
+        const candidates = new Set(extractCandidates(file.content));
+        const relativePath = toRelativeProjectPath(file.path, projectDir);
+        const absolutePath = normalizePath(file.path);
+        fileCandidates.set(relativePath, candidates);
+        fileCandidates.set(absolutePath, candidates);
+        for (const cls of candidates)
+            allCandidates.add(cls);
+    }
+    return { fileCandidates, allCandidates, builtAt: Date.now() };
+}
+function addCandidatesForPath(target, manifest, path, projectDir) {
+    const absolutePath = normalizePath(path);
+    const relativePath = toRelativeProjectPath(path, projectDir);
+    const candidates = manifest.fileCandidates.get(absolutePath) ??
+        manifest.fileCandidates.get(relativePath);
+    if (!candidates)
+        return;
+    for (const cls of candidates)
+        target.add(cls);
+}
+/**
+ * Resolve route-scoped Tailwind candidates from a precomputed per-project manifest.
+ */
+export function getRouteCandidates(options) {
+    const manifestKey = buildManifestCacheKey(options.projectScope, options.projectVersion);
+    const existingManifest = manifestCache.get(manifestKey);
+    const manifest = shouldRebuildManifest(existingManifest, options.developmentMode)
+        ? buildCandidateManifest(options.files, options.projectDir)
+        : existingManifest;
+    if (manifest !== existingManifest) {
+        manifestCache.set(manifestKey, manifest);
+        // Clear route subsets when project-level file manifest is rebuilt.
+        for (const key of routeCandidateCache.keys()) {
+            if (key.startsWith(`${manifestKey}:`))
+                routeCandidateCache.delete(key);
+        }
+    }
+    const routeCacheKey = `${manifestKey}:${options.routeKey}`;
+    const cachedRoute = routeCandidateCache.get(routeCacheKey);
+    if (cachedRoute)
+        return new Set(cachedRoute);
+    const routeCandidates = new Set();
+    for (const path of options.routeFilePaths) {
+        addCandidatesForPath(routeCandidates, manifest, path, options.projectDir);
+    }
+    for (const modulePath of getRouteModulePaths(options.projectScope, options.routeKey)) {
+        for (const sourcePath of buildSourceCandidatePaths(modulePath)) {
+            addCandidatesForPath(routeCandidates, manifest, sourcePath, options.projectDir);
+        }
+    }
+    // Fallback to full-project candidates for correctness if route manifest is incomplete.
+    if (routeCandidates.size === 0) {
+        for (const cls of manifest.allCandidates)
+            routeCandidates.add(cls);
+    }
+    routeCandidateCache.set(routeCacheKey, routeCandidates);
+    logger.debug("Resolved route candidates", {
+        projectScope: options.projectScope,
+        projectVersion: options.projectVersion,
+        route: options.routeKey,
+        count: routeCandidates.size,
+    });
+    return new Set(routeCandidates);
+}
+/**
+ * Invalidate cached candidate manifests for one project scope (or all scopes).
+ */
+export function invalidateProjectCandidateManifests(projectScope) {
+    if (!projectScope) {
+        manifestCache.clear();
+        routeCandidateCache.clear();
+        return;
+    }
+    for (const key of manifestCache.keys()) {
+        if (key.startsWith(`${projectScope}:`))
+            manifestCache.delete(key);
+    }
+    for (const key of routeCandidateCache.keys()) {
+        if (key.startsWith(`${projectScope}:`))
+            routeCandidateCache.delete(key);
+    }
+}

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

@@ -20,6 +20,8 @@ export interface HTMLGenerationContext {
     ssrHash: string;
     options?: RenderOptions;
     collectedHead?: CollectedHead;
+    /** Absolute paths to CSS files imported by components (collected during module loading) */
+    cssImports?: string[];
 }
 export declare class HTMLGenerator {
     private config;
@@ -35,6 +37,14 @@ export declare class HTMLGenerator {
     private resolveAppPath;
     private loadProjectFile;
     private buildHTMLOptions;
-    private extractProjectClasses;
+    /**
+     * Load CSS files imported by components and merge with the global stylesheet.
+     * Deduplicates against the configured Tailwind stylesheet path to avoid
+     * double-loading globals.css when it's both auto-discovered and explicitly imported.
+     */
+    private mergeImportedCSS;
+    private getProjectContentVersion;
+    private buildRouteManifestKey;
+    private extractProjectClassesForRoute;
 }
 //# sourceMappingURL=html.d.ts.map

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;AAE9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAShD,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;CAC/B;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAsB;gBAExB,MAAM,EAAE,mBAAmB;IAIjC,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAWjE,kBAAkB,CACtB,WAAW,EAAE,cAAc,EAC3B,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,cAAc,CAAC;YAmCZ,sBAAsB;YAsBtB,wBAAwB;YAkBxB,gBAAgB;YAehB,kBAAkB;IAsDhC,OAAO,CAAC,iBAAiB;IA4DzB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,cAAc;YAQR,eAAe;YAYf,gBAAgB;YAmEhB,qBAAqB;CAsCpC"}
+{"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;AAQ7D,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;AAE9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAchD,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;IAWjE,kBAAkB,CACtB,WAAW,EAAE,cAAc,EAC3B,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,cAAc,CAAC;YAmCZ,sBAAsB;YAsBtB,wBAAwB;YAkBxB,gBAAgB;YAehB,kBAAkB;IAsDhC,OAAO,CAAC,iBAAiB;IA4DzB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,cAAc;YAQR,eAAe;YAYf,gBAAgB;IAuE9B;;;;OAIG;YACW,gBAAgB;IA0D9B,OAAO,CAAC,wBAAwB;IAchC,OAAO,CAAC,qBAAqB;YAOf,6BAA6B;CAwD5C"}

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

@@ -1,13 +1,14 @@
 import { join } from "../../platform/compat/path/index.js";
 import { getExtensionName } from "../../utils/path-utils.js";
 import { extractHTMLMetadata, generateHTMLShellParts, injectHTMLContent, isFullHTMLDocument, } from "../../html/index.js";
-import { extractCandidates } from "../../html/styles-builder/tailwind-compiler.js";
 import { DEFAULT_DASHBOARD_PORT, rendererLogger } from "../../utils/index.js";
 import { injectElementSelectors } from "../../studio/element-selector-injector.js";
 import { computeSourceHash } from "../../studio/hash-utils.js";
 import { extractRelativePath } from "../../utils/route-path-utils.js";
 import { resolveAppComponentPath } from "../layouts/utils/app-resolver.js";
 import { StreamTimeoutError, streamToString } from "../utils/stream-utils.js";
+import { normalizeCssModuleKey, rewriteCssModuleContent, } from "../../transforms/css-modules/naming.js";
+import { getRouteCandidates } from "./css-candidate-manifest.js";
 const logger = rendererLogger.component("html-generator");
 export class HTMLGenerator {
     config;
@@ -204,11 +205,14 @@ export class HTMLGenerator {
     }
     async buildHTMLOptions(context, mergedFrontmatter) {
         const stylesheetPath = this.config.config?.tailwind?.stylesheet || "globals.css";
-        const [appComponentPath, globalCSS, projectClasses] = await Promise.all([
+        const [appComponentPath, globalCSS] = await Promise.all([
             this.resolveAppPath().then((p) => p ?? undefined),
             this.loadProjectFile(stylesheetPath),
-            this.extractProjectClasses(),
         ]);
+        const projectClasses = await this.extractProjectClassesForRoute(context, appComponentPath);
+        // Load CSS imported by components and merge with globalCSS.
+        // Deduplicate against the configured stylesheet to avoid double-loading.
+        const combinedCSS = await this.mergeImportedCSS(globalCSS, context.cssImports, stylesheetPath);
         logger.debug("App component resolution", {
             appComponentPath,
             projectDir: this.config.projectDir,
@@ -234,7 +238,7 @@ export class HTMLGenerator {
             pagePath,
             pageType,
             nonce: context.options?.nonce,
-            globalCSS,
+            globalCSS: combinedCSS,
             frontmatter: mergedFrontmatter,
             studioEmbed: context.options?.studioEmbed,
             projectId: context.options?.projectId,
@@ -250,8 +254,74 @@ export class HTMLGenerator {
             noHmr: context.options?.noHmr,
         };
     }
-    async extractProjectClasses() {
-        const SOURCE_EXTENSIONS = [".tsx", ".jsx", ".mdx", ".ts", ".js"];
+    /**
+     * Load CSS files imported by components and merge with the global stylesheet.
+     * Deduplicates against the configured Tailwind stylesheet path to avoid
+     * double-loading globals.css when it's both auto-discovered and explicitly imported.
+     */
+    async mergeImportedCSS(globalCSS, cssImports, stylesheetPath) {
+        if (!cssImports || cssImports.length === 0)
+            return globalCSS;
+        const normalizedStylesheetPath = stylesheetPath.replace(/^\/+/, "");
+        const configuredStylesheetAbsolute = normalizeCssModuleKey(join(this.config.projectDir, normalizedStylesheetPath));
+        const uniqueImports = new Map();
+        for (const cssPath of cssImports) {
+            const normalized = normalizeCssModuleKey(cssPath);
+            if (!uniqueImports.has(normalized)) {
+                uniqueImports.set(normalized, cssPath);
+            }
+        }
+        const sortedImports = [...uniqueImports.entries()].sort((a, b) => a[0].localeCompare(b[0]));
+        const regularCssSegments = [];
+        const moduleCssSegments = [];
+        for (const [normalizedCssPath, cssPath] of sortedImports) {
+            // Deduplicate only exact path matches to avoid skipping unrelated files
+            // like /styles/globals.css when the configured stylesheet is /globals.css.
+            if (normalizedCssPath === configuredStylesheetAbsolute) {
+                continue;
+            }
+            try {
+                const content = await this.config.adapter.fs.readFile(cssPath);
+                if (!content)
+                    continue;
+                if (normalizedCssPath.endsWith(".module.css")) {
+                    moduleCssSegments.push(rewriteCssModuleContent(content, normalizedCssPath));
+                }
+                else {
+                    regularCssSegments.push(content);
+                }
+            }
+            catch {
+                logger.debug("Could not load imported CSS file", { cssPath });
+            }
+        }
+        if (regularCssSegments.length === 0 && moduleCssSegments.length === 0)
+            return globalCSS;
+        const combined = [globalCSS, ...regularCssSegments, ...moduleCssSegments]
+            .filter(Boolean)
+            .join("\n");
+        logger.debug("Merged imported CSS with global stylesheet", {
+            importedCount: regularCssSegments.length + moduleCssSegments.length,
+            regularCount: regularCssSegments.length,
+            moduleCount: moduleCssSegments.length,
+            totalLength: combined.length,
+        });
+        return combined;
+    }
+    getProjectContentVersion() {
+        const wrappedFs = this.config.adapter.fs;
+        if (typeof wrappedFs.getUnderlyingAdapter !== "function")
+            return undefined;
+        const fsAdapter = wrappedFs.getUnderlyingAdapter();
+        return fsAdapter.getProjectData?.()?.updated_at;
+    }
+    buildRouteManifestKey(pagePath) {
+        const relativePagePath = extractRelativePath(pagePath, this.config.projectDir);
+        return relativePagePath
+            .replace(/\.(tsx|ts|jsx|mdx|md|js)$/, "")
+            .replace(/^pages\//, "");
+    }
+    async extractProjectClassesForRoute(context, appComponentPath) {
         const classes = new Set();
         const wrappedFs = this.config.adapter.fs;
         if (typeof wrappedFs.getUnderlyingAdapter !== "function")
@@ -260,19 +330,34 @@ export class HTMLGenerator {
         if (typeof fsAdapter.getAllSourceFiles !== "function")
             return classes;
         const files = await fsAdapter.getAllSourceFiles();
-        let filesProcessed = 0;
-        for (const file of files) {
-            if (!file.content)
-                continue;
-            if (!SOURCE_EXTENSIONS.some((ext) => file.path.endsWith(ext)))
-                continue;
-            filesProcessed++;
-            for (const cls of extractCandidates(file.content)) {
-                classes.add(cls);
-            }
-        }
+        const projectScope = context.options?.projectSlug || context.options?.projectId ||
+            this.config.projectDir;
+        const projectVersion = this.getProjectContentVersion() ??
+            (this.config.mode === "development" ? "dev" : "unknown");
+        const routeKey = this.buildRouteManifestKey(context.pageInfo.entity.path);
+        const routeLayoutPaths = context.nestedLayouts
+            .map((layout) => layout.componentPath || layout.path)
+            .filter((path) => Boolean(path));
+        const routeFilePaths = [
+            context.pageInfo.entity.path,
+            ...routeLayoutPaths,
+            ...(appComponentPath ? [appComponentPath] : []),
+        ];
+        const routeCandidates = getRouteCandidates({
+            projectScope,
+            projectVersion,
+            projectDir: this.config.projectDir,
+            routeKey,
+            routeFilePaths,
+            files,
+            developmentMode: this.config.mode === "development",
+        });
+        for (const cls of routeCandidates)
+            classes.add(cls);
         logger.debug("extractProjectClasses", {
-            filesProcessed,
+            filesProcessed: files.length,
+            routeKey,
+            routeFileCount: routeFilePaths.length,
             totalClasses: classes.size,
         });
         return classes;

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

@@ -1 +1 @@
-{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAgBH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAoChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAC;IACjC,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,OAAO,qBAAqB,EAAE,sBAAsB,CAAC;CAC1E;AAQD,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,kBAAkB,CAAqB;gBAEnC,MAAM,EAAE,oBAAoB;IAaxC;;;OAGG;IACH,gBAAgB,IAAI,IAAI;IAKxB,OAAO,CAAC,UAAU;IAIlB;;;;;;;;;OASG;YACW,qBAAqB;IAsDnC;;;OAGG;YACW,mBAAmB;IAkH3B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IA8N9E,+EAA+E;IACzE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA4KvF;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;CAetB"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAgBH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAwChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAC;IACjC,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,OAAO,qBAAqB,EAAE,sBAAsB,CAAC;CAC1E;AAQD,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,kBAAkB,CAAqB;gBAEnC,MAAM,EAAE,oBAAoB;IAaxC;;;OAGG;IACH,gBAAgB,IAAI,IAAI;IAKxB,OAAO,CAAC,UAAU;IAIlB;;;;;;;;;OASG;YACW,qBAAqB;IAsDnC;;;OAGG;YACW,mBAAmB;IAkH3B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IA4O9E,+EAA+E;IACzE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA4KvF;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;CAetB"}

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

@@ -31,6 +31,7 @@ import { LAYOUT_EXTENSIONS } from "../layouts/types.js";
 import { withTimeout, withTimeoutThrow } from "../utils/stream-utils.js";
 import { generateTailwind4CSS } from "../../html/styles-builder/index.js";
 import { createEsmCache, createModuleCache, loadModule } from "./module-loader/index.js";
+import { getCSSImports, runWithCSSCollector, } from "../../modules/react-loader/css-import-collector.js";
 // Extracted modules
 import { EMPTY_LAYOUT_RESULT, isDotPath } from "./path-helpers.js";
 import { cachePageCss, CSS_SSR_TIMEOUT_MS, getCachedPageCss, getPageCssCacheKey, } from "./css-cache.js";
@@ -215,7 +216,7 @@ export class RenderPipeline {
         if (this.config.mode === "development") {
             clearSSRModuleCacheForProject(projectId);
         }
-        return withSpan("render.page", async () => {
+        return withSpan("render.page", () => runWithCSSCollector(async () => {
             const pageResolveStart = performance.now();
             const pageInfo = await withSpan("render.resolve_page", () => this.config.pageResolver.resolvePage(slug), { "render.slug": slug });
             timing.pageResolve = Math.round(performance.now() - pageResolveStart);
@@ -283,6 +284,9 @@ export class RenderPipeline {
             const layoutApplyStart = performance.now();
             const wrappedElement = await withSpan("render.apply_layouts", () => this.config.layoutOrchestrator.applyLayoutsAndWrappers(pageElement, pageInfo, layoutResult.layoutBundle, layoutResult.nestedLayouts, layoutDataMap, options?.url, mergedFrontmatter, headings, options?.projectSlug), { "render.slug": slug, "render.layout_count": layoutResult.nestedLayouts.length });
             timing.layoutApply = Math.round(performance.now() - layoutApplyStart);
+            // Snapshot CSS imports collected during module loading (before SSR rendering).
+            // These are passed to the HTML generator to be included in the output.
+            const collectedCSSImports = getCSSImports();
             const ssrStart = performance.now();
             const ssrResult = await withSpan("render.ssr", () => withTimeoutThrow(this.config.ssrOrchestrator.performSSRRendering(wrappedElement, {
                 pageInfo,
@@ -291,8 +295,16 @@ export class RenderPipeline {
                 nestedLayouts: layoutResult.nestedLayouts,
                 collectedMetadata: pageBundleResult.collectedMetadata,
                 slug,
+                cssImports: collectedCSSImports,
             }, mergedOptions), SSR_RENDER_TIMEOUT_MS, `SSR rendering for ${slug}`), { "render.slug": slug, "render.delivery": mergedOptions?.delivery || "full" });
             timing.ssr = Math.round(performance.now() - ssrStart);
+            if (collectedCSSImports.length > 0) {
+                renderPipelineLog.debug("CSS imports collected for HTML generation", {
+                    slug,
+                    count: collectedCSSImports.length,
+                    paths: collectedCSSImports.map((p) => p.split("/").pop()),
+                });
+            }
             const pageModule = pageBundleResult.clientModuleCode && pageBundleResult.pageModuleType
                 ? {
                     slug,
@@ -321,7 +333,7 @@ export class RenderPipeline {
             timing.total = Math.round(performance.now() - pipelineStartTime);
             renderPipelineLog.debug("Complete", { slug, timing });
             return result;
-        }, {
+        }).then(({ result }) => result), {
             "render.slug": slug,
             "render.project_id": options?.projectId || this.config.projectDir,
             "render.mode": this.config.mode,

package/esm/src/server/bootstrap.d.ts

@@ -9,6 +9,8 @@ export interface BootstrapResult {
     usingFSAdapter: boolean;
     /** FSAdapter type (if used) */
     fsAdapterType?: string;
+    /** Dispose FSAdapter resources (WebSocket connections, caches) */
+    dispose?: () => void;
 }
 export declare function bootstrap(projectDir: string, adapter: RuntimeAdapter): Promise<BootstrapResult>;
 export declare function bootstrapDev(projectDir: string, adapter: RuntimeAdapter): Promise<BootstrapResult>;

package/esm/src/server/bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../../src/src/server/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AA2B1D,MAAM,WAAW,eAAe;IAC9B,8DAA8D;IAC9D,OAAO,EAAE,cAAc,CAAC;IAExB,2BAA2B;IAC3B,MAAM,EAAE,eAAe,CAAC;IAExB,wCAAwC;IACxC,cAAc,EAAE,OAAO,CAAC;IAExB,+BAA+B;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAkDD,wBAAsB,SAAS,CAC7B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,eAAe,CAAC,CAyF1B;AAED,wBAAsB,YAAY,CAChC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,eAAe,CAAC,CAa1B;AAED,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,eAAe,CAAC,CAyB1B"}
+{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../../src/src/server/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AA4B1D,MAAM,WAAW,eAAe;IAC9B,8DAA8D;IAC9D,OAAO,EAAE,cAAc,CAAC;IAExB,2BAA2B;IAC3B,MAAM,EAAE,eAAe,CAAC;IAExB,wCAAwC;IACxC,cAAc,EAAE,OAAO,CAAC;IAExB,+BAA+B;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,kEAAkE;IAClE,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAkDD,wBAAsB,SAAS,CAC7B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,eAAe,CAAC,CAqG1B;AAED,wBAAsB,YAAY,CAChC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,eAAe,CAAC,CAa1B;AAED,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,eAAe,CAAC,CAyB1B"}

package/esm/src/server/bootstrap.js

@@ -2,6 +2,7 @@ import { clearConfigCache, getConfig } from "../config/index.js";
 import { getEnvironmentConfig, refreshEnvironmentConfig, } from "../config/environment-config.js";
 import { getErrorMessage } from "../errors/veryfront-error.js";
 import { enhanceAdapterWithFS } from "../platform/adapters/fs/integration.js";
+import { isExtendedFSAdapter } from "../platform/adapters/fs/wrapper.js";
 import { getEnv } from "../platform/compat/process.js";
 import { initializeEsbuild } from "../platform/compat/esbuild.js";
 import { logger } from "../utils/index.js";
@@ -120,11 +121,20 @@ export async function bootstrap(projectDir, adapter) {
         runtime: adapter.id,
         fsAdapter: fsType,
     });
+    let dispose;
+    if (isExtendedFSAdapter(enhancedAdapter.fs)) {
+        const underlying = enhancedAdapter.fs.getUnderlyingAdapter();
+        if ("dispose" in underlying &&
+            typeof underlying.dispose === "function") {
+            dispose = () => underlying.dispose();
+        }
+    }
     return {
         adapter: enhancedAdapter,
         config,
         usingFSAdapter: true,
         fsAdapterType: fsType,
+        dispose,
     };
 }
 export async function bootstrapDev(projectDir, adapter) {

package/esm/src/server/handlers/preview/markdown-html-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markdown-html-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/preview/markdown-html-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AAMrD,oDAAoD;AACpD,MAAM,WAAW,mBAAmB;IAClC,wDAAwD;IACxD,OAAO,EAAE,MAAM,CAAC;IAChB,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,iDAAiD;IACjD,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IACzB,gDAAgD;IAChD,GAAG,EAAE,GAAG,CAAC;IACT,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,sCAAsC;IACtC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAyCD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM,CA0FzE"}
+{"version":3,"file":"markdown-html-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/preview/markdown-html-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AAMrD,oDAAoD;AACpD,MAAM,WAAW,mBAAmB;IAClC,wDAAwD;IACxD,OAAO,EAAE,MAAM,CAAC;IAChB,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,iDAAiD;IACjD,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IACzB,gDAAgD;IAChD,GAAG,EAAE,GAAG,CAAC;IACT,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,sCAAsC;IACtC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAgDD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM,CA0FzE"}

package/esm/src/server/handlers/preview/markdown-html-generator.js

@@ -21,16 +21,22 @@ function detectTheme(req, url) {
     return null;
 }
 /**
- * Generate the studio bridge `<script>` tag when embedded in Studio.
- * Returns an empty string when not in studio embed mode.
+ * Generate the studio bridge `<script>` tag.
+ * Injected when embedded in Studio (`studio_embed=true`) or for standalone
+ * markdown/MDX pages so the edit button and editor features are available.
  */
 function buildStudioScript(url, projectId, filePath) {
     const studioEmbed = url.searchParams.get("studio_embed") === "true";
-    if (!studioEmbed)
+    const isMarkdown = /\.mdx?$/i.test(filePath);
+    if (!studioEmbed && !isMarkdown)
         return "";
+    const queryProjectId = url.searchParams.get("vf_project_id")?.trim() || "";
+    const queryFileId = url.searchParams.get("vf_file_id")?.trim() || "";
+    const canonicalProjectId = queryProjectId || projectId;
+    const canonicalPageId = queryFileId || filePath;
     return `<script>${generateStudioBridgeScript({
-        projectId,
-        pageId: filePath,
+        projectId: canonicalProjectId,
+        pageId: canonicalPageId,
         pagePath: filePath,
     })}</script>`;
 }

package/esm/src/server/production-server.js

@@ -170,12 +170,14 @@ if (globalThis[Symbol.for("import-meta-ponyfill-esmodule")](import.meta).main) {
         // BIND_ADDRESS: 0.0.0.0 = all interfaces, 127.0.0.1 = localhost only
         // Note: Don't use HOSTNAME - K8s sets it to pod name which resolves to pod IP
         const bindAddress = adapter.env.get("BIND_ADDRESS") ?? "0.0.0.0";
+        const bootstrap = await bootstrapProd(projectDir, adapter);
         const server = await startProductionServer({
             projectDir,
             port,
             bindAddress,
             debug: isDebugEnabled(adapter.env),
             adapter, // Pass adapter to avoid re-detection
+            bootstrapResult: bootstrap,
             signal: shutdownController.signal,
         });
         // Wait for server to be fully ready before accepting traffic
@@ -209,6 +211,7 @@ if (globalThis[Symbol.for("import-meta-ponyfill-esmodule")](import.meta).main) {
                 // Phase 3: Stop accepting new connections and clean up
                 stopMemoryMonitoring();
                 requestTracker.shutdown();
+                bootstrap.dispose?.();
                 shutdownController.abort();
                 await server.stop();
                 await shutdownOTLP();
@@ -218,8 +221,13 @@ if (globalThis[Symbol.for("import-meta-ponyfill-esmodule")](import.meta).main) {
                 logger.warn("Error while shutting down production server:", error);
             }
         };
-        onSignal("SIGINT", () => void shutdown("SIGINT"));
-        onSignal("SIGTERM", () => void shutdown("SIGTERM"));
+        const handleSignal = (signal) => {
+            void shutdown(signal).catch((error) => {
+                logger.warn("Unhandled error while shutting down production server", { signal, error });
+            });
+        };
+        onSignal("SIGINT", () => handleSignal("SIGINT"));
+        onSignal("SIGTERM", () => handleSignal("SIGTERM"));
     }
     catch (e) {
         logger.error("Failed to start production server:", e);

package/esm/src/studio/bridge-template.d.ts

@@ -2,6 +2,8 @@ export interface StudioBridgeOptions {
     projectId: string;
     pageId: string;
     pagePath?: string;
+    debugSkipInit?: boolean;
+    debugExposeInternals?: boolean;
 }
 export declare function generateStudioBridgeScript(options: StudioBridgeOptions): string;
 //# sourceMappingURL=bridge-template.d.ts.map

package/esm/src/studio/bridge-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bridge-template.d.ts","sourceRoot":"","sources":["../../../src/src/studio/bridge-template.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM,CA+uB/E"}
+{"version":3,"file":"bridge-template.d.ts","sourceRoot":"","sources":["../../../src/src/studio/bridge-template.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAy/H/E"}