Skip to content

fix: cross-route client navigation hangs in Firefox (#652) #690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Divkix wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix: cross-route client navigation hangs in Firefox (#652) #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
030d111
fix: cross-route client navigation hangs in Firefox (#652)
Divkix Mar 26, 2026
bdb689d
fix: detect React Flight Thenables in updateBrowserTree and apply par…
Divkix Mar 26, 2026
c19abc7
fix: await createFromFetch before passing RSC payload to tree
Divkix Mar 26, 2026
e6978c0
fix: preserve app router params across cached navigation
Divkix Mar 26, 2026
f062859
fix: address review feedback on navigation caching and history manage…
Divkix Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions packages/vinext/src/global.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import type { Root } from "react-dom/client";
import type { OnRequestErrorHandler } from "./server/instrumentation";
import type { CachedRscResponse, PrefetchCacheEntry } from "./shims/navigation";

// ---------------------------------------------------------------------------
// Window globals — browser-side state shared across module boundaries
Expand Down Expand Up @@ -75,8 +76,17 @@ declare global {
*
* @param href - The destination URL (may be absolute or relative).
* @param redirectDepth - Internal parameter used to detect redirect loops.
* @param navigationKind - Internal hint for traversal vs regular navigation.
* @param historyUpdateMode - Internal hint for when history should publish.
*/
__VINEXT_RSC_NAVIGATE__: ((href: string, redirectDepth?: number) => Promise<void>) | undefined;
__VINEXT_RSC_NAVIGATE__:
| ((
href: string,
redirectDepth?: number,
navigationKind?: "navigate" | "traverse" | "refresh",
historyUpdateMode?: "push" | "replace",
) => Promise<void>)
| undefined;

/**
* A Promise that resolves when the current in-flight popstate RSC navigation
Expand All @@ -93,9 +103,7 @@ declare global {
* Lazily initialised on `window` by `shims/navigation.ts` so the same Map
* instance is shared between the navigation shim and the Link component.
*/
__VINEXT_RSC_PREFETCH_CACHE__:
| Map<string, { response: Response; timestamp: number }>
| undefined;
__VINEXT_RSC_PREFETCH_CACHE__: Map<string, PrefetchCacheEntry> | undefined;

/**
* Set of RSC URLs that have already been prefetched (or are in-flight).
Expand Down
Loading
Loading