fix: avoid conflict for routes ending with optional parameters#15861
Merged
Conversation
🦋 Changeset detectedLatest commit: 0a0f437 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 |
teemingc
commented
May 18, 2026
Member
Author
There was a problem hiding this comment.
This file has always existed but was empty. Figured I'd move the conflict code to it.
teemingc
commented
May 18, 2026
Comment on lines
+14
to
+15
| const ends_with_optional = /<\?.+?>$/.test(normalized); | ||
| if (!ends_with_optional && Array.from(normalized.matchAll(/<\?.+?>/g)).length) { |
teemingc
commented
May 18, 2026
| }, /** @type {string[]} */ ([])); | ||
| } | ||
| } else { | ||
| permutations = [normalized]; |
teemingc
commented
May 18, 2026
|
|
||
| const pattern = | ||
| id === '/' | ||
| id === '/' || root_group_pattern.test(id) |
Member
Author
There was a problem hiding this comment.
Helps avoid the case where /(group)/[[optional]] creates a route such as /(group) with an invalid matcher
dummdidumm
approved these changes
May 18, 2026
This was referenced May 18, 2026
Merged
Rich-Harris
pushed a commit
that referenced
this pull request
May 22, 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 main, this PR will be updated. # Releases ## @sveltejs/kit@2.61.0 ### Minor Changes - breaking: the `.run()` method has been removed from remote queries on both the client and the server. Use `await query()` directly instead — it now works everywhere ([#15779](#15779)) - feat: remote queries can now be awaited in any context (event handlers, module scope, async callbacks), not just inside reactive contexts. The cache is shared across reactive and non-reactive subscribers, so awaiting a query in an event handler will dedupe with components that have already subscribed to the same query. ([#15779](#15779)) - feat: live query instances are now themselves async-iterable ([#15878](#15878)) - feat: add programmatic `submit` method to `form` remote function instances ([#15657](#15657)) - feat: pass `form` remote function instance into `enhance` callback ([#15657](#15657)) ### Patch Changes - fix: resolve the app payload without using `process.env.NODE_ENV` ([#15852](#15852)) - fix: support `exactOptionalPropertyTypes` for optional route params ([#15825](#15825)) - fix: correctly send `true` value to the server for 'submit' and 'hidden' form fields ([#15858](#15858)) - fix: avoid build warnings about undefined universal hooks ([#15895](#15895)) - fix: prefer default error page when failing to decode the URL pathname ([#15744](#15744)) - fix: disable link prefetching on slow internet connections ([#15885](#15885)) - fix: allow routes ending with optional parameters next to more specific routes ([#15861](#15861)) - fix: remove reliance on Content-Length header in deserialize_binary_form, which caused failures when proxies (e.g. Vercel, Azure) strip the header and use chunked transfer encoding ([#15796](#15796)) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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
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.
closes #13704
This PR wraps the optional parameters permutations computation in a guard so that routes ending with an optional parameter are treated specially. Routes such as
/and/[[optional]]should be legal with/matching greedily.Please don't delete this checklist! Before submitting the PR, please make sure you do the following:
Tests
pnpm testand lint the project withpnpm lintandpnpm checkChangesets
pnpm changesetand following the prompts. Changesets that add features should beminorand those that fix bugs should bepatch. Please prefix changeset messages withfeat:,fix:, orchore:.Edits