Zengtudor
/
Nuxt
mirror of https://github.com/nuxt/nuxt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(layouts): resolving with nested custom dir (#4135)

This commit is contained in:
Alexander Lichter 2018-10-16 22:55:28 +01:00 committed by Pooya Parsa
parent 5979bd5e68
commit ae2d31ed19
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/builder/builder.js
View File

@ -254,9 +254,7 @@ export default class Builder {
}) })
layoutsFiles.forEach((file) => { layoutsFiles.forEach((file) => {
const name = file const name = file
.split('/') .replace(new RegExp(`^${this.options.dir.layouts}/`), '')
.slice(1)
.join('/')
.replace(/\.(vue|js)$/, '') .replace(/\.(vue|js)$/, '')
if (name === 'error') { if (name === 'error') {
if (!templateVars.components.ErrorPage) { if (!templateVars.components.ErrorPage) {

0
test/fixtures/custom-dirs/custom-layouts/default.vue → test/fixtures/custom-dirs/custom-layouts/layouts/default.vue vendored
View File

2
test/fixtures/custom-dirs/nuxt.config.js vendored
View File

@ -2,7 +2,7 @@ export default {
css: [{ src: '~/custom-assets/app.css' }], css: [{ src: '~/custom-assets/app.css' }],
dir: { dir: {
assets: 'custom-assets', assets: 'custom-assets',
layouts: 'custom-layouts', layouts: 'custom-layouts/layouts',
middleware: 'custom-middleware', middleware: 'custom-middleware',
pages: 'custom-pages', pages: 'custom-pages',
static: 'custom-static', static: 'custom-static',