@rebask/core 0.1.1 → 0.1.3

package/dist/components/link.js

@@ -16,10 +16,10 @@ export function Link({ href, prefetch, scroll, onClick, ref, ...props }) {
         if (!import.meta.env.PROD || !link || !isPrefetchable(link) || !isLinkVisible(link))
             return;
         if (getPrefetchStrategy(prefetch) === "viewport") {
-            router.prefetch(link.href, { skipShell: true });
+            router.prefetch(link.href, { skipShell: true }).catch(() => { });
         }
         else {
-            router.prefetchStatic(link.href);
+            router.prefetchStatic(link.href).catch(() => { });
         }
     };
     useEffect(() => {
@@ -31,17 +31,17 @@ export function Link({ href, prefetch, scroll, onClick, ref, ...props }) {
         const strategy = getPrefetchStrategy(prefetch);
         const onPrefetchStatic = () => {
             if (isPrefetchable(link))
-                router.prefetchStatic(link.href);
+                router.prefetchStatic(link.href).catch(() => { });
         };
         const onPrefetchFull = () => {
             if (isPrefetchable(link))
-                router.prefetch(link.href);
+                router.prefetch(link.href).catch(() => { });
         };
         if (strategy === "viewport") {
             // A viewport full prefetch goes for the full RSC directly instead of a shell.
             return listenLinkViewport(link, () => {
                 if (isPrefetchable(link))
-                    router.prefetch(link.href, { skipShell: true });
+                    router.prefetch(link.href, { skipShell: true }).catch(() => { });
             });
         }
         if (strategy === "intent") {

package/dist/components/prefetch-links.js

@@ -18,10 +18,10 @@ export function PrefetchLinks({ prefetch }) {
                 return;
             }
             if (strategy === "viewport") {
-                router.prefetch(el.href, { skipShell: true });
+                router.prefetch(el.href, { skipShell: true }).catch(() => { });
             }
             else {
-                router.prefetchStatic(el.href);
+                router.prefetchStatic(el.href).catch(() => { });
             }
         });
     };
@@ -48,19 +48,19 @@ export function PrefetchLinks({ prefetch }) {
         const strategy = getPrefetchStrategy(prefetch);
         const onPrefetchStatic = (el) => {
             if (el instanceof HTMLAnchorElement && isPrefetchable(el)) {
-                router.prefetchStatic(el.href);
+                router.prefetchStatic(el.href).catch(() => { });
             }
         };
         const onPrefetchFull = (el) => {
             if (el instanceof HTMLAnchorElement && isPrefetchable(el)) {
-                router.prefetch(el.href);
+                router.prefetch(el.href).catch(() => { });
             }
         };
         if (strategy === "viewport") {
             // A viewport full prefetch goes for the full RSC directly, never a shell.
             return listenViewport((el) => {
                 if (el instanceof HTMLAnchorElement && isPrefetchable(el)) {
-                    router.prefetch(el.href, { skipShell: true });
+                    router.prefetch(el.href, { skipShell: true }).catch(() => { });
                 }
             });
         }

package/dist/entry.browser.js

@@ -6,6 +6,7 @@ import { AppRoot } from "./components/app-root.js";
 import { learnRoutePrediction } from "./lib/client-route-prediction.js";
 import { captureClientTraceData, getClientTraceHeaders, setClientTraceData, } from "./lib/client-trace.js";
 import { getDeploymentIdHeader } from "./lib/deployment-id.js";
+import { reloadForDeploymentMismatch } from "./lib/deployment-reload.js";
 import { readDocumentRoute } from "./lib/document-route.js";
 import { HandledDeploymentMismatch, isRebaskServerError, ServerFunctionError, } from "./lib/errors.js";
 import { REBASK_ACTION_HEADER } from "./lib/ppr/headers.js";
@@ -55,8 +56,10 @@ async function main() {
             cache.handleDeploymentMismatch(response, url, "action");
         }
         catch (error) {
-            if (error instanceof HandledDeploymentMismatch)
+            if (error instanceof HandledDeploymentMismatch) {
+                reloadForDeploymentMismatch(error.event);
                 return;
+            }
             throw error;
         }
         // Non-Flight responses happen when the server rejects the request before action

package/dist/handlers/rsc/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/handlers/rsc/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAsBzE,MAAM,MAAM,kBAAkB,GAAG;IAChC,QAAQ,EAAE,OAAO,CAAA;IACjB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,SAAS,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAA;IACrE;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,gEAAgE;IAChE,QAAQ,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,WAAW,sBAAsB;IACtC,8EAA8E;IAC9E,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,oEAAoE;IACpE,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,CAAA;IACzD,wFAAwF;IACxF,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAC5B;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACpC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,WAAW,EACnB,aAAa,CAAC,EAAE,sBAAsB,GACpC,OAAO,CAAC,QAAQ,CAAC,CAoLnB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/handlers/rsc/index.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAsBzE,MAAM,MAAM,kBAAkB,GAAG;IAChC,QAAQ,EAAE,OAAO,CAAA;IACjB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,SAAS,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAA;IACrE;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,gEAAgE;IAChE,QAAQ,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,WAAW,sBAAsB;IACtC,8EAA8E;IAC9E,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,oEAAoE;IACpE,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,CAAA;IACzD,wFAAwF;IACxF,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAC5B;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACpC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,WAAW,EACnB,aAAa,CAAC,EAAE,sBAAsB,GACpC,OAAO,CAAC,QAAQ,CAAC,CAqLnB"}

package/dist/handlers/rsc/index.js

@@ -3,7 +3,7 @@ import { STATIC } from "../../lib/cache-storage.js";
 import { getDeploymentIdHeader } from "../../lib/deployment-id.js";
 import { resetDevOverlayReady } from "../../lib/dev-server.js";
 import { pageChannel } from "../../lib/devtools-channels.js";
-import { getCacheControlHeader, REBASK_HTML_VARY_HEADER, REBASK_SHELL_HEADER, REBASK_TAIL_HEADER, } from "../../lib/ppr/headers.js";
+import { getCacheControlHeader, REBASK_HTML_VARY_HEADER, REBASK_SHELL_HEADER, REBASK_TAIL_HEADER, REBASK_TREE_HEADER, } from "../../lib/ppr/headers.js";
 import { parseResumeState } from "../../lib/ppr/postponed-state.js";
 import { prerenderPaths } from "../../lib/prerender-paths.js";
 import {} from "../../lib/route-matcher.js";
@@ -62,6 +62,7 @@ export async function handlePageRoute(request, route, params, handleOptions) {
             return respond(new Response(JSON.stringify(payload), {
                 headers: {
                     "content-type": "application/json",
+                    [REBASK_TREE_HEADER]: "1",
                     "cache-control": getCacheControlHeader({ revalidate: STATIC }),
                     vary: REBASK_HTML_VARY_HEADER,
                     ...getDeploymentIdHeader(),

package/dist/lib/deployment-reload.d.ts

@@ -0,0 +1,3 @@
+import type { DeploymentMismatchEvent } from "../deployment.js";
+export declare function reloadForDeploymentMismatch(event: DeploymentMismatchEvent): void;
+//# sourceMappingURL=deployment-reload.d.ts.map

package/dist/lib/deployment-reload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deployment-reload.d.ts","sourceRoot":"","sources":["../../src/lib/deployment-reload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAI/D,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,uBAAuB,QAOzE"}

package/dist/lib/deployment-reload.js

@@ -0,0 +1,9 @@
+const RELOAD_KEY = "rebask:deployment-reload";
+export function reloadForDeploymentMismatch(event) {
+    // A mismatch can survive a reload when a CDN keeps serving an older asset, so reload at most
+    // once for each deployment.
+    if (sessionStorage.getItem(RELOAD_KEY) === event.receivedDeploymentId)
+        return;
+    sessionStorage.setItem(RELOAD_KEY, event.receivedDeploymentId);
+    window.location.reload();
+}

package/dist/lib/errors.d.ts

@@ -25,13 +25,17 @@ export declare class DeploymentMismatchError extends Error {
     readonly event: DeploymentMismatchEvent;
     constructor(event: DeploymentMismatchEvent);
 }
+export declare class DocumentNavigation extends Error {
+    constructor();
+}
 export declare class ServerFunctionError extends Error {
     readonly status: number;
     constructor(message: string, status: number);
 }
 /** Internal error used when there's a mismatch error in the router */
 export declare class HandledDeploymentMismatch extends Error {
-    constructor();
+    readonly event: DeploymentMismatchEvent;
+    constructor(event: DeploymentMismatchEvent);
 }
 export declare function isHangingPromiseError(error: unknown): error is HangingPromiseError;
 export declare function isPrerenderAbortError(error: unknown): error is PrerenderAbortError;

package/dist/lib/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/lib/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAM/D,eAAO,MAAM,0BAA0B,+BAA+B,CAAA;AActE;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,KAAK;IAC7C,QAAQ,CAAC,MAAM,4BAAyB;IAExC,YAAY,UAAU,EAAE,MAAM,EAE7B;CACD;AAED,yFAAyF;AACzF,qBAAa,mBAAoB,SAAQ,KAAK;IAC7C,QAAQ,CAAC,MAAM,4BAAyB;IAExC,cAGC;CACD;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC5C,QAAQ,CAAC,MAAM,kCAAyB;IAExC,YAAY,OAAO,EAAE,MAAM,EAK1B;CACD;AAED,8EAA8E;AAC9E,qBAAa,kBAAmB,SAAQ,KAAK;IAC5C,QAAQ,CAAC,MAAM,kCAAyB;IAExC,YAAY,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAExC;CACD;AAED,qBAAa,uBAAwB,SAAQ,KAAK;IACrC,QAAQ,CAAC,KAAK,EAAE,uBAAuB;IAAnD,YAAqB,KAAK,EAAE,uBAAuB,EAElD;CACD;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IAG5C,QAAQ,CAAC,MAAM,EAAE,MAAM;IAFxB,YACC,OAAO,EAAE,MAAM,EACN,MAAM,EAAE,MAAM,EAIvB;CACD;AAED,sEAAsE;AACtE,qBAAa,yBAA0B,SAAQ,KAAK;IACnD,cAEC;CACD;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,mBAAmB,CAElF;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,mBAAmB,CAElF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAG3D"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/lib/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAM/D,eAAO,MAAM,0BAA0B,+BAA+B,CAAA;AActE;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,KAAK;IAC7C,QAAQ,CAAC,MAAM,4BAAyB;IAExC,YAAY,UAAU,EAAE,MAAM,EAE7B;CACD;AAED,yFAAyF;AACzF,qBAAa,mBAAoB,SAAQ,KAAK;IAC7C,QAAQ,CAAC,MAAM,4BAAyB;IAExC,cAGC;CACD;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC5C,QAAQ,CAAC,MAAM,kCAAyB;IAExC,YAAY,OAAO,EAAE,MAAM,EAK1B;CACD;AAED,8EAA8E;AAC9E,qBAAa,kBAAmB,SAAQ,KAAK;IAC5C,QAAQ,CAAC,MAAM,kCAAyB;IAExC,YAAY,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAExC;CACD;AAED,qBAAa,uBAAwB,SAAQ,KAAK;IACrC,QAAQ,CAAC,KAAK,EAAE,uBAAuB;IAAnD,YAAqB,KAAK,EAAE,uBAAuB,EAElD;CACD;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC5C,cAEC;CACD;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IAG5C,QAAQ,CAAC,MAAM,EAAE,MAAM;IAFxB,YACC,OAAO,EAAE,MAAM,EACN,MAAM,EAAE,MAAM,EAIvB;CACD;AAED,sEAAsE;AACtE,qBAAa,yBAA0B,SAAQ,KAAK;IACvC,QAAQ,CAAC,KAAK,EAAE,uBAAuB;IAAnD,YAAqB,KAAK,EAAE,uBAAuB,EAElD;CACD;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,mBAAmB,CAElF;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,mBAAmB,CAElF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAG3D"}

package/dist/lib/errors.js

@@ -52,6 +52,11 @@ export class DeploymentMismatchError extends Error {
         this.event = event;
     }
 }
+export class DocumentNavigation extends Error {
+    constructor() {
+        super("document navigation required");
+    }
+}
 export class ServerFunctionError extends Error {
     status;
     constructor(message, status) {
@@ -62,8 +67,10 @@ export class ServerFunctionError extends Error {
 }
 /** Internal error used when there's a mismatch error in the router */
 export class HandledDeploymentMismatch extends Error {
-    constructor() {
+    event;
+    constructor(event) {
         super("handled deployment mismatch");
+        this.event = event;
     }
 }
 export function isHangingPromiseError(error) {

package/dist/lib/ppr/headers.d.ts

@@ -1,7 +1,7 @@
 import type { CacheControl } from "./types.js";
 /** Header used for RSC server functions. */
 export declare const REBASK_ACTION_HEADER = "x-rsc-action";
-/** Header used to request the route tree JSON. */
+/** Requests the route tree. Page routes echo it to identify the response as a route tree. */
 export declare const REBASK_TREE_HEADER = "x-rebask-tree";
 /** Header set to "1" when requesting a page segment's Flight shell. */
 export declare const REBASK_SHELL_HEADER = "x-rebask-shell";

package/dist/lib/ppr/headers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../../../src/lib/ppr/headers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,4CAA4C;AAC5C,eAAO,MAAM,oBAAoB,iBAAiB,CAAA;AAElD,kDAAkD;AAClD,eAAO,MAAM,kBAAkB,kBAAkB,CAAA;AAEjD,uEAAuE;AACvE,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AAEnD;;;GAGG;AACH,eAAO,MAAM,kBAAkB,kBAAkB,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,uBAAuB,uBAAuB,CAAA;AAE3D,gEAAgE;AAChE,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AAEnD;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,qBAAqB,CAAA;AAEvD,eAAO,MAAM,uBAAuB,0BAAkC,CAAA;AAEtE,eAAO,MAAM,sBAAsB,yDAAiF,CAAA;AAEpH,oBAAY,iBAAiB;IAC5B,mCAAmC;IACnC,GAAG,QAAQ;IACX,wEAAwE;IACxE,KAAK,UAAU;IACf,8BAA8B;IAC9B,IAAI,SAAS;CACb;AAED,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,UAAQ,GAAG,MAAM,CAoBtF;AAED,0FAA0F;AAC1F,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAO/E"}
+{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../../../src/lib/ppr/headers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,4CAA4C;AAC5C,eAAO,MAAM,oBAAoB,iBAAiB,CAAA;AAElD,6FAA6F;AAC7F,eAAO,MAAM,kBAAkB,kBAAkB,CAAA;AAEjD,uEAAuE;AACvE,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AAEnD;;;GAGG;AACH,eAAO,MAAM,kBAAkB,kBAAkB,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,uBAAuB,uBAAuB,CAAA;AAE3D,gEAAgE;AAChE,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AAEnD;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,qBAAqB,CAAA;AAEvD,eAAO,MAAM,uBAAuB,0BAAkC,CAAA;AAEtE,eAAO,MAAM,sBAAsB,yDAAiF,CAAA;AAEpH,oBAAY,iBAAiB;IAC5B,mCAAmC;IACnC,GAAG,QAAQ;IACX,wEAAwE;IACxE,KAAK,UAAU;IACf,8BAA8B;IAC9B,IAAI,SAAS;CACb;AAED,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,UAAQ,GAAG,MAAM,CAoBtF;AAED,0FAA0F;AAC1F,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAO/E"}

package/dist/lib/ppr/headers.js

@@ -1,6 +1,6 @@
 /** Header used for RSC server functions. */
 export const REBASK_ACTION_HEADER = "x-rsc-action";
-/** Header used to request the route tree JSON. */
+/** Requests the route tree. Page routes echo it to identify the response as a route tree. */
 export const REBASK_TREE_HEADER = "x-rebask-tree";
 /** Header set to "1" when requesting a page segment's Flight shell. */
 export const REBASK_SHELL_HEADER = "x-rebask-shell";

package/dist/lib/router-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router-cache.d.ts","sourceRoot":"","sources":["../../src/lib/router-cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router-cache.d.ts","sourceRoot":"","sources":["../../src/lib/router-cache.ts"],"names":[],"mappings":"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"}

package/dist/lib/router-cache.js

@@ -1,5 +1,6 @@
 import { atom } from "@lfades/atom";
 import { getDeploymentId, REBASK_DEPLOYMENT_ID_HEADER } from "./deployment-id.js";
+import { reloadForDeploymentMismatch } from "./deployment-reload.js";
 import { DeploymentMismatchError, HandledDeploymentMismatch } from "./errors.js";
 import { getRouteTreeUrl } from "./route-prediction.js";
 import { buildSlotKey, FLAG_LAYOUT, getNodeKey, KEY_SEPARATOR, segmentLocationMatches, segmentPathToShellPattern, segmentToCacheKey, } from "./segment-utils.js";
@@ -655,11 +656,13 @@ export class RouterCache {
         if (!id || !deploymentId || id === deploymentId)
             return;
         const event = { kind, url: String(url), deploymentId, receivedDeploymentId: id };
-        const action = this.onDeploymentMismatch?.(event) ?? "reload";
+        const action = this.onDeploymentMismatch?.(event);
         if (action === "throw") {
             throw new DeploymentMismatchError(event);
         }
-        window.location.reload();
-        throw new HandledDeploymentMismatch();
+        if (action === "reload") {
+            reloadForDeploymentMismatch(event);
+        }
+        throw new HandledDeploymentMismatch(event);
     }
 }

package/dist/observe-navigations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observe-navigations.d.ts","sourceRoot":"","sources":["../src/observe-navigations.tsx"],"names":[],"mappings":"AAYA;;;GAGG;AACH,wBAAgB,kBAAkB,SAkEjC"}
+{"version":3,"file":"observe-navigations.d.ts","sourceRoot":"","sources":["../src/observe-navigations.tsx"],"names":[],"mappings":"AAcA;;;GAGG;AACH,wBAAgB,kBAAkB,SAqGjC"}

package/dist/observe-navigations.js

@@ -1,5 +1,7 @@
 import { useEffect } from "react";
 import { useRouterCache } from "./components/cache-slot.js";
+import { reloadForDeploymentMismatch } from "./lib/deployment-reload.js";
+import { DocumentNavigation, HandledDeploymentMismatch } from "./lib/errors.js";
 import { beginNavigation, createNavigationIntent, isCurrentNavigation, pendingScrollAtom, } from "./lib/scroll.js";
 import { useRouter } from "./router.js";
 /**
@@ -16,39 +18,59 @@ export function ObserveNavigations() {
             cache.shellError = false;
             router.refresh(window.location.href).catch(() => { });
         }
-        function onNavigation(intent, scrollIntent) {
-            cache.pathnameAtom.set(window.location.pathname);
+        function onNavigation(intent, scrollIntent, url, commitHistory, onDocument) {
             const isCurrent = cache.captureRouteTransaction();
+            let committed = false;
+            const commit = () => {
+                if (committed)
+                    return;
+                committed = true;
+                // A same-document entry followed by a document reload breaks back/forward for non-page responses.
+                commitHistory?.();
+                cache.pathnameAtom.set(window.location.pathname);
+            };
             const activate = (routeTreeResponse, complete = false) => {
                 if (!isCurrentNavigation(intent) || !isCurrent())
                     return;
+                commit();
                 router.activate(routeTreeResponse);
                 if (scrollIntent && (complete || scrollIntent.type !== "hash")) {
                     pendingScrollAtom.set(scrollIntent);
                 }
             };
             router
-                .prefetch(window.location.href, { onRouteTree: activate })
+                .prefetch(url, { onRouteTree: activate })
                 .then((response) => activate(response, true))
                 // React receives rendering failures separately. This catch prevents a duplicate unhandled rejection.
-                .catch(() => { });
+                .catch((error) => {
+                if (error instanceof DocumentNavigation) {
+                    if (!isCurrentNavigation(intent) || !isCurrent())
+                        return;
+                    onDocument?.();
+                }
+                if (error instanceof HandledDeploymentMismatch) {
+                    if (!isCurrentNavigation(intent) || !isCurrent())
+                        return;
+                    commit();
+                    reloadForDeploymentMismatch(error.event);
+                }
+            });
         }
         function onPopstate() {
-            onNavigation(beginNavigation(), null);
+            const url = window.location.href;
+            onNavigation(beginNavigation(), null, url, undefined, () => window.location.replace(url));
         }
         const { pushState, replaceState } = window.history;
         window.addEventListener("popstate", onPopstate);
         window.history.pushState = function (...args) {
-            const res = pushState.apply(this, args);
-            const intent = createNavigationIntent(window.location.href);
-            onNavigation(intent, intent);
-            return res;
+            const url = new URL(args[2] || window.location.href, window.location.href).href;
+            const intent = createNavigationIntent(url);
+            onNavigation(intent, intent, url, () => pushState.apply(this, args), () => window.location.assign(url));
         };
         window.history.replaceState = function (...args) {
-            const res = replaceState.apply(this, args);
-            const intent = createNavigationIntent(window.location.href);
-            onNavigation(intent, intent);
-            return res;
+            const url = new URL(args[2] || window.location.href, window.location.href).href;
+            const intent = createNavigationIntent(url);
+            onNavigation(intent, intent, url, () => replaceState.apply(this, args), () => window.location.replace(url));
         };
         return () => {
             window.removeEventListener("popstate", onPopstate);

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"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"}

package/dist/router.js

@@ -8,7 +8,8 @@ import { useSegment } from "./components/segment-boundary.js";
 import { denyRoutePrediction, getRoutePathInfo, learnedPredictions, learnRoutePrediction, predictRouteTree, } from "./lib/client-route-prediction.js";
 import { captureClientTraceData, getClientTraceHeaders } from "./lib/client-trace.js";
 import { getDeploymentIdHeader } from "./lib/deployment-id.js";
-import { HandledDeploymentMismatch, DeploymentMismatchError } from "./lib/errors.js";
+import { reloadForDeploymentMismatch } from "./lib/deployment-reload.js";
+import { DocumentNavigation, HandledDeploymentMismatch, DeploymentMismatchError, } from "./lib/errors.js";
 import { extractSegmentHints } from "./lib/extract-segment-hints.js";
 import { REBASK_SHELL_HEADER, REBASK_TAIL_HEADER, REBASK_TRAILER_HEADER, REBASK_TREE_HEADER, } from "./lib/ppr/headers.js";
 import { getRouteTreeUrl, } from "./lib/route-prediction.js";
@@ -242,6 +243,11 @@ class Router {
         })
             .then(async (response) => {
             captureClientTraceData(response);
+            if (response.headers.get(REBASK_TREE_HEADER) !== "1") {
+                if (response.body)
+                    await response.body.cancel();
+                throw new DocumentNavigation();
+            }
             this.cache.handleDeploymentMismatch(response, url, "tree");
             const [tree, routePrediction] = (await response.json());
             return { tree, routePrediction, url: getUrl(url).href };
@@ -540,14 +546,7 @@ class Router {
         const { routePrediction: expectedRoutePrediction } = routeTreeResponse;
         const missing = this.cache.findMissingSegmentLocations(routeTreeResponse);
         if (missing.length > 0) {
-            try {
-                await Promise.all(missing.map((segment) => this.prefetchSegment(segment, dedupe, expectedRoutePrediction, skipShell)));
-            }
-            catch (error) {
-                if (error instanceof HandledDeploymentMismatch)
-                    return;
-                throw error;
-            }
+            await Promise.all(missing.map((segment) => this.prefetchSegment(segment, dedupe, expectedRoutePrediction, skipShell)));
         }
         if (isCurrent())
             this.applyRoutePrediction(routeTreeResponse);
@@ -580,10 +579,10 @@ class Router {
                 this.cache.registerRouteTree(predicted);
                 return predicted;
             }
-            if (inflightSiblingTree) {
+            if (inflightSiblingTree && isCurrentNavigation(inflightSiblingTree.navigation)) {
                 // An in-flight fetch under the same parent teaches this route's prediction, so the
                 // retry can avoid a second tree request.
-                await inflightSiblingTree.catch(() => { });
+                await inflightSiblingTree.response.catch(() => { });
                 return isCurrent()
                     ? this.prefetchRouteTree(url, cache, dedupe)
                     : this.fetchRouteTree(url, dedupe);
@@ -597,11 +596,12 @@ class Router {
             return routeTreeResponse;
         });
         if (cache) {
-            inflightRouteTreeByParent.set(parentPathname, routeTreeRequest);
+            const inflight = { response: routeTreeRequest, navigation: captureNavigationIntent() };
+            inflightRouteTreeByParent.set(parentPathname, inflight);
             routeTreeRequest
                 .catch(() => { })
                 .finally(() => {
-                if (inflightRouteTreeByParent.get(parentPathname) === routeTreeRequest) {
+                if (inflightRouteTreeByParent.get(parentPathname) === inflight) {
                     inflightRouteTreeByParent.delete(parentPathname);
                 }
             });
@@ -738,12 +738,18 @@ class Router {
         const target = getUrl(url);
         learnedPredictions.clear();
         this.cache.markRouteDataStale(scope === "page");
-        const routeTreeResponse = await this.prefetchRouteTree(target.href, false, dedupe);
+        const routeTreeResponse = await this.prefetchRouteTree(target.href, false, dedupe).catch((error) => {
+            if (error instanceof HandledDeploymentMismatch)
+                reloadForDeploymentMismatch(error.event);
+            throw error;
+        });
         if (!isCurrent())
             return routeTreeResponse;
         const pending = this.prefetchSegments(routeTreeResponse, dedupe, true).catch((error) => {
-            if (error instanceof HandledDeploymentMismatch)
+            if (error instanceof HandledDeploymentMismatch) {
+                reloadForDeploymentMismatch(error.event);
                 return;
+            }
             console.error("[rebask] refresh failed to prefetch segments:", error);
         });
         if (isCurrent() && isCurrentNavigation(navigationIntent)) {
@@ -860,6 +866,8 @@ class Router {
                 }
             })
                 .catch((error) => {
+                if (error instanceof HandledDeploymentMismatch)
+                    return;
                 console.error("[rebask] revalidate failed to prefetch active segments:", error);
             }));
             this.cache.restoreRouteTree(currentResponse);
@@ -879,6 +887,8 @@ class Router {
                     !segmentLocationMatches(segmentLocation, currentSearchParams));
             }
             work.push(...inactive.map((segmentLocation) => this.prefetchSegment(segmentLocation, false).catch((error) => {
+                if (error instanceof HandledDeploymentMismatch)
+                    return;
                 console.error("[rebask] revalidate failed to prefetch segment:", error);
             })));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebask/core",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Vite plugin and runtime for React Server Components",
   "homepage": "https://github.com/lfades/vext#readme",
   "license": "MIT",