fix: record a history traversal before resolving its route - #16959
Merged
Conversation
|
Install the latest version of pnpm add https://pkg.svelte.dev/@sveltejs/kit/c/3fc84c094041f98110f396ce144e4c204c55dc4dOpen in |
🦋 Changeset detectedLatest commit: 3fc84c0 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replaces #16954.
The
popstatehandler inclient.jsawaits route resolution (get_navigation_intent, and again insidenavigatebeforeaccept) before recording that the browser has moved. Under server-side route resolution that is a network round-trip, during whichcurrent_history_indexstill points at the entry we left. A popstate arriving in that window is swallowed by the cancellation guard, and agotopushes an entry with a duplicatehistoryIndex, so later scroll and snapshot restores read the wrong entry. This is the flake in https://github.com/sveltejs/kit/actions/runs/33085846048.Record the traversal synchronously: capture the source entry's scroll and snapshots and move the indices before anything async, restore them in
block()beforehistory.go(-delta), and capture the navigation token up front so a superseded popstate stops instead of taking over the newer navigation's token.navigateskips its own capture for popped navigations.Repro: a 120 ms delay after the
get_navigation_intentawait in the handler failsPreserves scroll and focus across popstate...4/4 intest:server-side-route-resolution:devbefore this change and passes 4/4 after it.