Skip to content

fix: record a history traversal before resolving its route - #16959

Merged
Rich-Harris merged 1 commit into
version-3from
popstate-shallow-race
Aug 27, 2026
Merged

Rich-Harris merged 1 commit into
version-3from
popstate-shallow-race

Conversation

@Nic-Polumeyv

Copy link
Copy Markdown
Contributor

Replaces #16954.

The popstate handler in client.js awaits route resolution (get_navigation_intent, and again inside navigate before accept) before recording that the browser has moved. Under server-side route resolution that is a network round-trip, during which current_history_index still points at the entry we left. A popstate arriving in that window is swallowed by the cancellation guard, and a goto pushes an entry with a duplicate historyIndex, 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() before history.go(-delta), and capture the navigation token up front so a superseded popstate stops instead of taking over the newer navigation's token. navigate skips its own capture for popped navigations.

Repro: a 120 ms delay after the get_navigation_intent await in the handler fails Preserves scroll and focus across popstate... 4/4 in test:server-side-route-resolution:dev before this change and passes 4/4 after it.

@pkg-svelte-dev

Copy link
Copy Markdown

Install the latest version of @sveltejs/kit from 3fc84c0:

pnpm add https://pkg.svelte.dev/@sveltejs/kit/c/3fc84c094041f98110f396ce144e4c204c55dc4d

Open in pkg.svelte.dev: https://pkg.svelte.dev/repos/kit/pr/16959

@changeset-bot

changeset-bot Bot commented Aug 27, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3fc84c0

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@sveltejs/kit Patch

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

@svelte-docs-bot

Copy link
Copy Markdown

@Rich-Harris Rich-Harris left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice sleuthing

@Rich-Harris
Rich-Harris merged commit b12bb78 into version-3 Aug 27, 2026
40 checks passed
@Rich-Harris
Rich-Harris deleted the popstate-shallow-race branch August 27, 2026 20:09
teemingc pushed a commit that referenced this pull request Sep 8, 2026
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to version-3, this PR
will be updated.

⚠️⚠️⚠️⚠️⚠️⚠️

`version-3` is currently in **pre mode** so this branch has prereleases
rather than normal releases. If you want to exit prereleases, run
`changeset pre exit` on `version-3`.

⚠️⚠️⚠️⚠️⚠️⚠️

# Releases
## @sveltejs/adapter-cloudflare@8.0.0-next.7

### Major Changes

