Skip to content

Commit

Permalink
fix(vue-app): no need to set layout on App (#7606)
Browse files Browse the repository at this point in the history
  • Loading branch information
Atinux committed Jun 25, 2020
1 parent 4a0cf8f commit fe01ec3
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions packages/vue-app/template/App.js
Expand Up @@ -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')
Expand Down

0 comments on commit fe01ec3

Please sign in to comment.