fix(router): use encodeURI instead (#4534)

QwikDev · Jun 20, 2023 · 347263e · 347263e
1 parent 737144a
commit 347263e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/qwik-city/buildtime/routing/parse-pathname.ts b/packages/qwik-city/buildtime/routing/parse-pathname.ts
@@ -22,7 +22,7 @@ export function parseRoutePathname(basePathname: string, pathname: string): Pars
     `^${segments
       .filter((segment) => segment.length > 0)
       .map((s) => {
-        const segment = decodeURIComponent(s);
+        const segment = decodeURI(s);
 
         // special case — /[...rest]/ could contain zero segments
         const catchAll = /^\[\.\.\.(\w+)?\]$/.exec(segment);
@@ -46,7 +46,7 @@ export function parseRoutePathname(basePathname: string, pathname: string): Pars
               }
 
               return (
-                encodeURIComponent(content)
+                encodeURI(content)
                   // allow users to specify characters on the file system in an encoded manner
                   .normalize()
                   // We use [ and ] to denote parameters, so users must encode these on the file

diff --git a/packages/qwik-city/buildtime/routing/parse-pathname.unit.ts b/packages/qwik-city/buildtime/routing/parse-pathname.unit.ts
@@ -68,6 +68,11 @@ const tests = {
     pattern: /^\/xyz\/%D8%B9%D8%B1%D8%A8%D9%8A\/?$/,
     paramNames: [],
   },
+  '/xyz/server$/': {
+    basePathname: '/',
+    pattern: /^\/xyz\/server\$\/?$/,
+    paramNames: [],
+  },
 };
 
 for (const [key, t] of Object.entries(tests)) {