fix: set default name to layout to avoid multi mounted (nuxt#7128)

atinux · web-flow · commit b82f8d16407a · 2020-03-25T19:14:17.000+01:00
diff --git a/packages/vue-app/template/App.js b/packages/vue-app/template/App.js
@@ -4,7 +4,8 @@ import {
   getMatchedComponentsInstances,
   getChildrenComponentInstancesUsingFetch,
   promisify,
-  globalHandleError
+  globalHandleError,
+  sanitizeComponent
 } from './utils'
 <% } %>
 <% if (features.layouts && components.ErrorPage) { %>import NuxtError from '<%= components.ErrorPage %>'<% } %>
@@ -23,7 +24,7 @@ import '<%= relativeToBuild(resolvePath(c.src || c, { isStyle: true })) %>'
   }
 }).join('\n') %>
 
-const layouts = { <%= Object.keys(layouts).map(key => `"_${key}": _${hash(key)}`).join(',') %> }<%= isTest ? '// eslint-disable-line' : '' %>
+const layouts = { <%= Object.keys(layouts).map(key => `"_${key}": sanitizeComponent(_${hash(key)})`).join(',') %> }<%= isTest ? '// eslint-disable-line' : '' %>
 
 <% if (splitChunks.layouts) { %>let resolvedLayouts = {}<% } %>
 <% } %>
diff --git a/packages/vue-app/template/utils.js b/packages/vue-app/template/utils.js
@@ -80,7 +80,7 @@ export function sanitizeComponent (Component) {
     Component._Ctor = Component
     Component.extendOptions = Component.options
   }
-  // For debugging purpose
+  // If no component name defined, set file path as name, (also fixes #5703)
   if (!Component.options.name && Component.options.__file) {
     Component.options.name = Component.options.__file
   }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ export function sanitizeComponent (Component) {`
`80`	`80`	`Component._Ctor = Component`
`81`	`81`	`Component.extendOptions = Component.options`
`82`	`82`	`}`
`83`		`- // For debugging purpose`
	`83`	`+ // If no component name defined, set file path as name, (also fixes #5703)`
`84`	`84`	`if (!Component.options.name && Component.options.__file) {`
`85`	`85`	`Component.options.name = Component.options.__file`
`86`	`86`	`}`