v2.14.10 [hotfix]

distributions/nuxt-start/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-start",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "description": "Starts Nuxt Application in production mode",
   "keywords": [
     "nuxt",
@@ -55,9 +55,9 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/cli": "2.14.9",
-    "@nuxt/core": "2.14.9",
-    "@nuxt/telemetry": "^1.2.3",
+    "@nuxt/cli": "2.14.10",
+    "@nuxt/core": "2.14.10",
+    "@nuxt/telemetry": "^1.3.0",
     "node-fetch": "^2.6.1",
     "vue": "^2.6.12",
     "vue-client-only": "^2.0.0",

distributions/nuxt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
   "keywords": [
     "nuxt",
@@ -58,15 +58,15 @@
     "postinstall": "opencollective || exit 0"
   },
   "dependencies": {
-    "@nuxt/builder": "2.14.9",
-    "@nuxt/cli": "2.14.9",
+    "@nuxt/builder": "2.14.10",
+    "@nuxt/cli": "2.14.10",
     "@nuxt/components": "^1.2.1",
-    "@nuxt/core": "2.14.9",
-    "@nuxt/generator": "2.14.9",
+    "@nuxt/core": "2.14.10",
+    "@nuxt/generator": "2.14.10",
     "@nuxt/loading-screen": "^2.0.3",
     "@nuxt/opencollective": "^0.3.2",
-    "@nuxt/telemetry": "^1.2.3",
-    "@nuxt/webpack": "2.14.9"
+    "@nuxt/telemetry": "^1.3.0",
+    "@nuxt/webpack": "2.14.10"
   },
   "engines": {
     "node": ">=10.13.0",

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.14.9",
+  "version": "2.14.10",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "conventionalCommits": true,

packages/babel-preset-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/babel-preset-app",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "description": "babel-preset-app for nuxt",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/builder",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/builder.js",
@@ -9,9 +9,9 @@
   ],
   "dependencies": {
     "@nuxt/devalue": "^1.2.4",
-    "@nuxt/utils": "2.14.9",
-    "@nuxt/vue-app": "2.14.9",
-    "@nuxt/webpack": "2.14.9",
+    "@nuxt/utils": "2.14.10",
+    "@nuxt/vue-app": "2.14.10",
+    "@nuxt/webpack": "2.14.10",
     "chalk": "^4.1.0",
     "chokidar": "^3.4.3",
     "consola": "^2.15.0",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/cli",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/cli.js",
@@ -12,8 +12,8 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/config": "2.14.9",
-    "@nuxt/utils": "2.14.9",
+    "@nuxt/config": "2.14.10",
+    "@nuxt/utils": "2.14.10",
     "boxen": "^4.2.0",
     "chalk": "^4.1.0",
     "compression": "^1.7.4",

packages/config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/config",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/config.js",
@@ -10,7 +10,8 @@
     "index.d.ts"
   ],
   "dependencies": {
-    "@nuxt/utils": "2.14.9",
+    "@nuxt/ufo": "^0.0.3",
+    "@nuxt/utils": "2.14.10",
     "consola": "^2.15.0",
     "create-require": "^1.1.1",
     "defu": "^3.2.2",

packages/config/src/options.js

@@ -7,6 +7,7 @@ import uniq from 'lodash/uniq'
 import consola from 'consola'
 import destr from 'destr'
 import { TARGETS, MODES, guardDir, isNonEmptyString, isPureObject, isUrl, getMainModule, urlJoin, getPKG } from '@nuxt/utils'
+import { normalizeURL } from '@nuxt/ufo'
 import { defaultNuxtConfigFile, getDefaultNuxtConfig } from './config'
 
 export function getNuxtConfig (_options) {
@@ -126,7 +127,7 @@ export function getNuxtConfig (_options) {
   if (!/\/$/.test(options.router.base)) {
     options.router.base += '/'
   }
-  options.router.base = encodeURI(decodeURI(options.router.base))
+  options.router.base = normalizeURL(options.router.base)
 
   // Legacy support for export
   if (options.export) {

packages/core/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@nuxt/core",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/core.js",
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@nuxt/config": "2.14.9",
+    "@nuxt/config": "2.14.10",
     "@nuxt/devalue": "^1.2.4",
-    "@nuxt/server": "2.14.9",
-    "@nuxt/utils": "2.14.9",
-    "@nuxt/vue-renderer": "2.14.9",
+    "@nuxt/server": "2.14.10",
+    "@nuxt/utils": "2.14.10",
+    "@nuxt/vue-renderer": "2.14.10",
     "consola": "^2.15.0",
     "debug": "^4.2.0",
     "esm": "^3.2.25",

packages/generator/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@nuxt/generator",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/generator.js",
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@nuxt/utils": "2.14.9",
+    "@nuxt/utils": "2.14.10",
     "chalk": "^4.1.0",
     "consola": "^2.15.0",
     "devalue": "^2.0.1",

packages/server/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nuxt/server",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/server.js",
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@nuxt/config": "2.14.9",
-    "@nuxt/utils": "2.14.9",
-    "@nuxt/vue-renderer": "2.14.9",
+    "@nuxt/config": "2.14.10",
+    "@nuxt/utils": "2.14.10",
+    "@nuxt/vue-renderer": "2.14.10",
     "@nuxtjs/youch": "^4.2.3",
     "chalk": "^4.1.0",
     "compression": "^1.7.4",

packages/server/src/server.js

@@ -162,12 +162,16 @@ export default class Server {
     }))
 
     // DX: redirect if router.base in development
-    if (this.options.dev && this.nuxt.options.router.base !== '/') {
+    const routerBase = this.nuxt.options.router.base
+    if (this.options.dev && routerBase !== '/') {
       this.useMiddleware({
         prefix: false,
-        handler: (req, res) => {
-          const to = urlJoin(this.nuxt.options.router.base, req.url)
-          consola.info(`[Development] Redirecting from \`${decodeURI(req.url)}\` to \`${decodeURI(to)}\` (router.base specified).`)
+        handler: (req, res, next) => {
+          if (decodeURI(req.url).startsWith(decodeURI(routerBase))) {
+            return next()
+          }
+          const to = urlJoin(routerBase, req.url)
+          consola.info(`[Development] Redirecting from \`${decodeURI(req.url)}\` to \`${decodeURI(to)}\` (router.base specified)`)
           res.writeHead(302, {
             Location: to
           })

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/types",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "description": "Nuxt types",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",

packages/utils/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@nuxt/utils",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/utils.js",
   "files": [
     "dist"
   ],
   "dependencies": {
+    "@nuxt/ufo": "^0.0.3",
     "consola": "^2.15.0",
     "fs-extra": "^9.0.1",
     "hash-sum": "^2.0.0",

packages/utils/src/route.js

@@ -1,7 +1,7 @@
 import path from 'path'
 import get from 'lodash/get'
 import consola from 'consola'
-
+import { normalizeURL } from '@nuxt/ufo'
 import { r } from './resolve'
 
 const routeChildren = function (route) {
@@ -201,10 +201,8 @@ export const createRoutes = function createRoutes ({
       } else if (key === 'index' && i + 1 === keys.length) {
         route.path += i > 0 ? '' : '/'
       } else {
-        const isDynamic = key.startsWith('_')
-        route.path += '/' + getRoutePathExtension(isDynamic ? key : encodeURIComponent(decodeURIComponent(key)))
-
-        if (isDynamic && key.length > 1) {
+        route.path += normalizeURL(getRoutePathExtension(key))
+        if (key.startsWith('_') && key.length > 1) {
           route.path += '?'
         }
       }

packages/vue-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vue-app",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/vue-app.js",
@@ -13,6 +13,7 @@
     "index.d.ts"
   ],
   "dependencies": {
+    "@nuxt/ufo": "^0.0.3",
     "node-fetch": "^2.6.1",
     "unfetch": "^4.2.0",
     "vue": "^2.6.12",

packages/vue-app/template/router.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
+import { normalizeURL } from '@nuxt/ufo'
 import { interopDefault } from './utils'<%= isTest ? '// eslint-disable-line no-unused-vars' : '' %>
 import scrollBehavior from './router.scrollBehavior.js'
 
@@ -105,16 +106,27 @@ export const routerOptions = {
   fallback: <%= router.fallback %>
 }
 
+function decodeObj(obj) {
+  for (const key in obj) {
+    if (typeof obj[key] === 'string') {
+      obj[key] = decodeURIComponent(obj[key])
+    }
+  }
+}
+
 export function createRouter () {
   const router = new Router(routerOptions)
-  const resolve = router.resolve.bind(router)
 
-  // encodeURI(decodeURI()) ~> support both encoded and non-encoded urls
+  const resolve = router.resolve.bind(router)
   router.resolve = (to, current, append) => {
     if (typeof to === 'string') {
-      to = encodeURI(decodeURI(to))
+      to = normalizeURL(to)
+    }
+    const r = resolve(to, current, append)
+    if (r && r.resolved && r.resolved.query) {
+      decodeObj(r.resolved.query)
     }
-    return resolve(to, current, append)
+    return r
   }
 
   return router

packages/vue-app/template/server.js

@@ -1,5 +1,6 @@
 import { stringify } from 'querystring'
 import Vue from 'vue'
+import { normalizeURL } from '@nuxt/ufo'
 <% if (fetch.server) { %>import fetch from 'node-fetch'<% } %>
 <% if (features.middleware) { %>import middleware from './middleware.js'<% } %>
 import {
@@ -50,12 +51,12 @@ const createNext = ssrContext => (opts) => {
     opts.path = urlJoin(routerBase, opts.path)
   }
   // Avoid loop redirect
-  if (encodeURI(decodeURI(opts.path)) === ssrContext.url) {
+  if (decodeURI(opts.path) === decodeURI(ssrContext.url)) {
     ssrContext.redirected = false
     return
   }
   ssrContext.res.writeHead(opts.status, {
-    Location: opts.path
+    Location: normalizeURL(opts.path)
   })
   ssrContext.res.end()
 }

packages/vue-app/template/utils.js

@@ -1,4 +1,5 @@
 import Vue from 'vue'
+import { normalizeURL } from '@nuxt/ufo'
 
 // window.{{globals.loadedCallback}} hook
 // Useful for jsdom testing or plugins (https://github.com/tmpvar/jsdom#dealing-with-asynchronous-script-loading)
@@ -309,7 +310,7 @@ export function getLocation (base, mode) {
 
   const fullPath = (path || '/') + window.location.search + window.location.hash
 
-  return encodeURI(fullPath)
+  return normalizeURL(fullPath)
 }
 
 // Imported from path-to-regexp
@@ -692,3 +693,4 @@ export function setScrollRestoration (newVal) {
     window.history.scrollRestoration = newVal;
   } catch(e) {}
 }
+

packages/vue-renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vue-renderer",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/vue-renderer.js",
@@ -9,7 +9,7 @@
   ],
   "dependencies": {
     "@nuxt/devalue": "^1.2.4",
-    "@nuxt/utils": "2.14.9",
+    "@nuxt/utils": "2.14.10",
     "consola": "^2.15.0",
     "fs-extra": "^9.0.1",
     "lru-cache": "^5.1.1",