skip decoding for href

pelly-ryu · Jul 19, 2024 · 373ceed · 373ceed
1 parent bf0a6be
commit 373ceed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/vike/utils/parseUrl.spec.ts b/vike/utils/parseUrl.spec.ts
@@ -445,7 +445,7 @@ describe('parseUrl', () => {
           "hash": "",
           "hashOriginal": null,
           "host": null,
-          "href": "/user/@rom",
+          "href": "/user/%40rom",
           "origin": null,
           "pathname": "/user/@rom",
           "pathnameOriginal": "/user/%40rom",
@@ -577,7 +577,7 @@ describe('parseUrl', () => {
           "hash": "",
           "hashOriginal": null,
           "host": null,
-          "href": "/user/%rom",
+          "href": "/user/%25rom",
           "origin": null,
           "pathname": "/user/%rom",
           "pathnameOriginal": "/user/%25rom",
@@ -629,7 +629,7 @@ describe('parseUrl', () => {
         "hash": "",
         "hashOriginal": null,
         "host": null,
-        "href": "/product/ö",
+        "href": "/product/%C3%B6",
         "origin": null,
         "pathname": "/product/ö",
         "pathnameOriginal": "/product/%C3%B6",
@@ -664,7 +664,7 @@ describe('parseUrl', () => {
         "hash": "",
         "hashOriginal": null,
         "host": null,
-        "href": "/ab",
+        "href": "/ab ",
         "origin": null,
         "pathname": "/ab",
         "pathnameOriginal": "/ab ",
@@ -682,7 +682,7 @@ describe('parseUrl', () => {
         "hash": "",
         "hashOriginal": null,
         "host": null,
-        "href": "/ab ",
+        "href": "/ab%20",
         "origin": null,
         "pathname": "/ab ",
         "pathnameOriginal": "/ab%20",
@@ -714,7 +714,7 @@ describe('parseUrl', () => {
         "hash": "",
         "hashOriginal": null,
         "host": null,
-        "href": "/a b",
+        "href": "/a%20b",
         "origin": null,
         "pathname": "/a b",
         "pathnameOriginal": "/a%20b",
@@ -733,7 +733,7 @@ describe('parseUrl', () => {
         "hash": "",
         "hashOriginal": null,
         "host": null,
-        "href": "/b?c",
+        "href": "/b%3Fc",
         "origin": null,
         "pathname": "/b?c",
         "pathnameOriginal": "/a%23/b%3Fc",
@@ -923,7 +923,7 @@ describe('parseUrl', () => {
         "hash": "âge",
         "hashOriginal": "#%C3%A2ge",
         "host": "example.com",
-        "href": "https://example.com/hello/sébastien?fruit=%C3%A2pple&fruit=orânge#%C3%A2ge",
+        "href": "https://example.com/hello/s%C3%A9bastien?fruit=%C3%A2pple&fruit=orânge#%C3%A2ge",
         "origin": "https://example.com",
         "pathname": "/hello/sébastien",
         "pathnameOriginal": "/some-base-url/hello/s%C3%A9bastien",

diff --git a/vike/utils/parseUrl.ts b/vike/utils/parseUrl.ts
@@ -83,18 +83,20 @@ function parseUrl(url: string, baseServer: string): UrlPrivate {
   })
 
   // Origin + pathname
-  const { protocol, origin, pathnameAbsoluteWithBase } = getPathnameWithBase(urlWithoutHashNorSearch, baseServer)
+  let { protocol, origin, pathnameAbsoluteWithBase } = getPathnameWithBase(urlWithoutHashNorSearch, baseServer)
   const pathnameOriginal = urlWithoutHashNorSearch.slice((origin || '').length)
   assertUrlComponents(url, origin, pathnameOriginal, searchOriginal, hashOriginal)
 
   // Base URL
   let { pathname, hasBaseServer } = removeBaseServer(pathnameAbsoluteWithBase, baseServer)
-  pathname = decodePathname(pathname)
 
   // More props
   const href = createUrlFromComponents(origin, pathname, searchOriginal, hashOriginal)
   const host = !origin ? null : origin.slice(protocol!.length)
 
+  // decode after setting href
+  pathname = decodePathname(pathname)
+
   assert(pathname.startsWith('/'))
   return {
     href,