-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
fix(router): apply trailingSlash config before basepath redirect comparison on SSR #7295
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.
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
EduardF1
wants to merge
8
commits into
TanStack:main
Choose a base branch
from
EduardF1:fix/ssr-basepath-trailing-slash-redirect
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c9c673a
fix(router): apply trailingSlash config before basepath redirect comp…
EduardF1 8854f4f
chore: add changeset
EduardF1 c503787
Merge branch 'main' into fix/ssr-basepath-trailing-slash-redirect
EduardF1 00fc9a4
Merge branch 'main' into fix/ssr-basepath-trailing-slash-redirect
EduardF1 a415ba9
Merge branch 'main' into fix/ssr-basepath-trailing-slash-redirect
EduardF1 3eb2c43
Merge branch 'main' into fix/ssr-basepath-trailing-slash-redirect
EduardF1 3c8b29d
Merge branch 'main' into fix/ssr-basepath-trailing-slash-redirect
EduardF1 f910ffd
test(router-core): cover trailingSlash handling of the rewritten base…
EduardF1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| --- | ||
| '@tanstack/router-core': patch | ||
| --- | ||
|
|
||
| fix(router-core): apply the `trailingSlash` option to the rewritten basepath `publicHref` before the SSR redirect comparison. | ||
|
|
||
| Fixes [#7291](https://github.com/TanStack/router/issues/7291): requesting a bare basepath URL (for example `/preview` with `basepath: '/preview'`) on the server always answered with a `308` redirect to `/preview/`, even with `trailingSlash: 'never'` (the default). `rewriteBasepath.output` joins the basepath and the internal pathname, which yields a trailing slash for the root route, and `buildLocation` never reconciled that with `trailingSlash` before comparing it to the incoming request URL. The rewritten pathname is now trimmed under `'never'`, given a trailing slash under `'always'` and left as is under `'preserve'`. This also applies to custom `rewrite.output` implementations: under `'never'` a trailing slash they emit is trimmed from `publicHref`. |
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
Add
publicHrefassertions for bare basepaths and trailing-slash modes. The reachable rewrite tests callbuildLocationand assert several same-originpublicHrefvalues, but they do not coverrewriteBasepath('/app')withtrailingSlash: 'never','always', or'preserve'. A regression could therefore return/app/instead of/appfor'never', or change the/app/result for the other modes, without failing the current tests. Add focused assertions before redirect comparison.🤖 Prompt for AI Agents