@rangojs/router 0.0.0-experimental.19 → 0.0.0-experimental.1b930379

package/src/browser/prefetch/policy.ts

@@ -5,6 +5,8 @@
  * Honors browser reduced-data preferences when available.
  */
 
+import { isPrefetchCacheDisabled } from "./cache.js";
+
 type NavigatorWithConnection = Navigator & {
   connection?: {
     saveData?: boolean;
@@ -18,6 +20,10 @@ type NavigatorWithConnection = Navigator & {
 export function shouldPrefetch(): boolean {
   if (typeof window === "undefined") return false;
 
+  // When prefetchCacheTTL is false/0, prefetching is fully disabled —
+  // no point issuing requests whose responses will be discarded.
+  if (isPrefetchCacheDisabled()) return false;
+
   const nav =
     typeof navigator !== "undefined"
       ? (navigator as NavigatorWithConnection)

package/src/browser/react/Link.tsx

@@ -37,7 +37,7 @@ import {
   unobserveForPrefetch,
 } from "../prefetch/observer.js";
 
-// Touch device detection for hybrid strategy.
+// Touch device detection for adaptive strategy.
 // Checked once at module load (Link.tsx is "use client", runs only in browser).
 const isTouchDevice =
   typeof window !== "undefined" && window.matchMedia("(hover: none)").matches;
@@ -47,14 +47,14 @@ const isTouchDevice =
  * - "hover": Prefetch on mouse enter (direct, no queue)
  * - "viewport": Prefetch when link enters viewport (queued, waits for idle)
  * - "render": Prefetch on component mount regardless of visibility (queued, waits for idle)
- * - "hybrid": Hover on pointer devices, viewport on touch devices
+ * - "adaptive": Hover on pointer devices, viewport on touch devices
  * - "none": No prefetching (default)
  */
 export type PrefetchStrategy =
   | "hover"
   | "viewport"
   | "render"
-  | "hybrid"
+  | "adaptive"
   | "none";
 
 /**
@@ -80,6 +80,16 @@ export interface LinkProps extends Omit<
    * Force full document navigation instead of SPA
    */
   reloadDocument?: boolean;
+  /**
+   * Whether to revalidate server data on navigation.
+   * Set to `false` to skip the RSC server fetch and only update the URL.
+   *
+   * Only takes effect when the pathname stays the same (search param / hash changes).
+   * If the pathname changes, this option is ignored and a full navigation occurs.
+   *
+   * @default true
+   */
+  revalidate?: boolean;
   /**
    * Prefetch strategy for the link destination
    * @default "none"
@@ -170,6 +180,7 @@ export const Link: ForwardRefExoticComponent<
     replace = false,
     scroll = true,
     reloadDocument = false,
+    revalidate,
     prefetch = "none",
     state,
     children,
@@ -181,9 +192,9 @@ export const Link: ForwardRefExoticComponent<
   const ctx = useContext(NavigationStoreContext);
   const isExternal = isExternalUrl(to);
 
-  // Resolve hybrid: viewport on touch devices, hover on pointer devices
+  // Resolve adaptive: viewport on touch devices, hover on pointer devices
   const resolvedStrategy =
-    prefetch === "hybrid" ? (isTouchDevice ? "viewport" : "hover") : prefetch;
+    prefetch === "adaptive" ? (isTouchDevice ? "viewport" : "hover") : prefetch;
 
   // Internal ref for viewport observation; merge with forwarded ref
   const internalRef = useRef<HTMLAnchorElement | null>(null);
@@ -262,9 +273,9 @@ export const Link: ForwardRefExoticComponent<
         resolvedState = currentState;
       }
 
-      ctx.navigate(to, { replace, scroll, state: resolvedState });
+      ctx.navigate(to, { replace, scroll, state: resolvedState, revalidate });
     },
-    [to, isExternal, reloadDocument, replace, scroll, ctx, onClick],
+    [to, isExternal, reloadDocument, replace, scroll, revalidate, ctx, onClick],
   );
 
   const handleMouseEnter = useCallback(() => {
@@ -340,6 +351,7 @@ export const Link: ForwardRefExoticComponent<
       data-external={isExternal ? "" : undefined}
       data-scroll={scroll === false ? "false" : undefined}
       data-replace={replace ? "true" : undefined}
+      data-revalidate={revalidate === false ? "false" : undefined}
       {...props}
     >
       <LinkContext.Provider value={to}>{children}</LinkContext.Provider>

package/src/browser/rsc-router.tsx

@@ -22,6 +22,7 @@ import type {
 import type { EventController } from "./event-controller.js";
 import type { ResolvedThemeConfig, Theme } from "../theme/types.js";
 import { initRangoState } from "./rango-state.js";
+import { initPrefetchCache } from "./prefetch/cache.js";
 import {
   isInterceptSegment,
   splitInterceptSegments,
@@ -201,10 +202,17 @@ export async function initBrowserApp(
   const rootLayout = initialPayload.metadata?.rootLayout;
   const version = initialPayload.metadata?.version;
 
-  // Initialize the localStorage state key for browser HTTP cache invalidation.
+  // Initialize the localStorage state key for cache invalidation.
   // Uses the build version so a new deploy automatically busts all cached prefetches.
   initRangoState(version ?? "0");
 
+  // Initialize the in-memory prefetch cache TTL from server config.
+  // A value of 0 disables the cache; undefined falls back to the module default.
+  const prefetchCacheTTL = initialPayload.metadata?.prefetchCacheTTL;
+  if (prefetchCacheTTL !== undefined) {
+    initPrefetchCache(prefetchCacheTTL);
+  }
+
   // Create a bound renderSegments that includes rootLayout
   const renderSegments = (
     segments: ResolvedSegment[],
@@ -260,7 +268,7 @@ export async function initBrowserApp(
     import.meta.hot.on("rsc:update", async () => {
       console.log("[RSCRouter] HMR: Server update, refetching RSC");
 
-      using handle = eventController.startNavigation(window.location.href, {
+      const handle = eventController.startNavigation(window.location.href, {
         replace: true,
       });
       const streamingToken = handle.startStreaming();
@@ -318,6 +326,7 @@ export async function initBrowserApp(
         console.log("[RSCRouter] HMR: RSC stream complete");
       } finally {
         streamingToken.end();
+        handle[Symbol.dispose]();
       }
     });
   }