rwsdk 0.1.25 → 0.1.27

package/dist/runtime/clientNavigation.d.ts

@@ -1,6 +1,9 @@
+export interface ClientNavigationOptions {
+    onNavigate?: () => void;
+    scrollToTop?: boolean;
+    scrollBehavior?: "auto" | "smooth" | "instant";
+}
 export declare function validateClickEvent(event: MouseEvent, target: HTMLElement): boolean;
-export declare function initClientNavigation(opts?: {
-    onNavigate: () => void;
-}): {
+export declare function initClientNavigation(opts?: ClientNavigationOptions): {
     handleResponse: (response: Response) => boolean;
 };

package/dist/runtime/clientNavigation.js

@@ -27,12 +27,70 @@ export function validateClickEvent(event, target) {
     }
     return true;
 }
-export function initClientNavigation(opts = {
-    onNavigate: async function onNavigate() {
-        // @ts-expect-error
-        await globalThis.__rsc_callServer();
-    },
-}) {
+export function initClientNavigation(opts = {}) {
+    // Merge user options with defaults
+    const options = {
+        onNavigate: async function onNavigate() {
+            // @ts-expect-error
+            await globalThis.__rsc_callServer();
+        },
+        scrollToTop: true,
+        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
     document.addEventListener("click", async function handleClickEvent(event) {
         // Prevent default navigation
@@ -43,12 +101,18 @@ 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);
         window.history.pushState({ path: href }, "", window.location.origin + href);
-        await opts.onNavigate();
+        await options.onNavigate();
     }, true);
     // Handle browser back/forward buttons
     window.addEventListener("popstate", async function handlePopState() {
-        await opts.onNavigate();
+        await options.onNavigate();
     });
     // Return a handleResponse function for use with initClient
     return {

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

@@ -1 +1,6 @@
 import "./shared";
+export interface ClientNavigationOptions {
+    onNavigate?: () => void;
+    scrollToTop?: boolean;
+    scrollBehavior?: "auto" | "smooth" | "instant";
+}

package/dist/scripts/ensure-deploy-env.mjs

@@ -15,9 +15,9 @@ const promptForDeployment = async () => {
     });
     return new Promise((resolve) => {
         // Handle Ctrl+C (SIGINT)
-        rl.on('SIGINT', () => {
+        rl.on("SIGINT", () => {
             rl.close();
-            console.log('\nDeployment cancelled.');
+            console.log("\nDeployment cancelled.");
             process.exit(1);
         });
         rl.question("Do you want to proceed with deployment? (y/N): ", (answer) => {

package/dist/vite/miniflareHMRPlugin.mjs

@@ -9,6 +9,7 @@ import { isJsFile } from "./isJsFile.mjs";
 import { invalidateModule } from "./invalidateModule.mjs";
 import { getShortName } from "../lib/getShortName.mjs";
 const log = debug("rwsdk:vite:hmr-plugin");
+let hasErrored = false;
 const hasDirective = async (filepath, directive) => {
     if (!isJsFile(filepath)) {
         return false;
@@ -54,7 +55,30 @@ const isInUseClientGraph = ({ file, clientFiles, server, }) => {
 export const miniflareHMRPlugin = (givenOptions) => [
     {
         name: "rwsdk:miniflare-hmr",
+        configureServer(server) {
+            return () => {
+                server.middlewares.use(function rwsdkDevServerErrorHandler(err, _req, _res, next) {
+                    if (err) {
+                        hasErrored = true;
+                    }
+                    next(err);
+                });
+            };
+        },
         async hotUpdate(ctx) {
+            if (hasErrored) {
+                const shortName = getShortName(ctx.file, ctx.server.config.root);
+                this.environment.logger.info(`${colors.cyan(`attempting to recover from error`)}: update to ${colors.dim(shortName)}`, {
+                    clear: true,
+                    timestamp: true,
+                });
+                hasErrored = false;
+                ctx.server.hot.send({
+                    type: "full-reload",
+                    path: "*",
+                });
+                return [];
+            }
             const { clientFiles, serverFiles, viteEnvironment: { name: environment }, workerEntryPathname: entry, } = givenOptions;
             if (process.env.VERBOSE) {
                 log(`Hot update: (env=${this.environment.name}) ${ctx.file}\nModule graph:\n\n${dumpFullModuleGraph(ctx.server, this.environment.name)}`);

package/package.json

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