nukejs 0.0.4 → 0.0.6

package/dist/build-common.js

@@ -1,9 +1,40 @@
 import fs from "fs";
 import path from "path";
-import crypto from "crypto";
+import { randomBytes } from "node:crypto";
 import { fileURLToPath, pathToFileURL } from "url";
 import { build } from "esbuild";
 import { findClientComponentsInTree } from "./component-analyzer.js";
+const NODE_BUILTINS = [
+  "node:*",
+  "http",
+  "https",
+  "fs",
+  "path",
+  "url",
+  "crypto",
+  "stream",
+  "buffer",
+  "events",
+  "util",
+  "os",
+  "net",
+  "tls",
+  "child_process",
+  "worker_threads",
+  "cluster",
+  "dgram",
+  "dns",
+  "readline",
+  "zlib",
+  "assert",
+  "module",
+  "perf_hooks",
+  "string_decoder",
+  "timers",
+  "async_hooks",
+  "v8",
+  "vm"
+];
 function walkFiles(dir, base = dir) {
   if (!fs.existsSync(dir)) return [];
   const results = [];
@@ -22,12 +53,14 @@ function analyzeFile(relPath, prefix = "api") {
   let segments = normalized.split("/");
   if (segments.at(-1) === "index") segments = segments.slice(0, -1);
   const paramNames = [];
+  const catchAllNames = [];
   const regexParts = [];
   let specificity = 0;
   for (const seg of segments) {
     const optCatchAll = seg.match(/^\[\[\.\.\.(.+)\]\]$/);
     if (optCatchAll) {
       paramNames.push(optCatchAll[1]);
+      catchAllNames.push(optCatchAll[1]);
       regexParts.push("(.*)");
       specificity += 1;
       continue;
@@ -35,10 +68,18 @@ function analyzeFile(relPath, prefix = "api") {
     const catchAll = seg.match(/^\[\.\.\.(.+)\]$/);
     if (catchAll) {
       paramNames.push(catchAll[1]);
+      catchAllNames.push(catchAll[1]);
       regexParts.push("(.+)");
       specificity += 10;
       continue;
     }
+    const optDynamic = seg.match(/^\[\[([^.][^\]]*)\]\]$/);
+    if (optDynamic) {
+      paramNames.push(optDynamic[1]);
+      regexParts.push("__OPT__([^/]*)");
+      specificity += 30;
+      continue;
+    }
     const dynamic = seg.match(/^\[(.+)\]$/);
     if (dynamic) {
       paramNames.push(dynamic[1]);
@@ -49,11 +90,26 @@ function analyzeFile(relPath, prefix = "api") {
     regexParts.push(seg.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
     specificity += 1e3;
   }
-  const srcRegex = segments.length === 0 ? "^/$" : "^/" + regexParts.join("/") + "$";
+  let srcRegex;
+  if (segments.length === 0) {
+    srcRegex = "^/$";
+  } else {
+    let body = "";
+    for (let i = 0; i < regexParts.length; i++) {
+      const part = regexParts[i];
+      if (part.startsWith("__OPT__")) {
+        const cap = part.slice(7);
+        body += i === 0 ? cap : `(?:/${cap})?`;
+      } else {
+        body += (i === 0 ? "" : "/") + part;
+      }
+    }
+    srcRegex = "^/" + body + "$";
+  }
   const funcSegments = normalized.split("/");
   if (funcSegments.at(-1) === "index") funcSegments.pop();
   const funcPath = funcSegments.length === 0 ? `/${prefix}/_index` : `/${prefix}/` + funcSegments.join("/");
-  return { srcRegex, paramNames, funcPath, specificity };
+  return { srcRegex, paramNames, catchAllNames, funcPath, specificity };
 }
 function isServerComponent(filePath) {
   const content = fs.readFileSync(filePath, "utf-8");
@@ -80,14 +136,12 @@ function findPageLayouts(routeFilePath, pagesDir) {
 }
 function extractDefaultExportName(filePath) {
   const content = fs.readFileSync(filePath, "utf-8");
-  const match = content.match(/export\s+default\s+(?:function\s+)?(\w+)/);
-  return match?.[1] ?? null;
+  return content.match(/export\s+default\s+(?:function\s+)?(\w+)/)?.[1] ?? null;
 }
 function collectServerPages(pagesDir) {
   if (!fs.existsSync(pagesDir)) return [];
   return walkFiles(pagesDir).filter((relPath) => {
-    const base = path.basename(relPath, path.extname(relPath));
-    if (base === "layout") return false;
+    if (path.basename(relPath, path.extname(relPath)) === "layout") return false;
     return isServerComponent(path.join(pagesDir, relPath));
   }).map((relPath) => ({
     ...analyzeFile(relPath, "page"),
@@ -97,27 +151,21 @@ function collectServerPages(pagesDir) {
 function collectGlobalClientRegistry(serverPages, pagesDir) {
   const registry = /* @__PURE__ */ new Map();
   for (const { absPath } of serverPages) {
-    for (const [id, p] of findClientComponentsInTree(absPath, pagesDir)) {
+    for (const [id, p] of findClientComponentsInTree(absPath, pagesDir))
       registry.set(id, p);
-    }
-    for (const layoutPath of findPageLayouts(absPath, pagesDir)) {
-      for (const [id, p] of findClientComponentsInTree(layoutPath, pagesDir)) {
+    for (const layoutPath of findPageLayouts(absPath, pagesDir))
+      for (const [id, p] of findClientComponentsInTree(layoutPath, pagesDir))
         registry.set(id, p);
-      }
-    }
   }
   return registry;
 }
 function buildPerPageRegistry(absPath, layoutPaths, pagesDir) {
   const registry = /* @__PURE__ */ new Map();
-  for (const [id, p] of findClientComponentsInTree(absPath, pagesDir)) {
+  for (const [id, p] of findClientComponentsInTree(absPath, pagesDir))
     registry.set(id, p);
-  }
-  for (const lp of layoutPaths) {
-    for (const [id, p] of findClientComponentsInTree(lp, pagesDir)) {
+  for (const lp of layoutPaths)
+    for (const [id, p] of findClientComponentsInTree(lp, pagesDir))
       registry.set(id, p);
-    }
-  }
   const clientComponentNames = {};
   for (const [id, filePath] of registry) {
     const name = extractDefaultExportName(filePath);
@@ -131,30 +179,29 @@ async function buildPages(pagesDir, staticDir) {
     console.warn(`\u26A0  Pages found in ${pagesDir} but none are server components`);
   }
   if (serverPages.length === 0) return [];
-  const globalClientRegistry = collectGlobalClientRegistry(serverPages, pagesDir);
-  const prerenderedHtml = await bundleClientComponents(globalClientRegistry, pagesDir, staticDir);
-  const prerenderedHtmlRecord = Object.fromEntries(prerenderedHtml);
+  const globalRegistry = collectGlobalClientRegistry(serverPages, pagesDir);
+  const prerenderedHtml = await bundleClientComponents(globalRegistry, pagesDir, staticDir);
+  const prerenderedRecord = Object.fromEntries(prerenderedHtml);
   const builtPages = [];
   for (const page of serverPages) {
-    const { funcPath, absPath } = page;
-    console.log(`  building  ${fs.existsSync(absPath) ? absPath : absPath}  \u2192  ${funcPath}  [page]`);
-    const layoutPaths = findPageLayouts(absPath, pagesDir);
-    const { registry, clientComponentNames } = buildPerPageRegistry(absPath, layoutPaths, pagesDir);
+    console.log(`  building  ${page.absPath}  \u2192  ${page.funcPath}  [page]`);
+    const layoutPaths = findPageLayouts(page.absPath, pagesDir);
+    const { registry, clientComponentNames } = buildPerPageRegistry(page.absPath, layoutPaths, pagesDir);
     const bundleText = await bundlePageHandler({
-      absPath,
+      absPath: page.absPath,
       pagesDir,
       clientComponentNames,
       allClientIds: [...registry.keys()],
       layoutPaths,
-      prerenderedHtml: prerenderedHtmlRecord
+      prerenderedHtml: prerenderedRecord,
+      catchAllNames: page.catchAllNames
     });
     builtPages.push({ ...page, bundleText });
   }
   return builtPages;
 }
 function makeApiAdapterSource(handlerFilename) {
-  return `
-import type { IncomingMessage, ServerResponse } from 'http';
+  return `import type { IncomingMessage, ServerResponse } from 'http';
 import * as mod from ${JSON.stringify("./" + handlerFilename)};
 
 function enhance(res: ServerResponse) {
@@ -197,7 +244,7 @@ export default async function handler(req: IncomingMessage, res: ServerResponse)
   }
   await fn(apiReq, apiRes);
 }
-`.trimStart();
+`;
 }
 function makePageAdapterSource(opts) {
   const {
@@ -206,32 +253,19 @@ function makePageAdapterSource(opts) {
     clientComponentNames,
     allClientIds,
     layoutArrayItems,
-    prerenderedHtml
+    prerenderedHtml,
+    catchAllNames
   } = opts;
-  return `
-import type { IncomingMessage, ServerResponse } from 'http';
+  return `import type { IncomingMessage, ServerResponse } from 'http';
 import * as __page__ from ${pageImport};
 ${layoutImports}
 
-// \u2500\u2500\u2500 Pre-built client component registry \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
-// Computed at BUILD TIME from the import tree.  Source files are not deployed,
-// so we must not read them with fs.readFileSync at runtime.
-// Key: default-export function name  \u2192  Value: stable content-hash ID
 const CLIENT_COMPONENTS: Record<string, string> = ${JSON.stringify(clientComponentNames)};
-
-// All client component IDs reachable from this page (page + layouts).
-// Sent to initRuntime so the browser pre-loads all bundles for SPA navigation.
 const ALL_CLIENT_IDS: string[] = ${JSON.stringify(allClientIds)};
-
-// Pre-rendered HTML for each client component, produced at BUILD TIME by
-// renderToString with default props.  Used directly in the span wrapper so
-// the server response contains real markup and React hydration never sees a
-// mismatch.  No react-dom/server is needed at runtime.
 const PRERENDERED_HTML: Record<string, string> = ${JSON.stringify(prerenderedHtml)};
+const CATCH_ALL_NAMES = new Set(${JSON.stringify(catchAllNames)});
 
-// \u2500\u2500\u2500 html-store (inlined \u2014 no external refs) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
-// Uses the same globalThis Symbol key as html-store.ts so any useHtml() call
-// (however imported) writes into the same store that runWithHtmlStore reads.
+// \u2500\u2500\u2500 html-store (inlined) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 type TitleValue = string | ((prev: string) => string);
 interface HtmlStore {
   titleOps: TitleValue[];
@@ -243,11 +277,10 @@ interface HtmlStore {
   style: { content?: string; media?: string }[];
 }
 const __STORE_KEY__ = Symbol.for('__nukejs_html_store__');
-function __getStore(): HtmlStore | null { return (globalThis as any)[__STORE_KEY__] ?? null; }
-function __setStore(s: HtmlStore | null): void { (globalThis as any)[__STORE_KEY__] = s; }
-function __emptyStore(): HtmlStore {
-  return { titleOps: [], htmlAttrs: {}, bodyAttrs: {}, meta: [], link: [], script: [], style: [] };
-}
+const __getStore = (): HtmlStore | null => (globalThis as any)[__STORE_KEY__] ?? null;
+const __setStore = (s: HtmlStore | null): void => { (globalThis as any)[__STORE_KEY__] = s; };
+const __emptyStore = (): HtmlStore =>
+  ({ titleOps: [], htmlAttrs: {}, bodyAttrs: {}, meta: [], link: [], script: [], style: [] });
 async function runWithHtmlStore(fn: () => Promise<void>): Promise<HtmlStore> {
   __setStore(__emptyStore());
   try { await fn(); return { ...(__getStore() ?? __emptyStore()) }; }
@@ -280,59 +313,44 @@ function openTag(tag: string, attrs: Record<string, string | undefined>): string
   const s = renderAttrs(attrs as Record<string, string | boolean | undefined>);
   return s ? \`<\${tag} \${s}>\` : \`<\${tag}>\`;
 }
-function metaKey(k: string): string { return k === 'httpEquiv' ? 'http-equiv' : k; }
-function linkKey(k: string): string {
-  if (k === 'hrefLang') return 'hreflang';
-  if (k === 'crossOrigin') return 'crossorigin';
-  return k;
-}
 function renderMetaTag(tag: Record<string, string | undefined>): string {
+  const key = (k: string) => k === 'httpEquiv' ? 'http-equiv' : k;
   const attrs: Record<string, string | undefined> = {};
-  for (const [k, v] of Object.entries(tag)) if (v !== undefined) attrs[metaKey(k)] = v;
+  for (const [k, v] of Object.entries(tag)) if (v !== undefined) attrs[key(k)] = v;
   return \`  <meta \${renderAttrs(attrs as any)} />\`;
 }
 function renderLinkTag(tag: Record<string, string | undefined>): string {
+  const key = (k: string) => k === 'hrefLang' ? 'hreflang' : k === 'crossOrigin' ? 'crossorigin' : k;
   const attrs: Record<string, string | undefined> = {};
-  for (const [k, v] of Object.entries(tag)) if (v !== undefined) attrs[linkKey(k)] = v;
+  for (const [k, v] of Object.entries(tag)) if (v !== undefined) attrs[key(k)] = v;
   return \`  <link \${renderAttrs(attrs as any)} />\`;
 }
 function renderScriptTag(tag: any): string {
-  const attrs: Record<string, any> = {
-    src: tag.src, type: tag.type, crossorigin: tag.crossOrigin,
-    integrity: tag.integrity, defer: tag.defer, async: tag.async, nomodule: tag.noModule,
-  };
-  const s = renderAttrs(attrs);
-  const open = s ? \`<script \${s}>\` : '<script>';
-  return \`  \${open}\${tag.src ? '' : (tag.content ?? '')}</script>\`;
+  const s = renderAttrs({ src: tag.src, type: tag.type, crossorigin: tag.crossOrigin,
+    integrity: tag.integrity, defer: tag.defer, async: tag.async, nomodule: tag.noModule });
+  return \`  \${s ? \`<script \${s}>\` : '<script>'}\${tag.src ? '' : (tag.content ?? '')}</script>\`;
 }
 function renderStyleTag(tag: any): string {
   const media = tag.media ? \` media="\${escapeAttr(tag.media)}"\` : '';
   return \`  <style\${media}>\${tag.content ?? ''}</style>\`;
 }
 
-// \u2500\u2500\u2500 Void element set \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+// \u2500\u2500\u2500 Renderer \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 const VOID_TAGS = new Set([
   'area','base','br','col','embed','hr','img','input',
   'link','meta','param','source','track','wbr',
 ]);
 
-// \u2500\u2500\u2500 Prop serialization \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
-// Converts React element trees in props to a JSON-safe format that
-// bundle.ts / initRuntime can reconstruct on the client.
 function serializeProps(value: any): any {
   if (value == null || typeof value !== 'object') return value;
   if (typeof value === 'function') return undefined;
-  if (Array.isArray(value)) {
-    return value.map(serializeProps).filter((v: any) => v !== undefined);
-  }
+  if (Array.isArray(value)) return value.map(serializeProps).filter((v: any) => v !== undefined);
   if ((value as any).$$typeof) {
-    const { type, props: elProps } = value as any;
-    if (typeof type === 'string') {
-      return { __re: 'html', tag: type, props: serializeProps(elProps) };
-    }
+    const { type, props: p } = value as any;
+    if (typeof type === 'string') return { __re: 'html', tag: type, props: serializeProps(p) };
     if (typeof type === 'function') {
       const cid = CLIENT_COMPONENTS[type.name];
-      if (cid) return { __re: 'client', componentId: cid, props: serializeProps(elProps) };
+      if (cid) return { __re: 'client', componentId: cid, props: serializeProps(p) };
     }
     return undefined;
   }
@@ -344,24 +362,16 @@ function serializeProps(value: any): any {
   return out;
 }
 
-// \u2500\u2500\u2500 Async recursive renderer \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
-// Handles: null/undefined/boolean \u2192 '', strings/numbers \u2192 escaped text, arrays,
-// Fragment, void/non-void HTML elements, class components, sync + async functions.
-// Client components \u2192 <span data-hydrate-id="\u2026"> markers for browser hydration.
 async function renderNode(node: any, hydrated: Set<string>): Promise<string> {
   if (node == null || typeof node === 'boolean') return '';
   if (typeof node === 'string') return escapeHtml(node);
   if (typeof node === 'number') return String(node);
-  if (Array.isArray(node)) {
-    return (await Promise.all(node.map(n => renderNode(n, hydrated)))).join('');
-  }
+  if (Array.isArray(node)) return (await Promise.all(node.map(n => renderNode(n, hydrated)))).join('');
 
   const { type, props } = node as { type: any; props: Record<string, any> };
   if (!type) return '';
 
-  if (type === Symbol.for('react.fragment')) {
-    return renderNode(props?.children ?? null, hydrated);
-  }
+  if (type === Symbol.for('react.fragment')) return renderNode(props?.children ?? null, hydrated);
 
   if (typeof type === 'string') {
     const { children, dangerouslySetInnerHTML, ...rest } = props || {};
@@ -392,21 +402,16 @@ async function renderNode(node: any, hydrated: Set<string>): Promise<string> {
     if (clientId) {
       hydrated.add(clientId);
       const serializedProps = serializeProps(props ?? {});
-      // Render with actual props so children/content appear in the SSR HTML.
-      // Fall back to the build-time pre-rendered HTML if the component throws
-      // (e.g. it references browser-only APIs during render).
       let ssrHtml: string;
       try {
-        const result = await (type as Function)(props || {});
-        ssrHtml = await renderNode(result, new Set());
+        ssrHtml = await renderNode(await (type as Function)(props || {}), new Set());
       } catch {
         ssrHtml = PRERENDERED_HTML[clientId] ?? '';
       }
       return \`<span data-hydrate-id="\${clientId}" data-hydrate-props="\${escapeHtml(JSON.stringify(serializedProps))}">\${ssrHtml}</span>\`;
     }
     const instance = type.prototype?.isReactComponent ? new (type as any)(props) : null;
-    const result = instance ? instance.render() : await (type as Function)(props || {});
-    return renderNode(result, hydrated);
+    return renderNode(instance ? instance.render() : await (type as Function)(props || {}), hydrated);
   }
 
   return '';
@@ -417,9 +422,8 @@ const LAYOUT_COMPONENTS: Array<(props: any) => any> = [${layoutArrayItems}];
 
 function wrapWithLayouts(element: any): any {
   let el = element;
-  for (let i = LAYOUT_COMPONENTS.length - 1; i >= 0; i--) {
+  for (let i = LAYOUT_COMPONENTS.length - 1; i >= 0; i--)
     el = { type: LAYOUT_COMPONENTS[i], props: { children: el }, key: null, ref: null };
-  }
   return el;
 }
 
@@ -427,36 +431,37 @@ function wrapWithLayouts(element: any): any {
 export default async function handler(req: IncomingMessage, res: ServerResponse): Promise<void> {
   try {
     const parsed = new URL(req.url || '/', 'http://localhost');
-    const params: Record<string, string> = {};
-    parsed.searchParams.forEach((v, k) => { params[k] = v; });
+    const params: Record<string, string | string[]> = {};
+    parsed.searchParams.forEach((_, k) => {
+      params[k] = CATCH_ALL_NAMES.has(k)
+        ? parsed.searchParams.getAll(k)
+        : parsed.searchParams.get(k) as string;
+    });
     const url = req.url || '/';
 
     const hydrated = new Set<string>();
-    const pageElement = { type: __page__.default, props: params as any, key: null, ref: null };
-    const wrapped     = wrapWithLayouts(pageElement);
+    const wrapped  = wrapWithLayouts({ type: __page__.default, props: params as any, key: null, ref: null });
 
     let appHtml = '';
-    const store = await runWithHtmlStore(async () => {
-      appHtml = await renderNode(wrapped, hydrated);
-    });
+    const store = await runWithHtmlStore(async () => { appHtml = await renderNode(wrapped, hydrated); });
 
-    const pageTitle = resolveTitle(store.titleOps, 'SSR App');
-    const headLines: string[] = [
+    const pageTitle = resolveTitle(store.titleOps, 'Nuke');
+    const headLines = [
       '  <meta charset="utf-8" />',
       '  <meta name="viewport" content="width=device-width, initial-scale=1" />',
       \`  <title>\${escapeHtml(pageTitle)}</title>\`,
-      ...store.meta.map(renderMetaTag),
-      ...store.link.map(renderLinkTag),
-      ...store.style.map(renderStyleTag),
-      ...store.script.map(renderScriptTag),
+      ...(store.meta.length || store.link.length || store.style.length || store.script.length ? [
+        '  <!--n-head-->',
+        ...store.meta.map(renderMetaTag),
+        ...store.link.map(renderLinkTag),
+        ...store.style.map(renderStyleTag),
+        ...store.script.map(renderScriptTag),
+        '  <!--/n-head-->',
+      ] : []),
     ];
 
     const runtimeData = JSON.stringify({
-      hydrateIds: [...hydrated],
-      allIds: ALL_CLIENT_IDS,
-      url,
-      params,
-      debug: 'silent',
+      hydrateIds: [...hydrated], allIds: ALL_CLIENT_IDS, url, params, debug: 'silent',
     }).replace(/</g, '\\u003c').replace(/>/g, '\\u003e').replace(/&/g, '\\u0026');
 
     const html = \`<!DOCTYPE html>
@@ -472,9 +477,9 @@ export default async function handler(req: IncomingMessage, res: ServerResponse)
   <script type="importmap">
   {
     "imports": {
-      "react":             "/__react.js",
-      "react-dom/client":  "/__react.js",
-      "react/jsx-runtime": "/__react.js",
+      "react":             "/__n.js",
+      "react-dom/client":  "/__n.js",
+      "react/jsx-runtime": "/__n.js",
       "nukejs":            "/__n.js"
     }
   }
@@ -498,10 +503,10 @@ export default async function handler(req: IncomingMessage, res: ServerResponse)
     res.end('Internal Server Error');
   }
 }
-`.trimStart();
+`;
 }
 async function bundleApiHandler(absPath) {
-  const adapterName = `_api_adapter_${crypto.randomBytes(4).toString("hex")}.ts`;
+  const adapterName = `_api_adapter_${randomBytes(4).toString("hex")}.ts`;
   const adapterPath = path.join(path.dirname(absPath), adapterName);
   fs.writeFileSync(adapterPath, makeApiAdapterSource(path.basename(absPath)));
   let text;
@@ -522,23 +527,28 @@ async function bundleApiHandler(absPath) {
   return text;
 }
 async function bundlePageHandler(opts) {
-  const { absPath, clientComponentNames, allClientIds, layoutPaths, prerenderedHtml } = opts;
-  const adapterName = `_page_adapter_${crypto.randomBytes(4).toString("hex")}.ts`;
+  const {
+    absPath,
+    clientComponentNames,
+    allClientIds,
+    layoutPaths,
+    prerenderedHtml,
+    catchAllNames
+  } = opts;
   const adapterDir = path.dirname(absPath);
-  const adapterPath = path.join(adapterDir, adapterName);
+  const adapterPath = path.join(adapterDir, `_page_adapter_${randomBytes(4).toString("hex")}.ts`);
   const layoutImports = layoutPaths.map((lp, i) => {
     const rel = path.relative(adapterDir, lp).replace(/\\/g, "/");
-    const importPath = rel.startsWith(".") ? rel : "./" + rel;
-    return `import __layout_${i}__ from ${JSON.stringify(importPath)};`;
+    return `import __layout_${i}__ from ${JSON.stringify(rel.startsWith(".") ? rel : "./" + rel)};`;
   }).join("\n");
-  const layoutArrayItems = layoutPaths.map((_, i) => `__layout_${i}__`).join(", ");
   fs.writeFileSync(adapterPath, makePageAdapterSource({
     pageImport: JSON.stringify("./" + path.basename(absPath)),
     layoutImports,
     clientComponentNames,
     allClientIds,
-    layoutArrayItems,
-    prerenderedHtml
+    layoutArrayItems: layoutPaths.map((_, i) => `__layout_${i}__`).join(", "),
+    prerenderedHtml,
+    catchAllNames
   }));
   let text;
   try {
@@ -549,38 +559,8 @@ async function bundlePageHandler(opts) {
       platform: "node",
       target: "node20",
       jsx: "automatic",
-      external: [
-        // Node built-ins only — all npm packages (react, nukejs, …) are inlined
-        "node:*",
-        "http",
-        "https",
-        "fs",
-        "path",
-        "url",
-        "crypto",
-        "stream",
-        "buffer",
-        "events",
-        "util",
-        "os",
-        "net",
-        "tls",
-        "child_process",
-        "worker_threads",
-        "cluster",
-        "dgram",
-        "dns",
-        "readline",
-        "zlib",
-        "assert",
-        "module",
-        "perf_hooks",
-        "string_decoder",
-        "timers",
-        "async_hooks",
-        "v8",
-        "vm"
-      ],
+      packages: "external",
+      external: NODE_BUILTINS,
       define: { "process.env.NODE_ENV": '"production"' },
       write: false
     });
@@ -611,7 +591,7 @@ async function bundleClientComponents(globalRegistry, pagesDir, staticDir) {
     fs.writeFileSync(path.join(outDir, `${id}.js`), browserResult.outputFiles[0].text);
     const ssrTmp = path.join(
       path.dirname(filePath),
-      `_ssr_${id}_${crypto.randomBytes(4).toString("hex")}.mjs`
+      `_ssr_${id}_${randomBytes(4).toString("hex")}.mjs`
     );
     try {
       const ssrResult = await build({
@@ -631,7 +611,7 @@ async function bundleClientComponents(globalRegistry, pagesDir, staticDir) {
       const { renderToString } = await import("react-dom/server");
       prerendered.set(id, renderToString(createElement(Component, {})));
       console.log(`  prerendered       ${id}`);
-    } catch (e) {
+    } catch {
       prerendered.set(id, "");
     } finally {
       if (fs.existsSync(ssrTmp)) fs.unlinkSync(ssrTmp);
@@ -640,7 +620,9 @@ async function bundleClientComponents(globalRegistry, pagesDir, staticDir) {
   console.log(`  bundled   ${globalRegistry.size} client component(s) \u2192 ${path.relative(process.cwd(), outDir)}/`);
   return prerendered;
 }
-async function buildReactBundle(staticDir) {
+async function buildCombinedBundle(staticDir) {
+  const nukeDir = path.dirname(fileURLToPath(import.meta.url));
+  const bundleFile = nukeDir.endsWith("dist") ? "bundle" : "bundle.ts";
   const result = await build({
     stdin: {
       contents: `
@@ -653,7 +635,7 @@ import React, {
 } from 'react';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { hydrateRoot, createRoot } from 'react-dom/client';
-
+export { initRuntime, setupLocationChangeMonitor } from "./${bundleFile}.js";
 export {
   useState, useEffect, useContext, useReducer, useCallback, useMemo,
   useRef, useImperativeHandle, useLayoutEffect, useDebugValue,
@@ -664,7 +646,8 @@ export {
 };
 export default React;
 `,
-      loader: "ts"
+      loader: "ts",
+      resolveDir: nukeDir
     },
     bundle: true,
     write: false,
@@ -678,21 +661,8 @@ export default React;
     },
     define: { "process.env.NODE_ENV": '"production"' }
   });
-  fs.writeFileSync(path.join(staticDir, "__react.js"), result.outputFiles[0].text);
-  console.log("  built     __react.js");
-}
-async function buildNukeBundle(staticDir) {
-  const nukeDir = path.dirname(fileURLToPath(import.meta.url));
-  const result = await build({
-    entryPoints: [path.join(nukeDir, "bundle.js")],
-    bundle: true,
-    write: false,
-    format: "esm",
-    minify: true,
-    external: ["react", "react-dom/client"]
-  });
   fs.writeFileSync(path.join(staticDir, "__n.js"), result.outputFiles[0].text);
-  console.log("  built     __n.js");
+  console.log("  built     __n.js  (react + runtime)");
 }
 function copyPublicFiles(publicDir, destDir) {
   if (!fs.existsSync(publicDir)) return;
@@ -700,26 +670,24 @@ function copyPublicFiles(publicDir, destDir) {
   (function walk(src, dest) {
     fs.mkdirSync(dest, { recursive: true });
     for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
-      const srcPath = path.join(src, entry.name);
-      const destPath = path.join(dest, entry.name);
+      const s = path.join(src, entry.name);
+      const d = path.join(dest, entry.name);
       if (entry.isDirectory()) {
-        walk(srcPath, destPath);
+        walk(s, d);
       } else {
-        fs.copyFileSync(srcPath, destPath);
+        fs.copyFileSync(s, d);
         count++;
       }
     }
   })(publicDir, destDir);
-  if (count > 0) {
+  if (count > 0)
     console.log(`  copied    ${count} public file(s) \u2192 ${path.relative(process.cwd(), destDir)}/`);
-  }
 }
 export {
   analyzeFile,
-  buildNukeBundle,
+  buildCombinedBundle,
   buildPages,
   buildPerPageRegistry,
-  buildReactBundle,
   bundleApiHandler,
   bundleClientComponents,
   bundlePageHandler,