feat: redirect trailing slashes on on-demand rendered pages #12994
+416
−17
Conversation
This file contains 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
🦋 Changeset detectedLatest commit: 25a0847 The changes in this PR will be included in the next version bump. 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 |
github-actions
bot
added
pkg: astro
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
CodSpeed Performance ReportMerging #12994 will not alter performanceComparing Summary
|
ematipico
reviewed
Jan 16, 2025
Comment on lines
108
to
111
| const withFileExt = /\/[^/]+\.\w+$/; | ||
|
|
||
| export function hasFileExtension(path: string) { | ||
| return withFileExt.test(path); |
There was a problem hiding this comment.
Suggested change
| const withFileExt = /\/[^/]+\.\w+$/; | |
| export function hasFileExtension(path: string) { | |
| return withFileExt.test(path); | |
| const WITH_FILE_EXT = /\/[^/]+\.\w+$/; | |
| export function hasFileExtension(path: string) { | |
| return WITH_FILE_EXT.test(path); |
There was a problem hiding this comment.
We already have the fileExtension, so can't we use that? The result would be an empty string 🤔
There was a problem hiding this comment.
Could do, but fileExtension will need a rewrite to use regex and not split though, because it isn't robust in cases where there's no extension. A dot anywhere in the path will give a false positive.
There was a problem hiding this comment.
I don't think this would be the right approach. It's running on every request, so I don't think it makes sense to use a function that does more than is needed.
|
I wonder if this is a significant enough change to be behind an experimental flag. |
This features seems to be mostly a change for adapters. In this case, you might want to add a new Astro feature: astro/packages/astro/src/types/public/integrations.ts Lines 100 to 130 in df90e6d Like this, adapters can opt-in and "break" things as much as they want, using their own versioning. What do you think? |
|
I don't think so. This will work without any change on the adapter's part. |
bluwy
approved these changes
Jan 16, 2025
That I know. I was suggesting an experimental path without necessarily having one in core, since this is a change that affects only on-demand pages with an adapter, and I would prefer this way because we don't know if users have already fixed this on their end. |
|
@ematipico why do you think this is breaking? |
|
!preview trailing-slash-redirect |
Closed
1 task
|
Snapshots have been released for the following packages:
Publish LogBuild Log |
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.
Changes
When the
trailingSlashoption is set toalwaysornever, on-demand rendered pages will now redirect to the correct URL when the trailing slash is incorrect. This was previously the case for static pages, but now works for on-demand pages as well. There are some exceptions:trailingSlashisignorethen it is not redirected/favicon.icowill not redirect to/favicon.ico//_with not redirect, because these are usually special internal pathsIn dev we don't redirect so it's more obvious that a link is incorrect. Instead I have updated the 404 page to give a bit more information if there's a trailing slash mismatch, and suggest goign to the version with the correct slash:
Fixes #12532
Fixes #12833
Fixes #11575
Testing
Added a big test suite. Refer to it for more examples.
Docs
This will need docs