reroute-js 0.24.1 → 0.25.0

package/cli/bin.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.24.1
+ * reroute-js v0.25.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>

package/cli/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 /**
- * reroute-js v0.24.1
+ * reroute-js v0.25.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>
@@ -48,7 +48,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "0.24.1";
+    return "0.25.0";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -66,7 +66,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "0a5e69f";
+    return "391f6f1";
   }
   return "dev";
 }
@@ -2441,6 +2441,8 @@ async function performSSRSetup(options, streaming = false) {
   }
 }
 async function performSSRSetupInternal(options, streaming) {
+  const debug = options.debug ?? false;
+  const t0 = debug ? performance.now() : 0;
   const {
     pathname,
     clientDir,
@@ -2452,19 +2454,33 @@ async function performSSRSetupInternal(options, streaming) {
     ogConfig
   } = options;
   await seedSSRModuleForPath(pathname, clientDir, cwd, isWatchMode);
+  if (debug)
+    console.log(`[Setup] ${pathname} - seedModule: ${(performance.now() - t0).toFixed(2)}ms`);
   resetSSRAccessTracking();
   const bundlePreload = createBundlePreload(bundleUrl);
   const preloadResult = await preloadContentModule(pathname, clientDir, cwd, isWatchMode);
+  if (debug)
+    console.log(`[Setup] ${pathname} - preloadContent: ${(performance.now() - t0).toFixed(2)}ms`);
   const computeResult = await computeSSRData(pathname, clientDir, cwd, isWatchMode, { streaming, maxAge }, searchParams);
+  if (debug)
+    console.log(`[Setup] ${pathname} - computeSSRData: ${(performance.now() - t0).toFixed(2)}ms`);
   setGlobalSSRData(computeResult.data);
-  const byCollectionForSSR = await loadCollections(cwd, isWatchMode);
+  const usingCachedCollections = !!options.cachedCollections;
+  const byCollectionForSSR = options.cachedCollections ? options.cachedCollections : await loadCollections(cwd, isWatchMode);
+  if (debug)
+    console.log(`[Setup] ${pathname} - loadCollections (cached: ${usingCachedCollections}): ${(performance.now() - t0).toFixed(2)}ms`);
   setGlobalCollections(byCollectionForSSR);
-  const inlineStyleTag = await inlineTailwindCSS(clientDir, !streaming, isWatchMode);
+  const usingCachedCSS = !!options.cachedTailwindCSS;
+  const inlineStyleTag = options.cachedTailwindCSS ? options.cachedTailwindCSS : await inlineTailwindCSS(clientDir, !streaming, isWatchMode);
+  if (debug)
+    console.log(`[Setup] ${pathname} - inlineTailwindCSS (cached: ${usingCachedCSS}): ${(performance.now() - t0).toFixed(2)}ms`);
   let statusOverride = preloadResult.statusOverride;
   if (computeResult.statusContainer.value) {
     statusOverride = computeResult.statusContainer.value;
   }
   const metadataResult = await extractPageMetadata(pathname, clientDir, cwd, isWatchMode, statusOverride, ogConfig);
+  if (debug)
+    console.log(`[Setup] ${pathname} - extractMetadata: ${(performance.now() - t0).toFixed(2)}ms`);
   return {
     ssrData: computeResult.data,
     ssrError: computeResult.error,
@@ -2578,7 +2594,9 @@ async function renderSSRDocument(options) {
     bundleUrl,
     maxAge,
     searchParams,
-    ogConfig
+    ogConfig,
+    cachedCollections: options.cachedCollections,
+    cachedTailwindCSS: options.cachedTailwindCSS
   }, false);
   const duplicatedData = duplicateQueryParamData(setup2.ssrData);
   setGlobalSSRData(duplicatedData);
@@ -4521,6 +4539,8 @@ var init_sitemap = __esm(() => {
 import { cloneElement as cloneElement2 } from "react";
 import { renderToReadableStream } from "react-dom/server";
 async function renderSSRDocumentStream(options) {
+  const debug = options.debug ?? false;
+  const t0 = debug ? performance.now() : 0;
   const {
     pathname,
     rootComponent,
@@ -4535,6 +4555,8 @@ async function renderSSRDocumentStream(options) {
     searchParams,
     ogConfig
   } = options;
+  if (debug)
+    console.log(`[renderStream] ${pathname} - start: 0ms`);
   const setup2 = await performSSRSetup({
     pathname,
     clientDir,
@@ -4543,8 +4565,13 @@ async function renderSSRDocumentStream(options) {
     bundleUrl,
     maxAge,
     searchParams,
-    ogConfig
+    ogConfig,
+    cachedCollections: options.cachedCollections,
+    cachedTailwindCSS: options.cachedTailwindCSS,
+    debug
   }, true);
+  if (debug)
+    console.log(`[renderStream] ${pathname} - performSSRSetup: ${(performance.now() - t0).toFixed(2)}ms`);
   let statusOverride = setup2.preloadStatusOverride;
   if (setup2.statusContainer.value) {
     statusOverride = setup2.statusContainer.value;
@@ -4555,8 +4582,15 @@ async function renderSSRDocumentStream(options) {
   const encoder = new TextEncoder;
   const { readable, writable } = new TransformStream;
   const writer = writable.getWriter();
-  const baseTemplate = await loadIndexHtml(clientDir);
+  const usingCache = !!options.cachedIndexHtml;
+  const tBeforeLoad = debug ? performance.now() : 0;
+  const baseTemplate = options.cachedIndexHtml ? options.cachedIndexHtml : await loadIndexHtml(clientDir);
+  if (debug)
+    console.log(`[renderStream] ${pathname} - loadIndexHtml (cached: ${usingCache}): ${(performance.now() - t0).toFixed(2)}ms (actual load: ${(performance.now() - tBeforeLoad).toFixed(2)}ms)`);
+  const tBeforeSplit = debug ? performance.now() : 0;
   const { htmlHead, rootStart, rootEnd, htmlTail } = splitTemplate(baseTemplate, appId);
+  if (debug)
+    console.log(`[renderStream] ${pathname} - splitTemplate: ${(performance.now() - t0).toFixed(2)}ms (split took: ${(performance.now() - tBeforeSplit).toFixed(2)}ms)`);
   const pageLang = setup2.metadataResult.pageLang || lang;
   let headWithLang = htmlHead.replace(/<html([^>]*)>/i, `<html$1 lang="${pageLang}">`);
   const extraHead = setup2.bundlePreload + setup2.preloadExtraHead + setup2.metadataResult.perPageHead;
@@ -4580,14 +4614,18 @@ async function renderSSRDocumentStream(options) {
     htmlTail,
     bundleUrl,
     isWatchMode,
+    debug,
     ssrData: setup2.ssrData,
     ssrError: setup2.ssrError,
     byCollectionForSSR: setup2.byCollectionForSSR,
     preloadHydrationScript: setup2.preloadHydrationScript
   });
+  if (debug)
+    console.log(`[renderStream] ${pathname} - returning stream: ${(performance.now() - t0).toFixed(2)}ms`);
   return { stream: readable, status: statusOverride || 200 };
 }
 async function streamSSRContent(writer, encoder, ctx) {
+  const t0 = ctx.debug ? performance.now() : 0;
   const STREAM_TIMEOUT_MS = 60000;
   let streamTimedOut = false;
   let timeoutId = null;
@@ -4604,6 +4642,8 @@ async function streamSSRContent(writer, encoder, ctx) {
 ` : ""}</head>`);
     const headContent = `${headWithLangAndContent}<body>`;
     await writer.write(encoder.encode(headContent));
+    if (ctx.debug)
+      console.log(`[Stream] ${ctx.pathname} - first byte written: ${(performance.now() - t0).toFixed(2)}ms`);
     await writer.write(encoder.encode(ctx.rootStart));
     const componentWithPathname = cloneElement2(ctx.rootComponent, {
       pathname: ctx.pathname,
@@ -6565,6 +6605,45 @@ async function generate(cwd, args = [], options = {}) {
     console.error("[reroute/gen] Failed to generate content:", error);
     throw error;
   }
+  try {
+    await perfTrack("Manifest generation", async () => {
+      const routesPath2 = join9(cwd, OUTPUT_ROUTES);
+      const routesModule = await import(`file://${routesPath2}?t=${Date.now()}`);
+      const routes = routesModule.routes || [];
+      const staticRoutes = routes.filter((r) => !r.params || r.params.length === 0).map((r) => r.pattern);
+      const contentRoutes = [];
+      const collectionsDir = join9(cwd, ".reroute", "collections");
+      try {
+        const collectionFiles = await readdir5(collectionsDir);
+        for (const file of collectionFiles) {
+          if (file.endsWith(".js")) {
+            const collectionPath = join9(collectionsDir, file);
+            const collectionModule = await import(`file://${collectionPath}?t=${Date.now()}`);
+            const items = collectionModule.items || [];
+            for (const item of items) {
+              if (item.href) {
+                contentRoutes.push(item.href);
+              }
+            }
+          }
+        }
+      } catch {}
+      const dynamicRoutes = [];
+      const dynamicFromTree = routes.filter((r) => r.params && r.params.length > 0).map((r) => {
+        return r.pattern.replace(/\/:[^/]+.*$/, "/*");
+      });
+      dynamicRoutes.push(...new Set(dynamicFromTree));
+      const manifest = {
+        staticRoutes,
+        contentRoutes,
+        dynamicRoutes,
+        version: 1
+      };
+      await Bun.write(join9(cwd, ".reroute", "manifest.json"), JSON.stringify(manifest, null, 2));
+    });
+  } catch (error) {
+    console.error("[reroute/gen] Failed to generate manifest:", error);
+  }
   if (config2.search?.enabled) {
     try {
       await perfTrack("Search index", () => buildSearchIndex(cwd, config2));
@@ -104784,7 +104863,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "0.24.1";
+    return "0.25.0";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -104801,10 +104880,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "0a5e69f";
+    return "391f6f1";
   }
   return "dev";
 }
 main();
 
-//# debugId=1BCFE4E8AAA30D0D64756E2164756E21
+//# debugId=5D1B63B507BAD56D64756E2164756E21