reroute-js 0.37.2 → 0.38.0

package/cli/bin.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.37.2
+ * reroute-js v0.38.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.37.2
+ * reroute-js v0.38.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>
@@ -48,7 +48,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "0.37.2";
+    return "0.38.0";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -66,7 +66,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "ba53f92";
+    return "4d90433";
   }
   return "dev";
 }
@@ -1281,9 +1281,16 @@ async function handleStreamingRouteData(rawResult, isPromise, pathname, set, ctx
     throw err;
   });
   ssrData[pathname] = task;
+  const g = globalThis;
+  if (!g.__REROUTE_DATA__)
+    g.__REROUTE_DATA__ = {};
+  g.__REROUTE_DATA__[pathname] = task;
   storeResult(pathname, task.then((value) => {
     handleCaching(value, set, cache, setStatus);
     ssrData[pathname] = value;
+    if (g.__REROUTE_DATA__) {
+      g.__REROUTE_DATA__[pathname] = value;
+    }
     return value;
   }));
   return {};
@@ -1291,6 +1298,9 @@ async function handleStreamingRouteData(rawResult, isPromise, pathname, set, ctx
 function handleFlattenedResult(entries, set, ctx, cache, setError, setStatus) {
   const { ssrData, storeResult } = ctx;
   const { cacheKey, statusCacheKey, maxAgeMs } = cache;
+  const g = globalThis;
+  if (!g.__REROUTE_DATA__)
+    g.__REROUTE_DATA__ = {};
   const promisesToResolve = [];
   for (const [key, val] of entries) {
     if (isThenable(val)) {
@@ -1298,6 +1308,8 @@ function handleFlattenedResult(entries, set, ctx, cache, setError, setStatus) {
         if (set.status !== 200) {
           setStatus(set.status);
         }
+        ssrData[key] = resolved;
+        g.__REROUTE_DATA__[key] = resolved;
         return resolved;
       }).catch((err) => {
         const msg = err instanceof Error ? err.message : String(err);
@@ -1306,10 +1318,12 @@ function handleFlattenedResult(entries, set, ctx, cache, setError, setStatus) {
         throw err;
       });
       ssrData[key] = wrappedPromise;
+      g.__REROUTE_DATA__[key] = wrappedPromise;
       storeResult(key, wrappedPromise);
       promisesToResolve.push(wrappedPromise.then((resolved) => [key, resolved]));
     } else {
       ssrData[key] = val;
+      g.__REROUTE_DATA__[key] = val;
       promisesToResolve.push(Promise.resolve([key, val]));
     }
   }
@@ -1430,7 +1444,11 @@ async function computeSSRData(pathname, clientDir, cwd, isWatchMode, options = {
 }
 function setGlobalSSRData(data) {
   try {
-    globalThis.__REROUTE_DATA__ = data;
+    const g = globalThis;
+    if (!g.__REROUTE_DATA__) {
+      g.__REROUTE_DATA__ = {};
+    }
+    Object.assign(g.__REROUTE_DATA__, data);
   } catch {}
 }
 var init_compute = __esm(() => {
@@ -6002,13 +6020,22 @@ function isProductionMode(args = []) {
 
 // packages/cli/src/commands/lib/streaming/analyzer.ts
 import { dirname as dirname3, join as join6 } from "node:path";
+function hasSSRDataExport(source) {
+  if (SSR_DATA_INLINE_EXPORT_REGEX.test(source)) {
+    return true;
+  }
+  if (SSR_DATA_DECLARATION_REGEX.test(source) && SSR_REEXPORT_REGEX.test(source)) {
+    return true;
+  }
+  return false;
+}
 async function analyzeRouteForStreaming(options) {
   const normalizedRelativePath = normalizeRelativePath(options.relativePath);
   let source = "";
   try {
     source = await Bun.file(options.absolutePath).text();
   } catch {}
-  const hasSSRData = SSR_DATA_REGEX.test(source);
+  const hasSSRData = hasSSRDataExport(source);
   const customSkeletonPath = await findSkeletonForTarget(options.routesDir, normalizedRelativePath, options.type);
   return {
     filePath: normalizedRelativePath,
@@ -6036,9 +6063,11 @@ async function findSkeletonForTarget(routesDir, relativePath, type) {
 function normalizeRelativePath(path3) {
   return path3.replace(/\\/g, "/");
 }
-var SSR_DATA_REGEX;
+var SSR_DATA_INLINE_EXPORT_REGEX, SSR_DATA_DECLARATION_REGEX, SSR_REEXPORT_REGEX;
 var init_analyzer = __esm(() => {
-  SSR_DATA_REGEX = /export\s+const\s+ssr[\s\S]*?data\s*[:(]/i;
+  SSR_DATA_INLINE_EXPORT_REGEX = /export\s+const\s+ssr\s*=[\s\S]*?data\s*[:(]/i;
+  SSR_DATA_DECLARATION_REGEX = /const\s+ssr\s*=[\s\S]*?data\s*[:(]/i;
+  SSR_REEXPORT_REGEX = /export\s*\{[^}]*\bssr\b/i;
 });
 
 // packages/cli/src/commands/lib/streaming/suspense.ts
@@ -105637,7 +105666,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "0.37.2";
+    return "0.38.0";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -105654,10 +105683,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "ba53f92";
+    return "4d90433";
   }
   return "dev";
 }
 main();
 
-//# debugId=A1EFD04599B58F0764756E2164756E21
+//# debugId=BED4176249D4C97364756E2164756E21