fix: make url-encoding history-aware #9496
Conversation
🦋 Changeset detectedLatest commit: 68b2478 The changes in this PR will be included in the next version bump. This PR includes changesets to release 5 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 |
| @@ -2038,14 +2035,13 @@ export function unstable_createStaticHandler( | |||
| ): Promise<Omit<StaticHandlerContext, "location"> | Response> { | |||
| let result: DataResult; | |||
| if (!actionMatch.route.action) { | |||
| let href = createServerHref(new URL(request.url)); | |||
There was a problem hiding this comment.
This createServerHref utility came over from Remix and was used in a few places that it didn't make sense. It's main purpose is to strip the hash from a URL because that doesn't get sent to the server, so really we want it in 2 places - (1) creating a submission and (2) creating a Request for a loader/action. So I removed the usages of createServerHref and instead use a more targeted stripHasFromPath utility in those 2 places.
| search: url.search, | ||
| hash: url.hash, | ||
| }; | ||
| location = init.history.encodeLocation(location); |
There was a problem hiding this comment.
This is the main part of this PR - encode incoming router.navigate locations using the implementation provided by history
| @@ -3059,13 +3048,8 @@ function getTargetMatch( | |||
| return pathMatches[pathMatches.length - 1]; | |||
| } | |||
|
|
|||
| function createURL(location: Location | string): URL { | |||
There was a problem hiding this comment.
createURL moves over to history.ts
Forgot about this callout in the special character encoding PR: #9477 (comment)
We do not want to automatically encode incoming
router.navigate()locations when using memory routers, so we introduce ahistory.encodeLocationmethod so encoding can be history aware.Decoding proves to a be a bit trickier, since we decode in
matchRouteswhich is not history-aware, but since memory locations should never be encoded in the first place, I think it's safe to decode all the time in there, sincedecodeURI('/path') === '/path'