@akanjs/cli 3.1.0-rc.1 → 3.1.0-rc.11

package/{index-c2yrsxdh.js → index-9z426msb.js}

@@ -1,25 +1,28 @@
 // @bun
 import {
   resolveSsrPageEntriesForApp
-} from "./index-55mynnqs.js";
+} from "./index-va06nr10.js";
 import {
   computeRouteSeedIndex,
   saveRouteSeedIndex,
-  BarrelAnalyzer,
-  createTsconfigPackageResolver,
-  rewriteBarrelImports,
   GraphClientEntryDiscovery,
-  bundleDefine,
   ClientEntriesBundler,
   VENDOR_SPECIFIERS,
-  RouteClientBuilder,
+  RouteClientBuilder
+} from "./index-w44cy4vs.js";
+import {
+  SOURCE_EXTS
+} from "./index-5nd1wtkv.js";
+import {
   CsrEntryFiles,
-  PagesEntrySourceGenerator,
+  BarrelAnalyzer,
+  createTsconfigPackageResolver,
+  rewriteBarrelImports,
   PagesBundleBuilder
-} from "./index-aprt7pkz.js";
+} from "./index-192ha4xh.js";
 import {
-  SOURCE_EXTS
-} from "./index-k9rrten6.js";
+  CssBlockParser
+} from "./index-62md4dwy.js";
 var __require = import.meta.require;
 
 // pkgs/@akanjs/devkit/frontendBuild/allRoutesBuilder.ts
@@ -127,233 +130,8 @@ class AllRoutesBuilder {
       this.#knownSet.add(abs);
   }
 }
