v2.13.2

distributions/nuxt-start/package.json

@@ -57,7 +57,7 @@
   "dependencies": {
     "@nuxt/cli": "2.13.1",
     "@nuxt/core": "2.13.1",
-    "@nuxt/telemetry": "^1.1.0",
+    "@nuxt/telemetry": "^1.2.0",
     "node-fetch": "^2.6.0",
     "vue": "^2.6.11",
     "vue-client-only": "^2.0.0",

distributions/nuxt/package.json

@@ -60,12 +60,12 @@
   "dependencies": {
     "@nuxt/builder": "2.13.1",
     "@nuxt/cli": "2.13.1",
-    "@nuxt/components": "^1.0.4",
+    "@nuxt/components": "^1.0.5",
     "@nuxt/core": "2.13.1",
     "@nuxt/generator": "2.13.1",
-    "@nuxt/loading-screen": "^2.0.1",
+    "@nuxt/loading-screen": "^2.0.2",
     "@nuxt/opencollective": "^0.3.0",
-    "@nuxt/telemetry": "^1.1.0",
+    "@nuxt/telemetry": "^1.2.0",
     "@nuxt/webpack": "2.13.1"
   },
   "engines": {

package.json

@@ -49,7 +49,7 @@
     "@vue/test-utils": "^1.0.3",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^26.1.0",
-    "consola": "^2.13.0",
+    "consola": "^2.14.0",
     "create-require": "^1.0.2",
     "cross-spawn": "^7.0.3",
     "eslint": "^7.3.1",
@@ -72,7 +72,7 @@
     "lodash": "^4.17.15",
     "node-fetch": "^2.6.0",
     "node-sass": "^4.14.1",
-    "puppeteer-core": "^4.0.0",
+    "puppeteer-core": "^4.0.1",
     "request": "^2.88.2",
     "rimraf": "^3.0.2",
     "rollup": "2.18.0",

packages/builder/package.json

@@ -14,7 +14,7 @@
     "@nuxt/webpack": "2.13.1",
     "chalk": "^3.0.0",
     "chokidar": "^3.4.0",
-    "consola": "^2.13.0",
+    "consola": "^2.14.0",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.6",
     "hash-sum": "^2.0.0",

packages/cli/package.json

@@ -18,7 +18,7 @@
     "chalk": "^3.0.0",
     "compression": "^1.7.4",
     "connect": "^3.7.0",
-    "consola": "^2.13.0",
+    "consola": "^2.14.0",
     "esm": "^3.2.25",
     "execa": "^3.4.0",
     "exit": "^0.1.2",

packages/cli/src/commands/export.js

@@ -34,7 +34,7 @@ export default {
     }
 
     const generator = await cmd.getGenerator(nuxt)
-    await nuxt.server.listen()
+    await nuxt.server.listen(0)
 
     const { errors } = await generator.generate({
       init: true,

packages/cli/src/commands/generate.js

@@ -95,7 +95,7 @@ export default {
     }
 
     const generator = await cmd.getGenerator(nuxt)
-    await nuxt.server.listen()
+    await nuxt.server.listen(0)
 
     const { errors } = await generator.generate({
       init: true,

packages/config/package.json

@@ -11,7 +11,7 @@
   ],
   "dependencies": {
     "@nuxt/utils": "2.13.1",
-    "consola": "^2.13.0",
+    "consola": "^2.14.0",
     "create-require": "^1.0.2",
     "defu": "^2.0.4",
     "destr": "^1.0.0",

packages/core/package.json

@@ -13,7 +13,7 @@
     "@nuxt/server": "2.13.1",
     "@nuxt/utils": "2.13.1",
     "@nuxt/vue-renderer": "2.13.1",
-    "consola": "^2.13.0",
+    "consola": "^2.14.0",
     "debug": "^4.1.1",
     "esm": "^3.2.25",
     "fs-extra": "^8.1.0",

packages/core/src/module.js

@@ -191,10 +191,16 @@ export default class ModuleContainer {
     }
 
     // Ensure module is required once
-    const key = (handler.meta && handler.meta.name) || src
+    const metaKey = handler.meta && handler.meta.name
+    const key = metaKey || src
     if (typeof key === 'string') {
       if (this.requiredModules[key]) {
-        return
+        if (!metaKey) {
+          // TODO: Skip with nuxt3
+          consola.warn('Modules should be only specified once:', key)
+        } else {
+          return
+        }
       }
       this.requiredModules[key] = { src, options, handler }
     }

packages/generator/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@nuxt/utils": "2.13.1",
     "chalk": "^3.0.0",
-    "consola": "^2.13.0",
+    "consola": "^2.14.0",
     "fs-extra": "^8.1.0",
     "html-minifier": "^4.0.0",
     "node-html-parser": "^1.2.20"

packages/server/package.json

@@ -15,7 +15,7 @@
     "chalk": "^3.0.0",
     "compression": "^1.7.4",
     "connect": "^3.7.0",
-    "consola": "^2.13.0",
+    "consola": "^2.14.0",
     "etag": "^1.8.1",
     "fresh": "^0.5.2",
     "fs-extra": "^8.1.0",

packages/types/package.json

@@ -23,7 +23,7 @@
     "@types/pug": "^2.0.4",
     "@types/serve-static": "^1.13.4",
     "@types/terser-webpack-plugin": "^2.2.0",
-    "@types/webpack": "^4.41.17",
+    "@types/webpack": "^4.41.18",
     "@types/webpack-bundle-analyzer": "^3.8.0",
     "@types/webpack-dev-middleware": "^3.7.1",
     "@types/webpack-hot-middleware": "^2.25.3"

packages/utils/package.json

@@ -8,7 +8,7 @@
     "dist"
   ],
   "dependencies": {
-    "consola": "^2.13.0",
+    "consola": "^2.14.0",
     "fs-extra": "^8.1.0",
     "hash-sum": "^2.0.0",
     "proper-lockfile": "^4.1.1",

packages/utils/src/resolve.js

@@ -18,10 +18,9 @@ export const wp = function wp (p = '') {
 }
 
 export const wChunk = function wChunk (p = '') {
-  if (isWindows) {
-    return p.replace(/\//g, '_')
-  }
-  return p
+  // workaround for SplitChunksPlugin that generate names starting from . for catchAll pages _.vue
+  // consider using https://webpack.js.org/configuration/output/#outputfilename for more robust control over filename generation
+  return p.replace('_', '[_]')
 }
 
 const reqSep = /\//g

packages/utils/src/route.js

@@ -13,14 +13,19 @@ export const flatRoutes = function flatRoutes (router, fileName = '', routes = [
       if (fileName === '' && r.path === '/') {
         routes.push('/')
       }
+
       return flatRoutes(r.children, fileName + r.path + '/', routes)
     }
     fileName = fileName.replace(/\/+/g, '/')
-    routes.push(
-      (r.path === '' && fileName[fileName.length - 1] === '/'
-        ? fileName.slice(0, -1)
-        : fileName) + r.path
-    )
+
+    // if child path is already absolute, do not make any concatenations
+    if (r.path && r.path.startsWith('/')) {
+      routes.push(r.path)
+    } else if (r.path === '' && fileName[fileName.length - 1] === '/') {
+      routes.push(fileName.slice(0, -1) + r.path)
+    } else {
+      routes.push(fileName + r.path)
+    }
   })
   return routes
 }

packages/utils/test/resolve.win.test.js

@@ -12,7 +12,7 @@ describe.win('util: resolve windows', () => {
   })
 
   test('should format windows path', () => {
-    expect(wChunk('nuxt/layout/test')).toEqual('nuxt_layout_test')
+    expect(wChunk('nuxt/layout/test')).toEqual('nuxt/layout/test')
   })
 
   test('should resolve alias path', () => {

packages/utils/test/route.test.js

@@ -40,6 +40,37 @@ describe('util: route', () => {
     expect(routes).toEqual(['/', '/foo/bar', '/foo/baz'])
   })
 
+  test('should flat absolute routes', () => {
+    const routes = flatRoutes([
+      {
+        name: 'foo',
+        path: '/foo',
+        children: [
+          { name: 'foo-bar', path: '/foo/bar' },
+          { name: 'foo-baz', path: '/foo/baz' }
+        ]
+      }
+    ])
+
+    expect(routes).toEqual(['/foo/bar', '/foo/baz'])
+  })
+
+  test('should flat absolute routes with empty path', () => {
+    const routes = flatRoutes([
+      {
+        name: 'foo',
+        path: '/foo',
+        children: [
+          { name: 'foo-root', path: '' },
+          { name: 'foo-bar', path: '/foo/bar' },
+          { name: 'foo-baz', path: '/foo/baz' }
+        ]
+      }
+    ])
+
+    expect(routes).toEqual(['/foo', '/foo/bar', '/foo/baz'])
+  })
+
   describe('util: route guard', () => {
     test('should guard parent dir', () => {
       expect(() => {

packages/vue-app/template/App.js

@@ -41,25 +41,12 @@ export default {
   render (h, props) {
     <% if (loading) { %>const loadingEl = h('NuxtLoading', { ref: 'loading' })<% } %>
     <% if (features.layouts) { %>
-    <% if (components.ErrorPage) { %>
-    if (this.nuxt.err && NuxtError) {
-      const errorLayout = (NuxtError.options || NuxtError).layout
-      if (errorLayout) {
-        this.setLayout(
-          typeof errorLayout === 'function'
-            ? errorLayout.call(NuxtError, this.context)
-            : errorLayout
-        )
-      }
-    }
-    <% } %>
     const layoutEl = h(this.layout || 'nuxt')
     const templateEl = h('div', {
       domProps: {
         id: '__layout'
       },
-
-          key: this.layoutName
+      key: this.layoutName
     }, [layoutEl])
     <% } else { %>
     const templateEl = h('nuxt')
@@ -308,7 +295,7 @@ export default {
       if (base && route.startsWith(base)) {
         route = route.substr(base.length)
       }
-      route = (route.replace(/\/+$/, '') || '/').split('?')[0]
+      route = (route.replace(/\/+$/, '') || '/').split('?')[0].split('#')[0]
       const src = urlJoin(base, staticAssetsBase, route, 'payload.js')
       try {
         const payload = await window.__NUXT_IMPORT__(decodeURI(route), encodeURI(src))

packages/vue-renderer/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@nuxt/devalue": "^1.2.4",
     "@nuxt/utils": "2.13.1",
-    "consola": "^2.13.0",
+    "consola": "^2.14.0",
     "fs-extra": "^8.1.0",
     "lru-cache": "^5.1.1",
     "vue": "^2.6.11",

packages/webpack/package.json

@@ -16,7 +16,7 @@
     "cache-loader": "^4.1.0",
     "caniuse-lite": "^1.0.30001088",
     "chalk": "^3.0.0",
-    "consola": "^2.13.0",
+    "consola": "^2.14.0",
     "css-loader": "^3.6.0",
     "cssnano": "^4.1.10",
     "eventsource-polyfill": "^0.9.6",

packages/webpack/src/builder.js

@@ -176,6 +176,7 @@ export class WebpackBundler {
           stats: false,
           logLevel: 'silent',
           watchOptions: this.buildContext.options.watchers.webpack,
+          fs: compiler.outputFileSystem,
           ...buildOptions.devMiddleware
         })
     )

test/dev/extract-css.test.js

@@ -5,7 +5,6 @@ import { loadFixture, getPort, Nuxt } from '../utils'
 
 let nuxt = null
 const readFile = promisify(fs.readFile)
-const isWindows = process.platform.startsWith('win')
 
 describe('extract css', () => {
   beforeAll(async () => {
@@ -17,7 +16,7 @@ describe('extract css', () => {
   })
 
   test('Verify global.css has been extracted and minified', async () => {
-    const fileName = isWindows ? 'pages_index.css' : 'pages/index.css'
+    const fileName = 'pages/index.css'
     const extractedIndexCss = resolve(__dirname, '..', 'fixtures/extract-css/.nuxt/dist/client', fileName)
     const content = await readFile(extractedIndexCss, 'utf-8')
 

test/fixtures/full-static/layouts/default.vue

@@ -10,7 +10,7 @@
       <NLink to="/pagination/1">
         Pagination
       </NLink>
-      <NLink to="/dynamic/foo bar">
+      <NLink to="/dynamic/foo bar#hash">
         Dynamic route 1
       </NLink>
       <NLink to="/dynamic/foo%20bar">