- breaking: populate env vars before `instrumentation.server.js` is
evaluated and update the adapter instrumentation API
([#16303](#16303))

- breaking: remove cloudflare `platform`, emulate the
`cloudflare:workers` module instead
([#16754](#16754))

- breaking: replace the `builder.generateManifest` with
`builder.generateServerInstance` and `builder.manifest`
([#16875](#16875))

### Patch Changes

- Updated dependencies
[[`9a4b343`](9a4b343),
[`ee2f55b`](ee2f55b),
[`65673a4`](65673a4),
[`1b79845`](1b79845),
[`b12bb78`](b12bb78),
[`03f1687`](03f1687),
[`49f0808`](49f0808),
[`e7c74bf`](e7c74bf),
[`0876d63`](0876d63),
[`9a2b9ba`](9a2b9ba),
[`c9f54b5`](c9f54b5),
[`22b8152`](22b8152),
[`f6d44cf`](f6d44cf),
[`3c3a27b`](3c3a27b),
[`7f376b1`](7f376b1),
[`8a587c7`](8a587c7),
[`aa4f960`](aa4f960)]:
  - @sveltejs/kit@3.0.0-next.27
## @sveltejs/adapter-netlify@7.0.0-next.11

### Major Changes

- breaking: populate env vars before `instrumentation.server.js` is
evaluated and update the adapter instrumentation API
([#16303](#16303))

- breaking: replace the `builder.generateManifest` with
`builder.generateServerInstance` and `builder.manifest`
([#16875](#16875))

### Patch Changes

- fix: route requests with omitted optional parameters to split
serverless functions
([#17020](#17020))

- fix: copy `_redirects` when deploying edge function
([#17047](#17047))

- chore: replace `@iarna/toml` with `smol-toml`
([#16948](#16948))

- chore: identify serverless functions with a UUID instead of Netlify's
function token ([#17044](#17044))

- fix: ensure serverless function files have unique names
([#17049](#17049))
- Updated dependencies
[[`9a4b343`](9a4b343),
[`ee2f55b`](ee2f55b),
[`65673a4`](65673a4),
[`1b79845`](1b79845),
[`b12bb78`](b12bb78),
[`03f1687`](03f1687),
[`49f0808`](49f0808),
[`e7c74bf`](e7c74bf),
[`0876d63`](0876d63),
[`9a2b9ba`](9a2b9ba),
[`c9f54b5`](c9f54b5),
[`22b8152`](22b8152),
[`f6d44cf`](f6d44cf),
[`3c3a27b`](3c3a27b),
[`7f376b1`](7f376b1),
[`8a587c7`](8a587c7),
[`aa4f960`](aa4f960)]:
  - @sveltejs/kit@3.0.0-next.27
## @sveltejs/adapter-node@6.0.0-next.12

### Major Changes

- breaking: populate env vars before `instrumentation.server.js` is
evaluated and update the adapter instrumentation API
([#16303](#16303))

- breaking: replace the `builder.generateManifest` with
`builder.generateServerInstance` and `builder.manifest`
([#16875](#16875))

### Patch Changes

- Updated dependencies
[[`9a4b343`](9a4b343),
[`ee2f55b`](ee2f55b),
[`65673a4`](65673a4),
[`1b79845`](1b79845),
[`b12bb78`](b12bb78),
[`03f1687`](03f1687),
[`49f0808`](49f0808),
[`e7c74bf`](e7c74bf),
[`0876d63`](0876d63),
[`9a2b9ba`](9a2b9ba),
[`c9f54b5`](c9f54b5),
[`22b8152`](22b8152),
[`f6d44cf`](f6d44cf),
[`3c3a27b`](3c3a27b),
[`7f376b1`](7f376b1),
[`8a587c7`](8a587c7),
[`aa4f960`](aa4f960)]:
  - @sveltejs/kit@3.0.0-next.27
## @sveltejs/adapter-vercel@7.0.0-next.9

### Major Changes

- breaking: populate env vars before `instrumentation.server.js` is
evaluated and update the adapter instrumentation API
([#16303](#16303))

- breaking: replace the `builder.generateManifest` with
`builder.generateServerInstance` and `builder.manifest`
([#16875](#16875))

### Patch Changes

- fix: pass the requested pathname, including any trailing slash, to ISR
functions ([#16903](#16903))

- fix: trace `process.cwd()`-relative files from the project directory
and never glob from the filesystem root
([#16972](#16972))
- Updated dependencies
[[`9a4b343`](9a4b343),
[`ee2f55b`](ee2f55b),
[`65673a4`](65673a4),
[`1b79845`](1b79845),
[`b12bb78`](b12bb78),
[`03f1687`](03f1687),
[`49f0808`](49f0808),
[`e7c74bf`](e7c74bf),
[`0876d63`](0876d63),
[`9a2b9ba`](9a2b9ba),
[`c9f54b5`](c9f54b5),
[`22b8152`](22b8152),
[`f6d44cf`](f6d44cf),
[`3c3a27b`](3c3a27b),
[`7f376b1`](7f376b1),
[`8a587c7`](8a587c7),
[`aa4f960`](aa4f960)]:
  - @sveltejs/kit@3.0.0-next.27
## @sveltejs/kit@3.0.0-next.27

### Major Changes

- major: error when a client-requested single-flight mutation isn't
respected by the server, allow the server to explicitly ignore refreshes
([#16892](#16892))

- breaking: remove `Server` constructor and `SSRManifest` from public
types ([#16876](#16876))

- breaking: replace the `builder.generateManifest` with
`builder.generateServerInstance` and `builder.manifest`
([#16875](#16875))

### Minor Changes

- feat: allow adapters to receive the Svelte config as a function
argument when adding Vite plugins
([#16986](#16986))

- feat: allow adapters to override `getRequest` and `setResponse` during
`vite dev` and `vite preview`
([#16753](#16753))

### Patch Changes

- fix: respect `paths.relative` during development for client files
([#17053](#17053))

- fix: clarify circular imports from `src/env`
([#17014](#17014))

- breaking: populate env vars before `instrumentation.server.js` is
evaluated and update the adapter instrumentation API
([#16303](#16303))

- fix: record a history traversal before resolving its route
([#16959](#16959))

- fix: support coordinate objects from image inputs in remote forms
([#16944](#16944))

- fix: walk and copy directories without a stat per file
([#16995](#16995))

- fix: widen remote form fields for union schemas and string enums
([#16937](#16937))

- fix: respond to `HEAD` requests without a body
([#17036](#17036))

- chore: replace deprecated Vite dev server APIs
([#16961](#16961))

- fix: settle a query's pending request in place when its value arrives
through `set()` ([#16958](#16958))

- fix: prevent `await_reactivity_loss` warning and
`state_unsafe_mutation` error when the new version detector runs after
an `await` ([#16915](#16915))

- chore: parse page options and remote modules with Vite's `parseSync`
instead of `acorn`
([#16947](#16947))
## @sveltejs/adapter-auto@8.0.0-next.4

### Minor Changes

- feat: add zero-config deployment support for Render
([#16850](#16850))

### Patch Changes

- Updated dependencies
[[`9a4b343`](9a4b343),
[`ee2f55b`](ee2f55b),
[`65673a4`](65673a4),
[`1b79845`](1b79845),
[`b12bb78`](b12bb78),
[`03f1687`](03f1687),
[`49f0808`](49f0808),
[`e7c74bf`](e7c74bf),
[`0876d63`](0876d63),
[`9a2b9ba`](9a2b9ba),
[`c9f54b5`](c9f54b5),
[`22b8152`](22b8152),
[`f6d44cf`](f6d44cf),
[`3c3a27b`](3c3a27b),
[`7f376b1`](7f376b1),
[`8a587c7`](8a587c7),
[`aa4f960`](aa4f960)]:
  - @sveltejs/kit@3.0.0-next.27
## @sveltejs/package@3.0.0-next.8

### Patch Changes

- chore: read the Svelte config via `@sveltejs/load-config`
([#17039](#17039))

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants