@rangojs/router 0.21.0 → 0.22.1

package/src/vite/router-discovery.ts

@@ -991,6 +991,14 @@ export function createRouterDiscoveryPlugin(
             (globalThis as any).__rscRouterDiscoveryActive ?? false,
           );
           s.devServerOrigin = getDevServerOrigin();
+          // The temp Node realm below shares this globalThis and runs the dev
+          // /__rsc_shell capture, which must replay the prerender store as
+          // the worker's HIT does: a capture that renders the Prerender
+          // handler live stores a doc record the HIT never reads, and the
+          // HIT loses the loader pushes its prelude rendered (#1057). That
+          // realm never evaluates the virtual module that sets this on the
+          // Node preset.
+          globalThis.__PRERENDER_DEV_URL = s.devServerOrigin;
 
           // Create a temp Node.js server to run runtime discovery and generate
           // named route types (static parser can't resolve factory calls).
@@ -2497,6 +2505,12 @@ export function createRouterDiscoveryPlugin(
             s.resolvedPrerenderModules,
             "Prerender",
             false,
+            // Mark onDemand exports (retained, not evicted) from the
+            // discovery-derived $$id set — the same evaluated source that sets
+            // the runtime od trie flag, so retention and serve can never
+            // disagree. Populated by discoverRouters (buildStart), which runs
+            // before this generateBundle pass.
+            s.onDemandHandlerIds,
           );
           if (handlers.length > 0) {
             const existing = s.handlerChunkInfoMap.get(fileName);

package/src/vite/utils/bundle-analysis.ts

@@ -29,20 +29,40 @@ export function findMatchingParenInBundle(
 
 /**
  * Scan a bundled chunk for handler exports and extract their names + $$id values.
- * Optionally detects passthrough flag. @internal Exported for testing only.
+ * Optionally detects the passthrough flag by parsing the call body, and marks
+ * onDemand from the authoritative discovery-derived handlerId set.
+ * @internal Exported for testing only.
  */
 export function extractHandlerExportsFromChunk(
   chunkCode: string,
   handlerModules: Map<string, string[]>,
   fnName: string,
   detectPassthrough: boolean,
-): Array<{ name: string; handlerId: string; passthrough: boolean }> {
+  // handlerIds ($$id) of routes the evaluated source marks onDemand — the
+  // single source of truth shared with the runtime od trie flag. Keyed on the
+  // same $$id the chunk scan extracts, so any spelling of the option (literal,
+  // spread, imported const) retains the producer; a textual scan of the call
+  // body cannot see non-literal spellings and silently evicted them.
+  onDemandHandlerIds?: ReadonlyMap<string, string>,
+): Array<{
+  name: string;
+  handlerId: string;
+  passthrough: boolean;
+  onDemand: boolean;
+}> {
   const handlers: Array<{
     name: string;
     handlerId: string;
     passthrough: boolean;
+    onDemand: boolean;
   }> = [];
 
+  // Only parse a call body (an O(callBody) paren walk per export) when the whole
+  // chunk actually contains the marker we're detecting — the common case (no
+  // passthrough opt-in anywhere in the chunk) skips the walk entirely.
+  const scanPassthrough =
+    detectPassthrough && chunkCode.includes("passthrough");
+
   for (const [, handlerNames] of handlerModules) {
     for (const name of handlerNames) {
       const eName = escapeRegExp(name);
@@ -53,7 +73,7 @@ export function extractHandlerExportsFromChunk(
       if (!match) continue;
 
       let isPassthrough = false;
-      if (detectPassthrough) {
+      if (scanPassthrough) {
         const eFnName = escapeRegExp(fnName);
         const callStartRe = new RegExp(
           `(?:const|let|var)\\s+${eName}\\s*=\\s*${eFnName}\\s*(?:<[^>]*>)?\\s*\\(`,
@@ -68,7 +88,12 @@ export function extractHandlerExportsFromChunk(
           }
         }
       }
-      handlers.push({ name, handlerId: match[1], passthrough: isPassthrough });
+      handlers.push({
+        name,
+        handlerId: match[1],
+        passthrough: isPassthrough,
+        onDemand: onDemandHandlerIds?.has(match[1]) ?? false,
+      });
     }
   }
 
@@ -82,7 +107,12 @@ export function extractHandlerExportsFromChunk(
  */
 export function evictHandlerCode(
   code: string,
-  exports: Array<{ name: string; handlerId: string; passthrough?: boolean }>,
+  exports: Array<{
+    name: string;
+    handlerId: string;
+    passthrough?: boolean;
+    onDemand?: boolean;
+  }>,
   fnName: string,
   brand: string,
 ): { code: string; savedBytes: number } | null {
@@ -90,8 +120,10 @@ export function evictHandlerCode(
   let modified = code;
 
   const eFnName = escapeRegExp(fnName);
-  for (const { name, handlerId, passthrough } of exports) {
-    if (passthrough) continue;
+  for (const { name, handlerId, passthrough, onDemand } of exports) {
+    // Keep the producer body for passthrough (live fallback) and onDemand
+    // (router.prerender() must be able to invoke the retained producer).
+    if (passthrough || onDemand) continue;
 
     const eName = escapeRegExp(name);
     // Match const/let/var: Rolldown (Vite 8) emits top-level bindings in the

package/dist/types/browser/react/subscribe-to-nothing.d.ts

@@ -1,7 +0,0 @@
-/**
- * `subscribe` for a useSyncExternalStore whose snapshot nothing notifies: the
- * hook is there for its server snapshot (useLocationState, useHandle), or the
- * value only changes with a render (Link's non-adaptive prefetch strategy).
- * One function, so its identity is stable across renders and hooks.
- */
-export declare const subscribeToNothing: () => () => void;

package/dist/types/segment-content-promise.d.ts

@@ -1,13 +0,0 @@
-import type { ReactNode } from "react";
-/**
- * Return a stable Promise wrapping `component`, memoized on the component ref.
- *
- * A fresh `Promise.resolve(component)` each render would suspend for one
- * microtask and briefly commit the loading fallback inside Suspender — the
- * intercept / parallel-slot flicker this indirection prevents. Reusing the
- * same Promise ref keeps React's `use()` in "known fulfilled" state after
- * the first observation.
- *
- * @internal
- */
-export declare function getMemoizedContentPromise(component: ReactNode): Promise<ReactNode>;

package/src/browser/react/subscribe-to-nothing.ts

@@ -1,7 +0,0 @@
-/**
- * `subscribe` for a useSyncExternalStore whose snapshot nothing notifies: the
- * hook is there for its server snapshot (useLocationState, useHandle), or the
- * value only changes with a render (Link's non-adaptive prefetch strategy).
- * One function, so its identity is stable across renders and hooks.
- */
-export const subscribeToNothing: () => () => void = () => () => {};

package/src/segment-content-promise.ts

@@ -1,67 +0,0 @@
-import type { ReactNode } from "react";
-
-/**
- * Stable Promise wrappers keyed on the component itself. Objects (React
- * elements, functions, lazy payloads) land in a WeakMap so entries GC when
- * the underlying component is released; primitives (string, number, boolean,
- * null) land in a Map so memoization still applies to text-/null-backed
- * segments like those in partial-update flows. Keeping this cache outside
- * the segment eliminates preservation fields on ResolvedSegment — it survives
- * reconciliation naturally because the component ref is what's stable.
- *
- * Browser-only. On the server each SSR render needs a fresh pending promise
- * so Suspense can emit the loading fallback HTML before content streams. A
- * shared already-resolved promise has `.status === "fulfilled"` attached by
- * React on its first observation — subsequent `use()` calls return
- * synchronously without suspending, so the Suspense fallback never makes it
- * into the initial HTML. Route-definition components share refs across
- * requests, so a global cache would leak tracked state between renders.
- */
-const IS_BROWSER = typeof window !== "undefined";
-const objectContentCache = IS_BROWSER
-  ? new WeakMap<object, Promise<ReactNode>>()
-  : null;
-const primitiveContentCache = IS_BROWSER
-  ? new Map<unknown, Promise<ReactNode>>()
-  : null;
-
-/**
- * Return a stable Promise wrapping `component`, memoized on the component ref.
- *
- * A fresh `Promise.resolve(component)` each render would suspend for one
- * microtask and briefly commit the loading fallback inside Suspender — the
- * intercept / parallel-slot flicker this indirection prevents. Reusing the
- * same Promise ref keeps React's `use()` in "known fulfilled" state after
- * the first observation.
- *
- * @internal
- */
-export function getMemoizedContentPromise(
-  component: ReactNode,
-): Promise<ReactNode> {
-  if (component instanceof Promise) {
-    return component as Promise<ReactNode>;
-  }
-
-  if (!objectContentCache || !primitiveContentCache) {
-    return Promise.resolve(component);
-  }
-
-  if (component !== null && typeof component === "object") {
-    const cached = objectContentCache.get(component);
-    if (cached) {
-      return cached;
-    }
-    const promise = Promise.resolve(component);
-    objectContentCache.set(component, promise);
-    return promise;
-  }
-
-  const cached = primitiveContentCache.get(component);
-  if (cached) {
-    return cached;
-  }
-  const promise = Promise.resolve(component);
-  primitiveContentCache.set(component, promise);
-  return promise;
-}