fix: only encode non dynamic path params (#8421)

nuxt · Dec 1, 2020 · 49c293b · 49c293b
1 parent 68d8fb8
commit 49c293b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/utils/src/route.js b/packages/utils/src/route.js
@@ -201,9 +201,10 @@ export const createRoutes = function createRoutes ({
       } else if (key === 'index' && i + 1 === keys.length) {
         route.path += i > 0 ? '' : '/'
       } else {
-        route.path += '/' + getRoutePathExtension(key)
+        const isDynamic = key.startsWith('_')
+        route.path += '/' + getRoutePathExtension(isDynamic ? key : encodeURIComponent(decodeURIComponent(key)))
 
-        if (key.startsWith('_') && key.length > 1) {
+        if (isDynamic && key.length > 1) {
           route.path += '?'
         }
       }

diff --git a/packages/vue-app/template/router.js b/packages/vue-app/template/router.js
@@ -47,7 +47,7 @@ import scrollBehavior from './router.scrollBehavior.js'
     }
     // @see: https://router.vuejs.org/api/#router-construction-options
     res += '{'
-    res += firstIndent + 'path: ' + JSON.stringify(encodeURI(decodeURI(route.path)))
+    res += firstIndent + 'path: ' + JSON.stringify(route.path)
     res += (route.components) ? nextIndent + 'components: {' + resMap + '\n' + baseIndent + tab + '}' : ''
     res += (route.component) ? nextIndent + 'component: ' + route._name : ''
     res += (route.redirect) ? nextIndent + 'redirect: ' + JSON.stringify(route.redirect) : ''