rwsdk 0.2.0-alpha.1 → 0.2.0-alpha.3

package/dist/runtime/clientNavigation.js

@@ -1,3 +1,10 @@
+function saveScrollPosition(x, y) {
+    window.history.replaceState({
+        ...window.history.state,
+        scrollX: x,
+        scrollY: y,
+    }, "", window.location.href);
+}
 export function validateClickEvent(event, target) {
     // should this only work for left click?
     if (event.button !== 0) {
@@ -31,7 +38,6 @@ export function validateClickEvent(event, target) {
     return true;
 }
 export function initClientNavigation(opts = {}) {
-    // Merge user options with defaults
     const options = {
         onNavigate: async function onNavigate() {
             // @ts-expect-error
@@ -41,63 +47,7 @@ export function initClientNavigation(opts = {}) {
         scrollBehavior: "instant",
         ...opts,
     };
-    // Prevent browser's automatic scroll restoration for popstate
-    if ("scrollRestoration" in history) {
-        history.scrollRestoration = "manual";
-    }
-    // Set up scroll behavior management
-    let popStateWasCalled = false;
-    let savedScrollPosition = null;
-    const observer = new MutationObserver(() => {
-        if (popStateWasCalled && savedScrollPosition) {
-            // Restore scroll position for popstate navigation (always instant)
-            window.scrollTo({
-                top: savedScrollPosition.y,
-                left: savedScrollPosition.x,
-                behavior: "instant",
-            });
-            savedScrollPosition = null;
-        }
-        else if (options.scrollToTop && !popStateWasCalled) {
-            // Scroll to top for anchor click navigation (configurable)
-            window.scrollTo({
-                top: 0,
-                left: 0,
-                behavior: options.scrollBehavior,
-            });
-            // Update the current history entry with the new scroll position (top)
-            // This ensures that if we navigate back and then forward again,
-            // we return to the top position, not some previous scroll position
-            window.history.replaceState({
-                ...window.history.state,
-                scrollX: 0,
-                scrollY: 0,
-            }, "", window.location.href);
-        }
-        popStateWasCalled = false;
-    });
-    const handleScrollPopState = (event) => {
-        popStateWasCalled = true;
-        // Save the scroll position that the browser would have restored to
-        const state = event.state;
-        if (state &&
-            typeof state === "object" &&
-            "scrollX" in state &&
-            "scrollY" in state) {
-            savedScrollPosition = { x: state.scrollX, y: state.scrollY };
-        }
-        else {
-            // Fallback: try to get scroll position from browser's session history
-            // This is a best effort since we can't directly access the browser's stored position
-            savedScrollPosition = { x: window.scrollX, y: window.scrollY };
-        }
-    };
-    const main = document.querySelector("main") || document.body;
-    if (main) {
-        window.addEventListener("popstate", handleScrollPopState);
-        observer.observe(main, { childList: true, subtree: true });
-    }
-    // Intercept all anchor tag clicks
+    history.scrollRestoration = "auto";
     document.addEventListener("click", async function handleClickEvent(event) {
         // Prevent default navigation
         if (!validateClickEvent(event, event.target)) {
@@ -107,17 +57,21 @@ export function initClientNavigation(opts = {}) {
         const el = event.target;
         const a = el.closest("a");
         const href = a?.getAttribute("href");
-        // Save current scroll position before navigating
-        window.history.replaceState({
-            path: window.location.pathname,
-            scrollX: window.scrollX,
-            scrollY: window.scrollY,
-        }, "", window.location.href);
+        saveScrollPosition(window.scrollX, window.scrollY);
         window.history.pushState({ path: href }, "", window.location.origin + href);
         await options.onNavigate();
+        if (options.scrollToTop && history.scrollRestoration === "auto") {
+            window.scrollTo({
+                top: 0,
+                left: 0,
+                behavior: options.scrollBehavior,
+            });
+            saveScrollPosition(0, 0);
+        }
+        history.scrollRestoration = "auto";
     }, true);
-    // Handle browser back/forward buttons
     window.addEventListener("popstate", async function handlePopState() {
+        saveScrollPosition(window.scrollX, window.scrollY);
         await options.onNavigate();
     });
     // Return a handleResponse function for use with initClient

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

@@ -5,7 +5,9 @@ export interface RequestInfo<Params = any, AppContext = DefaultAppContext> {
     request: Request;
     params: Params;
     ctx: AppContext;
+    /** @deprecated: Use `response.headers` instead */
     headers: Headers;
     rw: RwContext;
     cf: ExecutionContext;
+    response: ResponseInit;
 }

package/dist/runtime/requestInfo/worker.js

@@ -2,7 +2,7 @@ import { AsyncLocalStorage } from "async_hooks";
 const requestInfoDeferred = Promise.withResolvers();
 const requestInfoStore = new AsyncLocalStorage();
 const requestInfoBase = {};
-const REQUEST_INFO_KEYS = ["request", "params", "ctx", "headers", "rw", "cf"];
+const REQUEST_INFO_KEYS = ["request", "params", "ctx", "headers", "rw", "cf", "response"];
 REQUEST_INFO_KEYS.forEach((key) => {
     Object.defineProperty(requestInfoBase, key, {
         enumerable: true,

package/dist/runtime/worker.js

@@ -44,6 +44,10 @@ export const defineApp = (routes) => {
                     scriptsToBeLoaded: new Set(),
                     pageRouteResolved: undefined,
                 };
+                const userResponseInit = {
+                    status: 200,
+                    headers: new Headers(),
+                };
                 const outerRequestInfo = {
                     request,
                     headers: userHeaders,
@@ -51,6 +55,7 @@ export const defineApp = (routes) => {
                     params: {},
                     ctx: {},
                     rw,
+                    response: userResponseInit,
                 };
                 const createPageElement = (requestInfo, Page) => {
                     let pageElement;
@@ -89,10 +94,12 @@ export const defineApp = (routes) => {
                         onError,
                     });
                     if (isRSCRequest) {
+                        const responseHeaders = new Headers(userResponseInit.headers);
+                        responseHeaders.set("content-type", "text/x-component; charset=utf-8");
                         return new Response(rscPayloadStream, {
-                            headers: {
-                                "content-type": "text/x-component; charset=utf-8",
-                            },
+                            status: userResponseInit.status,
+                            statusText: userResponseInit.statusText,
+                            headers: responseHeaders,
                         });
                     }
                     let injectRSCPayloadStream;
@@ -112,10 +119,12 @@ export const defineApp = (routes) => {
                     if (injectRSCPayloadStream) {
                         html = html.pipeThrough(injectRSCPayloadStream);
                     }
+                    const responseHeaders = new Headers(userResponseInit.headers);
+                    responseHeaders.set("content-type", "text/html; charset=utf-8");
                     return new Response(html, {
-                        headers: {
-                            "content-type": "text/html; charset=utf-8",
-                        },
+                        status: userResponseInit.status,
+                        statusText: userResponseInit.statusText,
+                        headers: responseHeaders,
                     });
                 };
                 const response = await runWithRequestInfo(outerRequestInfo, async () => new Promise(async (resolve, reject) => {
@@ -135,11 +144,21 @@ export const defineApp = (routes) => {
                 // context(justinvdm, 18 Mar 2025): In some cases, such as a .fetch() call to a durable object instance, or Response.redirect(),
                 // we need to return a mutable response object.
                 const mutableResponse = new Response(response.body, response);
+                // Merge user headers from the legacy headers object
                 for (const [key, value] of userHeaders.entries()) {
                     if (!response.headers.has(key)) {
                         mutableResponse.headers.set(key, value);
                     }
                 }
+                // Merge headers from user response init (these take precedence)
+                if (userResponseInit.headers) {
+                    const userResponseHeaders = new Headers(userResponseInit.headers);
+                    for (const [key, value] of userResponseHeaders.entries()) {
+                        if (!response.headers.has(key)) {
+                            mutableResponse.headers.set(key, value);
+                        }
+                    }
+                }
                 await rw.pageRouteResolved?.promise;
                 return mutableResponse;
             }

package/package.json

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