@vesk/adapter 0.2.22 → 0.2.24

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"client-bundle.d.ts","sourceRoot":"","sources":["../src/client-bundle.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,kBAAkB,EAAmF,MAAM,yBAAyB,CAAC;AAoCnL;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CA8BhE;AAoWD;;;;;;;;;;;;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,CA4Z7B;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

@@ -197,14 +197,15 @@ 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;
-    }
+/**
+ * Parse-free stand-in for the per-chunk `import` scan: a chunk carries live
+ * `import` statements iff its deduped head rendered non-empty, or its import
+ * merge aborted (in which case some file bodies retain their raw imports for
+ * esbuild to bundle). Equivalent to parsing the assembled chunk code, without
+ * the ~50-100KB acorn parse per chunk on every dev rebuild.
+ */
+function chunkHasImports(headLen, mergeAborted) {
+    return headLen > 0 || mergeAborted;
 }
 /**
  * Rewrites a compiled file's source specifier so esbuild can resolve it from
@@ -228,8 +229,8 @@ function resolveImportSource(src, filePath) {
  * 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 —
+ * that with `Identifier has already been declared`, so a naive `import` scan
+ * used to silently pass 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`.
@@ -251,7 +252,7 @@ class ChunkImports {
         return code;
     }
     /** Folds one file's imports into the merged set and returns the code with its imports stripped. */
-    add(code, filePath) {
+    add(code, filePath, specSink) {
         if (!code || this.aborted)
             return code;
         let ast;
@@ -273,34 +274,28 @@ class ChunkImports {
             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 };
+                    if (!this.foldSpec(resolved, 'default', local, undefined, filePath, code))
+                        return code;
+                    specSink?.push({ source: resolved, 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 };
+                    if (!this.foldSpec(resolved, 'namespace', local, undefined, filePath, code))
+                        return code;
+                    specSink?.push({ source: resolved, 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 });
+                    if (!this.foldSpec(resolved, 'named', local, imported, filePath, code))
+                        return code;
+                    specSink?.push({ source: resolved, kind: 'named', local, imported });
                 }
             }
             let cut = node.end;
@@ -312,6 +307,45 @@ class ChunkImports {
             return code;
         return removeRanges(code, ranges);
     }
+    /**
+     * Shared single-spec fold used by both the fresh compile path and the
+     * parse-free warm replay. Returns false (and aborts the merge) on a
+     * conflicting binding — same shape as the pre-refactor inline logic.
+     */
+    foldSpec(source, kind, local, imported, filePath, code) {
+        let group = this.bySource.get(source);
+        if (!group) {
+            group = { named: new Map() };
+            this.bySource.set(source, group);
+        }
+        if (kind === 'default') {
+            if (group.default && group.default.local !== local) {
+                this.fail(`conflicting default imports from '${source}' in ${filePath}`, code);
+                return false;
+            }
+            group.default = { kind: 'default', local };
+        }
+        else if (kind === 'namespace') {
+            if (group.namespace && group.namespace.local !== local) {
+                this.fail(`conflicting namespace imports from '${source}' in ${filePath}`, code);
+                return false;
+            }
+            group.namespace = { kind: 'namespace', local };
+        }
+        else {
+            if (typeof imported !== 'string') {
+                this.fail(`nameless named-import from '${source}' in ${filePath}`, code);
+                return false;
+            }
+            const existing = group.named.get(imported);
+            if (existing && existing.local !== local) {
+                this.fail(`'${imported}' from '${source}' bound to both '${existing.local}' and '${local}' in ${filePath}`, code);
+                return false;
+            }
+            group.named.set(imported, { kind: 'named', local, imported });
+        }
+        return true;
+    }
     /** True when every file parsed and merged cleanly (no conflict, no parse abort). */
     get ok() {
         return !this.aborted;
@@ -352,6 +386,16 @@ function removeRanges(code, ranges) {
     }
     return out.trim();
 }
+/**
+ * Historical cache replay: re-parse a cached entry's import-carrying codes
+ * and re-fold them into the chunk accumulator. Used only on rare fold aborts
+ * and old-style cache entries — the parse-free fast path is the norm.
+ */
+function fallbackReplay(cached, filePath, imports) {
+    const comp = cached.compCode ? imports.add(cached.compCode, filePath).replace(/^\n+/, '').replace(/\n+$/, '') : '';
+    const hyd = cached.hydCode ? imports.add(cached.hydCode, filePath).replace(/__components/g, '__hydrators').replace(/^\n+/, '').replace(/\n+$/, '') : '';
+    return [comp, hyd].filter(Boolean).join('\n');
+}
 /**
  * Scopes one file's contribution to the shared chunk: module-level
  * import/export statements pass through untouched, all other top-level
@@ -454,7 +498,7 @@ function removeCompiledNodes(code, isTarget) {
 }
 export async function generateClientBundle(routeTree, appDir, componentMap, options) {
     const runtimeDir = findRuntimeSrc(appDir);
-    const seen = new Set();
+    let seen = new Set();
     const chunks = [];
     const runtimeImportNames = new Set();
     const cache = options?.cache;
@@ -540,9 +584,33 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
             // 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');
+            let cachedFileCode = '';
+            if (cached.compBody !== undefined) {
+                // Parse-free warm replay: the body/scoped strings and the folded
+                // import specifiers were computed once at fresh-compile time, so this
+                // hit costs zero parses (the hot path paid ~5 acorn parses per cached
+                // file per chunk before — ~4k parses per edit on the test app).
+                let aborted = false;
+                for (const s of cached.importSpecs ?? []) {
+                    if (!imports.foldSpec(s.source, s.kind, s.local, s.imported, filePath, cached.compCode)) {
+                        aborted = true;
+                        break;
+                    }
+                }
+                if (aborted) {
+                    // Rare fold conflict — fall back to the historical parse path so
+                    // the merge-abort semantics (and `ok` reporting) stay identical.
+                    cachedFileCode = fallbackReplay(cached, filePath, imports);
+                }
+                else if (cached.scoped) {
+                    output.push(cached.scoped);
+                }
+            }
+            else {
+                // Old-style entry (e.g. populated before the parse-free fields were
+                // introduced): historical replay.
+                cachedFileCode = fallbackReplay(cached, filePath, imports);
+            }
             if (cachedFileCode.trim())
                 output.push(scopeFileContribution(cachedFileCode));
             for (const n of cached.runtimeNames)
@@ -566,10 +634,14 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
         const { comp: rawComp, hyd: rawHyd, name: actualName } = compileClientBoth(src, null, filePath);
         // 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.
+        // The bodies/specs/scoped artifacts are cached too so warm replay never
+        // re-parses (see the `compBody !== undefined` fast path above).
         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+$/, '') : '';
+        const compSpecs = [];
+        const hydSpecs = [];
+        const compCode = compWithImports ? imports.add(compWithImports, filePath, compSpecs).replace(/^\n+/, '').replace(/\n+$/, '') : '';
+        const hydCode = hydWithImports ? imports.add(hydWithImports, filePath, hydSpecs).replace(/__components/g, '__hydrators').replace(/^\n+/, '').replace(/\n+$/, '') : '';
         if (rawComp)
             collectRuntimeImports(rawComp);
         if (rawHyd)
@@ -585,8 +657,9 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
         // Comp and hyd contributions of one file share its top-level bindings,
         // so they are scoped together in a single block (see replay path above).
         const fileCode = [compCode, hydCode].filter(Boolean).join('\n');
-        if (fileCode.trim())
-            output.push(scopeFileContribution(fileCode));
+        const scopedContribution = fileCode.trim() ? scopeFileContribution(fileCode) : '';
+        if (scopedContribution)
+            output.push(scopedContribution);
         if (actualName && resolvedName !== null && actualName !== resolvedName) {
             output.push(`Object.defineProperty(__components, ${JSON.stringify(resolvedName)}, { get: () => __components[${JSON.stringify(actualName)}], configurable: true });`);
             output.push(`Object.defineProperty(__hydrators, ${JSON.stringify(resolvedName)}, { get: () => __hydrators[${JSON.stringify(actualName)}], configurable: true });`);
@@ -601,6 +674,10 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
                 actualName,
                 runtimeNames: [...runtimeImportNames].filter((n) => !namesBefore.has(n)),
                 imports: importedPaths,
+                compBody: compCode,
+                hydBody: hydCode,
+                scoped: scopedContribution,
+                importSpecs: [...compSpecs, ...hydSpecs],
             });
         }
     }
@@ -630,6 +707,14 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
         const chunkEntries = [];
         function walkSplit(nodes, _chain) {
             for (const node of nodes) {
+                // Each chunk must be self-contained: reset the compile dedupe so a
+                // shared .vsk component (e.g. a site-wide Footer imported by the root
+                // layout) is emitted into every chunk that references it. With a
+                // single global `seen`, the first chunk to import a component owns it
+                // and later chunks reference `__components["X"]` without registering
+                // it — which breaks standalone layouts, whose match chain drops the
+                // index chunk at runtime.
+                seen = new Set();
                 const chunkCode = [];
                 const chunkImports = new ChunkImports();
                 const pagePath = resolve(appDir, node.sourceDir, 'page.vsk');
@@ -670,7 +755,7 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
                         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 });
+                    chunkEntries.push({ name: chunkName, code, node, imports: chunkHasImports(head.length, !chunkImports.ok) });
                 }
                 walkSplit(node.children || [], [..._chain, node]);
             }
@@ -679,6 +764,7 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
         const sharedCode = [];
         const sharedImports = new ChunkImports();
         const compMap = componentMap || new Map();
+        seen = new Set();
         for (const [compName, compPath] of compMap) {
             compileFile(compPath, compName, sharedCode, sharedImports);
         }
@@ -687,14 +773,14 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
                 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 });
+            chunkEntries.push({ name: 'shared.js', code, node: null, imports: chunkHasImports(head.length, !sharedImports.ok) });
         }
         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())
                 continue;
             let finalCode;
-            if (hasChunkImports(entry.code)) {
+            if (entry.imports) {
                 // 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

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,CAikBvG"}
+{"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,CAwnBvG"}

package/dist/dev-server.js

@@ -3,12 +3,12 @@ import { resolve, extname, dirname } from 'node:path';
 import { createServer } from 'node:http';
 import { fileURLToPath } from 'node:url';
 import { stripCodeTypes } from '@vesk/compiler/src/strip-ts';
-import { DEFAULT_MAX_BODY_BYTES } from '@vesk/compiler/src/server-codegen';
+import { DEFAULT_MAX_BODY_BYTES, safeJsonForScript } from '@vesk/compiler/src/server-codegen';
 import { build } from '@vesk/adapter/src/index';
-import { createHmrServer } from './hmr';
+import { buildErrorPayload, createHmrServer } from './hmr';
 import * as hmrApi from './hmr';
 import { createDevApiRouter } from './dev-api';
-import { buildRuntimeCode } from '@vesk/adapter/src/client-bundle';
+import { buildTreeShakenRuntime, runtimeExportNames } from '@vesk/adapter/src/client-bundle';
 import { resolveWithin, installMdReadHook } from '@vesk/adapter/src/paths';
 import { getPluginRecords } from './plugins';
 // @vesk/agentic — optional AI plugin; gated by active state if installed
@@ -358,6 +358,7 @@ export async function startDevServer(appDir, options) {
     let ssrVersion = Date.now();
     let routeTree = [];
     let runtimeBundle = '';
+    let pendingInitialError = null;
     let eventsMod = null;
     async function reloadEventsMod() {
         const eventsPath = resolve(devDir, 'server', 'events.js');
@@ -375,7 +376,7 @@ export async function startDevServer(appDir, options) {
     async function doBuild() {
         const start = Date.now();
         try {
-            const result = await build(appDir, { outDir: devDir, publicDir, hmr: true });
+            const result = await build(appDir, { outDir: devDir, publicDir, hmr: true, plugins: options?.plugins });
             const configPath = resolve(devDir, 'config.json');
             if (existsSync(configPath)) {
                 config = JSON.parse(readFileSync(configPath, 'utf-8'));
@@ -384,17 +385,39 @@ export async function startDevServer(appDir, options) {
                 routeTree = result.routeTree;
             const monorepoRoot = resolve(__dirname, '..', '..', '..');
             const runtimeDir = resolve(monorepoRoot, 'packages', 'runtime', 'dist');
-            runtimeBundle = buildRuntimeCode(runtimeDir);
+            // The full runtime surface for /_vesk/runtime.js. The legacy concat
+            // (buildRuntimeCode) collides on module-scope names shared by separate
+            // runtime modules (e.g. hydrateInitial in hydrate.ts and router.ts) and
+            // is a SyntaxError as a module — every import() of it fails. The
+            // tree-shaken full set is one closed IIFE + explicit re-exports, so all
+            // runtime names resolve. Matches prod, which serves client.js there.
+            runtimeBundle = await buildTreeShakenRuntime(runtimeDir, [...runtimeExportNames(runtimeDir)]);
             await reloadEventsMod();
             lastBuild = Date.now();
+            // successful build clears any pending error
+            pendingInitialError = null;
             console.error(`vesk dev: rebuilt in ${Date.now() - start}ms`);
         }
         catch (e) {
             const message = e instanceof Error ? e.message : String(e);
             console.error(`vesk dev: build error: ${message}`);
+            // surface the error to the HMR overlay + devtool Errors panel
+            try {
+                const filename = e?.filename
+                    || e?.file
+                    || 'app';
+                const payload = buildErrorPayload(e, String(filename), { appDir });
+                pendingInitialError = payload;
+                if (hmrSession) {
+                    hmrSession.broadcast('error', payload);
+                }
+            }
+            catch {
+                /* best-effort */
+            }
         }
     }
