Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Encode URIs during server rendering of <a href>/<form action> to avoi… #10769

Merged
merged 7 commits into from Aug 11, 2023
Merged

Encode URIs during server rendering of <a href>/<form action> to avoi… #10769

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e24606d
Encode URIs during server rendering of <a href>/<form action> to avoi…
brophdawg11 Aug 8, 2023
3626fef
Bump bundle
brophdawg11 Aug 9, 2023
3449554
Update approach
brophdawg11 Aug 9, 2023
142b2b0
bump bundle
brophdawg11 Aug 9, 2023
7ecb165
Remove absolute url check
brophdawg11 Aug 9, 2023
b9dd991
Update packages/react-router-dom/index.tsx
brophdawg11 Aug 10, 2023
f135058
Change approach to properly encode in encodeLocation
brophdawg11 Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -118,7 +118,7 @@
"none": "16.3 kB"
},
"packages/react-router-dom/dist/react-router-dom.production.min.js": {
"none": "13.1 kB"
"none": "13.0 kB"
},
"packages/react-router-dom/dist/umd/react-router-dom.production.min.js": {
"none": "19.1 kB"
Expand Down
6 changes: 2 additions & 4 deletions packages/react-router-dom/index.tsx
View file
Open in desktop
Expand Up @@ -1508,11 +1508,9 @@ export { usePrompt as unstable_usePrompt };
function safelyEncodeSsrHref(to: To, href: string): string {
let path = typeof to === "string" ? parsePath(to).pathname : to.pathname;
// Only touch the href for auto-generated paths
if (path === null || path === "" || path === ".") {
if (!path || path === ".") {
try {
let encoded = ABSOLUTE_URL_REGEX.test(href)
? new URL(href)
: new URL(href, "http://localhost");
brophdawg11 marked this conversation as resolved.
Show resolved Hide resolved
let encoded = new URL(href, "http://localhost");
return encoded.pathname + encoded.search;
} catch (e) {
// no-op - don't change href if we aren't sure it needs encoding
brophdawg11 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down