-
-
Notifications
You must be signed in to change notification settings - Fork 2k
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
Fix truncated basepath #3345
Fix truncated basepath #3345
Conversation
🦋 Changeset detectedLatest commit: 291c4f6 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 |
✔️ Deploy Preview for kit-demo canceled. 🔨 Explore the source changes: 291c4f6 🔍 Inspect the deploy log: https://app.netlify.com/sites/kit-demo/deploys/61e1fbabd05510000739039c |
@@ -229,7 +229,9 @@ export async function prerender({ cwd, out, log, config, build_data, fallback, a | |||
if (!is_root_relative(resolved)) continue; | |||
|
|||
const parsed = new URL(resolved, 'http://localhost'); | |||
const pathname = decodeURI(parsed.pathname).replace(config.kit.paths.base, ''); | |||
|
|||
if (!parsed.pathname.startsWith(config.kit.paths.base)) continue; |
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.
Do we need to decode first before checking this?
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.
In a couple of other places, it seems to be checked without decoding. paths.base
doesn't seem to be documented one way or the other (whether it's encoded or decoded); on the other hand, the encoded form isn't canonical, so e.g. even with a "normal"-looking base of /foo
, someone visiting via /%66%6f%6f
might not match, even though it's the "same" URL. (The same issue, I would imagine, applies to the other places where it's checked as well - including probably in adapters - and behavior would vary depending on whether whatever is upstream canonicalizes the URL.) Honestly, not sure how much of a problem that is.
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.
updated the PR
Getting static assets to work with
|
Supersedes #3337. Ensures that requests for
/basepath
(wherepaths.base === '/basepath
) resolve correctly (the existing tests didn't catch this because oftrailingSlash: 'always'
).This doesn't fix static asset handling, which is a bit finicky — will open a separate PR for that.
Please don't delete this checklist! Before submitting the PR, please make sure you do the following:
Tests
pnpm test
and lint the project withpnpm lint
andpnpm check
Changesets
pnpx changeset
and following the prompts. All changesets should bepatch
until SvelteKit 1.0