rwsdk 1.2.10 → 1.2.11

package/dist/runtime/client/navigation.js

@@ -34,6 +34,13 @@ export function validateClickEvent(event, target) {
 }
 let IS_CLIENT_NAVIGATION = false;
 let scrollRestoration = null;
+let currentPathKey = null;
+function getLocationPathKey() {
+    return `${window.location.pathname ?? ""}${window.location.search ?? ""}`;
+}
+function getUrlPathKey(url) {
+    return `${url.pathname ?? ""}${url.search ?? ""}` || getLocationPathKey();
+}
 export async function navigate(href, options = { history: "push" }) {
     if (!IS_CLIENT_NAVIGATION) {
         window.location.href = href;
@@ -52,6 +59,7 @@ export async function navigate(href, options = { history: "push" }) {
     else {
         scrollRestoration?.replaceEntry(href, url, nextScrollPosition);
     }
+    currentPathKey = getUrlPathKey(url);
     if (scrollToTop) {
         scrollRestoration?.setPendingScroll({
             ...nextScrollPosition,
@@ -109,6 +117,7 @@ export function initClientNavigation(opts = {}) {
     IS_CLIENT_NAVIGATION = true;
     scrollRestoration = createScrollRestoration();
     scrollRestoration.initialize();
+    currentPathKey = getLocationPathKey();
     document.addEventListener("click", async function handleClickEvent(event) {
         if (!validateClickEvent(event, event.target)) {
             return;
@@ -120,6 +129,12 @@ export function initClientNavigation(opts = {}) {
         await navigate(href, { history: "push", onNavigate: opts.onNavigate });
     }, true);
     window.addEventListener("popstate", async function handlePopState() {
+        const nextPathKey = getLocationPathKey();
+        const isHashOnlyChange = nextPathKey === currentPathKey;
+        currentPathKey = nextPathKey;
+        if (isHashOnlyChange) {
+            return;
+        }
         scrollRestoration?.restorePopStateScroll();
         await opts.onNavigate?.();
         await globalThis.__rsc_callServer(null, null, "navigation");

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

@@ -103,7 +103,7 @@ describe("onNavigate callback (issue #1123 regression)", () => {
             }),
         });
         vi.stubGlobal("window", {
-            location: { href: "http://localhost/" },
+            location: { href: "http://localhost/", pathname: "/", search: "" },
             addEventListener: vi.fn((event, handler) => {
                 if (event === "popstate")
                     capturedPopstateHandler = handler;
@@ -167,6 +167,7 @@ describe("onNavigate callback (issue #1123 regression)", () => {
         const onNavigate = vi.fn();
         initClientNavigation({ onNavigate });
         expect(capturedPopstateHandler).not.toBeNull();
+        window.location.pathname = "/about";
         await capturedPopstateHandler();
         expect(onNavigate).toHaveBeenCalled();
     });
@@ -208,11 +209,13 @@ describe("initClientNavigation", () => {
     let capturedScrollHandler = null;
     let capturedPagehideHandler = null;
     let capturedVisibilityChangeHandler = null;
+    let capturedPopstateHandler = null;
     beforeEach(() => {
         historyState = {};
         capturedScrollHandler = null;
         capturedPagehideHandler = null;
         capturedVisibilityChangeHandler = null;
+        capturedPopstateHandler = null;
         vi.clearAllMocks();
         const mockHistory = {
             scrollRestoration: "auto",
@@ -236,7 +239,7 @@ describe("initClientNavigation", () => {
             }),
         });
         vi.stubGlobal("window", {
-            location: { href: "http://localhost/" },
+            location: { href: "http://localhost/", pathname: "/", search: "" },
             addEventListener: vi.fn((event, handler) => {
                 if (event === "scroll") {
                     capturedScrollHandler = handler;
@@ -244,6 +247,9 @@ describe("initClientNavigation", () => {
                 if (event === "pagehide") {
                     capturedPagehideHandler = handler;
                 }
+                if (event === "popstate") {
+                    capturedPopstateHandler = handler;
+                }
             }),
             history: mockHistory,
             fetch: vi.fn(),
@@ -279,6 +285,22 @@ describe("initClientNavigation", () => {
         initClientNavigation();
         expect(history.scrollRestoration).toBe("manual");
     });
+    it("ignores hash-only popstate events so anchor links keep their native scroll", async () => {
+        const onNavigate = vi.fn();
+        globalThis.__rsc_callServer = vi.fn().mockResolvedValue(undefined);
+        const { onHydrated } = initClientNavigation({ onNavigate });
+        expect(capturedPopstateHandler).not.toBeNull();
+        window.location.hash =
+            "#heading";
+        window.location.href =
+            "http://localhost/#heading";
+        window.scrollY = 500;
+        await capturedPopstateHandler();
+        onHydrated();
+        expect(onNavigate).not.toHaveBeenCalled();
+        expect(globalThis.__rsc_callServer).not.toHaveBeenCalled();
+        expect(window.scrollTo).not.toHaveBeenCalled();
+    });
     it("does not write to history state on scroll", () => {
         initClientNavigation();
         expect(capturedScrollHandler).not.toBeNull();

package/dist/vite/transformServerFunctions.mjs

@@ -94,10 +94,8 @@ export const transformServerFunctions = (code, normalizedId, environment, server
         process.env.VERBOSE &&
             log(`Transforming for ${environment} environment: normalizedId=%s`, normalizedId);
         const exportInfo = findExportInfo(code, normalizedId);
-        const allExports = new Set([
-            ...exportInfo.localFunctions,
-            ...exportInfo.reExports.map((r) => r.localName),
-        ]);
+        const reExportNames = new Set(exportInfo.reExports.map((r) => r.localName));
+        const allExports = new Set(Array.from(exportInfo.localFunctions).filter((name) => !reExportNames.has(name)));
         // Check for default function exports that should also be named exports
         const defaultFunctionName = findDefaultFunctionName(code, normalizedId);
         if (defaultFunctionName) {
@@ -105,11 +103,26 @@ export const transformServerFunctions = (code, normalizedId, environment, server
         }
         // Generate completely new code for SSR
         const s = new MagicString("");
-        if (environment === "ssr") {
-            s.append('import { createServerReference } from "rwsdk/__ssr";\n\n');
+        const hasDefExport = hasDefaultExport(code, normalizedId);
+        if (allExports.size > 0 || hasDefExport) {
+            if (environment === "ssr") {
+                s.append('import { createServerReference } from "rwsdk/__ssr";\n\n');
+            }
+            else {
+                s.append('import { createServerReference } from "rwsdk/client";\n\n');
+            }
         }
-        else {
-            s.append('import { createServerReference } from "rwsdk/client";\n\n');
+        for (const reExport of exportInfo.reExports) {
+            const reExportStatement = reExport.originalName === "default"
+                ? `export { default as ${reExport.localName} } from ${JSON.stringify(reExport.moduleSpecifier)};\n`
+                : reExport.originalName === reExport.localName
+                    ? `export { ${reExport.originalName} } from ${JSON.stringify(reExport.moduleSpecifier)};\n`
+                    : `export { ${reExport.originalName} as ${reExport.localName} } from ${JSON.stringify(reExport.moduleSpecifier)};\n`;
+            s.append(reExportStatement);
+            log(`Preserved ${environment} re-export for function: %s (original: %s) from %s in normalizedId=%s`, reExport.localName, reExport.originalName, reExport.moduleSpecifier, normalizedId);
+        }
+        if (exportInfo.reExports.length > 0 && allExports.size > 0) {
+            s.append("\n");
         }
         const ext = path.extname(normalizedId).toLowerCase();
         const lang = ext === ".tsx" || ext === ".jsx" ? Lang.Tsx : SgLang.TypeScript;
@@ -151,7 +164,7 @@ export const transformServerFunctions = (code, normalizedId, environment, server
             }
         }
         // Check for default export in the actual module (not re-exports)
-        if (hasDefaultExport(code, normalizedId)) {
+        if (hasDefExport) {
             let method;
             let source = "action";
             const patterns = [

package/dist/vite/transformServerFunctions.test.mjs

@@ -169,6 +169,17 @@ export const getProject = serverQuery([
         SERVER_QUERY_ARRAY_POST_CODE,
     };
     describe("TRANSFORMS", () => {
+        it("preserves client re-exports so serverQuery metadata comes from the defining module", () => {
+            const barrelResult = transformServerFunctions(`
+"use server";
+
+export { getProject } from "./queries";
+`, "/actions.ts", "client", new Set());
+            expect(barrelResult?.code).toContain(`export { getProject } from "./queries";`);
+            expect(barrelResult?.code).not.toContain(`createServerReference("/actions.ts", "getProject")`);
+            const queryResult = transformServerFunctions(SERVER_QUERY_GET_CODE, "/queries.ts", "client", new Set());
+            expect(queryResult?.code).toContain(`createServerReference("/queries.ts", "getProject", "GET", "query")`);
+        });
         for (const [key, CODE] of Object.entries(TEST_CASES)) {
             describe(key, () => {
                 it(`CLIENT`, () => {

package/package.json

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