rwsdk 1.0.0-beta.44 → 1.0.0-beta.45

package/dist/runtime/client/client.d.ts

@@ -19,7 +19,7 @@ export declare const fetchTransport: Transport;
  *                             - `onCaughtError`: Handler for errors caught by error boundaries
  *                             - `onRecoverableError`: Handler for recoverable errors
  * @param handleResponse - Custom response handler for navigation errors (navigation GETs)
- * @param onHydrationUpdate - Callback invoked after a new RSC payload has been committed on the client
+ * @param onHydrated - Callback invoked after a new RSC payload has been committed on the client
  * @param onActionResponse - Optional hook invoked when an action returns a Response;
  *                           return true to signal that the response has been handled and
  *                           default behaviour (e.g. redirects) should be skipped
@@ -64,10 +64,10 @@ export declare const fetchTransport: Transport;
  *   },
  * });
  */
-export declare const initClient: ({ transport, hydrateRootOptions, handleResponse, onHydrationUpdate, onActionResponse, }?: {
+export declare const initClient: ({ transport, hydrateRootOptions, handleResponse, onHydrated, onActionResponse, }?: {
     transport?: Transport;
     hydrateRootOptions?: HydrationOptions;
     handleResponse?: (response: Response) => boolean;
-    onHydrationUpdate?: () => void;
+    onHydrated?: () => void;
     onActionResponse?: (actionResponse: ActionResponseData) => boolean | void;
 }) => Promise<void>;

package/dist/runtime/client/client.js

@@ -111,7 +111,7 @@ export const fetchTransport = (transportContext) => {
  *                             - `onCaughtError`: Handler for errors caught by error boundaries
  *                             - `onRecoverableError`: Handler for recoverable errors
  * @param handleResponse - Custom response handler for navigation errors (navigation GETs)
- * @param onHydrationUpdate - Callback invoked after a new RSC payload has been committed on the client
+ * @param onHydrated - Callback invoked after a new RSC payload has been committed on the client
  * @param onActionResponse - Optional hook invoked when an action returns a Response;
  *                           return true to signal that the response has been handled and
  *                           default behaviour (e.g. redirects) should be skipped
@@ -156,11 +156,11 @@ export const fetchTransport = (transportContext) => {
  *   },
  * });
  */
-export const initClient = async ({ transport = fetchTransport, hydrateRootOptions, handleResponse, onHydrationUpdate, onActionResponse, } = {}) => {
+export const initClient = async ({ transport = fetchTransport, hydrateRootOptions, handleResponse, onHydrated, onActionResponse, } = {}) => {
     const transportContext = {
         setRscPayload: () => { },
         handleResponse,
-        onHydrationUpdate,
+        onHydrated,
         onActionResponse,
     };
     let transportCallServer = transport(transportContext);
@@ -198,7 +198,7 @@ export const initClient = async ({ transport = fetchTransport, hydrateRootOption
         React.useEffect(() => {
             if (!streamData)
                 return;
-            transportContext.onHydrationUpdate?.();
+            transportContext.onHydrated?.();
         }, [streamData]);
         return (_jsx(_Fragment, { children: streamData
                 ? React.use(streamData).node

package/dist/runtime/client/navigation.d.ts

@@ -29,8 +29,8 @@ export declare function navigate(href: string, options?: NavigateOptions): Promi
  * // Basic usage
  * import { initClient, initClientNavigation } from "rwsdk/client";
  *
- * const { handleResponse, onHydrationUpdate } = initClientNavigation();
- * initClient({ handleResponse, onHydrationUpdate });
+ * const { handleResponse, onHydrated } = initClientNavigation();
+ * initClient({ handleResponse, onHydrated });
  *
  * @example
  * // With custom scroll behavior
@@ -58,5 +58,5 @@ export declare function navigate(href: string, options?: NavigateOptions): Promi
  */
 export declare function initClientNavigation(opts?: ClientNavigationOptions): {
     handleResponse: (response: Response) => boolean;
-    onHydrationUpdate: () => void;
+    onHydrated: () => void;
 };

package/dist/runtime/client/navigation.js

@@ -78,8 +78,8 @@ function saveScrollPosition(x, y) {
  * // Basic usage
  * import { initClient, initClientNavigation } from "rwsdk/client";
  *
- * const { handleResponse, onHydrationUpdate } = initClientNavigation();
- * initClient({ handleResponse, onHydrationUpdate });
+ * const { handleResponse, onHydrated } = initClientNavigation();
+ * initClient({ handleResponse, onHydrated });
  *
  * @example
  * // With custom scroll behavior
@@ -134,9 +134,9 @@ export function initClientNavigation(opts = {}) {
     if (opts.cacheStorage && typeof globalThis !== "undefined") {
         globalThis.__rsc_cacheStorage = opts.cacheStorage;
     }
-    function onHydrationUpdate() {
+    function onHydrated() {
         // After each RSC hydration/update, increment generation and evict old caches,
-        // then warm the navigation cache based on any <link rel="prefetch"> tags
+        // then warm the navigation cache based on any <link rel="x-prefetch"> tags
         // rendered for the current location.
         onNavigationCommit(undefined, opts.cacheStorage);
         void preloadFromLinkTags(undefined, undefined, opts.cacheStorage);
@@ -144,6 +144,6 @@ export function initClientNavigation(opts = {}) {
     // Return callbacks for use with initClient
     return {
         handleResponse,
-        onHydrationUpdate,
+        onHydrated,
     };
 }

package/dist/runtime/client/navigationCache.d.ts

@@ -57,7 +57,7 @@ export declare function evictOldGenerationCaches(env?: NavigationCacheEnvironmen
  */
 export declare function onNavigationCommit(env?: NavigationCacheEnvironment, cacheStorage?: NavigationCacheStorage): void;
 /**
- * Scan the document for `<link rel="prefetch" href="...">` elements that point
+ * Scan the document for `<link rel="x-prefetch" href="...">` elements that point
  * to same-origin paths and prefetch their RSC navigation responses into the
  * Cache API.
  *

package/dist/runtime/client/navigationCache.js

@@ -5,30 +5,22 @@ function getOrInitializeCacheState() {
     if (cacheState) {
         return cacheState;
     }
-    // Get or generate tabId
-    let tabId;
-    if (typeof window !== "undefined" && window.sessionStorage) {
+    let tabId = null;
+    if (typeof window !== "undefined") {
         try {
-            const stored = sessionStorage.getItem(TAB_ID_STORAGE_KEY);
-            if (stored) {
-                tabId = stored;
-            }
-            else {
-                tabId = crypto.randomUUID();
+            tabId = sessionStorage.getItem(TAB_ID_STORAGE_KEY);
+            if (!tabId) {
+                tabId = `${Date.now()}-${Math.floor(Math.random() * 1000000)}`;
                 sessionStorage.setItem(TAB_ID_STORAGE_KEY, tabId);
             }
         }
         catch {
-            // Fallback to in-memory tabId if sessionStorage is unavailable
-            tabId = crypto.randomUUID();
+            // sessionStorage might be unavailable
+            tabId = tabId || `${Date.now()}-${Math.floor(Math.random() * 1000000)}`;
         }
     }
-    else {
-        // Fallback for non-browser environments
-        tabId = crypto.randomUUID();
-    }
     cacheState = {
-        tabId,
+        tabId: tabId || "1",
         generation: 0,
         buildId: BUILD_ID,
     };
@@ -36,7 +28,7 @@ function getOrInitializeCacheState() {
 }
 function getCurrentCacheName() {
     const state = getOrInitializeCacheState();
-    return `rsc-prefetch:${state.buildId}:${state.tabId}:${state.generation}`;
+    return `rsc-x-prefetch:${state.buildId}:${state.tabId}:${state.generation}`;
 }
 function incrementGeneration() {
     const state = getOrInitializeCacheState();
@@ -135,6 +127,9 @@ export async function preloadNavigationUrl(rawUrl, env, cacheStorage) {
         const request = new Request(url.toString(), {
             method: "GET",
             redirect: "manual",
+            headers: {
+                "x-prefetch": "true",
+            },
         });
         const cacheName = getCurrentCacheName();
         const cache = await storage.open(cacheName);
@@ -221,7 +216,7 @@ export async function evictOldGenerationCaches(env, cacheStorage) {
         try {
             // List all cache names
             const cacheNames = await storage.keys();
-            const prefix = `rsc-prefetch:${buildId}:${tabId}:`;
+            const prefix = `rsc-x-prefetch:${buildId}:${tabId}:`;
             // Find all caches for this tab
             const tabCaches = cacheNames.filter((name) => name.startsWith(prefix));
             // Delete caches with generation numbers less than current
@@ -256,11 +251,16 @@ export async function evictOldGenerationCaches(env, cacheStorage) {
  * as complete and prepare for the next navigation cycle.
  */
 export function onNavigationCommit(env, cacheStorage) {
+    const runtimeEnv = env ?? getBrowserNavigationCacheEnvironment();
+    const storage = cacheStorage ?? createDefaultNavigationCacheStorage(runtimeEnv);
+    if (!storage) {
+        return;
+    }
     incrementGeneration();
-    void evictOldGenerationCaches(env, cacheStorage);
+    void evictOldGenerationCaches(env, storage);
 }
 /**
- * Scan the document for `<link rel="prefetch" href="...">` elements that point
+ * Scan the document for `<link rel="x-prefetch" href="...">` elements that point
  * to same-origin paths and prefetch their RSC navigation responses into the
  * Cache API.
  *
@@ -272,7 +272,7 @@ export async function preloadFromLinkTags(doc = document, env, cacheStorage) {
     if (typeof doc === "undefined") {
         return;
     }
-    const links = Array.from(doc.querySelectorAll('link[rel="prefetch"][href]'));
+    const links = Array.from(doc.querySelectorAll('link[rel="x-prefetch"][href]'));
     await Promise.all(links.map((link) => {
         const href = link.getAttribute("href");
         if (!href) {

package/dist/runtime/client/navigationCache.test.js

@@ -148,6 +148,19 @@ describe("navigationCache", () => {
             const requestUrl = new URL(request.url);
             expect(requestUrl.searchParams.has("__rsc")).toBe(true);
         });
+        it("should add x-prefetch header", async () => {
+            const env = {
+                isSecureContext: true,
+                origin: "https://example.com",
+                caches: mockCacheStorage,
+                fetch: mockFetch,
+            };
+            const url = new URL("https://example.com/test");
+            await preloadNavigationUrl(url, env);
+            const fetchCall = mockFetch.mock.calls[0];
+            const request = fetchCall[0];
+            expect(request.headers.get("x-prefetch")).toBe("true");
+        });
         it("should use custom cacheStorage when provided", async () => {
             const customCache = {
                 put: vi.fn().mockResolvedValue(undefined),
@@ -283,27 +296,27 @@ describe("navigationCache", () => {
             await preloadNavigationUrl(url, env);
             const openCall = mockCacheStorage.open.mock.calls[0];
             const cacheName = openCall[0];
-            const tabIdMatch = cacheName.match(/^rsc-prefetch:rwsdk:([^:]+):\d+$/);
+            const tabIdMatch = cacheName.match(/^rsc-x-prefetch:rwsdk:([^:]+):\d+$/);
             const tabId = tabIdMatch ? tabIdMatch[1] : "test-uuid-123";
             // Increment generation to 2 by calling onNavigationCommit twice
             onNavigationCommit(env);
             onNavigationCommit(env);
             // Mock cache names matching the actual tabId
             const allCacheNames = [
-                `rsc-prefetch:rwsdk:${tabId}:0`,
-                `rsc-prefetch:rwsdk:${tabId}:1`,
-                `rsc-prefetch:rwsdk:${tabId}:2`,
-                "rsc-prefetch:rwsdk:other-tab:0",
+                `rsc-x-prefetch:rwsdk:${tabId}:0`,
+                `rsc-x-prefetch:rwsdk:${tabId}:1`,
+                `rsc-x-prefetch:rwsdk:${tabId}:2`,
+                "rsc-x-prefetch:rwsdk:other-tab:0",
             ];
             mockCacheStorage.keys.mockResolvedValue(allCacheNames);
             await evictOldGenerationCaches(env);
             // Wait for the cleanup to execute
             await new Promise((resolve) => setTimeout(resolve, 10));
             // Should delete generations 0 and 1, but not 2 (current) or other-tab
-            expect(mockCacheStorage.delete).toHaveBeenCalledWith(`rsc-prefetch:rwsdk:${tabId}:0`);
-            expect(mockCacheStorage.delete).toHaveBeenCalledWith(`rsc-prefetch:rwsdk:${tabId}:1`);
-            expect(mockCacheStorage.delete).not.toHaveBeenCalledWith(`rsc-prefetch:rwsdk:${tabId}:2`);
-            expect(mockCacheStorage.delete).not.toHaveBeenCalledWith("rsc-prefetch:rwsdk:other-tab:0");
+            expect(mockCacheStorage.delete).toHaveBeenCalledWith(`rsc-x-prefetch:rwsdk:${tabId}:0`);
+            expect(mockCacheStorage.delete).toHaveBeenCalledWith(`rsc-x-prefetch:rwsdk:${tabId}:1`);
+            expect(mockCacheStorage.delete).not.toHaveBeenCalledWith(`rsc-x-prefetch:rwsdk:${tabId}:2`);
+            expect(mockCacheStorage.delete).not.toHaveBeenCalledWith("rsc-x-prefetch:rwsdk:other-tab:0");
         });
         it("should use custom cacheStorage when provided", async () => {
             // Get the actual tabId that will be used
@@ -317,7 +330,7 @@ describe("navigationCache", () => {
             await preloadNavigationUrl(url, env);
             const openCall = mockCacheStorage.open.mock.calls[0];
             const cacheName = openCall[0];
-            const tabIdMatch = cacheName.match(/^rsc-prefetch:rwsdk:([^:]+):\d+$/);
+            const tabIdMatch = cacheName.match(/^rsc-x-prefetch:rwsdk:([^:]+):\d+$/);
             const tabId = tabIdMatch ? tabIdMatch[1] : "test-uuid-123";
             const customStorage = {
                 open: vi.fn(),
@@ -325,8 +338,8 @@ describe("navigationCache", () => {
                 keys: vi
                     .fn()
                     .mockResolvedValue([
-                    `rsc-prefetch:rwsdk:${tabId}:0`,
-                    `rsc-prefetch:rwsdk:${tabId}:1`,
+                    `rsc-x-prefetch:rwsdk:${tabId}:0`,
+                    `rsc-x-prefetch:rwsdk:${tabId}:1`,
                 ]),
             };
             // Increment generation so there are old caches to delete
@@ -367,14 +380,14 @@ describe("navigationCache", () => {
         });
     });
     describe("preloadFromLinkTags", () => {
-        it("should preload URLs from prefetch link tags", async () => {
+        it("should preload URLs from x-prefetch link tags", async () => {
             const env = {
                 isSecureContext: true,
                 origin: "https://example.com",
                 caches: mockCacheStorage,
                 fetch: mockFetch,
             };
-            // Create a mock document with prefetch links
+            // Create a mock document with x-prefetch links
             const mockDoc = {
                 querySelectorAll: vi.fn().mockReturnValue([
                     {
@@ -450,7 +463,7 @@ describe("navigationCache", () => {
             await preloadNavigationUrl(url, env);
             const openCall = mockCacheStorage.open.mock.calls[0];
             const cacheName = openCall[0];
-            expect(cacheName).toMatch(/^rsc-prefetch:rwsdk:[^:]+:\d+$/);
+            expect(cacheName).toMatch(/^rsc-x-prefetch:rwsdk:[^:]+:\d+$/);
         });
     });
 });

package/dist/runtime/client/types.d.ts

@@ -23,7 +23,7 @@ export type TransportContext = {
      * This is useful for features like client-side navigation that want to run logic
      * after hydration/updates, e.g. warming navigation caches.
      */
-    onHydrationUpdate?: () => void;
+    onHydrated?: () => void;
     /**
      * Optional callback invoked when an action returns a Response.
      * Return true to signal that the response has been handled and

package/dist/runtime/lib/router.js

@@ -411,7 +411,9 @@ export function route(path, handler) {
     if (!normalizedPath.startsWith("/")) {
         normalizedPath = "/" + normalizedPath;
     }
-    if (!normalizedPath.endsWith("/")) {
+    // Special case: wildcard route "*" should normalize to "/*" (not "/*/")
+    // to allow it to match the root path "/"
+    if (normalizedPath !== "/*" && !normalizedPath.endsWith("/")) {
         normalizedPath = normalizedPath + "/";
     }
     // Normalize custom method keys to lowercase

package/dist/runtime/lib/router.test.js

@@ -34,6 +34,11 @@ describe("matchPath", () => {
     it("should match empty wildcard", () => {
         expect(matchPath("/files/*/", "/files//")).toEqual({ $0: "" });
     });
+    it("should match wildcard route against root path", () => {
+        // Wildcard route should match the root path "/"
+        // This tests the regression where route("*") stopped matching "/"
+        expect(matchPath("/*", "/")).toEqual({ $0: "" });
+    });
     // Test case 4: Paths with both parameters and wildcards
     it("should match paths with both parameters and wildcards", () => {
         expect(matchPath("/products/:productId/*/", "/products/abc/details/more/")).toEqual({ productId: "abc", $0: "details/more" });
@@ -541,6 +546,28 @@ describe("defineRoutes - Request Handling Behavior", () => {
             expect(response.status).toBe(404);
             expect(await response.text()).toBe("Not Found");
         });
+        it("should match wildcard route against root path", async () => {
+            // Regression test: wildcard route should match the root path "/"
+            const executionOrder = [];
+            const WildcardPage = () => {
+                executionOrder.push("WildcardPage");
+                return React.createElement("div", {}, "Wildcard Page");
+            };
+            const router = defineRoutes([route("*", WildcardPage)]);
+            const deps = createMockDependencies();
+            deps.mockRequestInfo.request = new Request("http://localhost:3000/");
+            deps.mockRequestInfo.path = "/";
+            const request = new Request("http://localhost:3000/");
+            await router.handle({
+                request,
+                renderPage: deps.mockRenderPage,
+                getRequestInfo: deps.getRequestInfo,
+                onError: deps.onError,
+                runWithRequestInfoOverrides: deps.mockRunWithRequestInfoOverrides,
+                rscActionHandler: deps.mockRscActionHandler,
+            });
+            expect(executionOrder).toEqual(["WildcardPage"]);
+        });
     });
     describe("Multiple Render Blocks with SSR Configuration", () => {
         it("should short-circuit on first matching render block and not apply later configurations", async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-beta.44",
+  "version": "1.0.0-beta.45",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {