Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-07 09:22:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update builder.js

Browse Source
This commit is contained in:
Sébastien Chopin 2017-08-14 14:15:00 +02:00 committed by GitHub
parent 814590c15a
commit 3e41a6750b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/builder/builder.js
View File

@ -162,17 +162,17 @@ export default class Builder extends Tapable {
// -- Layouts -- // -- Layouts --
if (fs.existsSync(resolve(this.options.srcDir, 'layouts'))) { if (fs.existsSync(resolve(this.options.srcDir, 'layouts'))) {
const layoutsFiles = await glob('layouts/*.{vue,js}', { cwd: this.options.srcDir }) const layoutsFiles = await glob('layouts/*.{vue,js}', { cwd: this.options.srcDir })
let hasErrorLayout = false
layoutsFiles.forEach((file) => { layoutsFiles.forEach((file) => {
let name = file.split('/').slice(-1)[0].replace('.vue', '').replace('.js', '') let name = file.split('/').slice(-1)[0].replace(/\.(js|vue)$/, '')
if (name === 'error') return if (name === 'error') {
hasErrorLayout = true
return
}
templateVars.layouts[name] = this.relativeToBuild(this.options.srcDir, file) templateVars.layouts[name] = this.relativeToBuild(this.options.srcDir, file)
}) })
if (!templateVars.components.ErrorPage) { if (!templateVars.components.ErrorPage && hasErrorLayout) {
if (layoutsFiles.includes('layouts/error.vue')) { templateVars.components.ErrorPage = this.relativeToBuild(this.options.srcDir, 'layouts/error')
templateVars.components.ErrorPage = this.relativeToBuild(this.options.srcDir, 'layouts/error.vue')
} else if (layoutsFiles.includes('layouts/error.js')) {
templateVars.components.ErrorPage = this.relativeToBuild(this.options.srcDir, 'layouts/error.js')
}
} }
} }
// If no default layout, create its folder and add the default folder // If no default layout, create its folder and add the default folder