@vesk/adapter 0.2.15 → 0.2.17

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