fix: redirect trailing slash normalization relatively instead of against root#13719
fix: redirect trailing slash normalization relatively instead of against root#13719HoldYourWaffle wants to merge 3 commits into
Conversation
Sharing internal utilities through `@sveltejs/kit/node` feels... odd
🦋 Changeset detectedLatest commit: 2f84edc The changes in this PR will be included in the next version bump. This PR includes changesets to release 2 packages
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 |
| const inverted_trailing_slash = | ||
| pathname.at(-1) === '/' ? pathname.slice(0, -1) : pathname + '/'; | ||
| if (prerendered.has(inverted_trailing_slash)) { | ||
| // ensure preservation of (possibly invisible) path prefixes | ||
| let location = relative_pathname(pathname, inverted_trailing_slash); |
There was a problem hiding this comment.
Shouldn't this have the correct path when the request comes in? If it doesn't, maybe that's something that should be fixed in Polka?
|
Sorry for the late review. Here are some thoughts:
I think we may be able to do without the extra dependency. We may be able to use our own solution. See kit/packages/kit/src/runtime/server/page/render.js Lines 114 to 119 in c690579
Yeah, I think it's good to introduce a test app for adapter-node although we have none set up currently.
We can't export internals through
We'll likely want to keep the ternary expression so that it doesn't regress. |
) Fixes #13718. Supersedes #13719, credit to @HoldYourWaffle for the diagnosis and approach. The trailing slash redirects use absolute pathnames, so any prefix a parent server strips before the request reaches kit (an Express mount, #13702) is dropped and the browser lands outside the app. The prefix never reaches Polka's parser, so it can't be reconstructed server side. A relative Location resolves against the full browser URL and is prefix-agnostic. Per the review on #13719, the helper is implemented in kit rather than adding `get-relative-path`, stays internal instead of being exported from `@sveltejs/kit/node`, and adapter-node gets a local copy since its handler is bundled standalone. Both call sites only produce pathnames differing by a trailing slash, so it handles exactly that case. The #2515 guard becomes unnecessary, a relative reference never starts with `/`. The options app trailingSlash tests now assert the Location values and fail on the old code. The prerender crawler resolves locations with `new URL()`, so it follows the relative form unchanged. Verified end to end with an adapter-node build mounted under a stripped prefix, both the SSR and the prerendered redirect. No adapter-node test app here since #16305 is establishing that infrastructure. --- ### Please don't delete this checklist! Before submitting the PR, please make sure you do the following: - [x] It's really useful if your PR references an issue where it is discussed ahead of time. In many cases, features are absent for a reason. For large changes, please create an RFC: https://github.com/sveltejs/rfcs - [x] This message body should clearly illustrate what problems it solves. - [x] Ideally, include a test that fails without this PR but passes with it. ### Tests - [x] Run the tests with `pnpm test` and lint the project with `pnpm lint` and `pnpm check` ### Changesets - [x] If your PR makes a change that should be noted in one or more packages' changelogs, generate a changeset by running `pnpm changeset` and following the prompts. Changesets that add features should be `minor` and those that fix bugs should be `patch`. Please prefix changeset messages with `feat:`, `fix:`, or `chore:`. ### Edits - [x] Please ensure that 'Allow edits from maintainers' is checked. PRs without this option may be closed. --------- Co-authored-by: HoldYourWaffle <holdyourwaffle@gmail.com>
|
Closing in favour of #16431 |
Fixes #13718.
As mentioned there:
Locationis allowed to be relative, so I just... did that.For the scenario listed in the issue that means
/sveltekit/sverdle/is redirected withLocation: ../sverdle, which correctly resolves to/sveltekit/sverdle.Remaining things to consider
get-relative-pathcode that does the heavy lifting, but I'd like to confirm this is the correct solution first.adapter-node+dynamic base project or keep it simple and just check if the path is relative?adapter-nodecurrently imports the internalrelative_pathnameutility through@sveltejs/kit/node, which feels a bit weird, is there a better place for this?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