vinext 0.0.42 → 0.0.44

package/dist/server/app-browser-entry.js

@@ -7,9 +7,9 @@ import "../client/instrumentation-client.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
 import { createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, resolveAndClassifyNavigationCommit, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDisposition, resolveServerActionRequestState, routerReducer } from "./app-browser-state.js";
 import { devOnCaughtError } from "./app-browser-error.js";
-import { createElement, startTransition, use, useLayoutEffect, useReducer, useRef } from "react";
-import { hydrateRoot } from "react-dom/client";
+import { createElement, startTransition, use, useLayoutEffect, useRef, useState } from "react";
 import { createFromFetch, createFromReadableStream, createTemporaryReferenceSet, encodeReply, setServerCallback } from "@vitejs/plugin-rsc/browser";
+import { hydrateRoot } from "react-dom/client";
 //#region src/server/app-browser-entry.ts
 function toActionType(kind) {
 	return kind === "traverse" ? "traverse" : "navigate";
@@ -21,21 +21,56 @@ let nextNavigationRenderId = 0;
 let activeNavigationId = 0;
 const pendingNavigationCommits = /* @__PURE__ */ new Map();
 const pendingNavigationPrePaintEffects = /* @__PURE__ */ new Map();
-let dispatchBrowserRouterAction = null;
+function isRouterStatePromise(value) {
+	return value instanceof Promise;
+}
+let setBrowserRouterState = null;
 let browserRouterStateRef = null;
+let activePendingBrowserRouterState = null;
 let latestClientParams = {};
 const visitedResponseCache = /* @__PURE__ */ new Map();
 function isServerActionResult(value) {
 	return !!value && typeof value === "object" && "root" in value;
 }
-function getBrowserRouterDispatch() {
-	if (!dispatchBrowserRouterAction) throw new Error("[vinext] Browser router dispatch is not initialized");
-	return dispatchBrowserRouterAction;
+function getBrowserRouterStateSetter() {
+	if (!setBrowserRouterState) throw new Error("[vinext] Browser router state setter is not initialized");
+	return setBrowserRouterState;
 }
 function getBrowserRouterState() {
 	if (!browserRouterStateRef) throw new Error("[vinext] Browser router state is not initialized");
 	return browserRouterStateRef.current;
 }
+function beginPendingBrowserRouterState() {
+	const setter = getBrowserRouterStateSetter();
+	if (activePendingBrowserRouterState && !activePendingBrowserRouterState.settled) {
+		activePendingBrowserRouterState.settled = true;
+		activePendingBrowserRouterState.resolve(getBrowserRouterState());
+	}
+	let resolve;
+	const promise = new Promise((resolvePromise) => {
+		resolve = resolvePromise;
+	});
+	const pending = {
+		promise,
+		resolve,
+		settled: false
+	};
+	activePendingBrowserRouterState = pending;
+	setter(promise);
+	return pending;
+}
+function settlePendingBrowserRouterState(pending) {
+	if (!pending || pending.settled) return;
+	pending.settled = true;
+	pending.resolve(getBrowserRouterState());
+	if (activePendingBrowserRouterState === pending) activePendingBrowserRouterState = null;
+}
+function resolvePendingBrowserRouterState(pending, action) {
+	if (!pending || pending.settled) return;
+	pending.settled = true;
+	pending.resolve(routerReducer(getBrowserRouterState(), action));
+	if (activePendingBrowserRouterState === pending) activePendingBrowserRouterState = null;
+}
 function applyClientParams(params) {
 	latestClientParams = params;
 	setClientParams(params);
@@ -213,7 +248,7 @@ async function commitSameUrlNavigatePayload(nextElements, returnValue) {
 		window.location.assign(window.location.href);
 		return;
 	}
-	if (disposition === "dispatch") dispatchBrowserTree(pending.action.elements, navigationSnapshot, pending.action.renderId, "navigate", pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, false);
+	if (disposition === "dispatch") dispatchBrowserTree(pending.action.elements, navigationSnapshot, pending.action.renderId, "navigate", pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, null, false);
 	if (returnValue) {
 		if (!returnValue.ok) throw returnValue.data;
 		return returnValue.data;
@@ -222,7 +257,7 @@ async function commitSameUrlNavigatePayload(nextElements, returnValue) {
 function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 	const resolvedElements = use(initialElements);
 	const initialMetadata = readAppElementsMetadata(resolvedElements);
-	const [treeState, dispatchTreeState] = useReducer(routerReducer, {
+	const [treeStateValue, setTreeStateValue] = useState({
 		elements: resolvedElements,
 		interceptionContext: initialMetadata.interceptionContext,
 		layoutFlags: initialMetadata.layoutFlags,
@@ -232,17 +267,18 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 		rootLayoutTreePath: initialMetadata.rootLayoutTreePath,
 		routeId: initialMetadata.routeId
 	});
+	const treeState = isRouterStatePromise(treeStateValue) ? use(treeStateValue) : treeStateValue;
 	const stateRef = useRef(treeState);
 	stateRef.current = treeState;
 	useLayoutEffect(() => {
-		dispatchBrowserRouterAction = dispatchTreeState;
+		setBrowserRouterState = setTreeStateValue;
 		browserRouterStateRef = stateRef;
 		return () => {
-			if (dispatchBrowserRouterAction === dispatchTreeState) dispatchBrowserRouterAction = null;
+			if (setBrowserRouterState === setTreeStateValue) setBrowserRouterState = null;
 			if (browserRouterStateRef === stateRef) browserRouterStateRef = null;
 			setMountedSlotsHeader(null);
 		};
-	}, [dispatchTreeState]);
+	}, [setTreeStateValue]);
 	useLayoutEffect(() => {
 		setMountedSlotsHeader(getMountedSlotIdsHeader(stateRef.current.elements));
 	}, [treeState.elements]);
@@ -255,9 +291,9 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 	if (!ClientNavigationRenderContext) return committedTree;
 	return createElement(ClientNavigationRenderContext.Provider, { value: treeState.navigationSnapshot }, committedTree);
 }
-function dispatchBrowserTree(elements, navigationSnapshot, renderId, actionType, interceptionContext, layoutFlags, previousNextUrl, routeId, rootLayoutTreePath, useTransitionMode) {
-	const dispatch = getBrowserRouterDispatch();
-	const applyAction = () => dispatch({
+function dispatchBrowserTree(elements, navigationSnapshot, renderId, actionType, interceptionContext, layoutFlags, previousNextUrl, routeId, rootLayoutTreePath, pendingRouterState, useTransitionMode) {
+	const setter = getBrowserRouterStateSetter();
+	const action = {
 		elements,
 		interceptionContext,
 		layoutFlags,
@@ -267,11 +303,18 @@ function dispatchBrowserTree(elements, navigationSnapshot, renderId, actionType,
 		rootLayoutTreePath,
 		routeId,
 		type: actionType
-	});
+	};
+	const applyAction = () => {
+		if (pendingRouterState) {
+			resolvePendingBrowserRouterState(pendingRouterState, action);
+			return;
+		}
+		setter(routerReducer(getBrowserRouterState(), action));
+	};
 	if (useTransitionMode) startTransition(applyAction);
 	else applyAction();
 }
-async function renderNavigationPayload(payload, navigationSnapshot, targetHref, navId, historyUpdateMode, params, previousNextUrl, useTransition = true, actionType = "navigate") {
+async function renderNavigationPayload(payload, navigationSnapshot, targetHref, navId, historyUpdateMode, params, previousNextUrl, pendingRouterState, useTransition = true, actionType = "navigate") {
 	const renderId = ++nextNavigationRenderId;
 	const committed = new Promise((resolve) => {
 		pendingNavigationCommits.set(renderId, resolve);
@@ -294,12 +337,14 @@ async function renderNavigationPayload(payload, navigationSnapshot, targetHref,
 			startedNavigationId: navId
 		});
 		if (disposition === "skip") {
+			settlePendingBrowserRouterState(pendingRouterState);
 			const resolve = pendingNavigationCommits.get(renderId);
 			pendingNavigationCommits.delete(renderId);
 			resolve?.();
 			return;
 		}
 		if (disposition === "hard-navigate") {
+			settlePendingBrowserRouterState(pendingRouterState);
 			pendingNavigationCommits.delete(renderId);
 			window.location.assign(targetHref);
 			return;
@@ -307,12 +352,13 @@ async function renderNavigationPayload(payload, navigationSnapshot, targetHref,
 		queuePrePaintNavigationEffect(renderId, createNavigationCommitEffect(targetHref, historyUpdateMode, navId, params, pending.previousNextUrl));
 		activateNavigationSnapshot();
 		snapshotActivated = true;
-		dispatchBrowserTree(pending.action.elements, navigationSnapshot, renderId, actionType, pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, useTransition);
+		dispatchBrowserTree(pending.action.elements, navigationSnapshot, renderId, actionType, pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, pendingRouterState, useTransition);
 	} catch (error) {
 		pendingNavigationPrePaintEffects.delete(renderId);
 		const resolve = pendingNavigationCommits.get(renderId);
 		pendingNavigationCommits.delete(renderId);
 		if (snapshotActivated) commitClientNavigationState(navId);
+		settlePendingBrowserRouterState(pendingRouterState);
 		resolve?.();
 		throw error;
 	}
@@ -333,9 +379,45 @@ function restorePopstateScrollPosition(state) {
 		window.scrollTo(x, y);
 	});
 }
+let isPageUnloading = false;
+const RSC_RELOAD_KEY = "__vinext_rsc_initial_reload__";
+function readReloadFlag() {
+	try {
+		return sessionStorage.getItem(RSC_RELOAD_KEY);
+	} catch {
+		return null;
+	}
+}
+function writeReloadFlag(path) {
+	try {
+		sessionStorage.setItem(RSC_RELOAD_KEY, path);
+	} catch {}
+}
+function clearReloadFlag() {
+	try {
+		sessionStorage.removeItem(RSC_RELOAD_KEY);
+	} catch {}
+}
+function recoverFromBadInitialRscResponse(reason) {
+	const currentPath = window.location.pathname + window.location.search;
+	if (readReloadFlag() === currentPath) {
+		clearReloadFlag();
+		console.error(`[vinext] Initial RSC fetch ${reason} after reload; aborting hydration. Server-rendered HTML remains visible; client components will not hydrate.`);
+		return null;
+	}
+	writeReloadFlag(currentPath);
+	if (readReloadFlag() !== currentPath) {
+		console.error(`[vinext] Initial RSC fetch ${reason}; sessionStorage unavailable so the reload-loop guard cannot persist — aborting hydration. Server-rendered HTML remains visible; client components will not hydrate.`);
+		return null;
+	}
+	console.warn(`[vinext] Initial RSC fetch ${reason}; reloading once to let the server render the HTML error page`);
+	window.location.reload();
+	return null;
+}
 async function readInitialRscStream() {
 	const vinext = getVinextBrowserGlobal();
 	if (vinext.__VINEXT_RSC__ || vinext.__VINEXT_RSC_CHUNKS__ || vinext.__VINEXT_RSC_DONE__) {
+		clearReloadFlag();
 		if (vinext.__VINEXT_RSC__) {
 			const embedData = vinext.__VINEXT_RSC__;
 			delete vinext.__VINEXT_RSC__;
@@ -350,6 +432,11 @@ async function readInitialRscStream() {
 		return createProgressiveRscStream();
 	}
 	const rscResponse = await fetch(toRscUrl(window.location.pathname + window.location.search));
+	if (!rscResponse.ok) return recoverFromBadInitialRscResponse(`returned ${rscResponse.status}`);
+	const contentType = rscResponse.headers.get("content-type") ?? "";
+	if (!contentType.startsWith("text/x-component")) return recoverFromBadInitialRscResponse(`returned non-RSC content-type "${contentType || "(missing)"}"`);
+	if (!rscResponse.body) return recoverFromBadInitialRscResponse("returned empty body");
+	clearReloadFlag();
 	let params = {};
 	const paramsHeader = rscResponse.headers.get("X-Vinext-Params");
 	if (paramsHeader) try {
@@ -357,7 +444,6 @@ async function readInitialRscStream() {
 		applyClientParams(params);
 	} catch {}
 	restoreHydrationNavigationContext(window.location.pathname, window.location.search, params);
-	if (!rscResponse.body) throw new Error("[vinext] Initial RSC response had no body");
 	return rscResponse.body;
 }
 function registerServerActionCallback() {
@@ -396,7 +482,12 @@ function registerServerActionCallback() {
 }
 async function main() {
 	registerServerActionCallback();
-	const root = normalizeAppElementsPromise(createFromReadableStream(await readInitialRscStream()));
+	const rscStream = await readInitialRscStream();
+	if (rscStream === null) return;
+	bootstrapHydration(rscStream);
+}
+function bootstrapHydration(rscStream) {
+	const root = normalizeAppElementsPromise(createFromReadableStream(rscStream));
 	const initialNavigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
 	replaceHistoryStateWithoutNotify(createHistoryStateWithPreviousNextUrl(window.history.state, null), "", window.location.href);
 	window.__VINEXT_RSC_ROOT__ = hydrateRoot(document, createElement(BrowserRoot, {
@@ -404,99 +495,123 @@ async function main() {
 		initialNavigationSnapshot
 	}), import.meta.env.DEV ? { onCaughtError: devOnCaughtError } : void 0);
 	window.__VINEXT_HYDRATED_AT = performance.now();
-	window.__VINEXT_RSC_NAVIGATE__ = async function navigateRsc(href, redirectDepth = 0, navigationKind = "navigate", historyUpdateMode, previousNextUrlOverride) {
-		if (redirectDepth > 10) {
-			console.error("[vinext] Too many RSC redirects — aborting navigation to prevent infinite loop.");
-			window.location.href = href;
-			return;
-		}
+	window.__VINEXT_RSC_NAVIGATE__ = async function navigateRsc(href, redirectDepth = 0, navigationKind = "navigate", historyUpdateMode, previousNextUrlOverride, programmaticTransition = false) {
 		let _snapshotPending = false;
+		let pendingRouterState = null;
 		const navId = ++activeNavigationId;
+		let currentHref = href;
+		let currentHistoryMode = historyUpdateMode;
+		let currentPrevNextUrl = previousNextUrlOverride;
+		let redirectCount = redirectDepth;
 		try {
-			const url = new URL(href, window.location.origin);
-			const rscUrl = toRscUrl(url.pathname + url.search);
-			const requestState = getRequestState(navigationKind, previousNextUrlOverride);
-			const requestInterceptionContext = requestState.interceptionContext;
-			const requestPreviousNextUrl = requestState.previousNextUrl;
-			const navState = getClientNavigationState();
-			const currentPath = navState?.pendingPathname ?? navState?.cachedPathname ?? stripBasePath(window.location.pathname, __basePath);
-			const isSameRoute = stripBasePath(url.pathname, __basePath) === currentPath;
-			setPendingPathname(url.pathname, navId);
-			const elementsAtNavStart = getBrowserRouterState().elements;
-			const mountedSlotsHeader = getMountedSlotIdsHeader(elementsAtNavStart);
-			const cachedRoute = getVisitedResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader, navigationKind);
-			if (cachedRoute) {
+			if (programmaticTransition) pendingRouterState = beginPendingBrowserRouterState();
+			while (true) {
+				if (redirectCount > 10) {
+					console.error("[vinext] Too many RSC redirects — aborting navigation to prevent infinite loop.");
+					window.location.href = currentHref;
+					return;
+				}
+				const url = new URL(currentHref, window.location.origin);
+				const rscUrl = toRscUrl(url.pathname + url.search);
+				const requestState = getRequestState(navigationKind, currentPrevNextUrl);
+				const requestInterceptionContext = requestState.interceptionContext;
+				const requestPreviousNextUrl = requestState.previousNextUrl;
+				const navState = getClientNavigationState();
+				const currentPath = navState?.pendingPathname ?? navState?.cachedPathname ?? stripBasePath(window.location.pathname, __basePath);
+				const isSameRoute = stripBasePath(url.pathname, __basePath) === currentPath;
+				setPendingPathname(url.pathname, navId);
+				const elementsAtNavStart = getBrowserRouterState().elements;
+				const mountedSlotsHeader = getMountedSlotIdsHeader(elementsAtNavStart);
+				const cachedRoute = getVisitedResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader, navigationKind);
+				if (cachedRoute) {
+					if (navId !== activeNavigationId) return;
+					const cachedParams = cachedRoute.params;
+					const cachedNavigationSnapshot = createClientNavigationRenderSnapshot(currentHref, cachedParams);
+					const cachedPayload = normalizeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(cachedRoute.response))));
+					if (navId !== activeNavigationId) return;
+					_snapshotPending = true;
+					try {
+						await renderNavigationPayload(cachedPayload, cachedNavigationSnapshot, currentHref, navId, currentHistoryMode, cachedParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind));
+					} finally {
+						_snapshotPending = false;
+					}
+					return;
+				}
+				let navResponse;
+				let navResponseUrl = null;
+				if (navigationKind !== "refresh") {
+					const prefetchedResponse = consumePrefetchResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader);
+					if (prefetchedResponse) {
+						navResponse = restoreRscResponse(prefetchedResponse, false);
+						navResponseUrl = prefetchedResponse.url;
+					}
+				}
+				if (!navResponse) {
+					const requestHeaders = createRscRequestHeaders(requestInterceptionContext);
+					if (mountedSlotsHeader) requestHeaders.set("X-Vinext-Mounted-Slots", mountedSlotsHeader);
+					navResponse = await fetch(rscUrl, {
+						headers: requestHeaders,
+						credentials: "include"
+					});
+				}
+				if (navId !== activeNavigationId) return;
+				const isRscResponse = (navResponse.headers.get("content-type") ?? "").startsWith("text/x-component");
+				if (!navResponse.ok || !isRscResponse || !navResponse.body) {
+					const responseUrl = navResponseUrl ?? navResponse.url;
+					let hardNavTarget = currentHref;
+					if (responseUrl) {
+						const parsed = new URL(responseUrl, window.location.origin);
+						const origUrl = new URL(currentHref, window.location.origin);
+						let pathname = parsed.pathname.replace(/\.rsc$/, "");
+						if (origUrl.pathname.length > 1 && origUrl.pathname.endsWith("/") && !pathname.endsWith("/")) pathname += "/";
+						hardNavTarget = pathname + parsed.search;
+						if (origUrl.hash) hardNavTarget += origUrl.hash;
+					}
+					window.location.href = hardNavTarget;
+					return;
+				}
+				const finalUrl = new URL(navResponseUrl ?? navResponse.url, window.location.origin);
+				const requestedUrl = new URL(rscUrl, window.location.origin);
+				if (finalUrl.pathname !== requestedUrl.pathname) {
+					const destinationPath = finalUrl.pathname.replace(/\.rsc$/, "") + finalUrl.search;
+					replaceHistoryStateWithoutNotify(createHistoryStateWithPreviousNextUrl(null, requestPreviousNextUrl), "", destinationPath);
+					currentHref = destinationPath;
+					currentHistoryMode = void 0;
+					currentPrevNextUrl = requestPreviousNextUrl;
+					redirectCount += 1;
+					continue;
+				}
+				let navParams = {};
+				const paramsHeader = navResponse.headers.get("X-Vinext-Params");
+				if (paramsHeader) try {
+					navParams = JSON.parse(decodeURIComponent(paramsHeader));
+				} catch {}
+				const navigationSnapshot = createClientNavigationRenderSnapshot(currentHref, navParams);
+				const responseSnapshot = await snapshotRscResponse(navResponse);
 				if (navId !== activeNavigationId) return;
-				const cachedParams = cachedRoute.params;
-				const cachedNavigationSnapshot = createClientNavigationRenderSnapshot(href, cachedParams);
-				const cachedPayload = normalizeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(cachedRoute.response))));
+				const rscPayload = normalizeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(responseSnapshot))));
 				if (navId !== activeNavigationId) return;
 				_snapshotPending = true;
 				try {
-					await renderNavigationPayload(cachedPayload, cachedNavigationSnapshot, href, navId, historyUpdateMode, cachedParams, requestPreviousNextUrl, isSameRoute, toActionType(navigationKind));
+					await renderNavigationPayload(rscPayload, navigationSnapshot, currentHref, navId, currentHistoryMode, navParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind));
 				} finally {
 					_snapshotPending = false;
 				}
+				if (navId !== activeNavigationId) return;
+				storeVisitedResponseSnapshot(rscUrl, resolveVisitedResponseInterceptionContext(requestInterceptionContext, readAppElementsMetadata(await rscPayload).interceptionContext), responseSnapshot, navParams);
 				return;
 			}
-			let navResponse;
-			let navResponseUrl = null;
-			if (navigationKind !== "refresh") {
-				const prefetchedResponse = consumePrefetchResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader);
-				if (prefetchedResponse) {
-					navResponse = restoreRscResponse(prefetchedResponse, false);
-					navResponseUrl = prefetchedResponse.url;
-				}
-			}
-			if (!navResponse) {
-				const requestHeaders = createRscRequestHeaders(requestInterceptionContext);
-				if (mountedSlotsHeader) requestHeaders.set("X-Vinext-Mounted-Slots", mountedSlotsHeader);
-				navResponse = await fetch(rscUrl, {
-					headers: requestHeaders,
-					credentials: "include"
-				});
-			}
-			if (navId !== activeNavigationId) return;
-			const finalUrl = new URL(navResponseUrl ?? navResponse.url, window.location.origin);
-			const requestedUrl = new URL(rscUrl, window.location.origin);
-			if (finalUrl.pathname !== requestedUrl.pathname) {
-				const destinationPath = finalUrl.pathname.replace(/\.rsc$/, "") + finalUrl.search;
-				replaceHistoryStateWithoutNotify(createHistoryStateWithPreviousNextUrl(null, requestPreviousNextUrl), "", destinationPath);
-				const navigate = window.__VINEXT_RSC_NAVIGATE__;
-				if (!navigate) {
-					window.location.href = destinationPath;
-					return;
-				}
-				return navigate(destinationPath, redirectDepth + 1, navigationKind, void 0, requestPreviousNextUrl);
-			}
-			let navParams = {};
-			const paramsHeader = navResponse.headers.get("X-Vinext-Params");
-			if (paramsHeader) try {
-				navParams = JSON.parse(decodeURIComponent(paramsHeader));
-			} catch {}
-			const navigationSnapshot = createClientNavigationRenderSnapshot(href, navParams);
-			const responseSnapshot = await snapshotRscResponse(navResponse);
-			if (navId !== activeNavigationId) return;
-			const rscPayload = normalizeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(responseSnapshot))));
-			if (navId !== activeNavigationId) return;
-			_snapshotPending = true;
-			try {
-				await renderNavigationPayload(rscPayload, navigationSnapshot, href, navId, historyUpdateMode, navParams, requestPreviousNextUrl, isSameRoute, toActionType(navigationKind));
-			} finally {
-				_snapshotPending = false;
-			}
-			if (navId !== activeNavigationId) return;
-			storeVisitedResponseSnapshot(rscUrl, resolveVisitedResponseInterceptionContext(requestInterceptionContext, readAppElementsMetadata(await rscPayload).interceptionContext), responseSnapshot, navParams);
-			return;
 		} catch (error) {
 			if (_snapshotPending) {
 				_snapshotPending = false;
 				commitClientNavigationState(navId);
 			}
-			if (navId === activeNavigationId) clearPendingPathname(navId);
 			if (navId !== activeNavigationId) return;
-			console.error("[vinext] RSC navigation error:", error);
-			window.location.href = href;
+			if (!isPageUnloading) console.error("[vinext] RSC navigation error:", error);
+			window.location.href = currentHref;
+		} finally {
+			settlePendingBrowserRouterState(pendingRouterState);
+			if (navId === activeNavigationId) clearPendingPathname(navId);
 		}
 	};
 	if ("scrollRestoration" in history) history.scrollRestoration = "manual";
@@ -520,13 +635,21 @@ async function main() {
 				renderId: ++nextNavigationRenderId,
 				type: "replace"
 			});
-			dispatchBrowserTree(pending.action.elements, navigationSnapshot, pending.action.renderId, "replace", pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, false);
+			dispatchBrowserTree(pending.action.elements, navigationSnapshot, pending.action.renderId, "replace", pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, null, false);
 		} catch (error) {
 			console.error("[vinext] RSC HMR error:", error);
 		}
 	});
 }
-if (typeof document !== "undefined") main();
+if (typeof document !== "undefined") {
+	window.addEventListener("pagehide", () => {
+		isPageUnloading = true;
+	});
+	window.addEventListener("pageshow", () => {
+		isPageUnloading = false;
+	});
+	main();
+}
 //#endregion
 export {};