reroute-js 1.0.0-alpha.13 → 1.0.0-alpha.15

package/elysia/index.js

@@ -1,5 +1,5 @@
 /**
- * reroute-js v1.0.0-alpha.13
+ * reroute-js v1.0.0-alpha.15
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -3497,26 +3497,45 @@ var init_scripts = __esm(() => {
 
 // packages/core/src/ssr/lib/styles.ts
 import { createHash } from "node:crypto";
-function themeLink(query) {
-  return `<link rel="stylesheet" href="${THEME_CSS_HREF}?${query}" data-reroute="theme">`;
-}
-function hashCss(css) {
-  return createHash("sha1").update(css).digest("hex").slice(0, 12);
-}
-async function readThemeCssFromDisk(clientDir) {
-  const candidates = [
-    join(clientDir, "..", ".reroute", "index.css"),
-    join(clientDir, "..", "..", ".reroute", "index.css"),
-    join(clientDir, "..", "..", "..", ".reroute", "index.css"),
-    join(clientDir, "..", "..", "..", "..", ".reroute", "index.css")
+import { readdirSync } from "node:fs";
+function themeCssHash(css) {
+  return createHash("sha1").update(css).digest("hex").slice(0, 8);
+}
+function themeCssFileName(css) {
+  return `index.${themeCssHash(css)}.css`;
+}
+function themeLink(href) {
+  return `<link rel="stylesheet" href="${href}" data-reroute="theme">`;
+}
+function bundlesDirs(clientDir) {
+  return [
+    join(clientDir, "..", ".reroute", "bundles"),
+    join(clientDir, "..", "..", ".reroute", "bundles"),
+    join(clientDir, "..", "..", "..", ".reroute", "bundles"),
+    join(clientDir, "..", "..", "..", "..", ".reroute", "bundles")
   ];
-  for (const cssPath of candidates) {
-    if (await Bun.file(cssPath).exists()) {
-      const { readFileSync } = await import("node:fs");
-      return readFileSync(cssPath, "utf-8");
-    }
+}
+async function readFileIfExists(path) {
+  if (!await Bun.file(path).exists())
+    return "";
+  const { readFileSync } = await import("node:fs");
+  return readFileSync(path, "utf-8");
+}
+async function readThemeFromBundles(clientDir) {
+  for (const dir of bundlesDirs(clientDir)) {
+    try {
+      const hashed = readdirSync(dir).find((name) => HASHED_THEME_RE.test(name));
+      if (hashed) {
+        const css2 = await readFileIfExists(join(dir, hashed));
+        if (css2)
+          return { css: css2, href: `/bundles/${hashed}` };
+      }
+      const css = await readFileIfExists(join(dir, "index.css"));
+      if (css)
+        return { css, href: `/bundles/${themeCssFileName(css)}` };
+    } catch {}
   }
-  return "";
+  return null;
 }
 function bundledThemeCss() {
   return globalThis.__REROUTE_THEME_CSS__ || "";
@@ -3524,18 +3543,26 @@ function bundledThemeCss() {
 async function inlineThemeCSS(clientDir, isWatchMode = false) {
   try {
     if (isWatchMode) {
-      return themeLink(`t=${Date.now()}`);
+      return themeLink(`${THEME_CSS_WATCH_HREF}?t=${Date.now()}`);
     }
-    const css = bundledThemeCss() || await readThemeCssFromDisk(clientDir);
+    const fromDisk = await readThemeFromBundles(clientDir);
+    const css = bundledThemeCss() || fromDisk?.css;
     if (!css)
       return "";
-    return themeLink(`v=${hashCss(css)}`);
+    if (bundledThemeCss()) {
+      return themeLink(`/bundles/${themeCssFileName(css)}`);
+    }
+    if (fromDisk)
+      return themeLink(fromDisk.href);
+    return "";
   } catch {
     return "";
   }
 }
-var THEME_CSS_HREF = "/.reroute/index.css";
-var init_styles = () => {};
+var THEME_CSS_WATCH_HREF = "/bundles/index.css", HASHED_THEME_RE;
+var init_styles = __esm(() => {
+  HASHED_THEME_RE = /^index\.[a-z0-9]{8,}\.css$/i;
+});
 
 // packages/core/src/ssr/lib/setup.ts
 async function performSSRSetup(options, streaming = false) {
@@ -4050,6 +4077,9 @@ Formats: .txt | .md | Accept: text/plain | Accept: text/markdown`;
 // packages/core/src/llms/extractor.ts
 import { pathToFileURL as pathToFileURL5 } from "node:url";
 import { renderToStaticMarkup } from "react-dom/server";
+function stripLayoutChrome(html2) {
+  return html2.replace(/<nav[\s\S]*?<\/nav>/gi, "").replace(/<header[\s\S]*?<\/header>/gi, "").replace(/<aside[\s\S]*?<\/aside>/gi, "");
+}
 function shouldExcludeRoute(pathname, excludeRoutes) {
   if (!excludeRoutes || excludeRoutes.length === 0) {
     return false;
@@ -4172,10 +4202,7 @@ async function extractSSRContent(pathname, rootComponent, clientDir, cwd, isWatc
     if (appDivMatch) {
       contentHtml = appDivMatch[1];
     }
-    contentHtml = contentHtml.replace(/<nav[\s\S]*?<\/nav>/gi, "");
-    contentHtml = contentHtml.replace(/<footer[\s\S]*?<\/footer>/gi, "");
-    contentHtml = contentHtml.replace(/<header[\s\S]*?<\/header>/gi, "");
-    contentHtml = contentHtml.replace(/<aside[\s\S]*?<\/aside>/gi, "");
+    contentHtml = stripLayoutChrome(contentHtml);
     return {
       title: extractTitle(html2),
       body: stripHtmlTags(contentHtml),
@@ -6685,6 +6712,7 @@ __export(exports_core, {
   statusCache: () => statusCache,
   stripEnd: () => stripEnd,
   stripHtmlTags: () => stripHtmlTags,
+  stripLayoutChrome: () => stripLayoutChrome,
   stripStart: () => stripStart,
   takeSSRContentResults: () => takeSSRContentResults,
   toBytes: () => toBytes,
@@ -7050,6 +7078,9 @@ function getAssetCacheControl(filePath, contentType, maxAge, directive, isWatchM
 }
 
 // packages/elysia/src/routes/artifacts.ts
+function isThemeBundleName(fileName) {
+  return fileName === "index.css" || /^index\.[a-z0-9]{8,}\.css$/i.test(fileName);
+}
 function bundledThemeCssResponse(cacheControl) {
   const bundled = globalThis.__REROUTE_THEME_CSS__;
   if (!bundled)
@@ -7063,50 +7094,24 @@ function bundledThemeCssResponse(cacheControl) {
 }
 function registerArtifactsRoutes(app, cwd, fileCache, options) {
   const { bundleMaxAge, directive, isWatchMode = false } = options;
-  app.get("/.reroute/index.css", async ({ headers: headers2 }) => {
-    const filePath = join(cwd, ".reroute", "index.css");
-    const acceptEncoding = headers2["accept-encoding"] ?? "";
-    const cacheControl = isWatchMode ? "no-cache, no-store, must-revalidate" : `${directive}, max-age=${bundleMaxAge}`;
-    if (isWatchMode) {
-      try {
-        const { readFileSync } = await import("node:fs");
-        const content2 = readFileSync(filePath);
-        return new Response(content2, {
-          headers: {
-            "Content-Type": "text/css; charset=utf-8",
-            "Cache-Control": cacheControl
-          }
-        });
-      } catch {
-        return bundledThemeCssResponse(cacheControl);
-      }
-    }
-    try {
-      return await serveFile(filePath, acceptEncoding, fileCache, {
-        cacheControl
-      });
-    } catch (error) {
-      if (error instanceof NotFoundError2) {
-        return bundledThemeCssResponse(cacheControl);
-      }
-      throw error;
-    }
-  });
   app.get("/bundles/*", async ({ params, headers: headers2 }) => {
     const fileName = String(params["*"] ?? "").replace(/^\/+/, "");
     if (!fileName)
       throw new NotFoundError2;
     const filePath = join(cwd, ".reroute", "bundles", fileName);
     const acceptEncoding = headers2["accept-encoding"] ?? "";
+    const cacheControl = getHashedFileCacheControl(fileName, bundleMaxAge, directive, isWatchMode);
     try {
-      const cacheControl = getHashedFileCacheControl(fileName, bundleMaxAge, directive, isWatchMode);
       return await serveFile(filePath, acceptEncoding, fileCache, {
         cacheControl
       });
-    } catch (e) {
-      if (e instanceof NotFoundError2)
-        throw e;
-      console.error("[reroute] Failed to serve bundle:", filePath, e);
+    } catch (error) {
+      if (error instanceof NotFoundError2 && isThemeBundleName(fileName)) {
+        return bundledThemeCssResponse(cacheControl);
+      }
+      if (error instanceof NotFoundError2)
+        throw error;
+      console.error("[reroute] Failed to serve bundle:", filePath, error);
       throw new NotFoundError2;
     }
   });
@@ -7430,7 +7435,7 @@ function shouldReloadOnReconnect(previousBootId, nextBootId) {
 
 // packages/elysia/src/routes/themeCssRefresh.ts
 function refreshThemeCss() {
-  const href = `/.reroute/index.css?t=${Date.now()}`;
+  const href = `/bundles/index.css?t=${Date.now()}`;
   const next = document.createElement("link");
   next.rel = "stylesheet";
   next.setAttribute("data-reroute", "theme");
@@ -10360,4 +10365,4 @@ export {
   reroute
 };
 
-//# debugId=78024E3217BF060B64756E2164756E21
+//# debugId=8C0B03A2E26E264C64756E2164756E21