-    await doBuild();
+    await doBuild().catch(() => { });
     const server = createServer(async (req, res) => {
         const url = new URL(req.url || '/', `http://localhost:${port}`);
         // Dev panel endpoints (/__vesk/...): HMR state, plugin list, activate/
@@ -491,6 +514,28 @@ export async function startDevServer(appDir, options) {
             res.end(runtimeBundle);
             return;
         }
+        // External data scripts (/ssr-data.js?t=...) are emitted by
+        // storeDataScriptGlobal once a render serializes SSR data. Without this
+        // route the dev SPA fallback served the HTML document as the script's
+        // payload, which the client then failed to parse as JavaScript
+        // ("Unexpected token '<'") — dev pages never serialized data before so
+        // the tag was never emitted and this was unreachable. Mirrors prod-server.
+        if (url.pathname === '/ssr-data.js') {
+            const token = url.searchParams.get('t') || '';
+            const store = globalThis.__vsk_ssr_data_store;
+            const payload = store?.[token];
+            if (payload)
+                delete store[token];
+            console.error(`[ssr-data-trace] ${url.pathname} token=${token.slice(0, 6)} referer=${req.headers['referer'] || req.headers['referrer'] || '-'} payload=${payload ? JSON.stringify({ props: Object.keys(payload.props || {}), data: Object.keys(payload.ssrData || {}) }) : 'NONE'}`);
+            const lines = [];
+            if (payload?.props)
+                lines.push(`globalThis.__vesk_props = ${safeJsonForScript(JSON.stringify(payload.props))};`);
+            if (payload?.ssrData)
+                lines.push(`globalThis.__vsk_ssr_data = ${safeJsonForScript(JSON.stringify(payload.ssrData))};`);
+            res.writeHead(200, { 'Content-Type': 'application/javascript', 'Cache-Control': 'no-store' });
+            res.end(lines.join('\n') || '// no ssr data');
+            return;
+        }
         if (url.pathname.startsWith('/_vesk/static/')) {
             const relPath = url.pathname.slice('/_vesk/static/'.length);
             const staticPath = resolveWithin(resolve(devDir, 'static'), relPath);
@@ -558,6 +603,9 @@ export async function startDevServer(appDir, options) {
                             let finalBody = body;
                             if (contentType.includes('text/html')) {
                                 finalBody = injectDevScripts(body);
+                                if (finalBody.includes('/ssr-data.js')) {
+                                    console.error(`[body-trace] ${url.pathname} HTML body carries ssr-data ref (was-in-body=${body.includes('/ssr-data.js')})`);
+                                }
                             }
                             res.writeHead(response.status, headers);
                             res.end(finalBody);
@@ -602,10 +650,15 @@ export async function startDevServer(appDir, options) {
                 const handlerPath = resolve(devDir, ssrRoute.function);
                 if (existsSync(handlerPath)) {
                     try {
+                        const t0 = process.hrtime.bigint();
+                        const tImport0 = process.hrtime.bigint();
                         const mod = await import(`${handlerPath}?t=${ssrVersion}`);
+                        const tImport1 = process.hrtime.bigint();
                         const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
                         const response = await mod.handle(webRequest);
+                        const tHandle1 = process.hrtime.bigint();
                         const body = await response.text();
+                        const tText1 = process.hrtime.bigint();
                         const headers = Object.fromEntries(response.headers);
                         const contentType = headers['content-type'] || '';
                         let finalBody = body;
@@ -614,6 +667,7 @@ export async function startDevServer(appDir, options) {
                         }
                         res.writeHead(response.status, headers);
                         res.end(finalBody);
+                        console.error(`[vdtime] ${url.pathname} ssrVersion=${ssrVersion} total=${Number(tHandle1 - t0) / 1e6 | 0}ms import=${Number(tImport1 - tImport0) / 1e6 | 0}ms handle=${Number(tHandle1 - tImport1) / 1e6 | 0}ms text=${Number(tText1 - tHandle1) / 1e6 | 0}ms`);
                     }
                     catch (e) {
                         res.writeHead(500, { 'Content-Type': 'text/html' });
@@ -655,6 +709,10 @@ export async function startDevServer(appDir, options) {
     });
     const hmr = createHmrServer(server, appDir, devDir, componentMap);
     hmrSession = hmr;
+    // replay any build error that happened before the HMR server existed
+    if (pendingInitialError) {
+        hmr.broadcast('error', pendingInitialError);
+    }
     // ── 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.

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;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"}
+{"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,CA6FjB;AAwRD,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,CA6KA"}

package/dist/hmr.js

@@ -57,15 +57,39 @@ export function buildErrorPayload(error, filename, opts = {}) {
             ? error.stack
             : undefined;
     let codeframe;
+    let resolvedAbsPath;
     if (line !== null && line >= 1 && typeof opts.appDir === 'string') {
         let src;
-        try {
-            const absPath = resolve(opts.appDir, file);
-            if (existsSync(absPath))
-                src = readFileSync(absPath, 'utf-8');
+        const candidates = [];
+        // file may be relative to appDir (e.g. "comparison/page.vsk"),
+        // prefixed with "app/" (e.g. "app/comparison/page.vsk"),
+        // absolute, or relative to project root.
+        if (file.startsWith('/')) {
+            candidates.push(file);
         }
-        catch {
-            src = undefined;
+        else {
+            candidates.push(resolve(opts.appDir, file));
+            if (file.startsWith('app/')) {
+                candidates.push(resolve(opts.appDir, file.slice(4)));
+                candidates.push(resolve(opts.appDir, '..', file));
+            }
+            else {
+                candidates.push(resolve(opts.appDir, '..', file));
+            }
+            // also try file as-is relative to cwd
+            candidates.push(resolve(file));
+        }
+        for (const absPath of candidates) {
+            try {
+                if (existsSync(absPath)) {
+                    src = readFileSync(absPath, 'utf-8');
+                    resolvedAbsPath = absPath;
+                    break;
+                }
+            }
+            catch {
+                /* try next candidate */
+            }
         }
         if (typeof src === 'string' && src.length > 0) {
             const cf = buildCodeframe(src, line, column ?? 1);
@@ -76,9 +100,9 @@ export function buildErrorPayload(error, filename, opts = {}) {
         }
     }
     const tipsData = suggestFor(message);
-    const filePath = typeof opts.appDir === 'string'
+    const filePath = resolvedAbsPath ?? (typeof opts.appDir === 'string'
         ? resolve(opts.appDir, file)
-        : undefined;
+        : undefined);
     // The file header already shows the location; strip the redundant
     // " in <file>" suffix compilers append to messages (e.g. acorn's
     // "Unexpected token in /abs/app/page.vsk").
@@ -129,9 +153,13 @@ function collectAncestorLayouts(routeTree, sourceDir, chain = []) {
         if (node.sourceDir === sourceDir)
             return chain;
         if (node.children) {
+            // Standalone layouts drop the ancestor chain — they replace the
+            // root layout nesting for all descendants.
+            const isStandalone = node.standalone === true;
+            const base = isStandalone ? [] : chain;
             const nextChain = node.layout
-                ? [...chain, { sourceDir: node.sourceDir, layoutCompName: node.layout }]
-                : chain;
+                ? [...base, { sourceDir: node.sourceDir, layoutCompName: node.layout }]
+                : base;
             const found = collectAncestorLayouts(node.children, sourceDir, nextChain);
             if (found)
                 return found;
@@ -478,11 +506,35 @@ export function createHmrServer(httpServer, appDir, devDir, componentMap) {
                     }
                 }
                 if (sourceDir !== null) {
-                    const routeNode = findRouteForSource(routeTree, sourceDir);
+                    // sourceDir from extractSourceDir is relative to appDir (e.g. "community/discussions"),
+                    // while routeTree nodes store absolute sourceDir — normalize to absolute for lookup
+                    let absSourceDir;
+                    if (sourceDir === '') {
+                        absSourceDir = appDir;
+                    }
+                    else if (sourceDir.startsWith('app/')) {
+                        absSourceDir = resolve(appDir, '..', sourceDir);
+                    }
+                    else {
+                        absSourceDir = resolve(appDir, sourceDir);
+                    }
+                    const routeNode = findRouteForSource(routeTree, absSourceDir);
                     if (routeNode) {
-                        const ancestorLayouts = collectAncestorLayouts(routeTree, sourceDir);
+                        const ancestorLayouts = collectAncestorLayouts(routeTree, absSourceDir);
                         regenerateSsrFunction(routeNode, appDir, devDir, componentMap, { ancestorLayouts: ancestorLayouts || [] });
                     }
+                    else if (filename.endsWith('page.vsk') || filename.endsWith('layout.vsk')) {
+                        // new route (e.g. freshly created app/community/discussions/page.vsk)
+                        // — routeTree is stale, need a full rebuild to pick up the new node
+                        // and generate its SSR function with the correct layout chain
+                        try {
+                            await doFullBuild();
+                            broadcast('reload', { reason: `new route: ${filename}`, time: Date.now() - start });
+                        }
+                        catch (e) {
+                            broadcast('error', buildErrorPayload(e, filename, { appDir }));
+                        }
+                    }
                 }
                 console.error(`vesk hmr: ${assignments.map(a => a.name).join(', ')} (${Date.now() - start}ms)`);
             }

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,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"}
+{"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,CA8TpG;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

@@ -197,9 +197,13 @@ export async function build(appDir, options) {
     const actionMap = {};
     function walk(nodes, ancestorLayouts = []) {
         for (const node of nodes) {
-            const childAncestorLayouts = node.layout
-                ? [...ancestorLayouts, { sourceDir: node.sourceDir, layoutCompName: node.layout }]
-                : ancestorLayouts;
+            // Standalone layouts drop the entire ancestor chain — they replace
+            // the root layout nesting, so only their own layout (if any) remains.
+            const isStandalone = node.standalone === true;
+            let childAncestorLayouts = isStandalone ? [] : ancestorLayouts;
+            if (node.layout) {
+                childAncestorLayouts = [...childAncestorLayouts, { sourceDir: node.sourceDir, layoutCompName: node.layout }];
+            }
             if (node.page) {
                 const mwChain = collectMiddlewareChain(routeTree, node.fullPath, appDir);
                 let mwCode = null;
@@ -207,7 +211,10 @@ export async function build(appDir, options) {
                     const mwSources = mwChain.map((m) => readFileSync(m.sourcePath, 'utf-8'));
                     mwCode = compileMiddlewareCode(mwSources);
                 }
-                const { funcPath, funcCode, name } = generateSsrFunction(node, appDir, outDir, componentMap, { ancestorLayouts, middlewareCode: mwCode, headExtra: pluginHeadExtra });
+                // For standalone routes the layout chain is cleared — only the
+                // standalone node's own layout (if any) applies, no root ancestors.
+                const ssrAncestorLayouts = isStandalone ? [] : ancestorLayouts;
+                const { funcPath, funcCode, name } = generateSsrFunction(node, appDir, outDir, componentMap, { ancestorLayouts: ssrAncestorLayouts, middlewareCode: mwCode, headExtra: pluginHeadExtra });
                 writeFileSync(funcPath, funcCode, 'utf-8');
                 const pagePath = resolve(appDir, node.sourceDir, 'page.vsk');
                 if (existsSync(pagePath)) {
@@ -217,7 +224,7 @@ export async function build(appDir, options) {
                         const layoutSrc = readFileSync(resolve(appDir, node.sourceDir, 'layout.vsk'), 'utf-8');
                         actionIds.push(...collectActionIds(layoutSrc));
                     }
-                    for (const a of ancestorLayouts) {
+                    for (const a of ssrAncestorLayouts) {
                         const ancestorSrc = readFileSync(resolve(appDir, a.sourceDir, 'layout.vsk'), 'utf-8');
                         actionIds.push(...collectActionIds(ancestorSrc));
                     }

package/dist/load-config.d.ts

@@ -0,0 +1,3 @@
+import type { VeskConfig } from '@vesk/compiler/src/types';
+export declare function loadVeskConfig(projectDir: string): Promise<VeskConfig | undefined>;
+//# sourceMappingURL=load-config.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"load-config.d.ts","sourceRoot":"","sources":["../src/load-config.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA+DxF"}

package/dist/load-config.js

@@ -0,0 +1,85 @@
+/**
+ * Shared `vesk.config.{ts,js}` loader for the CLI and the production server.
+ *
+ * TS configs are transpiled to ESM and evaluated from a temp module rooted
+ * inside the project (`.vesk/`) so bare package imports (`@vesk/plugin-*`)
+ * resolve against the project's own `node_modules`. `@vesk/compiler` imports
+ * are stripped and the helpers injected via `globalThis.__vesk_inject` so the
+ * running CLI/adapter's own compiler build is used regardless of which version
+ * the project has installed.
+ */
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+import { pathToFileURL } from 'node:url';
+import { createRequire } from 'node:module';
+import { defineConfig, definePlugin, preset, validateConfig } from '@vesk/compiler/src/config';
+export async function loadVeskConfig(projectDir) {
+    const jsPath = join(projectDir, 'vesk.config.js');
+    const tsPath = join(projectDir, 'vesk.config.ts');
+    let configPath = null;
+    if (existsSync(jsPath))
+        configPath = jsPath;
+    else if (existsSync(tsPath))
+        configPath = tsPath;
+    if (!configPath)
+        return undefined;
+    let raw;
+    if (configPath.endsWith('.ts')) {
+        const { transpile } = await import('typescript');
+        const src = readFileSync(configPath, 'utf-8');
+        let js = transpile(src, { module: 99, target: 99 });
+        const inject = { defineConfig, definePlugin, preset };
+        const projectRequire = createRequire(join(projectDir, 'package.json'));
+        const importRe = /import\s+(?:(?:\*\s*as\s+([\w$]+))|([\w$]+(?:\s*,\s*\{[^}]*\})?)|(\{[^}]*\}))\s+from\s+['"]([^'"]+)['"]\s*;?/g;
+        let m;
+        while ((m = importRe.exec(js)) !== null) {
+            const nsName = m[1];
+            const defPart = m[2];
+            const namedPart = m[3];
+            const specifier = m[4];
+            if (specifier === '@vesk/compiler')
+                continue;
+            const mod = await import(pathToFileURL(projectRequire.resolve(specifier)).href);
+            if (nsName) {
+                inject[nsName] = mod;
+            }
+            else if (defPart) {
+                const defaultName = defPart.split(',')[0].trim();
+                inject[defaultName] = mod.default ?? mod;
+                const open = defPart.indexOf('{');
+                if (open !== -1) {
+                    for (const n of defPart.slice(open).matchAll(/(\w+)/g))
+                        inject[n[1]] = mod[n[1]];
+                }
+            }
+            else if (namedPart) {
+                for (const n of namedPart.matchAll(/(\w+)/g))
+                    inject[n[1]] = mod[n[1]];
+            }
+        }
+        js = js.replace(importRe, '');
+        const injectKeys = Object.keys(inject);
+        js = `const {${injectKeys.join(',')}} = globalThis.__vesk_inject;\n` + js;
+        const tmpFile = join(projectDir, '.vesk', 'config.loader.tmp.mjs');
+        mkdirSync(dirname(tmpFile), { recursive: true });
+        writeFileSync(tmpFile, js, 'utf-8');
+        globalThis.__vesk_inject = inject;
+        try {
+            const mod = await import(`${pathToFileURL(tmpFile).href}?t=${Date.now()}`);
+            raw = mod.default;
+        }
+        finally {
+            delete globalThis.__vesk_inject;
+        }
+    }
+    else {
+        const mod = await import(`${pathToFileURL(configPath).href}?t=${Date.now()}`);
+        raw = mod.default;
+    }
+    if (typeof raw === 'function')
+        raw = raw();
+    const config = (typeof defineConfig === 'function' ? defineConfig(raw) : raw);
+    if (typeof validateConfig === 'function')
+        validateConfig(config);
+    return config;
+}

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,CAkcxI"}
+{"version":3,"file":"prod-server.d.ts","sourceRoot":"","sources":["../src/prod-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2D,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AA8CjG,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,CAwbxI"}

package/dist/prod-server.js

@@ -1,13 +1,12 @@
 import { readFileSync, existsSync, statSync } from 'node:fs';
 import { resolve, extname, dirname } from 'node:path';
 import { createServer } from 'node:http';
-import { createRequire } from 'node:module';
 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, hasBuiltGlobalCss } from '@vesk/adapter/src/css';
-const _require = createRequire(import.meta.url);
+import { loadVeskConfig } from '@vesk/adapter/src/load-config';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 async function readBody(req, maxBytes = DEFAULT_MAX_BODY_BYTES) {
     const chunks = [];
@@ -140,23 +139,11 @@ export async function startProdServer(outDir, options) {
     let securityConfig = {};
     let mdConfig;
     try {
-        const veskConfigPath = resolve(projectDir, 'vesk.config.js');
-        const veskConfigTsPath = resolve(projectDir, 'vesk.config.ts');
-        let rawConfig = {};
-        if (existsSync(veskConfigPath)) {
-            rawConfig = _require(veskConfigPath);
+        const config = await loadVeskConfig(projectDir);
+        if (config) {
+            securityConfig = { security: config.security };
+            mdConfig = config.md;
         }
-        else if (existsSync(veskConfigTsPath)) {
-            const { transpile } = _require('typescript');
-            const src = readFileSync(veskConfigTsPath, 'utf-8');
-            const result = transpile(src, { module: 99, target: 99 });
-            rawConfig = eval(`(${result})`);
-        }
-        if (typeof rawConfig === 'function')
-            rawConfig = rawConfig();
-        const configObj = rawConfig;
-        securityConfig = { security: configObj.security };
-        mdConfig = configObj.md;
     }
     catch (e) {
         // Fail closed: keep the secure defaults above and warn loudly — a broken

package/dist/runtime-bundle.js

@@ -39,7 +39,7 @@ export async function bundleRuntime(appDir, outDir) {
     const runtimeRoot = findRuntimeSrc(appDir);
     const entryFile = resolve(outDir, 'server', `.runtime-entry-${buildId++}.mjs`);
     const entryContent = [
-        `import { renderPage, renderFullPage, renderPageStream, compileFile, setRuntimeModule, setVskHydrate, assertSameOrigin } from ${JSON.stringify(resolve(compilerRoot, 'server-codegen.js'))};`,
+        `import { renderPage, renderFullPage, renderPageStream, compileFile, setRuntimeModule, setVskHydrate, hydratePrecompile, assertSameOrigin } from ${JSON.stringify(resolve(compilerRoot, 'server-codegen.js'))};`,
         `import { parseCookies } from ${JSON.stringify(resolve(compilerRoot, 'server-cookies.js'))};`,
         `import * as __veskRuntime from ${JSON.stringify(resolve(runtimeRoot, 'index-server.js'))};`,
         '',
@@ -77,7 +77,7 @@ export async function bundleRuntime(appDir, outDir) {
         '  return req.locals || {};',
         '}',
         '',
-        'export { renderPage, renderFullPage, renderPageStream, compileFile, setVskHydrate, parseCookies, assertSameOrigin };',
+        'export { renderPage, renderFullPage, renderPageStream, compileFile, setVskHydrate, hydratePrecompile, parseCookies, assertSameOrigin };',
         'export { withSsrStore } from "@vesk/compiler/src/ssr-store";',
         '',
         '// Deliver hydration data as an origin-served script so strict CSP (no unsafe-inline)',

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,CAoYtD"}
+{"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;AAI7F,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQjF;AAgED,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,13 +1,7 @@
 import { readFileSync, existsSync } from 'node:fs';
 import { resolve, relative, join } from 'node:path';
-import { resolveComponentName } from '@vesk/compiler/src/server-codegen';
+import { resolveComponentName, precompileFile } from '@vesk/compiler/src/server-codegen';
 import { resolveCssUrls, hasBuiltGlobalCss } from '@vesk/adapter/src/css';
-function escapeSource(src) {
-    return src
-        .replace(/\\/g, '\\\\')
-        .replace(/`/g, '\\`')
-        .replace(/\$/g, '\\$');
-}
 // Finds the nearest error.vsk walking up from the route's own directory to the
 // app root, mirroring the router's findErrorComponent chain semantics.
 export function resolveErrorFile(sourceDir, appDir) {
@@ -31,6 +25,19 @@ function routeName(segments) {
 function extractCompName(src) {
     return resolveComponentName(src);
 }
+/**
+ * Precompiles a `.vsk` file at BUILD time into a `PrecompileFilePlan` and
+ * returns it as a JSON object literal. True AOT: no source is embedded, no
+ * compile happens in the deployed function — `hydratePrecompile` rebuilds the
+ * render result at module load from this JSON alone.
+ */
+function precompilePlan(entryPath) {
+    const src = readFileSync(entryPath, 'utf-8');
+    return JSON.stringify(precompileFile(src, entryPath));
+}
+function hydrateInvoke(planExpr) {
+    return `(() => { try { return hydratePrecompile(${planExpr}); } catch { return null; } })()`;
+}
 function buildParamExtraction(node, urlParts) {
     const parts = [];
     let partIdx = Math.max(0, urlParts.length - 1);
@@ -96,38 +103,32 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
         const entryPath = resolve(appDir, entry.sourceDir, 'layout.vsk');
         const entrySrc = readFileSync(entryPath, 'utf-8');
         const entryComp = extractCompName(entrySrc) || 'Layout';
-        const escaped = escapeSource(entrySrc);
+        const plan = precompilePlan(entryPath);
         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); } })()`,
+            plan,
+            compiled: hydrateInvoke(plan),
         });
     }
-    const pageSrc = readFileSync(pagePath, 'utf-8');
-    const pageComp = extractCompName(pageSrc) || 'Page';
+    const pagePlan = precompilePlan(pagePath);
+    const pageComp = extractCompName(readFileSync(pagePath, 'utf-8')) || 'Page';
     const errorPath = resolveErrorFile(routeNode.sourceDir, appDir);
     const errorSrc = errorPath ? readFileSync(errorPath, 'utf-8') : null;
     const errorComp = errorPath ? (extractCompName(errorSrc) || 'Error') : null;
     const errorVars = errorPath
-        ? `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';
+        ? `const _errorComp = ${JSON.stringify(errorComp)};\nconst _errorCompiled = ${hydrateInvoke(precompilePlan(errorPath))};\n`
+        : 'const _errorComp = null;\nconst _errorCompiled = null;\n';
     let src = '';
     if (layoutDecls.length > 0) {
-        src = `const _pageSrc = \`${escapeSource(pageSrc)}\`;\n`;
-        src += `const _pageComp = ${JSON.stringify(pageComp)};\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 _pageComp = ${JSON.stringify(pageComp)};\n`;
+        src += `const _pageCompiled = (() => { try { return hydratePrecompile(${pagePlan}); } catch { return null; } })();\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 {
-        src = `const _src = \`${escapeSource(pageSrc)}\`;\nconst _comp = ${JSON.stringify(pageComp)};\n`;
-        src += `const _srcPath = ${JSON.stringify(pagePath)};\n`;
-        src += `const _srcCompiled = (() => { try { setVskHydrate(true); return compileFile(_src, { sourcePath: _srcPath }); } catch { return null; } finally { setVskHydrate(false); } })();\n`;
+        src = `const _comp = ${JSON.stringify(pageComp)};\n`;
+        src += `const _compiled = (() => { try { return hydratePrecompile(${pagePlan}); } catch { return null; } })();\n`;
         src += errorVars;
     }
     const urlParts = routeNode.fullPath.split('/').filter(Boolean);
@@ -139,12 +140,11 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     const compRegEntries = [];
     const compMap = componentMap || new Map();
     for (const [compName, compPath] of compMap) {
-        const compSrc = readFileSync(compPath, 'utf-8');
-        const escapedSrc = escapeSource(compSrc);
-        compRegEntries.push(`  registry.set(${JSON.stringify(compName)}, async (props, __registry, __vesk) => {\n    const _src = \`${escapedSrc}\`;\n    const _comp = ${JSON.stringify(compName)};\n    const _compiled = (() => { try { setVskHydrate(true); return compileFile(_src, { sourcePath: ${JSON.stringify(compPath)} }); } catch { return null; } finally { setVskHydrate(false); } })();\n    const result = await renderPage(_src, _comp, props, __registry, { hydrate: true, cached: _compiled, sourcePath: ${JSON.stringify(compPath)} });\n    return result.body;\n  })`);
+        const plan = precompilePlan(compPath);
+        compRegEntries.push(`  (() => {\n    const _compiled = (() => { try { return hydratePrecompile(${plan}); } catch { return null; } })();\n    registry.set(${JSON.stringify(compName)}, async (props, __registry, __vesk) => {\n      const result = await renderPage('', ${JSON.stringify(compName)}, props, __registry, { hydrate: true, cached: _compiled });\n      return result.body;\n    });\n  })();`);
     }
     if (compRegEntries.length > 0) {
-        registryCode = `const __componentRegistry = new Map();\n{\n${compRegEntries.join('\n')}\n}\n`;
+        registryCode = 'const __componentRegistry = new Map();\n{\n' + compRegEntries.join('\n') + '\n}\n';
     }
     else {
         registryCode = 'const __componentRegistry = new Map();\n';
@@ -153,9 +153,9 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     if (layoutDecls.length > 0) {
         htmlFnCode = [
             'async function __renderErrorBody(props) {',
-            '  if (!_errorSrc) throw props.error || new Error("Internal Server Error");',
+            '  if (!_errorComp) throw props.error || new Error("Internal Server Error");',
             '  try {',
-            '    const result = await renderPage(_errorSrc, _errorComp, props, __componentRegistry, { hydrate: true, cached: _errorCompiled, sourcePath: _errorPath });',
+            '    const result = await renderPage(\'\', _errorComp, props, __componentRegistry, { hydrate: true, cached: _errorCompiled });',
             '    return result.body;',
             '  } catch {',
             '    return \'<h1>500 \\u2014 Internal Server Error</h1>\';',
@@ -168,7 +168,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             '  let caughtError = null;',
             "  const __expose = process.env.NODE_ENV !== 'production';",
             '  try {',
-            '    page = await renderPage(_pageSrc, _pageComp, { params }, __componentRegistry, { hydrate: true, cached: _pageCompiled, sourcePath: _pagePath });',
+            '    page = await renderPage(\'\', _pageComp, { params }, __componentRegistry, { hydrate: true, cached: _pageCompiled });',
             '  } catch (err) {',
             '    if (err && (err.name === \'NotFoundError\' || err.name === \'Redirect\')) throw err;',
             '    caughtError = err;',
@@ -178,12 +178,12 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             '  }',
             '  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] });',
+            '  for (let _i = _layoutCompList.length - 1; _i > 0; _i--) {',
+            "    const _inner = await renderPage('', _layoutCompList[_i], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_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] });',
+            "  const html = await renderFullPage('', _layoutCompList[0], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[0]" + bakedOptions + clientScriptOption + dataScriptOption + ", pageHead: _head });",
             "  return new Response(html, { headers: { 'Content-Type': 'text/html' }, status: caughtError ? 500 : 200 });",
             '  });',
             '}',
@@ -193,19 +193,19 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     else {
         htmlFnCode = [
             'async function __renderErrorFullPage(params, requestUrl, err) {',
-            '  if (!_errorSrc) throw err;',
+            '  if (!_errorComp) throw err;',
             "  const __expose = process.env.NODE_ENV !== 'production';",
             "  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) : '';",
             "  const props = { params, statusCode: 500, error: __expose ? message : 'Internal Server Error', stack: __expose ? stack : '', url: requestUrl || '' };",
-            '  return renderFullPage(_errorSrc, _errorComp, props, __componentRegistry, { hydrate: true, cached: _errorCompiled' + bakedOptions + clientScriptOption + dataScriptOption + ', sourcePath: _errorPath });',
+            "  return renderFullPage('', _errorComp, props, __componentRegistry, { hydrate: true, cached: _errorCompiled" + bakedOptions + clientScriptOption + dataScriptOption + " });",
             '}',
             '',
             'async function __renderHtml(params, requestUrl) {',
             '  return withSsrStore(async () => {',
             '  let stream;',
             '  try {',
-            '    stream = renderPageStream(_src, _comp, { params }, __componentRegistry, { hydrate: true, cached: _srcCompiled' + bakedOptions + clientScriptOption + dataScriptOption + ', sourcePath: _srcPath });',
+            "    stream = renderPageStream('', _comp, { params }, __componentRegistry, { hydrate: true, cached: _compiled" + bakedOptions + clientScriptOption + dataScriptOption + ' });',
             '  } catch (err) {',
             '    if (err && (err.name === \'NotFoundError\' || err.name === \'Redirect\')) throw err;',
             '    const html = await __renderErrorFullPage(params, requestUrl, err);',
@@ -235,25 +235,41 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     }
     let dataCode;
     const exposeErr = "process.env.NODE_ENV !== 'production'";
+    // SPA data-nav renders page + layouts through renderPage and never runs
+    // renderFullPage/renderPageStream, whose finally blocks own the per-request
+    // token/slot cleanup in the full-page path. Clear the handoff globals here so
+    // the next full-page render can't reuse the stale token and serialize the
+    // previous nav's SSR data into its page (ssr-data leak).
+    const dataNavCleanup = [
+        '  } finally {',
+        '    const __dnToken = globalThis.__vsk_ssr_token;',
+        '    delete globalThis.__vsk_ssr;',
+        '    if (__dnToken) delete globalThis[`__vsk_ssr_data_${__dnToken}`];',
+        '    delete globalThis.__vsk_ssr_token;',
+        '    delete globalThis.__vsk_ssr_data;',
+        '  }',
+    ];
     if (layoutDecls.length > 0) {
         dataCode = [
             "  if (request.headers.get('x-vesk-data') === '1') {",
-            '    let dataPage;',
             '    try {',
-            '      dataPage = await renderPage(_pageSrc, _pageComp, { params }, __componentRegistry, { hydrate: true, cached: _pageCompiled, sourcePath: _pagePath });',
-            '    } catch (err) {',
-            '      if (err && (err.name === \'NotFoundError\' || err.name === \'Redirect\')) throw err;',
-            '      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' } });`,
-            '    }',
-            '    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' },",
-            '    });',
+            '      let dataPage;',
+            '      try {',
+            "        dataPage = await renderPage('', _pageComp, { params }, __componentRegistry, { hydrate: true, cached: _pageCompiled });",
+            '      } catch (err) {',
+            "        if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
+            '        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' } });`,
+            '      }',
+            '      let _dataHead = dataPage.head || \'\';',
+            '      for (let _i = _layoutCompList.length - 1; _i >= 0; _i--) {',
+            "        const _dl = await renderPage('', _layoutCompList[_i], { params, children: '' }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_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' },",
+            '      });',
+            ...dataNavCleanup,
             '  }',
             '  return __renderHtml(params, url.href);',
         ].join('\n');
@@ -261,17 +277,19 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     else {
         dataCode = [
             "  if (request.headers.get('x-vesk-data') === '1') {",
-            '    let dataPage;',
             '    try {',
-            '      dataPage = await renderPage(_src, _comp, { params }, __componentRegistry, { hydrate: true, cached: _srcCompiled, sourcePath: _srcPath });',
-            '    } catch (err) {',
-            '      if (err && (err.name === \'NotFoundError\' || err.name === \'Redirect\')) throw err;',
-            '      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' } });`,
-            '    }',
-            "    return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: dataPage.head || '' }), {",
-            "      headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' },",
-            '    });',
+            '      let dataPage;',
+            '      try {',
+            "        dataPage = await renderPage('', _comp, { params }, __componentRegistry, { hydrate: true, cached: _compiled });",
+            '      } catch (err) {',
+            "        if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
+            '        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' } });`,
+            '      }',
+            "      return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: dataPage.head || '' }), {",
+            "        headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' },",
+            '      });',
+            ...dataNavCleanup,
             '  }',
             '  return __renderHtml(params, url.href);',
         ].join('\n');
@@ -318,28 +336,16 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             '  }',
         ].join('\n');
     }
-    let registerActionsCode;
-    if (layoutDecls.length > 0) {
-        registerActionsCode = [
-            'async function __registerActions() {',
-            '  if (__actionsRegistered) return;',
-            '  __actionsRegistered = true;',
-            '  for (let _i = 0; _i < _layoutSrcList.length; _i++) compileFile(_layoutSrcList[_i], { sourcePath: _layoutPathList[_i] });',
-            '  compileFile(_pageSrc, { sourcePath: _pagePath });',
-            '}',
-            '',
-        ].join('\n');
-    }
-    else {
-        registerActionsCode = [
-            'async function __registerActions() {',
-            '  if (__actionsRegistered) return;',
-            '  __actionsRegistered = true;',
-            '  compileFile(_src, { sourcePath: _srcPath });',
-            '}',
-            '',
-        ].join('\n');
-    }
+    // Actions are registered while each plan hydrates (its actions-transformed
+    // top-level code runs `defineAction` during `hydratePrecompile`), so the
+    // request-time registration pass is a no-op.
+    const registerActionsCode = [
+        'async function __registerActions() {',
+        '  if (__actionsRegistered) return;',
+        '  __actionsRegistered = true;',
+        '}',
+        '',
+    ].join('\n');
     const actionCode = [
         'export async function handleAction(request, id) {',
         '  // CSRF defense: cross-site browser POSTs always carry an Origin header.',
@@ -421,7 +427,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
         '',
     ].join('\n');
     const funcCode = [
-        "import { renderFullPage, renderPageStream, renderPage, compileFile, setVskHydrate, parseCookies, getAction, validateActionInput, issuesToFieldMap, storeDataScriptGlobal, withSsrStore, assertSameOrigin, VeskRequest } from '../runtime.js';",
+        "import { renderFullPage, renderPageStream, renderPage, hydratePrecompile, parseCookies, getAction, validateActionInput, issuesToFieldMap, storeDataScriptGlobal, withSsrStore, assertSameOrigin, VeskRequest } from '../runtime.js';",
         '',
         middlewareCode || '',
         registryCode,

package/dist/types.d.ts

@@ -1,2 +1,2 @@
-export type { RouteNode, ApiRouteNode, VeskPlugin, ServerEventContext, VeskEventHandlers, VeskSecurity, VeskCors, VeskRateLimit, VeskSecurityPreset, SecurityConfig, MiddlewareChainItem, MiddlewareExtractResult, AncestorLayout, BuildOptions, DevServerOptions, ProdServerOptions, SsrFunctionOptions, ApiFunctionOptions, ClientBundleOptions, ClientBundleFileEntry, ClientBundleCache, ChunkEntry, ClientBundleResult, MonolithicBundleParts, Manifest, ManifestRouteEntry, ManifestActionEntry, ManifestPrerenderedEntry, SsgRouteResult, BuildResult, ImageRef, ImageResult, SeoCheckIssue, SeoAuditResult, CombinedPageInfo, Tracked, Resource, UseFetchOptions, UseFetchStreamOptions, VeskRequest, VeskResponse, SetCookieOptions, CookieStore, ServerRequest, SsrDataSink, MdProps, MdConfig, MdHtmlMode, MarkdownOptions, MdHtmlWarning, } from '@vesk/types';
+export type { RouteNode, ApiRouteNode, VeskPlugin, ServerEventContext, VeskEventHandlers, VeskSecurity, VeskCors, VeskRateLimit, VeskSecurityPreset, SecurityConfig, MiddlewareChainItem, MiddlewareExtractResult, AncestorLayout, BuildOptions, DevServerOptions, ProdServerOptions, SsrFunctionOptions, ApiFunctionOptions, ClientBundleOptions, ClientBundleFileEntry, ClientBundleChunkSpec, ClientBundleCache, ChunkEntry, ClientBundleResult, MonolithicBundleParts, Manifest, ManifestRouteEntry, ManifestActionEntry, ManifestPrerenderedEntry, SsgRouteResult, BuildResult, ImageRef, ImageResult, SeoCheckIssue, SeoAuditResult, CombinedPageInfo, Tracked, Resource, UseFetchOptions, UseFetchStreamOptions, VeskRequest, VeskResponse, SetCookieOptions, CookieStore, ServerRequest, SsrDataSink, MdProps, MdConfig, MdHtmlMode, MarkdownOptions, MdHtmlWarning, } from '@vesk/types';
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,YAAY,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,YAAY,EACZ,QAAQ,EACR,aAAa,EACb,kBAAkB,EAClB,cAAc,EACd,mBAAmB,EACnB,uBAAuB,EACvB,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,iBAAiB,EACjB,UAAU,EACV,kBAAkB,EAClB,qBAAqB,EACrB,QAAQ,EACR,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,cAAc,EACd,WAAW,EACX,QAAQ,EACR,WAAW,EACX,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACX,aAAa,EACb,WAAW,EACX,OAAO,EACP,QAAQ,EACR,UAAU,EACV,eAAe,EACf,aAAa,GACd,MAAM,aAAa,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,YAAY,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,YAAY,EACZ,QAAQ,EACR,aAAa,EACb,kBAAkB,EAClB,cAAc,EACd,mBAAmB,EACnB,uBAAuB,EACvB,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,iBAAiB,EACjB,UAAU,EACV,kBAAkB,EAClB,qBAAqB,EACrB,QAAQ,EACR,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,cAAc,EACd,WAAW,EACX,QAAQ,EACR,WAAW,EACX,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACX,aAAa,EACb,WAAW,EACX,OAAO,EACP,QAAQ,EACR,UAAU,EACV,eAAe,EACf,aAAa,GACd,MAAM,aAAa,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/adapter",
-  "version": "0.2.22",
+  "version": "0.2.24",
   "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.22",
-    "@vesk/runtime": "^0.2.22",
-    "@vesk/types": "^0.2.22"
+    "@vesk/compiler": "^0.2.24",
+    "@vesk/runtime": "^0.2.24",
+    "@vesk/types": "^0.2.24"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",