reroute-js 1.0.0-alpha.22 → 1.0.0-alpha.24

package/cli/bin.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v1.0.0-alpha.22
+ * reroute-js v1.0.0-alpha.24
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>

package/cli/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 /**
- * reroute-js v1.0.0-alpha.22
+ * reroute-js v1.0.0-alpha.24
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -68,7 +68,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "1.0.0-alpha.22";
+    return "1.0.0-alpha.24";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -86,7 +86,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "53ae62b";
+    return "ab63579";
   }
   return "dev";
 }
@@ -7744,6 +7744,12 @@ function setupRemarkPlugins(cwd, enableGfm) {
   }
   return remarkPlugins;
 }
+function shikiRehypeOptions(theme) {
+  if (theme === "github-light" || theme === "github-dark") {
+    return { themes: { light: "github-light", dark: "github-dark" } };
+  }
+  return { theme };
+}
 function setupRehypePlugins(cwd, theme) {
   const rehypePlugins = [];
   const rehypeRaw = tryLoadModule(cwd, "rehype-raw");
@@ -7764,7 +7770,10 @@ function setupRehypePlugins(cwd, theme) {
   }
   const rehypeShiki = tryLoadModule(cwd, "@shikijs/rehype");
   if (rehypeShiki) {
-    rehypePlugins.push([rehypeShiki.default || rehypeShiki, { theme }]);
+    rehypePlugins.push([
+      rehypeShiki.default || rehypeShiki,
+      shikiRehypeOptions(theme)
+    ]);
   } else {
     console.warn("[reroute/mdx] @shikijs/rehype not available, skipping highlighting");
   }
@@ -8284,6 +8293,15 @@ import { join as join13 } from "node:path";
 function isWatchNoise(name) {
   return name.split(/[/\\]/).some((part) => part.startsWith(".")) || /\.bust-[^/\\]+$/.test(name);
 }
+function isClientSource(name, skipRoutes) {
+  if (isWatchNoise(name))
+    return false;
+  if (name.includes(".reroute") || name.includes("node_modules"))
+    return false;
+  if (skipRoutes && /(^|[/\\])routes[/\\]/.test(name))
+    return false;
+  return /\.(tsx|ts|jsx|js|html|md|mdx|css)$/.test(name);
+}
 function createContentFingerprint(options) {
   const hashes = new Map;
   const startedAt = Date.now();
@@ -8330,7 +8348,7 @@ __export(exports_gen, {
 });
 import { watch } from "node:fs";
 import { copyFile as copyFile2, mkdir as mkdir3, readdir as readdir8, rm, unlink as unlink3 } from "node:fs/promises";
-import { dirname as dirname7, extname as extname4, join as join14 } from "node:path";
+import { dirname as dirname7, extname as extname4, join as join14, resolve as resolve3 } from "node:path";
 import { pathToFileURL as pathToFileURL8 } from "node:url";
 async function bundleThemeCssIntoArtifacts(cwd) {
   const cssPath = join14(cwd, ".reroute", "bundles", "index.css");
@@ -8608,8 +8626,17 @@ function getImportPath(filePath, streamingMap, routesImportBase) {
   const pathWithoutExt = filePath.replace(/\.(tsx|ts)$/, "");
   return `${routesImportBase}/${pathWithoutExt}`;
 }
-function generateTypeScript(tree, streamingMap, client, routesImportBase) {
-  const helperImport = "import { createLazyRoute } from 'reroute-js/react';";
+function lazyRouteFallbackImport(config2) {
+  const value = config2.streaming?.defaultSkeleton;
+  if (typeof value !== "string" || value.trim().length === 0)
+    return;
+  return importFromReroute(value);
+}
+function generateTypeScript(tree, streamingMap, client, routesImportBase, fallbackImport) {
+  const helperImport = fallbackImport ? `import { createLazyRoute } from 'reroute-js/react';
+import LazyRouteFallback from '${fallbackImport}';` : "import { createLazyRoute } from 'reroute-js/react';";
+  const clientFallbackArgs = fallbackImport ? ", undefined, LazyRouteFallback" : "";
+  const serverFallbackArgs = fallbackImport ? ", LazyRouteFallback" : "";
   const ssrHelper = "const _ssr = (m: any) => m.ssr;";
   const metaHelper = "const _meta = (m: any) => m.meta;";
   const metaImports = [
@@ -8633,23 +8660,23 @@ const Layout${i}Meta = _meta(Layout${i}Module);`)
     ...tree.routes.map((r, i) => {
       const importPath = getImportPath(r.filePath, streamingMap, routesImportBase);
       if (client) {
-        return `const Route${i} = createLazyRoute(() => import('${importPath}'), "${r.pattern}");`;
+        return `const Route${i} = createLazyRoute(() => import('${importPath}'), "${r.pattern}"${clientFallbackArgs});`;
       }
-      return `const Route${i} = createLazyRoute(() => import('${importPath}'), "${r.pattern}", Route${i}Eager);`;
+      return `const Route${i} = createLazyRoute(() => import('${importPath}'), "${r.pattern}", Route${i}Eager${serverFallbackArgs});`;
     }),
     ...tree.layouts.map((l, i) => {
       const importPath = getImportPath(l.filePath, streamingMap, routesImportBase);
       if (client) {
-        return `const Layout${i} = createLazyRoute(() => import('${importPath}'), "${l.pattern}");`;
+        return `const Layout${i} = createLazyRoute(() => import('${importPath}'), "${l.pattern}"${clientFallbackArgs});`;
       }
-      return `const Layout${i} = createLazyRoute(() => import('${importPath}'), "${l.pattern}", Layout${i}Eager);`;
+      return `const Layout${i} = createLazyRoute(() => import('${importPath}'), "${l.pattern}", Layout${i}Eager${serverFallbackArgs});`;
     }),
     ...tree.notFoundRoutes.map((nf, i) => {
       const importPath = getImportPath(nf.filePath, streamingMap, routesImportBase);
       if (client) {
-        return `const NotFound${i} = createLazyRoute(() => import('${importPath}'), "${nf.notFoundBasePattern || "/"}");`;
+        return `const NotFound${i} = createLazyRoute(() => import('${importPath}'), "${nf.notFoundBasePattern || "/"}"${clientFallbackArgs});`;
       }
-      return `const NotFound${i} = createLazyRoute(() => import('${importPath}'), "${nf.notFoundBasePattern || "/"}", NotFound${i}Eager);`;
+      return `const NotFound${i} = createLazyRoute(() => import('${importPath}'), "${nf.notFoundBasePattern || "/"}", NotFound${i}Eager${serverFallbackArgs});`;
     })
   ].join(`
 `);
@@ -9503,8 +9530,9 @@ async function generate(cwd, args = [], options = {}) {
       const all = Array.from(new Set([...files, ...nfFiles]));
       const tree = generateRouteTree(all.map((f) => f.replace(/\\/g, "/")));
       const streamingAnalyses = streamingEnabled ? await buildStreamingWrappersForTree(cwd, routesPath, tree, config2) : new Map;
-      const serverRoutes = generateTypeScript(tree, streamingAnalyses, false, routesImportBase);
-      const clientRoutes = generateTypeScript(tree, streamingAnalyses, true, routesImportBase);
+      const fallbackImport = lazyRouteFallbackImport(config2);
+      const serverRoutes = generateTypeScript(tree, streamingAnalyses, false, routesImportBase, fallbackImport);
+      const clientRoutes = generateTypeScript(tree, streamingAnalyses, true, routesImportBase, fallbackImport);
       await Bun.write(join14(cwd, OUTPUT_ROUTES), serverRoutes);
       await Bun.write(join14(cwd, OUTPUT_ROUTES_CLIENT), clientRoutes);
     });
@@ -10061,30 +10089,32 @@ async function startGenWatch(cwd, args) {
       console.log("[reroute/watch]   ├─ index.css synced");
     }
   }
-  let pendingClientFiles = new Set;
-  const clientWatcher = watch(clientPath, { recursive: true }, (_ev, filename) => {
-    if (!filename)
-      return;
-    const name = String(filename);
-    if (isWatchNoise(name))
-      return;
-    if (name.includes(".reroute") || name.includes("node_modules"))
-      return;
-    if (name.includes("routes/") || name.includes("routes\\"))
-      return;
-    if (!/\.(tsx|ts|jsx|js|html|md|mdx|css)$/.test(name))
-      return;
-    pendingClientFiles.add(name);
-    mediumDebounce(() => {
-      const names = [...pendingClientFiles];
-      pendingClientFiles = new Set;
-      retainChangedFiles(clientPath, names, fingerprint).then((changed) => {
-        if (changed.length === 0)
-          return;
-        const reloadMode = changed.every((n) => n.endsWith(".css")) ? "css" : "full";
-        scheduleBuild(() => rebuildWatchedClient(changed), "client change", reloadMode);
+  const watchClientSources = (dir, skipRoutes) => {
+    let pending = new Set;
+    return watch(dir, { recursive: true }, (_ev, filename) => {
+      if (!filename)
+        return;
+      const name = String(filename);
+      if (!isClientSource(name, skipRoutes))
+        return;
+      pending.add(name);
+      mediumDebounce(() => {
+        const names = [...pending];
+        pending = new Set;
+        retainChangedFiles(dir, names, fingerprint).then((changed) => {
+          if (changed.length === 0)
+            return;
+          const reloadMode = changed.every((n) => n.endsWith(".css")) ? "css" : "full";
+          scheduleBuild(() => rebuildWatchedClient(changed), "client change", reloadMode);
+        });
       });
     });
+  };
+  const clientWatcher = watchClientSources(clientPath, true);
+  const extraWatchers = (loadedConfig.app?.watch ?? []).map((entry) => {
+    const dir = resolve3(cwd, entry);
+    console.log(`[reroute/watch] \uD83D\uDCE6 Watching ${dir}...`);
+    return watchClientSources(dir, false);
   });
   console.log(`[reroute/watch] ✓ Watch mode active - ready for changes!
 `);
@@ -10093,7 +10123,8 @@ async function startGenWatch(cwd, args) {
     clientWatcher,
     packagesWatcher,
     configWatcher,
-    ...envWatchers
+    ...envWatchers,
+    ...extraWatchers
   ].filter(Boolean);
   return {
     close() {
@@ -10124,10 +10155,10 @@ async function gen(args) {
     process.exit(0);
   }
   const session = await startGenWatch(cwd, args);
-  await new Promise((resolve3) => {
+  await new Promise((resolve4) => {
     process.on("SIGINT", () => {
       session.close();
-      resolve3();
+      resolve4();
     });
   });
   process.exit(0);
@@ -10248,7 +10279,7 @@ async function waitForServerReady(port = 3000, timeout = 30000) {
         return;
       }
     } catch {}
-    await new Promise((resolve3) => setTimeout(resolve3, checkInterval));
+    await new Promise((resolve4) => setTimeout(resolve4, checkInterval));
     checkInterval = Math.min(checkInterval * 1.5, maxInterval);
   }
   throw new Error(`Timeout waiting for server to respond after ${timeout}ms. ` + `Make sure your server is starting correctly on port ${port}.`);
@@ -95945,7 +95976,7 @@ Should be of format "before:after"`);
         }
       }
       function objectize(node) {
-        function resolve3(value, key) {
+        function resolve4(value, key) {
           if (!value._parent)
             return;
           if (value._parent._default && value._parent._default[key])
@@ -95968,8 +95999,8 @@ Should be of format "before:after"`);
           if (isObject(value)) {
             if (!value._before && !value._after)
               return objectize(value);
-            value._before = value._before || resolve3(value, "_before");
-            value._after = value._after || resolve3(value, "_after");
+            value._before = value._before || resolve4(value, "_before");
+            value._after = value._after || resolve4(value, "_after");
             return;
           }
           throw new Error("nodes need to be either {String}, {Object} or {Function}." + value + " is neither.");
@@ -104866,7 +104897,7 @@ function parsePort(args) {
 async function waitForInitialBuild(genProcess) {
   console.log("[reroute/dev] Waiting for initial build...");
   const outputBuffer = [];
-  const buildCompletePromise = new Promise((resolve3, reject) => {
+  const buildCompletePromise = new Promise((resolve4, reject) => {
     const timeout = setTimeout(() => {
       reject(new Error("Timeout waiting for initial build to complete (120s)"));
     }, 120000);
@@ -104876,7 +104907,7 @@ async function waitForInitialBuild(genProcess) {
         clearTimeout(timeout);
         genProcess.stdout?.removeListener("data", checkComplete);
         genProcess.stderr?.removeListener("data", checkComplete);
-        resolve3();
+        resolve4();
       }
     };
     genProcess.stdout?.on("data", checkComplete);
@@ -105067,7 +105098,7 @@ async function start(args) {
 `);
     const genCommand = useShell ? `${rerouteCmd} gen ${genArgs.join(" ")}` : rerouteCmd;
     const genArgsWithCmd = useShell ? [] : ["gen", ...genArgs];
-    await new Promise((resolve3, reject) => {
+    await new Promise((resolve4, reject) => {
       const genProcess = spawn2(genCommand, genArgsWithCmd, {
         stdio: ["ignore", "pipe", "pipe"],
         shell: useShell
@@ -105078,7 +105109,7 @@ async function start(args) {
         if (code !== null && code !== 0) {
           reject(new Error(`Gen exited with code ${code}`));
         } else {
-          resolve3();
+          resolve4();
         }
       });
       genProcess.on("error", (error) => {
@@ -105120,13 +105151,13 @@ async function start(args) {
       serverProcess.kill("SIGINT");
       process.exit(0);
     });
-    await new Promise((resolve3, reject) => {
+    await new Promise((resolve4, reject) => {
       serverProcess.on("exit", (code) => {
         if (code !== null && code !== 0) {
           console.error(colorizeLogPrefixAnsi(`[reroute/start] Server exited with code ${code}`));
           reject(new Error(`Server exited with code ${code}`));
         } else {
-          resolve3();
+          resolve4();
         }
       });
       serverProcess.on("error", (error) => {
@@ -105258,7 +105289,7 @@ async function cleanRerouteFolder(cwd) {
     process.stdout.write(colorizeLogPrefixAnsi(`[reroute/build] Cleaning .reroute folder...
 `));
     rmSync(rerouteDir, { recursive: true, force: true });
-    await new Promise((resolve3) => setTimeout(resolve3, 100));
+    await new Promise((resolve4) => setTimeout(resolve4, 100));
     process.stdout.write(colorizeLogPrefixAnsi(`[reroute/build] ✓ .reroute folder cleaned
 `));
   }
@@ -105284,7 +105315,7 @@ async function runGenCommand(rerouteCmd, useShell, noCompression) {
   const genArgs = useShell ? [] : ["gen", "--prod", noCompression ? "--no-compression" : ""];
   const genBuffer = { current: "" };
   const handleGenOutput = createOutputHandler(genBuffer);
-  await new Promise((resolve3, reject) => {
+  await new Promise((resolve4, reject) => {
     const genProcess = spawn3(genCommand, genArgs, {
       stdio: ["ignore", "pipe", "pipe"],
       shell: useShell
@@ -105295,7 +105326,7 @@ async function runGenCommand(rerouteCmd, useShell, noCompression) {
       if (code !== null && code !== 0) {
         reject(new Error(`Gen exited with code ${code}`));
       } else {
-        resolve3();
+        resolve4();
       }
     });
     genProcess.on("error", (error) => {
@@ -107470,7 +107501,7 @@ async function analyze(args) {
       const useShell = rerouteCmd.includes(" ");
       const buildCommand = useShell ? `${rerouteCmd} build` : rerouteCmd;
       const buildArgs = useShell ? [] : ["build"];
-      await new Promise((resolve3, reject) => {
+      await new Promise((resolve4, reject) => {
         const buildProcess = spawn4(buildCommand, buildArgs, {
           stdio: "inherit",
           shell: useShell
@@ -107479,7 +107510,7 @@ async function analyze(args) {
           if (code !== null && code !== 0) {
             reject(new Error(`Build exited with code ${code}`));
           } else {
-            resolve3();
+            resolve4();
           }
         });
         buildProcess.on("error", (error) => {
@@ -107686,8 +107717,8 @@ async function killProcessOnPort(port) {
     const proc = spawn4("bunx", ["kill-port", String(port)], {
       stdio: "ignore"
     });
-    await new Promise((resolve3) => {
-      proc.on("close", () => resolve3());
+    await new Promise((resolve4) => {
+      proc.on("close", () => resolve4());
     });
   } catch {}
 }
@@ -108050,7 +108081,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "1.0.0-alpha.22";
+    return "1.0.0-alpha.24";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -108067,10 +108098,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "53ae62b";
+    return "ab63579";
   }
   return "dev";
 }
 main();
 
-//# debugId=6EFAB19C7B4DAA9864756E2164756E21
+//# debugId=6277845B47C49F9964756E2164756E21