@vesk/adapter 0.2.16 → 0.2.18

package/dist/client-bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-bundle.d.ts","sourceRoot":"","sources":["../src/client-bundle.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,kBAAkB,EAAqC,MAAM,yBAAyB,CAAC;AAoCrI;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CA8BhE;AAoLD;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAkBxD;AAmCD,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,SAAS,EAAE,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CA4T7B;AAMD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CA+B3D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAUlE;AAYD;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAuCrG"}
+{"version":3,"file":"client-bundle.d.ts","sourceRoot":"","sources":["../src/client-bundle.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,kBAAkB,EAAqC,MAAM,yBAAyB,CAAC;AAoCrI;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CA8BhE;AAmUD;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAkBxD;AAmCD,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,SAAS,EAAE,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CAuX7B;AAMD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CA+B3D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAUlE;AAYD;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAuCrG"}

package/dist/client-bundle.js

@@ -1,4 +1,4 @@
-import { readFileSync, existsSync, writeFileSync, unlinkSync, statSync, rmSync } from 'node:fs';
+import { readFileSync, existsSync, writeFileSync, unlinkSync, statSync, rmSync, mkdtempSync } from 'node:fs';
 import { resolve, join, dirname, relative, sep } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { build } from './esbuild-fallback.js';
@@ -197,18 +197,160 @@ function demoteExports(code) {
         code = code.slice(0, e.start) + e.text + code.slice(e.end);
     return code;
 }
+function hasChunkImports(code) {
+    try {
+        const ast = parse(code);
+        return (ast.body ?? []).some((n) => n.type === 'ImportDeclaration');
+    }
+    catch {
+        return false;
+    }
+}
 /**
- * Code-split chunks execute as classic scripts, so NO import statement may
- * survive in a contribution (runtime and `.vsk` imports are stripped
- * earlier; npm packages and relative `.ts` values are unresolvable from a
- * `/_vesk/static/` classic script). Strips every remaining import and
- * demotes value exports — server-only components never execute
- * client-side, and islands must receive data through props/serialization
- * rather than module imports (a stripped binding referenced by an island
- * fails loudly at that island instead of killing the whole chunk).
+ * Rewrites a compiled file's source specifier so esbuild can resolve it from
+ * the temp bundle entry. Bare package specifiers (e.g. `lucide-vesk`) stay
+ * as-is; relative specifiers are resolved to absolute filesystem paths with a
+ * `.ts` extension appended so esbuild loads the module as TypeScript and
+ * inlines its exported values. Offset-based on the parser AST — never a text
+ * scan.
+ */
+function resolveImportSource(src, filePath) {
+    if (src.startsWith('./') || src.startsWith('../')) {
+        return resolve(dirname(filePath), src) + '.ts';
+    }
+    return src;
+}
+/**
+ * Accumulates every import a code-split chunk needs and rebuilds it as a
+ * single deduped import block.
+ *
+ * A chunk is the concatenation of several independently compiled files, and
+ * each file's component AND hydrator both keep their imports verbatim. So the
+ * same named binding frequently appears multiple times in one chunk — once per
+ * (file, comp|hyd) pair, plus once per extra file. acorn's `parse()` rejects
+ * that with `Identifier has already been declared`, so `hasChunkImports` used
+ * to silently return false and esbuild — which rejects the same duplicates —
+ * never ran; the chunk shipped with raw `import` statements inside its
+ * classic-script IIFE and hydration died with `SyntaxError: Cannot use import
+ * statement outside a module`.
+ *
+ * Processing each file's contribution in isolation avoids the duplicate
+ * bindings entirely (a single compiled file parses cleanly), folds the imports
+ * into a per-source map keyed by local binding, strips them from the file
+ * body, and later emits one merged import block at the top of the chunk.
  */
-function stripChunkImports(code) {
-    return demoteExports(removeCompiledNodes(code, isAnyImport));
+class ChunkImports {
+    bySource = new Map();
+    aborted = false;
+    abortReason = null;
+    fail(reason, code) {
+        if (!this.aborted) {
+            this.aborted = true;
+            this.abortReason = reason;
+        }
+        return code;
+    }
+    /** Folds one file's imports into the merged set and returns the code with its imports stripped. */
+    add(code, filePath) {
+        if (!code || this.aborted)
+            return code;
+        let ast;
+        try {
+            ast = parse(code);
+        }
+        catch {
+            // A single compiled file is always valid ESM; if it somehow is not,
+            // stop merging so the assembler falls back to the historical path.
+            return this.fail(`unparseable contribution from ${filePath}`, code);
+        }
+        const body = ast.body ?? [];
+        const ranges = [];
+        for (const raw of body) {
+            const node = raw;
+            if (node.type !== 'ImportDeclaration' || typeof node.start !== 'number' || typeof node.end !== 'number')
+                continue;
+            const src = node.source?.value;
+            if (typeof src !== 'string')
+                continue;
+            const resolved = resolveImportSource(src, filePath);
+            let group = this.bySource.get(resolved);
+            if (!group) {
+                group = { named: new Map() };
+                this.bySource.set(resolved, group);
+            }
+            for (const spec of node.specifiers ?? []) {
+                const s = spec;
+                const local = s.local?.name;
+                if (typeof local !== 'string')
+                    return this.fail(`nameless specifier from '${resolved}' in ${filePath}`, code);
+                if (s.type === 'ImportDefaultSpecifier') {
+                    if (group.default && group.default.local !== local)
+                        return this.fail(`conflicting default imports from '${resolved}' in ${filePath}`, code);
+                    group.default = { kind: 'default', local };
+                }
+                else if (s.type === 'ImportNamespaceSpecifier') {
+                    if (group.namespace && group.namespace.local !== local)
+                        return this.fail(`conflicting namespace imports from '${resolved}' in ${filePath}`, code);
+                    group.namespace = { kind: 'namespace', local };
+                }
+                else if (s.type === 'ImportSpecifier') {
+                    const imported = s.imported?.name;
+                    if (typeof imported !== 'string')
+                        return this.fail(`nameless named-import from '${resolved}' in ${filePath}`, code);
+                    const existing = group.named.get(imported);
+                    if (existing && existing.local !== local)
+                        return this.fail(`'${imported}' from '${resolved}' bound to both '${existing.local}' and '${local}' in ${filePath}`, code);
+                    group.named.set(imported, { kind: 'named', local, imported });
+                }
+            }
+            let cut = node.end;
+            if (code[cut] === ';')
+                cut++;
+            ranges.push([node.start, cut]);
+        }
+        if (ranges.length === 0)
+            return code;
+        return removeRanges(code, ranges);
+    }
+    /** True when every file parsed and merged cleanly (no conflict, no parse abort). */
+    get ok() {
+        return !this.aborted;
+    }
+    /** Why the merge aborted (null when `ok`). Surfaced by the assembler. */
+    get reason() {
+        return this.abortReason;
+    }
+    /** Renders the deduped import block (empty string when there are no imports). */
+    render() {
+        if (this.aborted || this.bySource.size === 0)
+            return '';
+        const lines = [];
+        const sources = [...this.bySource.keys()].sort();
+        for (const src of sources) {
+            const g = this.bySource.get(src);
+            const parts = [];
+            if (g.default)
+                parts.push(`import ${g.default.local} from ${JSON.stringify(src)}`);
+            if (g.namespace)
+                parts.push(`import * as ${g.namespace.local} from ${JSON.stringify(src)}`);
+            const named = [...g.named.values()].sort((a, b) => (a.imported < b.imported ? -1 : 1));
+            if (named.length > 0) {
+                const specs = named.map((sp) => (sp.imported === sp.local ? sp.local : `${sp.imported} as ${sp.local}`)).join(', ');
+                parts.push(`import { ${specs} } from ${JSON.stringify(src)}`);
+            }
+            lines.push(parts.join('\n'));
+        }
+        return lines.join('\n');
+    }
+}
+/** Removes a set of offset ranges from a source string, high-to-low. */
+function removeRanges(code, ranges) {
+    const sorted = [...ranges].sort((a, b) => b[0] - a[0]);
+    let out = code;
+    for (const [start, end] of sorted) {
+        out = out.slice(0, start) + out.slice(end);
+    }
+    return out.trim();
 }
 /**
  * Scopes one file's contribution to the shared chunk: module-level
@@ -365,7 +507,7 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
     function stripExports(code) {
         return removeCompiledNodes(code, isComponentExport);
     }
-    function compileFile(filePath, resolvedName, output) {
+    function compileFile(filePath, resolvedName, output, imports) {
         if (seen.has(filePath))
             return;
         seen.add(filePath);
@@ -390,11 +532,17 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
         if (cached && cacheUsable) {
             cachedFileHits++;
             for (const dep of cached.imports)
-                compileFile(dep, cache?.files.get(dep)?.actualName ?? '', output);
+                compileFile(dep, cache?.files.get(dep)?.actualName ?? '', output, imports);
             // Comp and hyd contributions of one file share its top-level bindings
             // (e.g. `const links` used by both the component and its hydrator),
-            // so they must be scoped together in a single block.
-            const cachedFileCode = [cached.compCode, cached.hydCode].filter(Boolean).join('\n');
+            // so they must be scoped together in a single block. Cached codes keep
+            // their imports; each side is folded separately because comp+hyd of one
+            // file carry the same import twice (joint parse would abort the merge).
+            // Mirror the fresh path exactly: strip, rename the hydrator registry,
+            // trim — otherwise warm output drifts from cold output.
+            const cachedComp = cached.compCode ? imports.add(cached.compCode, filePath).replace(/^\n+/, '').replace(/\n+$/, '') : '';
+            const cachedHyd = cached.hydCode ? imports.add(cached.hydCode, filePath).replace(/__components/g, '__hydrators').replace(/^\n+/, '').replace(/\n+$/, '') : '';
+            const cachedFileCode = [cachedComp, cachedHyd].filter(Boolean).join('\n');
             if (cachedFileCode.trim())
                 output.push(scopeFileContribution(cachedFileCode));
             for (const n of cached.runtimeNames)
@@ -411,13 +559,17 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
             src = inlineMdContentAttrs(src, dirname(filePath), guessProjectRoots(appDir));
         }
         const namesBefore = cache ? new Set(runtimeImportNames) : null;
-        const importedPaths = resolveVskImports(filePath, (p, n) => compileFile(p, n || '', output));
+        const importedPaths = resolveVskImports(filePath, (p, n) => compileFile(p, n, output, imports));
         // One parse/IR pass feeds both client modes AND the component-name
         // lookup — the dev hot path pays the acorn+TS parse once per edit
         // instead of three times.
         const { comp: rawComp, hyd: rawHyd, name: actualName } = compileClientBoth(src, null, filePath);
-        const compCode = rawComp ? stripChunkImports(stripExports(stripVskImports(stripRuntimeImport(rawComp)))).replace(/^\n+/, '').replace(/\n+$/, '') : '';
-        const hydCode = rawHyd ? stripChunkImports(stripExports(stripVskImports(stripRuntimeImport(rawHyd)))).replace(/__components/g, '__hydrators').replace(/^\n+/, '').replace(/\n+$/, '') : '';
+        // Cache keeps the import-carrying codes so a warm build can re-fold them
+        // into its own fresh accumulator; the emitted codes are import-stripped.
+        const compWithImports = rawComp ? stripExports(stripVskImports(stripRuntimeImport(rawComp))) : '';
+        const hydWithImports = rawHyd ? stripExports(stripVskImports(stripRuntimeImport(rawHyd))) : '';
+        const compCode = compWithImports ? imports.add(compWithImports, filePath).replace(/^\n+/, '').replace(/\n+$/, '') : '';
+        const hydCode = hydWithImports ? imports.add(hydWithImports, filePath).replace(/__components/g, '__hydrators').replace(/^\n+/, '').replace(/\n+$/, '') : '';
         if (rawComp)
             collectRuntimeImports(rawComp);
         if (rawHyd)
@@ -444,8 +596,8 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
             cache.files.set(filePath, {
                 mtimeMs: st.mtimeMs,
                 size: st.size,
-                compCode,
-                hydCode,
+                compCode: compWithImports,
+                hydCode: hydWithImports,
                 actualName,
                 runtimeNames: [...runtimeImportNames].filter((n) => !namesBefore.has(n)),
                 imports: importedPaths,
@@ -479,57 +631,113 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
         function walkSplit(nodes, _chain) {
             for (const node of nodes) {
                 const chunkCode = [];
+                const chunkImports = new ChunkImports();
                 const pagePath = resolve(appDir, node.sourceDir, 'page.vsk');
                 if (node.page && existsSync(pagePath)) {
-                    compileFile(pagePath, node.page, chunkCode);
+                    compileFile(pagePath, node.page, chunkCode, chunkImports);
                 }
                 const layoutPath = resolve(appDir, node.sourceDir, 'layout.vsk');
                 if (node.layout && existsSync(layoutPath)) {
-                    compileFile(layoutPath, node.layout, chunkCode);
+                    compileFile(layoutPath, node.layout, chunkCode, chunkImports);
                 }
                 const errorPath = resolve(appDir, node.sourceDir, 'error.vsk');
                 if (node.error && existsSync(errorPath)) {
-                    compileFile(errorPath, node.error, chunkCode);
+                    compileFile(errorPath, node.error, chunkCode, chunkImports);
                 }
                 const notFoundPath = resolve(appDir, node.sourceDir, 'not-found.vsk');
                 if (node.notFound && existsSync(notFoundPath)) {
-                    compileFile(notFoundPath, node.notFound, chunkCode);
+                    compileFile(notFoundPath, node.notFound, chunkCode, chunkImports);
                 }
                 const offlinePath = resolve(appDir, node.sourceDir, 'offline.vsk');
                 if (node.offline && existsSync(offlinePath)) {
-                    compileFile(offlinePath, node.offline, chunkCode);
+                    compileFile(offlinePath, node.offline, chunkCode, chunkImports);
                 }
                 const networkPath = resolve(appDir, node.sourceDir, 'network.vsk');
                 if (node.network && existsSync(networkPath)) {
-                    compileFile(networkPath, node.network, chunkCode);
+                    compileFile(networkPath, node.network, chunkCode, chunkImports);
                 }
                 const loadingPath = resolve(appDir, node.sourceDir, 'loading.vsk');
                 if (node.loading && existsSync(loadingPath)) {
-                    compileFile(loadingPath, node.loading, chunkCode);
+                    compileFile(loadingPath, node.loading, chunkCode, chunkImports);
                 }
                 if (chunkCode.length > 0) {
                     const chunkName = `page-${buildChunkName(node)}.js`;
-                    chunkEntries.push({ name: chunkName, code: chunkCode.join('\n\n'), node });
+                    // Prepend this chunk's deduped imports (one statement per source, no
+                    // duplicate bindings) so the classic script exposes the bare
+                    // identifiers its file bodies reference, and esbuild can parse and
+                    // inline them.
+                    if (!chunkImports.ok)
+                        console.error('[vesk] chunk import merge aborted for', chunkName + ':', chunkImports.reason);
+                    const head = chunkImports.render();
+                    const code = (head ? head + '\n\n' : '') + chunkCode.join('\n\n');
+                    chunkEntries.push({ name: chunkName, code, node });
                 }
                 walkSplit(node.children || [], [..._chain, node]);
             }
         }
         walkSplit(routeTree, []);
         const sharedCode = [];
+        const sharedImports = new ChunkImports();
         const compMap = componentMap || new Map();
         for (const [compName, compPath] of compMap) {
-            compileFile(compPath, compName, sharedCode);
+            compileFile(compPath, compName, sharedCode, sharedImports);
         }
         if (sharedCode.length > 0) {
-            chunkEntries.push({ name: 'shared.js', code: sharedCode.join('\n\n'), node: null });
+            if (!sharedImports.ok)
+                console.error('[vesk] chunk import merge aborted for shared.js:', sharedImports.reason);
+            const head = sharedImports.render();
+            const code = (head ? head + '\n\n' : '') + sharedCode.join('\n\n');
+            chunkEntries.push({ name: 'shared.js', code, node: null });
         }
+        const chunkIIFE = (body) => `(()=>{\nconst __components = globalThis.__components || (globalThis.__components = {});\nconst __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});\n${body}\n})();\n`;
         for (const entry of chunkEntries) {
-            if (entry.code.trim()) {
-                chunks.push({
-                    name: entry.name,
-                    code: `(()=>{\nconst __components = globalThis.__components || (globalThis.__components = {});\nconst __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});\n${entry.code}\n})();\n`,
-                });
+            if (!entry.code.trim())
+                continue;
+            let finalCode;
+            if (hasChunkImports(entry.code)) {
+                // Bundle the chunk through esbuild so every remaining import (npm
+                // packages like lucide-vesk and rewritten relative `.ts` value
+                // modules) is inlined into the IIFE — a classic script cannot carry
+                // a live `import`, and a stripped binding referenced by a component
+                // would otherwise throw `X is not defined` at hydration. Imports were
+                // already deduped per file by `ChunkImports`, so esbuild can parse the
+                // bundle entry.
+                const tmpBase = mkdtempSync(join(resolve(appDir, '..'), 'tmp-vesk-chunk-'));
+                const tmpFile = join(tmpBase, 'entry.js');
+                const toBundle = `const __components = globalThis.__components || (globalThis.__components = {});\nconst __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});\n${entry.code}\n`;
+                writeFileSync(tmpFile, toBundle);
+                try {
+                    const result = await build({
+                        entryPoints: [tmpFile],
+                        bundle: true,
+                        format: 'iife',
+                        platform: 'browser',
+                        write: false,
+                        logLevel: 'silent',
+                        loader: { '.js': 'tsx' },
+                    });
+                    finalCode = result.outputFiles[0].text;
+                }
+                catch (e) {
+                    const err = e;
+                    console.error('[vesk] chunk bundle failed', entry.name, err?.errors?.map((x) => x.text).join(' | ') || err?.message || String(e));
+                    // Fall back to the historical behavior: strip every import so the
+                    // classic script at least parses (referenced values will surface as
+                    // ReferenceErrors at runtime — the pre-existing failure mode).
+                    const stripped = demoteExports(removeCompiledNodes(entry.code, isAnyImport));
+                    finalCode = chunkIIFE(stripped);
+                }
+                finally {
+                    try {
+                        rmSync(tmpBase, { recursive: true, force: true });
+                    }
+                    catch { }
+                }
+            }
+            else {
+                finalCode = chunkIIFE(entry.code);
             }
+            chunks.push({ name: entry.name, code: finalCode });
         }
         function annotate(nodes) {
             for (const node of nodes) {

package/dist/css.d.ts

@@ -1,26 +1,21 @@
-export declare const TAILWIND_CSS_URL = "/_vesk/static/_tailwind.css";
 export declare const GLOBAL_CSS_URL = "/_vesk/static/global.css";
 /** Resolve the project's user stylesheet source (`src/global.css`, then `src/app.css`). */
 export declare function resolveUserCssPath(appDir: string): string | null;
 /** True when the project has a user stylesheet source (`src/global.css` or `src/app.css`). */
 export declare function hasUserCss(appDir: string): boolean;
-/** True when a non-empty `_tailwind.css` was produced for the build (prod disk output). */
-export declare function hasBuiltTailwindCss(outDir: string): boolean;
+/** True when a non-empty `global.css` was produced for the build (prod disk output). */
+export declare function hasBuiltGlobalCss(outDir: string): boolean;
 /** True when the active plugin pipeline includes the tailwind plugin. */
 export declare function isTailwindPlugin(plugins: Array<{
     name?: string;
 }> | undefined | null): boolean;
 /**
  * Single source of truth for the `/_vesk/static/*.css` link list. Callers
- * supply environment facts — `tailwind`: tailwind output is available
- * (built-file present + non-empty in prod, active plugin in dev);
- * `userCss`: a user stylesheet exists — so build, request, dev, and prod
- * paths share one ordering.
+ * supply environment facts — `enabled`: a global stylesheet output is
+ * available (built-file present + non-empty in prod, user stylesheet present
+ * in dev) — so build, request, dev, and prod paths share one ordering.
  */
 export declare function resolveCssUrls(opts: {
-    tailwind?: boolean;
-    userCss?: boolean;
+    enabled?: boolean;
 }): string[];
-/** Drop tailwind framework directives from user CSS, keeping hand-written rules. */
-export declare function stripTailwindDirectives(css: string): string;
 //# sourceMappingURL=css.d.ts.map

package/dist/css.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"css.d.ts","sourceRoot":"","sources":["../src/css.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,gBAAgB,gCAAgC,CAAC;AAC9D,eAAO,MAAM,cAAc,6BAA6B,CAAC;AAEzD,2FAA2F;AAC3F,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMhE;AAED,8FAA8F;AAC9F,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,2FAA2F;AAC3F,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAG3D;AAED,yEAAyE;AACzE,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAE9F;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,EAAE,CAKxF;AAED,oFAAoF;AACpF,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAkB3D"}
+{"version":3,"file":"css.d.ts","sourceRoot":"","sources":["../src/css.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,cAAc,6BAA6B,CAAC;AAEzD,2FAA2F;AAC3F,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMhE;AAED,8FAA8F;AAC9F,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,wFAAwF;AACxF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAGzD;AAED,yEAAyE;AACzE,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAE9F;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,EAAE,CAGpE"}

package/dist/css.js

@@ -1,14 +1,19 @@
 /**
  * Shared stylesheet resolution for the adapter build, prod server, generated
  * SSR functions, dev server, and action handler. Each environment feeds its
- * facts (`tailwind` output available, user stylesheet present) into
- * `resolveCssUrls`, so the `/_vesk/static/*.css` link list and its ordering
- * come from one place instead of six ad-hoc copies.
+ * facts (`enabled`: a built global stylesheet exists) into `resolveCssUrls`,
+ * so the `/_vesk/static/global.css` link list comes from one place instead of
+ * several ad-hoc copies.
+ *
+ * Vesk follows the single-file CSS convention used by other frameworks
+ * (Next.js/Remix/SvelteKit): a single `src/global.css` is the stylesheet
+ * source. When the Tailwind plugin is active the whole file is compiled into
+ * one `/_vesk/static/global.css`; otherwise the user CSS is served as-is from
+ * the same URL. There is no separate `_tailwind.css` anymore — user rules and
+ * the compiled Tailwind output live in the same file, in one `<link>`.
  */
 import { readFileSync, existsSync } from 'node:fs';
 import { resolve } from 'node:path';
-import { cssBlockEnd } from '@vesk/compiler/src/scan';
-export const TAILWIND_CSS_URL = '/_vesk/static/_tailwind.css';
 export const GLOBAL_CSS_URL = '/_vesk/static/global.css';
 /** Resolve the project's user stylesheet source (`src/global.css`, then `src/app.css`). */
 export function resolveUserCssPath(appDir) {
@@ -24,9 +29,9 @@ export function resolveUserCssPath(appDir) {
 export function hasUserCss(appDir) {
     return resolveUserCssPath(appDir) !== null;
 }
-/** True when a non-empty `_tailwind.css` was produced for the build (prod disk output). */
-export function hasBuiltTailwindCss(outDir) {
-    const p = resolve(outDir, 'static', '_tailwind.css');
+/** True when a non-empty `global.css` was produced for the build (prod disk output). */
+export function hasBuiltGlobalCss(outDir) {
+    const p = resolve(outDir, 'static', 'global.css');
     return existsSync(p) && readFileSync(p, 'utf-8').trim().length > 0;
 }
 /** True when the active plugin pipeline includes the tailwind plugin. */
@@ -35,36 +40,12 @@ export function isTailwindPlugin(plugins) {
 }
 /**
  * Single source of truth for the `/_vesk/static/*.css` link list. Callers
- * supply environment facts — `tailwind`: tailwind output is available
- * (built-file present + non-empty in prod, active plugin in dev);
- * `userCss`: a user stylesheet exists — so build, request, dev, and prod
- * paths share one ordering.
+ * supply environment facts — `enabled`: a global stylesheet output is
+ * available (built-file present + non-empty in prod, user stylesheet present
+ * in dev) — so build, request, dev, and prod paths share one ordering.
  */
 export function resolveCssUrls(opts) {
-    const urls = [];
-    if (opts.tailwind)
-        urls.push(TAILWIND_CSS_URL);
-    if (opts.userCss)
-        urls.push(GLOBAL_CSS_URL);
-    return urls;
-}
-/** Drop tailwind framework directives from user CSS, keeping hand-written rules. */
-export function stripTailwindDirectives(css) {
-    const blockStart = /^\s*@(theme\s*\{|layer\s+(components|utilities)\s*\{|utility\s+[\w-]+\s*\{)/;
-    let result = css.replace(/^\s*@import\s+['"]tailwindcss['"]\s*;?\s*$/gm, '');
-    result = result.replace(/^\s*@source\s+['"][^'"]+['"]\s*;?\s*$/gm, '');
-    const output = [];
-    let pos = 0;
-    while (pos < result.length) {
-        const lineEnd = result.indexOf('\n', pos) === -1 ? result.length : result.indexOf('\n', pos) + 1;
-        const line = result.slice(pos, lineEnd);
-        if (blockStart.test(line.trim())) {
-            const end = cssBlockEnd(result, pos);
-            pos = end;
-            continue;
-        }
-        output.push(line);
-        pos = lineEnd;
-    }
-    return output.join('').trim();
+    if (opts.enabled)
+        return [GLOBAL_CSS_URL];
+    return [];
 }

package/dist/dev-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-config.d.ts","sourceRoot":"","sources":["../src/dev-config.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,6EAA6E;AAC7E,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc,CAMjE;AAQD;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAmC/G;AAED,oEAAoE;AACpE,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAM9E;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAQrG;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAc5F;AAoID,wJAAwJ;AACxJ,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAcxD;AAyYD;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA2EtF;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAqC9F"}
+{"version":3,"file":"dev-config.d.ts","sourceRoot":"","sources":["../src/dev-config.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,6EAA6E;AAC7E,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc,CAMjE;AAQD;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAmC/G;AAED,oEAAoE;AACpE,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAM9E;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAQrG;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAc5F;AAgOD,wJAAwJ;AACxJ,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAcxD;AAyYD;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA2EtF;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAqC9F"}

package/dist/dev-config.js

@@ -208,7 +208,7 @@ function tryParseJsObject(src) {
         while (i < src.length && /\s/.test(src[i]))
             i++;
         if (src[i] === '=')
-            return null; // `key = value` — not a literal object; bail
+            return null;
         if (src[i] !== ':')
             return null;
         i++;
@@ -222,10 +222,62 @@ function tryParseJsObject(src) {
     }
     return out;
 }
+/** Skip a balanced (…) expression starting at `i`, returning the index after the closing ')' (or on failure, `i` unchanged). */
+function skipBalancedParens(src, i) {
+    if (src[i] !== '(')
+        return i;
+    let depth = 0;
+    let inStr = null;
+    let esc = false;
+    for (let j = i; j < src.length; j++) {
+        const ch = src[j];
+        if (inStr) {
+            if (esc) {
+                esc = false;
+                continue;
+            }
+            if (ch === '\\') {
+                esc = true;
+                continue;
+            }
+            if (ch === inStr)
+                inStr = null;
+            continue;
+        }
+        if (ch === '"' || ch === "'" || ch === '`') {
+            inStr = ch;
+            continue;
+        }
+        if (ch === '(')
+            depth++;
+        if (ch === ')') {
+            depth--;
+            if (depth === 0)
+                return j + 1;
+        }
+    }
+    return i; // unbalanced — bail
+}
+/**
+ * Return a raw source span (used for function calls, variable refs, spreads
+ * that can't be round-tripped as literals). The value is stored as a wrapper
+ * object so serializeValue can emit it verbatim.
+ */
+function rawSpan(src, from, to) {
+    return { value: { __veskRaw: src.slice(from, to) }, next: to };
+}
 function parseLiteralValue(src, i) {
     const c = src[i];
     if (c === undefined)
         return null;
+    // spread: ...expr
+    if (c === '.' && src.slice(i, i + 3) === '...') {
+        const expr = parseLiteralValue(src, i + 3);
+        if (expr === null || expr.__invalid)
+            return rawSpan(src, i, skipToEndOfRaw(src, i + 3));
+        // preserve spread marker in the serialized output
+        return { value: { __veskRaw: '...' + serializeValue(expr.value) }, next: expr.next };
+    }
     if (c === '{') {
         const end = findMatchingBrace(src, i);
         if (end === -1)
@@ -251,8 +303,10 @@ function parseLiteralValue(src, i) {
                 continue;
             }
             const r = parseLiteralValue(src, j);
-            if (r === null || r.__invalid)
-                return { value: undefined, next: i, __invalid: true };
+            if (r === null || r.__invalid) {
+                // Can't parse this array element — fall back to raw span for the whole array
+                return rawSpan(src, i, skipToEndOfArray(src, i));
+            }
             vals.push(r.value);
             j = r.next;
         }
@@ -268,6 +322,7 @@ function parseLiteralValue(src, i) {
         }
         return { value: s, next: j + 1 };
     }
+    // identifiers, numbers, booleans, null, and tokens followed by '(' (function calls)
     let j = i;
     while (j < src.length && /[\w.\-]/.test(src[j]))
         j++;
@@ -280,8 +335,86 @@ function parseLiteralValue(src, i) {
         return { value: null, next: j };
     if (/^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(token))
         return { value: Number(token), next: j };
+    // token is an identifier or a function name — check if it's followed by '(' (call)
+    if (j < src.length && src[j] === '(') {
+        const end = skipBalancedParens(src, j);
+        return rawSpan(src, i, end);
+    }
+    // bare variable reference (e.g. `testPlugin`, `tailwindcss`)
+    if (token.length > 0)
+        return rawSpan(src, i, j);
     return { value: undefined, next: i, __invalid: true };
 }
+/** Skip forward from `i` to find the end of a raw expression (used for spread fallback). */
+function skipToEndOfRaw(src, i) {
+    let depth = 0;
+    let inStr = null;
+    let esc = false;
+    for (let j = i; j < src.length; j++) {
+        const ch = src[j];
+        if (inStr) {
+            if (esc) {
+                esc = false;
+                continue;
+            }
+            if (ch === '\\') {
+                esc = true;
+                continue;
+            }
+            if (ch === inStr)
+                inStr = null;
+            continue;
+        }
+        if (ch === '"' || ch === "'" || ch === '`') {
+            inStr = ch;
+            continue;
+        }
+        if (ch === '(')
+            depth++;
+        if (ch === ')') {
+            if (depth === 0)
+                return j;
+            depth--;
+        }
+        if (depth === 0 && (ch === ',' || ch === '}' || ch === ']'))
+            return j;
+    }
+    return src.length;
+}
+/** Skip to the matching ']' for a raw array span. */
+function skipToEndOfArray(src, i) {
+    let depth = 0;
+    let inStr = null;
+    let esc = false;
+    for (let j = i; j < src.length; j++) {
+        const ch = src[j];
+        if (inStr) {
+            if (esc) {
+                esc = false;
+                continue;
+            }
+            if (ch === '\\') {
+                esc = true;
+                continue;
+            }
+            if (ch === inStr)
+                inStr = null;
+            continue;
+        }
+        if (ch === '"' || ch === "'" || ch === '`') {
+            inStr = ch;
+            continue;
+        }
+        if (ch === '[')
+            depth++;
+        if (ch === ']') {
+            depth--;
+            if (depth === 0)
+                return j + 1;
+        }
+    }
+    return src.length;
+}
 function serializeObject(obj) {
     return Object.keys(obj)
         .map((k) => `${isBareKey(k) ? k : JSON.stringify(k)}: ${serializeValue(obj[k])}`)
@@ -291,6 +424,9 @@ function isBareKey(k) {
     return /^[a-zA-Z_$][\w$]*$/.test(k);
 }
 function serializeValue(v) {
+    if (v !== null && typeof v === 'object' && '__veskRaw' in v) {
+        return String(v.__veskRaw);
+    }
     if (v === null)
         return 'null';
     if (typeof v === 'string')

package/dist/dev-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../src/dev-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,MAAM,EAA6C,MAAM,WAAW,CAAC;AAOjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAI7C,OAAO,KAAK,EAAa,gBAAgB,EAAwB,MAAM,yBAAyB,CAAC;AAgBjG;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,IAAI,GAAG,WAAW,GAAG,OAAO,GAAG,MAAM,CAAC;IAC9C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACxD,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB;+EAC2E;IAC3E,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,mEAAmE;AACnE,wBAAgB,kBAAkB,IAAI,WAAW,CAEhD;AAuCD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAIzE;AAkBD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,mHAAmH;IACnH,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B;;8BAE0B;IAC1B,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACrE,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,WAAW,CAAC;IAChC,8EAA8E;IAC9E,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,wBAAwB,GAAG;IACvE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;CAChH,CAUA;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAa3C;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIrD;AA8CD,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA8hBvG"}
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../src/dev-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,MAAM,EAA6C,MAAM,WAAW,CAAC;AAOjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAI7C,OAAO,KAAK,EAAa,gBAAgB,EAAwB,MAAM,yBAAyB,CAAC;AAgBjG;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,IAAI,GAAG,WAAW,GAAG,OAAO,GAAG,MAAM,CAAC;IAC9C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACxD,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB;+EAC2E;IAC3E,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,mEAAmE;AACnE,wBAAgB,kBAAkB,IAAI,WAAW,CAEhD;AAuCD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAIzE;AAkBD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,mHAAmH;IACnH,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B;;8BAE0B;IAC1B,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACrE,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,WAAW,CAAC;IAChC,8EAA8E;IAC9E,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,wBAAwB,GAAG;IACvE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;CAChH,CAUA;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAa3C;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIrD;AA8CD,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAikBvG"}

package/dist/dev-server.js

@@ -260,7 +260,10 @@ export async function startDevServer(appDir, options) {
     async function buildAdapterAgenticProvider(cfg) {
         const providerName = String(cfg.provider || loadAgenticConfig(agenticProjectDir).provider || 'openai');
         const apiKey = cfg.apiKey || getApiKey(agenticProjectDir, providerName) || '';
-        const model = cfg.model || loadAgenticConfig(agenticProjectDir).model || (providerName === 'anthropic' ? 'claude-sonnet-4-6' : providerName === 'google' ? 'gemini-2.0-flash' : providerName === 'ollama' ? 'llama3.1' : providerName === 'opencode' ? 'claude-sonnet-4-6' : providerName === 'opencode-go' ? 'opencode-go/kimi-k3' : providerName === 'openrouter' ? 'openrouter/auto' : 'gpt-4o-mini');
+        const model = cfg.model || loadAgenticConfig(agenticProjectDir).model || '';
+        if (!model) {
+            throw new Error('no model configured — open Settings → Agentic and pick a model');
+        }
         const baseUrl = cfg.baseUrl || loadAgenticConfig(agenticProjectDir).baseUrl || undefined;
         const maxTokens = typeof cfg.maxTokens === 'number' ? cfg.maxTokens : undefined;
         if (providerName === 'anthropic')
@@ -652,6 +655,41 @@ export async function startDevServer(appDir, options) {
     });
     const hmr = createHmrServer(server, appDir, devDir, componentMap);
     hmrSession = hmr;
+    // ── Console streaming to devtool ────────────────────────────────────────
+    // Read `logs` from vesk.config and wire up server-side console interception
+    // so console.log/warn/error/info/debug are forwarded to the devtool Log tab.
+    {
+        let logsLevels = null;
+        try {
+            const { readConfig } = await import('@vesk/adapter/src/dev-config');
+            const cfgResult = await readConfig(resolve(appDir, '..'));
+            const logsCfg = cfgResult.config?.logs;
+            if (logsCfg === false) {
+                logsLevels = null; // disabled
+            }
+            else if (typeof logsCfg === 'object' && logsCfg !== null) {
+                logsLevels = { log: true, warn: true, error: true, info: true, debug: true, ...logsCfg };
+            }
+            else {
+                logsLevels = { log: true, warn: true, error: true, info: true, debug: true };
+            }
+        }
+        catch {
+            logsLevels = { log: true, warn: true, error: true, info: true, debug: true };
+        }
+        if (logsLevels) {
+            const origFns = {};
+            for (const lvl of ['log', 'warn', 'error', 'info', 'debug']) {
+                origFns[lvl] = console[lvl].bind(console);
+                console[lvl] = (...args) => {
+                    origFns[lvl](...args);
+                    if (!logsLevels[lvl])
+                        return;
+                    hmr.broadcast('console', { level: lvl, message: args.map(String).join(' ') });
+                };
+            }
+        }
+    }
     const srcDir = resolve(appDir, '..', 'src');
     try {
         if (existsSync(srcDir)) {

package/dist/hmr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hmr.d.ts","sourceRoot":"","sources":["../src/hmr.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAUxC,OAAO,EAAsC,KAAK,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAEvG,OAAO,KAAK,EAAE,SAAS,EAAkB,MAAM,yBAAyB,CAAC;AAIzE;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAaD,wBAAgB,WAAW,IAAI;IAC7B,MAAM,EAAE,IAAI,GAAG,QAAQ,CAAC;IACxB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAQA;AAED,MAAM,WAAW,wBAAwB;IACvC,8EAA8E;IAC9E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wEAAwE;IACxE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,wBAA6B,GAClC,eAAe,CAsEjB;AA0RD,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC;IACD,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAClE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvH,WAAW,EAAE,MAAM,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;CACnD,CAyJA"}
+{"version":3,"file":"hmr.d.ts","sourceRoot":"","sources":["../src/hmr.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAUxC,OAAO,EAAsC,KAAK,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAEvG,OAAO,KAAK,EAAE,SAAS,EAAkB,MAAM,yBAAyB,CAAC;AAIzE;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAaD,wBAAgB,WAAW,IAAI;IAC7B,MAAM,EAAE,IAAI,GAAG,QAAQ,CAAC;IACxB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAQA;AAED,MAAM,WAAW,wBAAwB;IACvC,8EAA8E;IAC9E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wEAAwE;IACxE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,wBAA6B,GAClC,eAAe,CAsEjB;AAoRD,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC;IACD,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAClE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvH,WAAW,EAAE,MAAM,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;CACnD,CAyJA"}

package/dist/hmr.js

@@ -6,7 +6,7 @@ import { compileClient } from '@vesk/compiler/src/client-codegen';
 import { buildHmrEvalSnippet } from './client-bundle';
 import { resolveComponentName, randomToken } from '@vesk/compiler/src/server-codegen';
 import { resolveErrorFile } from '@vesk/adapter/src/ssr-function';
-import { resolveCssUrls, hasUserCss, hasBuiltTailwindCss } from '@vesk/adapter/src/css';
+import { resolveCssUrls, hasBuiltGlobalCss } from '@vesk/adapter/src/css';
 import { isAllowedWsUpgrade } from '@vesk/adapter/src/paths';
 import { parseCompilerError, buildCodeframe } from '@vesk/adapter/src/error-codeframe';
 import { suggestFor } from '@vesk/adapter/src/error-tips';
@@ -243,10 +243,8 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
     const ancestorLayouts = options?.ancestorLayouts || [];
     const headExtra = options?.headExtra || null;
     const pagePath = resolve(appDir, routeNode.sourceDir, 'page.vsk');
-    const layoutPath = resolve(appDir, routeNode.sourceDir, 'layout.vsk');
     const cssUrls = resolveCssUrls({
-        tailwind: hasBuiltTailwindCss(outDir),
-        userCss: hasUserCss(appDir),
+        enabled: hasBuiltGlobalCss(outDir),
     });
     const cssOption = cssUrls.length > 0 ? `, cssUrls: ${JSON.stringify(cssUrls)}` : '';
     const headExtraOption = headExtra ? `, headExtra: ${JSON.stringify(headExtra)}` : '';
@@ -255,10 +253,25 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
     const name = routeName(parts);
     const funcDir = resolve(outDir, 'server', 'functions');
     const funcPath = resolve(funcDir, `${name}.js`);
-    const hasLayout = !!routeNode.layout;
-    const hasAncestorLayout = ancestorLayouts.length > 0;
     const pageSrc = readFileSync(pagePath, 'utf-8');
     const pageComp = extractCompName(pageSrc) || 'Page';
+    const layoutStack = [
+        ...ancestorLayouts.map((a) => ({ sourceDir: a.sourceDir, layoutCompName: a.layoutCompName })),
+        ...(routeNode.layout ? [{ sourceDir: routeNode.sourceDir, layoutCompName: routeNode.layout }] : []),
+    ];
+    const layoutDecls = [];
+    for (const entry of layoutStack) {
+        const entryPath = resolve(appDir, entry.sourceDir, 'layout.vsk');
+        const entrySrc = readFileSync(entryPath, 'utf-8');
+        const entryComp = extractCompName(entrySrc) || 'Layout';
+        const escaped = escapeSource(entrySrc);
+        layoutDecls.push({
+            src: `\`${escaped}\``,
+            comp: JSON.stringify(entryComp),
+            path: JSON.stringify(entryPath),
+            compiled: `(() => { try { setVskHydrate(true); return compileFile(\`${escaped}\`, { sourcePath: ${JSON.stringify(entryPath)} }); } catch { return null; } finally { setVskHydrate(false); } })()`,
+        });
+    }
     const errorPath = resolveErrorFile(routeNode.sourceDir, appDir);
     const errorSrc = errorPath ? readFileSync(errorPath, 'utf-8') : null;
     const errorComp = errorPath ? (extractCompName(errorSrc) || 'Error') : null;
@@ -268,28 +281,15 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
     const clientScriptOption = ', clientScriptUrl: "/_vesk/static/client.js"';
     const dataScriptOption = ', externalDataScript: storeDataScriptGlobal';
     let src = '';
-    if (hasLayout) {
-        const layoutSrc = readFileSync(layoutPath, 'utf-8');
-        const layoutComp = extractCompName(layoutSrc) || 'Layout';
-        src = `const _layoutSrc = \`${escapeSource(layoutSrc)}\`;\nconst _pageSrc = \`${escapeSource(pageSrc)}\`;\n`;
-        src += `const _layoutComp = ${JSON.stringify(layoutComp)};\nconst _pageComp = ${JSON.stringify(pageComp)};\n`;
-        src += `const _layoutPath = ${JSON.stringify(layoutPath)};\nconst _pagePath = ${JSON.stringify(pagePath)};\n`;
-        src += `const _layoutCompiled = (() => { try { setVskHydrate(true); return compileFile(_layoutSrc, { sourcePath: _layoutPath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`;
-        src += `const _pageCompiled = (() => { try { setVskHydrate(true); return compileFile(_pageSrc, { sourcePath: _pagePath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`;
-        src += errorVars;
-    }
-    else if (hasAncestorLayout) {
-        const outerLayout = ancestorLayouts[0];
-        const outerLayoutPath = resolve(appDir, outerLayout.sourceDir, 'layout.vsk');
-        const outerLayoutSrc = readFileSync(outerLayoutPath, 'utf-8');
-        const outerLayoutComp = extractCompName(outerLayoutSrc) || 'Layout';
+    if (layoutDecls.length > 0) {
         src = `const _pageSrc = \`${escapeSource(pageSrc)}\`;\n`;
         src += `const _pageComp = ${JSON.stringify(pageComp)};\n`;
-        src += `const _layoutSrc = \`${escapeSource(outerLayoutSrc)}\`;\n`;
-        src += `const _layoutComp = ${JSON.stringify(outerLayoutComp)};\n`;
-        src += `const _layoutPath = ${JSON.stringify(outerLayoutPath)};\nconst _pagePath = ${JSON.stringify(pagePath)};\n`;
-        src += `const _layoutCompiled = (() => { try { setVskHydrate(true); return compileFile(_layoutSrc, { sourcePath: _layoutPath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`;
+        src += `const _pagePath = ${JSON.stringify(pagePath)};\n`;
         src += `const _pageCompiled = (() => { try { setVskHydrate(true); return compileFile(_pageSrc, { sourcePath: _pagePath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`;
+        src += `const _layoutSrcList = [\n${layoutDecls.map((d) => '  ' + d.src + ',').join('\n')}\n];\n`;
+        src += `const _layoutCompList = [${layoutDecls.map((d) => d.comp).join(', ')}];\n`;
+        src += `const _layoutPathList = [${layoutDecls.map((d) => d.path).join(', ')}];\n`;
+        src += `const _layoutCompiledList = [\n${layoutDecls.map((d) => '  ' + d.compiled + ',').join('\n')}\n];\n`;
         src += errorVars;
     }
     else {
@@ -316,7 +316,7 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
         registryCode = 'const __componentRegistry = new Map();\n';
     }
     let renderCode;
-    if (hasLayout) {
+    if (layoutDecls.length > 0) {
         renderCode = [
             '  let page;',
             '  let caughtError = null;',
@@ -329,24 +329,14 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
             "    const stack = err && typeof err === 'object' && 'stack' in err ? String(err.stack) : '';",
             "    page = { body: await __renderErrorBody({ params, statusCode: 500, error: message, stack, url: url.href }), head: '' };",
             '  }',
-            '  const html = await renderFullPage(_layoutSrc, _layoutComp, { params, children: (caughtError ? \'<!--vesk-ssr-error:\' + (caughtError && typeof caughtError === \'object\' && \'message\' in caughtError ? encodeURIComponent(String(caughtError.message)) : \'\') + \'-->\' : \'\') + page.body }, __componentRegistry, { hydrate: true, cached: _layoutCompiled' + bakedOptions + clientScriptOption + dataScriptOption + ', pageHead: page.head, sourcePath: _layoutPath });',
-            "  return new Response(html, { headers: { 'Content-Type': 'text/html' }, status: caughtError ? 500 : 200 });",
-        ].join('\n');
-    }
-    else if (hasAncestorLayout) {
-        renderCode = [
-            '  let page;',
-            '  let caughtError = null;',
-            '  try {',
-            '    page = await renderPage(_pageSrc, _pageComp, { params }, __componentRegistry, { hydrate: true, cached: _pageCompiled, sourcePath: _pagePath });',
-            '  } catch (err) {',
-            "    if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
-            '    caughtError = err;',
-            "    const message = err && typeof err === 'object' && 'message' in err ? String(err.message) : String(err);",
-            "    const stack = err && typeof err === 'object' && 'stack' in err ? String(err.stack) : '';",
-            "    page = { body: await __renderErrorBody({ params, statusCode: 500, error: message, stack, url: url.href }), head: '' };",
+            "  let _body = (caughtError ? '<!--vesk-ssr-error:' + (caughtError && typeof caughtError === 'object' && 'message' in caughtError ? encodeURIComponent(String(caughtError.message)) : '') + '-->' : '') + page.body;",
+            "  let _head = page.head || '';",
+            "  for (let _i = _layoutSrcList.length - 1; _i > 0; _i--) {",
+            "    const _inner = await renderPage(_layoutSrcList[_i], _layoutCompList[_i], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_i], sourcePath: _layoutPathList[_i] });",
+            '    _body = _inner.body;',
+            "    if (_inner.head) _head = _inner.head + _head;",
             '  }',
-            '  const html = await renderFullPage(_layoutSrc, _layoutComp, { params, children: (caughtError ? \'<!--vesk-ssr-error:\' + (caughtError && typeof caughtError === \'object\' && \'message\' in caughtError ? encodeURIComponent(String(caughtError.message)) : \'\') + \'-->\' : \'\') + page.body }, __componentRegistry, { hydrate: true, cached: _layoutCompiled' + bakedOptions + clientScriptOption + dataScriptOption + ', pageHead: page.head, sourcePath: _layoutPath });',
+            "  const html = await renderFullPage(_layoutSrcList[0], _layoutCompList[0], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[0]" + bakedOptions + clientScriptOption + dataScriptOption + ', pageHead: _head, sourcePath: _layoutPathList[0] });',
             "  return new Response(html, { headers: { 'Content-Type': 'text/html' }, status: caughtError ? 500 : 200 });",
         ].join('\n');
     }

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACe,YAAY,EAAE,WAAW,EAC7B,UAAU,EAChC,MAAM,yBAAyB,CAAC;AAiBjC;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CACjB;AACD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,UAAU,EAAE,EACrB,OAAO,EAAE,iBAAiB,EAAE,GAAG,IAAI,GAAG,SAAS,GAC9C,UAAU,EAAE,CAQd;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EAAE,EACrB,KAAK,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GACxC,UAAU,EAAE,CAGd;AA+BD,wBAAsB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAyUpG;AAED,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIhE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,yBAAyB,EACzB,eAAe,GAChB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,mBAAmB,EACnB,YAAY,EACZ,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,aAAa,GACd,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACe,YAAY,EAAE,WAAW,EAC7B,UAAU,EAChC,MAAM,yBAAyB,CAAC;AAiBjC;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CACjB;AACD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,UAAU,EAAE,EACrB,OAAO,EAAE,iBAAiB,EAAE,GAAG,IAAI,GAAG,SAAS,GAC9C,UAAU,EAAE,CAQd;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EAAE,EACrB,KAAK,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GACxC,UAAU,EAAE,CAGd;AA+BD,wBAAsB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAuTpG;AAED,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIhE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,yBAAyB,EACzB,eAAe,GAChB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,mBAAmB,EACnB,YAAY,EACZ,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,aAAa,GACd,MAAM,2BAA2B,CAAC"}

package/dist/index.js

@@ -3,7 +3,7 @@ import { resolve, dirname, relative, basename } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { bundleRuntime } from '@vesk/adapter/src/runtime-bundle';
 import { generateSsrFunction } from '@vesk/adapter/src/ssr-function';
-import { resolveUserCssPath, stripTailwindDirectives, isTailwindPlugin, resolveCssUrls, hasUserCss, hasBuiltTailwindCss } from '@vesk/adapter/src/css';
+import { resolveUserCssPath, isTailwindPlugin, resolveCssUrls, hasBuiltGlobalCss } from '@vesk/adapter/src/css';
 import { collectActionIds } from '@vesk/compiler/src/actions';
 import { generateApiFunction } from '@vesk/adapter/src/api-function';
 import { compileMiddleware, compileMiddlewareCode } from '@vesk/adapter/src/middleware';
@@ -153,43 +153,25 @@ export async function build(appDir, options) {
     const cssSourcePath = resolveUserCssPath(appDir);
     if (cssSourcePath !== null) {
         const cssContent = readFileSync(cssSourcePath, 'utf-8');
-        const userCss = stripTailwindDirectives(cssContent);
-        const userCssTarget = resolve(outDir, 'static', 'global.css');
-        writeFileSync(userCssTarget, userCss, 'utf-8');
-        console.error(`vesk build: css  → static/global.css  (${userCss.length} bytes)`);
-        const twCssTarget = resolve(outDir, 'static', '_tailwind.css');
+        const cssTarget = resolve(outDir, 'static', 'global.css');
         const tailwindActive = isTailwindPlugin(pluginsPipelines);
-        if (!tailwindActive) {
-            writeFileSync(twCssTarget, '', 'utf-8');
-            console.error('vesk build: css  → static/_tailwind.css  (empty, tailwind plugin inactive)');
-        }
-        else {
-            let twCss = cssContent;
+        let finalCss = cssContent;
+        if (tailwindActive) {
             for (const plugin of pluginsPipelines) {
                 if (typeof plugin.onCSS === 'function') {
-                    const result = await plugin.onCSS(twCss, cssSourcePath);
+                    const result = await plugin.onCSS(finalCss, cssSourcePath);
                     if (result !== null && typeof result === 'string') {
-                        twCss = result;
+                        finalCss = result;
                     }
                 }
             }
-            const hasUnresolvedTailwindImport = /@import\s+['"]tailwindcss['"]/.test(twCss);
-            if (hasUnresolvedTailwindImport) {
-                const lines = twCss.split('\n').filter(l => !/^\s*@import\s+['"]tailwindcss['"]/.test(l));
-                twCss = lines.join('\n').trim();
-                if (twCss.length === 0) {
-                    writeFileSync(twCssTarget, '', 'utf-8');
-                    console.error('vesk build: css  → static/_tailwind.css  (empty, tailwind unresolved)');
-                }
-                else {
-                    writeFileSync(twCssTarget, twCss, 'utf-8');
-                    console.error(`vesk build: css  → static/_tailwind.css  (${twCss.length} bytes, tailwind partially unresolved)`);
-                }
-            }
-            else {
-                writeFileSync(twCssTarget, twCss, 'utf-8');
-                console.error(`vesk build: css  → static/_tailwind.css  (${twCss.length} bytes)`);
-            }
+        }
+        writeFileSync(cssTarget, finalCss, 'utf-8');
+        if (tailwindActive) {
+            console.error(`vesk build: css  → static/global.css  (${finalCss.length} bytes)`);
+        }
+        else {
+            console.error(`vesk build: css  → static/global.css  (${finalCss.length} bytes, tailwind plugin inactive)`);
         }
     }
     const { scanRoutes, scanComponents } = await resolveCompilerApi('router.js');
@@ -311,8 +293,7 @@ export async function build(appDir, options) {
     if (options?.ssg) {
         const { generateSsgRoutes } = await import('./static.js');
         const cssUrls = resolveCssUrls({
-            tailwind: hasBuiltTailwindCss(outDir),
-            userCss: hasUserCss(appDir),
+            enabled: hasBuiltGlobalCss(outDir),
         });
         prerenderedRoutes = await generateSsgRoutes(routeTree, appDir, outDir, pluginsPipelines, pluginHeadExtra, cssUrls);
         console.error(`vesk build: ssg   → prerendered/  (${prerenderedRoutes.length} pages)`);

package/dist/prod-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prod-server.d.ts","sourceRoot":"","sources":["../src/prod-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2D,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AA+CjG,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAIzE;AA+FD,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAmcxI"}
+{"version":3,"file":"prod-server.d.ts","sourceRoot":"","sources":["../src/prod-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2D,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AA+CjG,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAIzE;AA+FD,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAkcxI"}

package/dist/prod-server.js

@@ -6,7 +6,7 @@ import { fileURLToPath } from 'node:url';
 import { createRateLimiter, resolveComponentName, safeJsonForScript, getClientProtocol, DEFAULT_MAX_BODY_BYTES } from '@vesk/compiler/src/server-codegen';
 import { securityHeaders } from '@vesk/compiler/src/server-utils';
 import { resolveWithin, installMdReadHook } from '@vesk/adapter/src/paths';
-import { resolveCssUrls, hasUserCss, hasBuiltTailwindCss } from '@vesk/adapter/src/css';
+import { resolveCssUrls, hasBuiltGlobalCss } from '@vesk/adapter/src/css';
 const _require = createRequire(import.meta.url);
 const __dirname = dirname(fileURLToPath(import.meta.url));
 async function readBody(req, maxBytes = DEFAULT_MAX_BODY_BYTES) {
@@ -436,8 +436,7 @@ export async function startProdServer(outDir, options) {
         }
         const appDir = resolve(projectDir, 'app');
         const pageCssUrls = resolveCssUrls({
-            tailwind: hasBuiltTailwindCss(outDir),
-            userCss: hasUserCss(appDir),
+            enabled: hasBuiltGlobalCss(outDir),
         });
         const nfPath = resolve(appDir, 'not-found.vsk');
         let notFoundHtml = null;

package/dist/ssr-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-function.d.ts","sourceRoot":"","sources":["../src/ssr-function.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAkB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAW7F,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQjF;AAiDD,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,kBAAkB,GAC3B;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAsXtD"}
+{"version":3,"file":"ssr-function.d.ts","sourceRoot":"","sources":["../src/ssr-function.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAkB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAW7F,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQjF;AAiDD,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,kBAAkB,GAC3B;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAoYtD"}

package/dist/ssr-function.js

@@ -1,7 +1,7 @@
 import { readFileSync, existsSync } from 'node:fs';
 import { resolve, relative, join } from 'node:path';
 import { resolveComponentName } from '@vesk/compiler/src/server-codegen';
-import { resolveCssUrls, hasUserCss, hasBuiltTailwindCss } from '@vesk/adapter/src/css';
+import { resolveCssUrls, hasBuiltGlobalCss } from '@vesk/adapter/src/css';
 function escapeSource(src) {
     return src
         .replace(/\\/g, '\\\\')
@@ -75,22 +75,35 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     const middlewareCode = options?.middlewareCode || null;
     const headExtra = options?.headExtra || null;
     const pagePath = resolve(appDir, routeNode.sourceDir, 'page.vsk');
-    const layoutPath = resolve(appDir, routeNode.sourceDir, 'layout.vsk');
     const parts = routeNode.fullPath.split('/').filter(Boolean);
     const name = routeName(parts);
     const funcDir = resolve(outDir, 'server', 'functions');
     const funcPath = resolve(funcDir, `${name}.js`);
     const cssUrls = resolveCssUrls({
-        tailwind: hasBuiltTailwindCss(outDir),
-        userCss: hasUserCss(appDir),
+        enabled: hasBuiltGlobalCss(outDir),
     });
     const cssOption = cssUrls.length > 0 ? `, cssUrls: ${JSON.stringify(cssUrls)}` : '';
     // Static head snippet baked from the active onHead plugins — merged into
     // every rendered head at request time (page tags win via mergeHeadHtml).
     const headExtraOption = headExtra ? `, headExtra: ${JSON.stringify(headExtra)}` : '';
     const bakedOptions = cssOption + headExtraOption;
-    const hasLayout = !!routeNode.layout;
-    const hasAncestorLayout = ancestorLayouts.length > 0;
+    const layoutStack = [
+        ...ancestorLayouts.map((a) => ({ sourceDir: a.sourceDir, layoutCompName: a.layoutCompName })),
+        ...(routeNode.layout ? [{ sourceDir: routeNode.sourceDir, layoutCompName: routeNode.layout }] : []),
+    ];
+    const layoutDecls = [];
+    for (const entry of layoutStack) {
+        const entryPath = resolve(appDir, entry.sourceDir, 'layout.vsk');
+        const entrySrc = readFileSync(entryPath, 'utf-8');
+        const entryComp = extractCompName(entrySrc) || 'Layout';
+        const escaped = escapeSource(entrySrc);
+        layoutDecls.push({
+            src: `\`${escaped}\``,
+            comp: JSON.stringify(entryComp),
+            path: JSON.stringify(entryPath),
+            compiled: `(() => { try { setVskHydrate(true); return compileFile(\`${escaped}\`, { sourcePath: ${JSON.stringify(entryPath)} }); } catch { return null; } finally { setVskHydrate(false); } })()`,
+        });
+    }
     const pageSrc = readFileSync(pagePath, 'utf-8');
     const pageComp = extractCompName(pageSrc) || 'Page';
     const errorPath = resolveErrorFile(routeNode.sourceDir, appDir);
@@ -100,28 +113,15 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
         ? `const _errorSrc = \`${escapeSource(errorSrc)}\`;\nconst _errorComp = ${JSON.stringify(errorComp)};\nconst _errorPath = ${JSON.stringify(errorPath)};\nconst _errorCompiled = (() => { try { setVskHydrate(true); return compileFile(_errorSrc, { sourcePath: _errorPath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`
         : 'const _errorSrc = null;\nconst _errorComp = null;\nconst _errorPath = null;\nconst _errorCompiled = null;\n';
     let src = '';
-    if (hasLayout) {
-        const layoutSrc = readFileSync(layoutPath, 'utf-8');
-        const layoutComp = extractCompName(layoutSrc) || 'Layout';
-        src = `const _layoutSrc = \`${escapeSource(layoutSrc)}\`;\nconst _pageSrc = \`${escapeSource(pageSrc)}\`;\n`;
-        src += `const _layoutComp = ${JSON.stringify(layoutComp)};\nconst _pageComp = ${JSON.stringify(pageComp)};\n`;
-        src += `const _layoutPath = ${JSON.stringify(layoutPath)};\nconst _pagePath = ${JSON.stringify(pagePath)};\n`;
-        src += `const _layoutCompiled = (() => { try { setVskHydrate(true); return compileFile(_layoutSrc, { sourcePath: _layoutPath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`;
-        src += `const _pageCompiled = (() => { try { setVskHydrate(true); return compileFile(_pageSrc, { sourcePath: _pagePath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`;
-        src += errorVars;
-    }
-    else if (hasAncestorLayout) {
-        const outerLayout = ancestorLayouts[0];
-        const outerLayoutPath = resolve(appDir, outerLayout.sourceDir, 'layout.vsk');
-        const outerLayoutSrc = readFileSync(outerLayoutPath, 'utf-8');
-        const outerLayoutComp = extractCompName(outerLayoutSrc) || 'Layout';
+    if (layoutDecls.length > 0) {
         src = `const _pageSrc = \`${escapeSource(pageSrc)}\`;\n`;
         src += `const _pageComp = ${JSON.stringify(pageComp)};\n`;
-        src += `const _layoutSrc = \`${escapeSource(outerLayoutSrc)}\`;\n`;
-        src += `const _layoutComp = ${JSON.stringify(outerLayoutComp)};\n`;
-        src += `const _layoutPath = ${JSON.stringify(outerLayoutPath)};\nconst _pagePath = ${JSON.stringify(pagePath)};\n`;
-        src += `const _layoutCompiled = (() => { try { setVskHydrate(true); return compileFile(_layoutSrc, { sourcePath: _layoutPath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`;
+        src += `const _pagePath = ${JSON.stringify(pagePath)};\n`;
         src += `const _pageCompiled = (() => { try { setVskHydrate(true); return compileFile(_pageSrc, { sourcePath: _pagePath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`;
+        src += `const _layoutSrcList = [\n${layoutDecls.map((d) => '  ' + d.src + ',').join('\n')}\n];\n`;
+        src += `const _layoutCompList = [${layoutDecls.map((d) => d.comp).join(', ')}];\n`;
+        src += `const _layoutPathList = [${layoutDecls.map((d) => d.path).join(', ')}];\n`;
+        src += `const _layoutCompiledList = [\n${layoutDecls.map((d) => '  ' + d.compiled + ',').join('\n')}\n];\n`;
         src += errorVars;
     }
     else {
@@ -150,7 +150,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
         registryCode = 'const __componentRegistry = new Map();\n';
     }
     let htmlFnCode;
-    if (hasLayout || hasAncestorLayout) {
+    if (layoutDecls.length > 0) {
         htmlFnCode = [
             'async function __renderErrorBody(props) {',
             '  if (!_errorSrc) throw props.error || new Error("Internal Server Error");',
@@ -176,7 +176,14 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             "    const stack = err && typeof err === 'object' && 'stack' in err ? String(err.stack) : '';",
             "    page = { body: await __renderErrorBody({ params, statusCode: 500, error: __expose ? message : 'Internal Server Error', stack: __expose ? stack : '', url: requestUrl || '' }), head: '' };",
             '  }',
-            "  const html = await renderFullPage(_layoutSrc, _layoutComp, { params, children: (caughtError ? '<!--vesk-ssr-error:' + (caughtError && typeof caughtError === 'object' && 'message' in caughtError ? encodeURIComponent(__expose ? String(caughtError.message) : 'Internal Server Error') : '') + '-->' : '') + page.body }, __componentRegistry, { hydrate: true, cached: _layoutCompiled" + bakedOptions + clientScriptOption + dataScriptOption + ', pageHead: page.head, sourcePath: _layoutPath });',
+            '  let _body = (caughtError ? \'<!--vesk-ssr-error:\' + (caughtError && typeof caughtError === \'object\' && \'message\' in caughtError ? encodeURIComponent(__expose ? String(caughtError.message) : \'Internal Server Error\') : \'\') + \'-->\' : \'\') + page.body;',
+            '  let _head = page.head || \'\';',
+            '  for (let _i = _layoutSrcList.length - 1; _i > 0; _i--) {',
+            '    const _inner = await renderPage(_layoutSrcList[_i], _layoutCompList[_i], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_i], sourcePath: _layoutPathList[_i] });',
+            '    _body = _inner.body;',
+            '    if (_inner.head) _head = _inner.head + _head;',
+            '  }',
+            '  const html = await renderFullPage(_layoutSrcList[0], _layoutCompList[0], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[0]' + bakedOptions + clientScriptOption + dataScriptOption + ', pageHead: _head, sourcePath: _layoutPathList[0] });',
             "  return new Response(html, { headers: { 'Content-Type': 'text/html' }, status: caughtError ? 500 : 200 });",
             '  });',
             '}',
@@ -228,7 +235,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     }
     let dataCode;
     const exposeErr = "process.env.NODE_ENV !== 'production'";
-    if (hasLayout || hasAncestorLayout) {
+    if (layoutDecls.length > 0) {
         dataCode = [
             "  if (request.headers.get('x-vesk-data') === '1') {",
             '    let dataPage;',
@@ -239,8 +246,12 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             '      const message = err && typeof err === \'object\' && \'message\' in err ? String(err.message) : String(err);',
             `      return new Response(JSON.stringify({ error: ${exposeErr} ? message : 'Internal Server Error' }), { status: 500, headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' } });`,
             '    }',
-            '    const dataLayout = await renderPage(_layoutSrc, _layoutComp, { params, children: \'\' }, __componentRegistry, { hydrate: true, cached: _layoutCompiled, sourcePath: _layoutPath });',
-            "    return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: (dataLayout.head || '') + (dataPage.head || '') }), {",
+            '    let _dataHead = dataPage.head || \'\';',
+            '    for (let _i = _layoutSrcList.length - 1; _i >= 0; _i--) {',
+            '      const _dl = await renderPage(_layoutSrcList[_i], _layoutCompList[_i], { params, children: \'\' }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_i], sourcePath: _layoutPathList[_i] });',
+            '      _dataHead = (_dl.head || \'\') + _dataHead;',
+            '    }',
+            "    return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: _dataHead }), {",
             "      headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' },",
             '    });',
             '  }',
@@ -308,12 +319,12 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
         ].join('\n');
     }
     let registerActionsCode;
-    if (hasLayout || hasAncestorLayout) {
+    if (layoutDecls.length > 0) {
         registerActionsCode = [
             'async function __registerActions() {',
             '  if (__actionsRegistered) return;',
             '  __actionsRegistered = true;',
-            '  compileFile(_layoutSrc, { sourcePath: _layoutPath });',
+            '  for (let _i = 0; _i < _layoutSrcList.length; _i++) compileFile(_layoutSrcList[_i], { sourcePath: _layoutPathList[_i] });',
             '  compileFile(_pageSrc, { sourcePath: _pagePath });',
             '}',
             '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/adapter",
-  "version": "0.2.16",
+  "version": "0.2.18",
   "type": "module",
   "description": "Vesk adapter — builds deployable .vesk/ output for Deno and Node serverless",
   "main": "./dist/index.js",
@@ -23,9 +23,9 @@
     "sharp": "^0.35.3"
   },
   "dependencies": {
-    "@vesk/compiler": "^0.2.16",
-    "@vesk/runtime": "^0.2.16",
-    "@vesk/types": "^0.2.16"
+    "@vesk/compiler": "^0.2.18",
+    "@vesk/runtime": "^0.2.18",
+    "@vesk/types": "^0.2.18"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",