-
-// pkgs/@akanjs/devkit/frontendBuild/csrArtifactBuilder.ts
-import { mkdir, rm, unlink } from "fs/promises";
-import path2 from "path";
-class CsrArtifactBuilder {
-  #app;
-  #command;
-  #lang;
-  #cssAssets;
-  constructor(app, command = "start", lang = "en", { cssAssets = null } = {}) {
-    this.#app = app;
-    this.#command = command;
-    this.#lang = lang;
-    this.#cssAssets = cssAssets;
-  }
-  async build() {
-    const pageKeys = await this.#app.getPageKeys();
-    if (pageKeys.length === 0) {
-      this.#app.log(`[cli] no route files under ${this.#app.cwdPath}/page \u2014 skipping CSR build`);
-      return null;
-    }
-    const pageEntries = await resolveSsrPageEntriesForApp(this.#app, pageKeys);
-    const akanConfig = await this.#app.getConfig();
-    const cssAssets = await this.#loadCssAssets();
-    const basePaths = [...akanConfig.basePaths];
-    const htmlBasePaths = basePaths.length > 0 ? basePaths : [""];
-    await rm(this.#outputDir, { recursive: true, force: true });
-    await mkdir(this.#generatedDir, { recursive: true });
-    const generatedFiles = Object.fromEntries((await Promise.all(htmlBasePaths.map(async (basePath) => [
-      this.#createHtmlFile(basePath),
-      await this.#createEntryFile(basePath, CsrArtifactBuilder.pageEntriesForBasePath(pageEntries, basePath, basePaths))
-    ]))).flat());
-    const result = await Bun.build({
-      ...CsrArtifactBuilder.bundleOptions(this.#app, this.#command, akanConfig.optimizeImports),
-      entrypoints: htmlBasePaths.map((basePath) => this.#generatedPath(CsrArtifactBuilder.htmlFilename(basePath))),
-      files: generatedFiles,
-      root: this.#generatedDir,
-      outdir: this.#outputDir
-    });
-    if (!result.success) {
-      const logs = result.logs.map((log) => log.message).join(`
-`);
-      throw new Error(`[csr-build] failed${logs ? `
-${logs}` : ""}`);
-    }
-    await this.#inlineCsrArtifacts(cssAssets);
-    this.#app.verbose(`[csr-build] output -> ${this.#outputDir}`);
-    return { outputDir: this.#outputDir };
-  }
-  static bundleOptions(app, command, optimizeImports = []) {
-    return {
-      target: "browser",
-      splitting: false,
-      minify: true,
-      define: bundleDefine(app, command, "csr"),
-      optimizeImports,
-      plugins: [PagesBundleBuilder.createCssStubPlugin()]
-    };
-  }
-  static pageEntriesForBasePath(pageEntries, basePath, basePaths) {
-    return CsrEntryFiles.pageEntriesForBasePath(pageEntries, basePath, basePaths);
-  }
-  static htmlFilename(basePath) {
-    return `${basePath || "index"}.html`;
-  }
-  static entryFilename(basePath) {
-    return CsrEntryFiles.entryFilename(basePath);
-  }
-  static basePathOfHtml(htmlPath) {
-    const name = path2.basename(htmlPath, ".html");
-    return name === "index" ? "" : name;
-  }
-  get #outputDir() {
-    return path2.join(this.#command === "build" ? this.#app.dist.cwdPath : this.#app.cwdPath, this.#command === "build" ? "csr" : ".akan/artifact/csr");
-  }
-  get #generatedDir() {
-    return path2.join(this.#app.cwdPath, ".akan/generated/csr");
-  }
-  get #artifactDir() {
-    return path2.join(this.#command === "build" ? this.#app.dist.cwdPath : this.#app.cwdPath, ".akan/artifact");
-  }
-  #generatedPath(filename) {
-    return path2.join(this.#generatedDir, filename);
-  }
-  async#createEntryFile(basePath, pageEntries) {
-    return [
-      this.#generatedPath(CsrArtifactBuilder.entryFilename(basePath)),
-      `import { bootCsr } from "akanjs/webkit";
-${await PagesEntrySourceGenerator.generateStatic(pageEntries)}
-void bootCsr(pages);
-`
-    ];
-  }
-  #createHtmlFile(basePath) {
-    return [
-      this.#generatedPath(CsrArtifactBuilder.htmlFilename(basePath)),
-      `<!doctype html>
-<html lang="${this.#lang}">
-  <head>
-    <meta charset="utf-8" />
-    <title>${this.#app.name}</title>
-    <base href="/" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="./${CsrArtifactBuilder.entryFilename(basePath)}"></script>
-  </body>
-</html>
-  `
-    ];
-  }
-  async#loadCssAssets() {
-    if (this.#cssAssets)
-      return this.#cssAssets;
-    const artifactFile = Bun.file(path2.join(this.#artifactDir, "base-artifact.json"));
-    if (!await artifactFile.exists())
-      return {};
-    const artifact = await artifactFile.json();
-    return artifact.cssAssets ?? {};
-  }
-  async#inlineCsrArtifacts(cssAssets) {
-    const jsFiles = new Set;
-    for (const htmlPath of await this.#listOutputFiles((filePath) => filePath.endsWith(".html"))) {
-      const htmlFile = Bun.file(htmlPath);
-      if (!await htmlFile.exists())
-        continue;
-      const basePath = CsrArtifactBuilder.basePathOfHtml(htmlPath);
-      const cssAsset = cssAssets[basePath];
-      if (!cssAsset) {
-        this.#app.logger.warn(`[csr-build] base-artifact.json has no compiled stylesheet for ${basePath || "root"}; ${path2.basename(htmlPath)} ships without CSS`);
-      }
-      const inlined = await this.#inlineHtmlAssets(await htmlFile.text(), htmlPath, cssAsset);
-      for (const filePath of inlined.jsFiles)
-        jsFiles.add(filePath);
-      await Bun.write(htmlPath, inlined.html);
-    }
-    for (const filePath of jsFiles)
-      await unlink(filePath).catch(() => {
-        return;
-      });
-    const remainingAssets = await this.#listOutputFiles((filePath) => filePath.endsWith(".js") || filePath.endsWith(".css"));
-    if (remainingAssets.length > 0) {
-      throw new Error(`[csr-build] expected single-file HTML, but CSR assets remain:
-${remainingAssets.join(`
-`)}`);
-    }
-  }
-  async#inlineHtmlAssets(html, htmlPath, cssAsset) {
-    let next = html;
-    if (cssAsset) {
-      const css = await Bun.file(path2.join(this.#artifactDir, cssAsset.cssRelPath)).text();
-      next = CsrArtifactBuilder.injectBeforeHeadEnd(next, CsrArtifactBuilder.createInlineStyle(css));
-    }
-    const jsFiles = [];
-    next = await CsrArtifactBuilder.replaceModuleScriptSrc(next, async (src) => {
-      const jsPath = CsrArtifactBuilder.resolveHtmlAssetPath(htmlPath, src);
-      jsFiles.push(jsPath);
-      return await Bun.file(jsPath).text();
-    });
-    return { html: next, jsFiles };
-  }
-  async#listOutputFiles(predicate) {
-    const glob = new Bun.Glob("**/*");
-    const files = [];
-    for await (const filePath of glob.scan({ cwd: this.#outputDir, absolute: true })) {
-      if (predicate(filePath))
-        files.push(filePath);
-    }
-    return files.sort();
-  }
-  static injectBeforeHeadEnd(html, snippet) {
-    const scannable = CsrArtifactBuilder.blankEmbeddedContent(html);
-    const headEnd = scannable.search(/<\/head\s*>/i);
-    if (headEnd !== -1)
-      return `${html.slice(0, headEnd)}${snippet}
-${html.slice(headEnd)}`;
-    const bodyStart = scannable.search(/<body(?:\s|>)/i);
-    if (bodyStart !== -1)
-      return `${html.slice(0, bodyStart)}${snippet}
-${html.slice(bodyStart)}`;
-    return `${html}
-${snippet}`;
-  }
-  static blankEmbeddedContent(html) {
-    return html.replace(/<script\b[^>]*>[\s\S]*?<\/script\s*>|<style\b[^>]*>[\s\S]*?<\/style\s*>|<!--[\s\S]*?-->/gi, (match) => " ".repeat(match.length));
-  }
-  static createInlineStyle(css) {
-    return `<style data-akan-css="active">
-${css.replace(/<\/style/gi, "<\\/style")}
-</style>`;
-  }
-  static async replaceModuleScriptSrc(html, loadScript) {
-    const scriptRe = /<script\b(?=[^>]*\btype=["']module["'])(?=[^>]*\bsrc=["']([^"']+)["'])[^>]*>\s*<\/script>/gi;
-    let result = "";
-    let lastIndex = 0;
-    let matched = false;
-    for (const match of html.matchAll(scriptRe)) {
-      const full = match[0];
-      const src = match[1];
-      if (match.index === undefined || !src)
-        continue;
-      matched = true;
-      result += html.slice(lastIndex, match.index);
-      result += `<script type="module">
-${CsrArtifactBuilder.escapeInlineScript(await loadScript(src))}
-</script>`;
-      lastIndex = match.index + full.length;
-    }
-    if (!matched)
-      return html;
-    return result + html.slice(lastIndex);
-  }
-  static escapeInlineScript(source) {
-    return source.replace(/<\/script/gi, "<\\/script");
-  }
-  static resolveHtmlAssetPath(htmlPath, src) {
-    if (/^[a-z][a-z0-9+.-]*:/i.test(src) || src.startsWith("//")) {
-      throw new Error(`[csr-build] cannot inline external script: ${src}`);
-    }
-    const normalized = src.startsWith("/") ? src.slice(1) : src;
-    return path2.resolve(path2.dirname(htmlPath), normalized);
-  }
-}
-
 // pkgs/@akanjs/devkit/frontendBuild/cssCompiler.ts
-import path4 from "path";
+import path3 from "path";
 import { Logger } from "akanjs/common";
 import { compile } from "tailwindcss";
 
@@ -424,7 +202,7 @@ class CssCandidateCache {
 }
 
 // pkgs/@akanjs/devkit/frontendBuild/cssImportResolver.ts
-import path3 from "path";
+import path2 from "path";
 var CSS_IMPORT_EXTS = ["", ".css", "/styles.css", "/index.css"];
 
 class CssImportResolver {
@@ -467,7 +245,7 @@ class CssImportResolver {
     const exact = this.#paths[id];
     if (exact) {
       for (const repl of exact) {
-        const resolved = await this.#firstExisting(path3.resolve(this.#workspaceRoot, repl));
+        const resolved = await this.#firstExisting(path2.resolve(this.#workspaceRoot, repl));
         if (resolved)
           return resolved;
       }
@@ -478,7 +256,7 @@ class CssImportResolver {
       const suffix = id.slice(prefix.length);
       for (const repl of replacements) {
         const replPath = repl.endsWith("/*") ? repl.slice(0, -1) : repl;
-        const resolved = await this.#firstExisting(path3.resolve(this.#workspaceRoot, replPath + suffix));
+        const resolved = await this.#firstExisting(path2.resolve(this.#workspaceRoot, replPath + suffix));
         if (resolved)
           return resolved;
       }
@@ -508,34 +286,34 @@ class CssImportResolver {
     try {
       if (!await Bun.file(pkgPath).exists())
         return null;
-      const pkgDir = path3.dirname(pkgPath);
+      const pkgDir = path2.dirname(pkgPath);
       const pkg = await Bun.file(pkgPath).json();
       const subpath = id === pkgName ? "." : `.${id.slice(pkgName.length)}`;
       const exportValue = pkg.exports?.[subpath];
       const exportedEntry = typeof exportValue === "string" ? exportValue : exportValue?.style || exportValue?.import || exportValue?.default;
       if (exportedEntry)
-        return await this.#firstExisting(path3.resolve(pkgDir, exportedEntry));
+        return await this.#firstExisting(path2.resolve(pkgDir, exportedEntry));
       if (subpath !== ".")
-        return await this.#firstExisting(path3.resolve(pkgDir, subpath));
-      return await this.#firstExisting(path3.resolve(pkgDir, pkg.exports?.["."]?.style || pkg.style || "index.css"));
+        return await this.#firstExisting(path2.resolve(pkgDir, subpath));
+      return await this.#firstExisting(path2.resolve(pkgDir, pkg.exports?.["."]?.style || pkg.style || "index.css"));
     } catch {
       return null;
     }
   }
   #resolutionBases(fromBase) {
-    return [fromBase, this.#workspaceRoot, path3.dirname(Bun.main), path3.resolve(path3.dirname(Bun.main), "../..")];
+    return [fromBase, this.#workspaceRoot, path2.dirname(Bun.main), path2.resolve(path2.dirname(Bun.main), "../..")];
   }
   #packageJsonCandidates(pkgName) {
     return [
-      path3.join(this.#workspaceRoot, "pkgs", pkgName, "package.json"),
-      path3.join(this.#workspaceRoot, "node_modules", pkgName, "package.json"),
-      path3.join(path3.dirname(Bun.main), "node_modules", pkgName, "package.json"),
-      path3.join(path3.dirname(Bun.main), "../../", pkgName, "package.json")
+      path2.join(this.#workspaceRoot, "pkgs", pkgName, "package.json"),
+      path2.join(this.#workspaceRoot, "node_modules", pkgName, "package.json"),
+      path2.join(path2.dirname(Bun.main), "node_modules", pkgName, "package.json"),
+      path2.join(path2.dirname(Bun.main), "../../", pkgName, "package.json")
     ];
   }
   async#firstExisting(basePath) {
     for (const suffix of CSS_IMPORT_EXTS) {
-      const candidate = path3.normalize(`${basePath}${suffix}`);
+      const candidate = path2.normalize(`${basePath}${suffix}`);
       if (await Bun.file(candidate).exists())
         return candidate;
     }
@@ -548,7 +326,7 @@ class CssImportResolver {
     return parts[0] ?? null;
   }
   static isCssFile(filePath) {
-    return path3.extname(filePath) === ".css";
+    return path2.extname(filePath) === ".css";
   }
 }
 
@@ -566,7 +344,7 @@ class CssCompiler {
     this.#app = app;
   }
   get #candidateCachePath() {
-    return path4.join(this.#app.cwdPath, ".akan/cache/cssCandidates.json");
+    return path3.join(this.#app.cwdPath, ".akan/cache/cssCandidates.json");
   }
   #cssText = null;
   #cssTextByBasePath = null;
@@ -596,7 +374,7 @@ class CssCompiler {
           return filePath;
       }
       for (const ext of SOURCE_EXTS) {
-        const filePath = path4.join(absPathNoExt, `index${ext}`);
+        const filePath = path3.join(absPathNoExt, `index${ext}`);
         if (await this.#fileExists(filePath))
           return filePath;
       }
@@ -645,14 +423,14 @@ class CssCompiler {
     return this.#cssTextByBasePath;
   }
   async#warnUnreachableStylesheets() {
-    const pageDir = path4.join(this.#app.cwdPath, "page");
+    const pageDir = path3.join(this.#app.cwdPath, "page");
     const glob = new Bun.Glob("**/*.css");
     for await (const cssPath of glob.scan({ cwd: pageDir, absolute: true })) {
-      if (cssPath.includes(`${path4.sep}(libs)${path4.sep}`))
+      if (cssPath.includes(`${path3.sep}(libs)${path3.sep}`))
         continue;
       if (this.#discoveredCssPaths.has(cssPath))
         continue;
-      this.#logger.warn(`css ${path4.relative(this.#app.cwdPath, cssPath)} is imported by no route and never compiled`);
+      this.#logger.warn(`css ${path3.relative(this.#app.cwdPath, cssPath)} is imported by no route and never compiled`);
     }
   }
   async discoverCss({ refresh } = {}) {
@@ -664,7 +442,7 @@ class CssCompiler {
     pageKeys
   } = {}) {
     pageKeys ??= await this.#app.getPageKeys({ refresh });
-    const seeds = pageKeys.map((key) => path4.resolve(this.#app.cwdPath, "page", key));
+    const seeds = pageKeys.map((key) => path3.resolve(this.#app.cwdPath, "page", key));
     const cssFiles = new Set;
     const sourceFiles = new Set;
     const queue = [...seeds];
@@ -696,7 +474,7 @@ class CssCompiler {
       } catch {
         continue;
       }
-      const importerDir = path4.dirname(filePath);
+      const importerDir = path3.dirname(filePath);
       for (const imp of imports) {
         const spec = imp.path;
         if (!spec)
@@ -721,18 +499,18 @@ class CssCompiler {
     return { cssPaths, sourcePaths: [...sourceFiles] };
   }
   async#libTokenStylesheets(sourceFiles) {
-    const libsRoot = path4.join(this.#app.workspace.workspaceRoot, "libs");
+    const libsRoot = path3.join(this.#app.workspace.workspaceRoot, "libs");
     const libNames = new Set;
     for (const filePath of sourceFiles) {
-      const relPath = path4.relative(libsRoot, filePath);
-      if (relPath.startsWith("..") || path4.isAbsolute(relPath))
+      const relPath = path3.relative(libsRoot, filePath);
+      if (relPath.startsWith("..") || path3.isAbsolute(relPath))
         continue;
-      const [libName] = relPath.split(path4.sep);
+      const [libName] = relPath.split(path3.sep);
       if (libName)
         libNames.add(libName);
     }
     const tokenPaths = await Promise.all([...libNames].sort().map(async (libName) => {
-      const tokensPath = path4.join(libsRoot, libName, "ui/tokens.css");
+      const tokensPath = path3.join(libsRoot, libName, "ui/tokens.css");
       return await this.#fileExists(tokensPath) ? tokensPath : null;
     }));
     return tokenPaths.filter((tokensPath) => !!tokensPath);
@@ -747,7 +525,7 @@ class CssCompiler {
     const compileStarted = Date.now();
     const compilers = await Promise.all(cssPaths.map(async (cssPath) => {
       const css = await Bun.file(cssPath).text();
-      const base = path4.dirname(cssPath);
+      const base = path3.dirname(cssPath);
       const imported = new Map;
       const compiler = await compile(css, {
         base,
@@ -787,11 +565,11 @@ class CssCompiler {
     const content = await Bun.file(p).text();
     imported?.set(p, content);
     this.#logger.verbose(`css import "${id}" from ${fromBase} -> ${p} (${content.length} bytes)`);
-    return { path: p, base: path4.dirname(p), content };
+    return { path: p, base: path3.dirname(p), content };
   }
   async#resolveCssImport(id, fromBase) {
     if (id.startsWith(".") || id.startsWith("/")) {
-      const filePath = path4.resolve(fromBase, id);
+      const filePath = path3.resolve(fromBase, id);
       if (await this.#fileExists(filePath))
         return filePath;
       throw new Error(`[css] failed to resolve stylesheet import "${id}" from ${fromBase} (no file at ${filePath})`);
@@ -805,7 +583,7 @@ class CssCompiler {
   async#loadModule(id, fromBase) {
     const p = __require.resolve(id, { paths: [fromBase] });
     const mod = await import(p);
-    return { path: p, base: path4.dirname(p), module: mod.default ?? mod };
+    return { path: p, base: path3.dirname(p), module: mod.default ?? mod };
   }
   #resolveSourceImport(id, fromBase, resolvePackage) {
     const cacheKey = `${fromBase}\x00${id}`;
@@ -818,7 +596,7 @@ class CssCompiler {
   }
   async#resolveSourceImportUncached(id, fromBase, resolvePackage) {
     if (id.startsWith(".") || id.startsWith("/")) {
-      const abs = id.startsWith("/") ? id : path4.resolve(fromBase, id);
+      const abs = id.startsWith("/") ? id : path3.resolve(fromBase, id);
       return this.#resolveSourceFileCandidate(abs);
     }
     const pkg = await resolvePackage(id);
@@ -869,22 +647,28 @@ function resolveSourceWithRequire(id, fromBase) {
   }
 }
 function isSourceFile(filePath) {
-  return SOURCE_EXTS.has(path4.extname(filePath));
+  return SOURCE_EXTS.has(path3.extname(filePath));
 }
 function isIgnoredNodeModuleSource(filePath) {
   return NODE_MODULES_RE.test(filePath) && !AKANJS_NODE_MODULE_RE.test(filePath);
 }
 function declaredCustomProperties(css) {
-  const withoutThemeBlocks = css.replace(/@theme[^{]*\{[^}]*\}/g, "");
-  return [...new Set([...withoutThemeBlocks.matchAll(/(?:^|[\s;{])(--[\w-]+)\s*:/g)].map(([, name]) => name))].filter((name) => !!name);
+  const names = new Set;
+  CssBlockParser.walk(CssBlockParser.parse(css), true, (node) => {
+    if (node.kind === "block")
+      return node.atRule === "@theme" ? null : true;
+    if (node.property.startsWith("--"))
+      names.add(node.property);
+    return null;
+  });
+  return [...names];
 }
 function getPageKeyBasePath(pageKey, basePaths) {
   return CsrEntryFiles.basePathOfPageKey(pageKey, basePaths);
 }
-
 // pkgs/@akanjs/devkit/frontendBuild/fontOptimizer.ts
-import { mkdir as mkdir2, stat as stat2 } from "fs/promises";
-import path5 from "path";
+import { mkdir, stat as stat2 } from "fs/promises";
+import path4 from "path";
 import ts from "typescript";
 var FONT_URL_PREFIX = "/_akan/fonts";
 var DEFAULT_FONT_SUBSETS = ["latin"];
@@ -901,7 +685,7 @@ class FontOptimizer {
   constructor(app, command = "start") {
     this.#app = app;
     this.#command = command;
-    this.#artifactRoot = path5.join(command === "build" ? app.dist.cwdPath : app.cwdPath, ".akan/artifact");
+    this.#artifactRoot = path4.join(command === "build" ? app.dist.cwdPath : app.cwdPath, ".akan/artifact");
   }
   async optimize() {
     const fonts = await this.discoverFonts();
@@ -926,7 +710,7 @@ class FontOptimizer {
     return result;
   }
   get #cachePath() {
-    return path5.join(this.#artifactRoot, "fontCache.json");
+    return path4.join(this.#artifactRoot, "fontCache.json");
   }
   async#buildCacheKey(fonts) {
     const sources = [];
@@ -941,7 +725,7 @@ class FontOptimizer {
         sources.push({ optimizedSrc: face.optimizedSrc, ...stamp });
       }
       for (const filePath of font.subsetFiles ?? []) {
-        const abs = path5.isAbsolute(filePath) ? filePath : path5.join(this.#app.cwdPath, filePath);
+        const abs = path4.isAbsolute(filePath) ? filePath : path4.join(this.#app.cwdPath, filePath);
         const stamp = await this.#fileStamp(abs);
         if (!stamp)
           return null;
@@ -967,7 +751,7 @@ class FontOptimizer {
     const cache = await Bun.file(this.#cachePath).json().catch(() => null);
     if (cache?.version !== FontOptimizer.#cacheVersion || cache.key !== key)
       return null;
-    const files = cache.files.map((relativePath) => path5.join(this.#artifactRoot, relativePath));
+    const files = cache.files.map((relativePath) => path4.join(this.#artifactRoot, relativePath));
     for (const filePath of files) {
       if (!await Bun.file(filePath).exists())
         return null;
@@ -979,7 +763,7 @@ class FontOptimizer {
       version: FontOptimizer.#cacheVersion,
       key,
       css: result.css,
-      files: result.files.map((filePath) => path5.relative(this.#artifactRoot, filePath))
+      files: result.files.map((filePath) => path4.relative(this.#artifactRoot, filePath))
     };
     await Bun.write(this.#cachePath, JSON.stringify(cache));
   }
@@ -987,7 +771,7 @@ class FontOptimizer {
     const pageKeys = await this.#app.getPageKeys();
     const fonts = [];
     await Promise.all(pageKeys.map(async (key) => {
-      const filePath = path5.resolve(this.#app.cwdPath, "page", key);
+      const filePath = path4.resolve(this.#app.cwdPath, "page", key);
       const file = Bun.file(filePath);
       if (!await file.exists())
         return;
@@ -1006,8 +790,8 @@ class FontOptimizer {
         this.#app.logger.warn(`[font] source not found: ${face.src}`);
         continue;
       }
-      const outputPath = path5.join(this.#artifactRoot, face.optimizedSrc.replace(/^\/_akan\//, ""));
-      await mkdir2(path5.dirname(outputPath), { recursive: true });
+      const outputPath = path4.join(this.#artifactRoot, face.optimizedSrc.replace(/^\/_akan\//, ""));
+      await mkdir(path4.dirname(outputPath), { recursive: true });
       const sourceBuffer = Buffer.from(await Bun.file(sourcePath).arrayBuffer());
       const outputBuffer = await this.#buildFontBuffer(font, sourceBuffer, sourcePath);
       await Bun.write(outputPath, outputBuffer);
@@ -1029,7 +813,7 @@ class FontOptimizer {
     const entries = Array.isArray(value) ? value : [];
     const fonts = entries.filter((entry) => this.#isReadableFont(entry));
     if (fonts.length !== entries.length || !Array.isArray(value))
-      this.#app.logger.warn(`[font] ${path5.relative(this.#app.cwdPath, filePath)} declares fonts the build cannot read without evaluating the module \u2014 write the list inline, or nothing is subset for it and every /_akan/fonts request 404s`);
+      this.#app.logger.warn(`[font] ${path4.relative(this.#app.cwdPath, filePath)} declares fonts the build cannot read without evaluating the module \u2014 write the list inline, or nothing is subset for it and every /_akan/fonts request 404s`);
     return fonts.map((font) => ({ ...font, subsets: font.subsets ?? [...DEFAULT_FONT_SUBSETS] }));
   }
   #isReadableFont(value) {
@@ -1187,8 +971,8 @@ class FontOptimizer {
       return null;
     const rel = src.replace(/^\//, "");
     const candidates = [
-      this.#command === "build" ? path5.join(this.#app.dist.cwdPath, "public", rel) : null,
-      path5.join(this.#app.cwdPath, "public", rel),
+      this.#command === "build" ? path4.join(this.#app.dist.cwdPath, "public", rel) : null,
+      path4.join(this.#app.cwdPath, "public", rel),
       this.#resolveWorkspacePublicPath(rel)
     ].filter(Boolean);
     for (const candidate of candidates) {
@@ -1220,7 +1004,7 @@ class FontOptimizer {
       return "woff2";
     if (signature === "OTTO")
       return "otf";
-    const ext = path5.extname(sourcePath).slice(1).toLowerCase();
+    const ext = path4.extname(sourcePath).slice(1).toLowerCase();
     if (ext === "otf" || ext === "woff" || ext === "woff2")
       return ext;
     return "ttf";
@@ -1229,7 +1013,7 @@ class FontOptimizer {
     const [root, dep, ...rest] = rel.split("/");
     if (root !== "libs" || !dep || rest.length === 0)
       return null;
-    return path5.join(this.#app.workspace.workspaceRoot, "libs", dep, "public", ...rest);
+    return path4.join(this.#app.workspace.workspaceRoot, "libs", dep, "public", ...rest);
   }
   async#getSubsetText(font) {
     const parts = new Set;
@@ -1239,7 +1023,7 @@ class FontOptimizer {
     if (font.subsetText)
       parts.add(font.subsetText);
     for (const filePath of font.subsetFiles ?? []) {
-      const abs = path5.isAbsolute(filePath) ? filePath : path5.join(this.#app.cwdPath, filePath);
+      const abs = path4.isAbsolute(filePath) ? filePath : path4.join(this.#app.cwdPath, filePath);
       const file = Bun.file(abs);
       if (await file.exists())
         parts.add(await file.text());
@@ -1259,7 +1043,7 @@ class FontOptimizer {
   }
   async#collectAutoSubsetText() {
     const libPageRoots = (await this.#app.getPageRoots()).filter((root) => root.keyPrefix).map((root) => root.dir);
-    const roots = [...["page", "ui", "lib"].map((dir) => path5.join(this.#app.cwdPath, dir)), ...libPageRoots];
+    const roots = [...["page", "ui", "lib"].map((dir) => path4.join(this.#app.cwdPath, dir)), ...libPageRoots];
     const glob = new Bun.Glob("**/*.{ts,tsx,js,jsx,html,md}");
     const parts = [];
     for (const root of [...new Set(roots)].sort()) {
@@ -1269,7 +1053,7 @@ class FontOptimizer {
       const filePaths = [];
       for await (const filePath of glob.scan({ cwd: root, absolute: true }))
         filePaths.push(filePath);
-      for (const filePath of filePaths.sort())
+      for (const filePath of filePaths.sort((a, b) => a < b ? -1 : a > b ? 1 : 0))
         parts.push(await Bun.file(filePath).text());
     }
     return parts.join("");
@@ -1370,10 +1154,9 @@ ${declarations.map(([prop, value]) => `  ${prop}: ${value};`).join(`
     return JSON.stringify(value);
   }
 }
-
 // pkgs/@akanjs/devkit/frontendBuild/fontPruner.ts
-import { rm as rm2, rmdir, stat as stat3 } from "fs/promises";
-import path6 from "path";
+import { rm, rmdir, stat as stat3 } from "fs/promises";
+import path5 from "path";
 import { isFontOptimizationEnabled } from "akanjs/client";
 var FONT_GLOB = "**/*.{woff2,woff,ttf,otf,ttc,eot}";
 var REFERRER_GLOB = "**/*.{css,js,mjs,cjs,json,html,htm,svg,xml,webmanifest}";
@@ -1386,8 +1169,8 @@ class FontPruner {
   constructor(app, { keepFonts = [] } = {}) {
     this.#app = app;
     this.#keepGlobs = keepFonts;
-    this.#publicRoot = path6.join(app.dist.cwdPath, "public");
-    this.#artifactRoot = path6.join(app.dist.cwdPath, ".akan/artifact");
+    this.#publicRoot = path5.join(app.dist.cwdPath, "public");
+    this.#artifactRoot = path5.join(app.dist.cwdPath, ".akan/artifact");
   }
   async prune() {
     const empty = { removed: [], kept: [], freedBytes: 0 };
@@ -1402,7 +1185,7 @@ class FontPruner {
     for (const font of fonts) {
       const target = isFontOptimizationEnabled(font) ? optimizedSrcs : unoptimizedSrcs;
       for (const fontPath of font.paths)
-        target.add(path6.posix.basename(fontPath.src));
+        target.add(path5.posix.basename(fontPath.src));
     }
     const result = { removed: [], kept: [], freedBytes: 0 };
     const undecided = [];
@@ -1440,10 +1223,10 @@ class FontPruner {
   async#collectCandidates() {
     const candidates = [];
     for await (const rel of new Bun.Glob(FONT_GLOB).scan({ cwd: this.#publicRoot, dot: false })) {
-      const entry = await stat3(path6.join(this.#publicRoot, rel)).catch(() => null);
+      const entry = await stat3(path5.join(this.#publicRoot, rel)).catch(() => null);
       if (!entry?.isFile())
         continue;
-      candidates.push({ rel: rel.split(path6.sep).join("/"), basename: path6.basename(rel), bytes: entry.size });
+      candidates.push({ rel: rel.split(path5.sep).join("/"), basename: path5.basename(rel), bytes: entry.size });
     }
     return candidates;
   }
@@ -1453,11 +1236,11 @@ class FontPruner {
     const bundled = candidates.filter((candidate) => !optimizedSrcs.has(candidate.basename));
     const roots = [
       { dir: this.#publicRoot, label: "public", needles: authoritative },
-      { dir: path6.join(this.#artifactRoot, "styles"), label: ".akan/artifact/styles", needles: authoritative },
-      { dir: path6.join(this.#artifactRoot, "client"), label: ".akan/artifact/client", needles: bundled },
-      { dir: path6.join(this.#artifactRoot, "client-ssr"), label: ".akan/artifact/client-ssr", needles: bundled },
-      { dir: path6.join(this.#artifactRoot, "server"), label: ".akan/artifact/server", needles: bundled },
-      { dir: path6.join(this.#app.dist.cwdPath, "csr"), label: "csr", needles: bundled }
+      { dir: path5.join(this.#artifactRoot, "styles"), label: ".akan/artifact/styles", needles: authoritative },
+      { dir: path5.join(this.#artifactRoot, "client"), label: ".akan/artifact/client", needles: bundled },
+      { dir: path5.join(this.#artifactRoot, "client-ssr"), label: ".akan/artifact/client-ssr", needles: bundled },
+      { dir: path5.join(this.#artifactRoot, "server"), label: ".akan/artifact/server", needles: bundled },
+      { dir: path5.join(this.#app.dist.cwdPath, "csr"), label: "csr", needles: bundled }
     ];
     for (const root of roots) {
       const pending = root.needles.filter((candidate) => !referrers.has(candidate.rel));
@@ -1476,20 +1259,20 @@ class FontPruner {
       const remaining = needles.filter((needle) => !referrers.has(needle.rel));
       if (!remaining.length)
         return;
-      const text = await Bun.file(path6.join(root.dir, rel)).text().catch(() => "");
+      const text = await Bun.file(path5.join(root.dir, rel)).text().catch(() => "");
       if (!text)
         continue;
       for (const needle of remaining) {
         if (needle.forms.some((form) => text.includes(form)))
-          referrers.set(needle.rel, `${root.label}/${rel.split(path6.sep).join("/")}`);
+          referrers.set(needle.rel, `${root.label}/${rel.split(path5.sep).join("/")}`);
       }
     }
   }
   async#remove(files) {
-    await Promise.all(files.map((file) => rm2(path6.join(this.#publicRoot, file), { force: true })));
-    const dirs = [...new Set(files.map((file) => path6.posix.dirname(file)))].filter((dir) => dir !== "." && dir !== "/").sort((a, b) => b.length - a.length);
+    await Promise.all(files.map((file) => rm(path5.join(this.#publicRoot, file), { force: true })));
+    const dirs = [...new Set(files.map((file) => path5.posix.dirname(file)))].filter((dir) => dir !== "." && dir !== "/").sort((a, b) => b.length - a.length);
     for (const dir of dirs)
-      await rmdir(path6.join(this.#publicRoot, dir)).catch(() => {
+      await rmdir(path5.join(this.#publicRoot, dir)).catch(() => {
         return;
       });
   }
@@ -1534,10 +1317,9 @@ class FontPruner {
     return await stat3(dir).then((entry) => entry.isDirectory(), () => false);
   }
 }
-
 // pkgs/@akanjs/devkit/frontendBuild/precompressArtifacts.ts
 import fs from "fs";
-import path7 from "path";
+import path6 from "path";
 import zlib from "zlib";
 var COMPRESSIBLE_EXTS = new Set([".css", ".html", ".js", ".json", ".svg"]);
 var MIN_COMPRESS_BYTES = 1024;
@@ -1547,8 +1329,8 @@ var GZIP_LEVEL = 9;
 var { formatBytes } = FontPruner;
 async function precompressArtifacts(app) {
   const roots = [
-    path7.join(app.dist.cwdPath, ".akan/artifact/client"),
-    path7.join(app.dist.cwdPath, ".akan/artifact/styles")
+    path6.join(app.dist.cwdPath, ".akan/artifact/client"),
+    path6.join(app.dist.cwdPath, ".akan/artifact/styles")
   ];
   const result = { files: 0, inputBytes: 0, outputBytes: 0, brotliBytes: 0 };
   await Promise.all(roots.map((root) => precompressRoot(root, result)));
@@ -1567,7 +1349,7 @@ async function precompressRoot(root, result) {
     const bytes = await Bun.file(filePath).bytes();
     const buffer = bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
     const gz = Bun.gzipSync(buffer, { level: GZIP_LEVEL });
-    const br = brotliCompress(buffer, path7.extname(filePath).toLowerCase());
+    const br = brotliCompress(buffer, path6.extname(filePath).toLowerCase());
     await Promise.all([Bun.write(`${filePath}.gz`, gz), Bun.write(`${filePath}.br`, br)]);
     result.files += 1;
     result.inputBytes += bytes.byteLength;
@@ -1587,16 +1369,15 @@ function brotliCompress(buffer, ext) {
 async function shouldPrecompress(filePath) {
   if (filePath.endsWith(".gz") || filePath.endsWith(".br"))
     return false;
-  if (!COMPRESSIBLE_EXTS.has(path7.extname(filePath).toLowerCase()))
+  if (!COMPRESSIBLE_EXTS.has(path6.extname(filePath).toLowerCase()))
     return false;
   const file = Bun.file(filePath);
   if (!await file.exists())
     return false;
   return file.size >= MIN_COMPRESS_BYTES;
 }
-
 // pkgs/@akanjs/devkit/frontendBuild/ssrBaseArtifactBuilder.ts
-import path8 from "path";
+import path7 from "path";
 import { optimize } from "@tailwindcss/node";
 function prepareCssAsset(command, basePath, cssText) {
   return optimize(cssText, { file: `${basePath || "root"}.css`, minify: command === "build" }).code;
@@ -1614,7 +1395,7 @@ class SsrBaseArtifactBuilder {
     this.#command = command;
     this.#serverEnv = serverEnv;
     this.#artifactDir = `${command === "build" ? app.dist.cwdPath : app.cwdPath}/.akan/artifact`;
-    this.#absArtifactDir = path8.resolve(this.#artifactDir);
+    this.#absArtifactDir = path7.resolve(this.#artifactDir);
   }
   static servedWeb(command, web) {
     return command === "start" ? { ssr: true, csr: true } : web;
@@ -1639,7 +1420,7 @@ class SsrBaseArtifactBuilder {
       rscRuntimeSsrManifest,
       vendorMap,
       cssAssets,
-      pagesBundlePath: this.#command === "build" ? path8.relative(this.#absArtifactDir, pagesBundle.bundlePath) : pagesBundle.bundlePath,
+      pagesBundlePath: this.#command === "build" ? path7.relative(this.#absArtifactDir, pagesBundle.bundlePath) : pagesBundle.bundlePath,
       pagesBundleBuildId: pagesBundle.buildId,
       domains: [...akanConfig.domains],
       subRoutes: Object.fromEntries(Array.from(akanConfig.subRoutes.entries()).map(([basePath, domains]) => [basePath, [...domains]])),
@@ -1657,18 +1438,18 @@ class SsrBaseArtifactBuilder {
         androidSha256CertFingerprints: target.android?.sha256CertFingerprints
       }))
     };
-    await Bun.write(path8.join(this.#absArtifactDir, "base-artifact.json"), `${JSON.stringify(artifact, null, 2)}
+    await Bun.write(path7.join(this.#absArtifactDir, "base-artifact.json"), `${JSON.stringify(artifact, null, 2)}
 `);
     this.#app.verbose(`[base-artifact] complete in ${Date.now() - this.#started}ms`);
     return { artifact, seedIndex, cssCompiler, optimizedFonts };
   }
   async#buildRuntimeClientEntries() {
     const akanServerPath = await this.#resolveAkanServerPath();
-    const rscClientEntry = path8.resolve(akanServerPath, "rscClient.tsx");
-    const rscSegmentOutletEntry = path8.resolve(akanServerPath, "rscSegmentOutlet.tsx");
+    const rscClientEntry = path7.resolve(akanServerPath, "rscClient.tsx");
+    const rscSegmentOutletEntry = path7.resolve(akanServerPath, "rscSegmentOutlet.tsx");
     const vendorEntries = VENDOR_SPECIFIERS.map((specifier) => ({
       specifier,
-      absPath: path8.resolve(akanServerPath, "vendor", `${specifier.replaceAll("/", "-").replaceAll(".", "-")}.ts`)
+      absPath: path7.resolve(akanServerPath, "vendor", `${specifier.replaceAll("/", "-").replaceAll(".", "-")}.ts`)
     }));
     const entries = [rscClientEntry, rscSegmentOutletEntry, ...vendorEntries.map((v) => v.absPath)];
     const clientBundle = await new ClientEntriesBundler({ app: this.#app, entries, command: this.#command }).bundle();
@@ -1705,15 +1486,15 @@ class SsrBaseArtifactBuilder {
   async#resolveAkanServerPath() {
     const candidates = [];
     try {
-      candidates.push(path8.dirname(Bun.resolveSync("akanjs/server", this.#app.workspace.workspaceRoot)));
+      candidates.push(path7.dirname(Bun.resolveSync("akanjs/server", this.#app.workspace.workspaceRoot)));
     } catch {}
-    candidates.push(path8.join(this.#app.workspace.workspaceRoot, "pkgs/akanjs/server"), path8.join(this.#app.workspace.workspaceRoot, "node_modules/akanjs/server"));
+    candidates.push(path7.join(this.#app.workspace.workspaceRoot, "pkgs/akanjs/server"), path7.join(this.#app.workspace.workspaceRoot, "node_modules/akanjs/server"));
     try {
-      candidates.push(path8.dirname(Bun.resolveSync("akanjs/server", path8.dirname(Bun.main))));
+      candidates.push(path7.dirname(Bun.resolveSync("akanjs/server", path7.dirname(Bun.main))));
     } catch {}
-    candidates.push(path8.join(path8.dirname(Bun.main), "node_modules/akanjs/server"), path8.join(path8.dirname(Bun.main), "../../akanjs/server"), path8.resolve(import.meta.dir, "../../server"), path8.resolve(import.meta.dir, "../server"));
+    candidates.push(path7.join(path7.dirname(Bun.main), "node_modules/akanjs/server"), path7.join(path7.dirname(Bun.main), "../../akanjs/server"), path7.resolve(import.meta.dir, "../../server"), path7.resolve(import.meta.dir, "../server"));
     for (const candidate of candidates) {
-      if (await Bun.file(path8.join(candidate, "rscClient.tsx")).exists())
+      if (await Bun.file(path7.join(candidate, "rscClient.tsx")).exists())
         return candidate;
     }
     throw new Error(`[base-artifact] failed to locate akanjs/server; looked in: ${candidates.join(", ")}`);
@@ -1742,7 +1523,7 @@ ${preparedCssText}`).toString(36);
       `styles/${cssAssetName}-${cssHash}.css`,
       `/_akan/styles/${cssAssetName}-${cssHash}.css`
     ];
-    await Bun.write(path8.join(this.#absArtifactDir, cssRelPath), preparedCssText);
+    await Bun.write(path7.join(this.#absArtifactDir, cssRelPath), preparedCssText);
     SsrBaseArtifactBuilder.#warnDroppedImports(this.#app, cssRelPath, preparedCssText, imported);
     this.#app.verbose(`[base-artifact] wrote ${preparedCssText.length} bytes of CSS for ${basePath} -> ${cssRelPath}`);
     return [basePath, { cssUrl, cssRelPath }];
@@ -1758,4 +1539,4 @@ ${preparedCssText}`).toString(36);
     }
   }
 }
-export { AllRoutesBuilder, CsrArtifactBuilder, CssCompiler, FontOptimizer, FontPruner, precompressArtifacts, SsrBaseArtifactBuilder };
+export { AllRoutesBuilder, CssCompiler, FontOptimizer, FontPruner, precompressArtifacts, SsrBaseArtifactBuilder };