Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-24 06:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow modules to provide their createRoutes

Browse Source
This commit is contained in:
Pooya Parsa 2017-05-21 15:25:01 +04:30
parent 8f08f13941
commit f5541999fd
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/build.js
View File

@ -98,13 +98,15 @@ export function options () {
export async function build () { export async function build () {
// Check if pages dir exists and warn if not // Check if pages dir exists and warn if not
if (!fs.existsSync(join(this.srcDir, 'pages'))) { if (typeof this.createRoutes !== 'function') {
if (fs.existsSync(join(this.srcDir, '..', 'pages'))) { if (!fs.existsSync(join(this.srcDir, 'pages'))) {
console.error('> No `pages` directory found. Did you mean to run `nuxt` in the parent (`../`) directory?') // eslint-disable-line no-console if (fs.existsSync(join(this.srcDir, '..', 'pages'))) {
} else { console.error('> No `pages` directory found. Did you mean to run `nuxt` in the parent (`../`) directory?') // eslint-disable-line no-console
console.error('> Couldn\'t find a `pages` directory. Please create one under the project root') // eslint-disable-line no-console } else {
console.error('> Couldn\'t find a `pages` directory. Please create one under the project root') // eslint-disable-line no-console
}
process.exit(1)
} }
process.exit(1)
} }
debug(`App root: ${this.srcDir}`) debug(`App root: ${this.srcDir}`)
debug('Generating .nuxt/ files...') debug('Generating .nuxt/ files...')
@ -214,9 +216,12 @@ async function generateRoutesAndFiles () {
// -- Routes -- // -- Routes --
debug('Generating routes...') debug('Generating routes...')
// Format routes for the lib/app/router.js template // Format routes for the lib/app/router.js template
if (fs.existsSync(resolve(this.srcDir, 'pages'))) { if (typeof this.createRoutes !== 'function') {
// Use internal createRoutes
const files = await glob('pages/**/*.vue', {cwd: this.srcDir}) const files = await glob('pages/**/*.vue', {cwd: this.srcDir})
templateVars.router.routes = createRoutes(files, this.srcDir) templateVars.router.routes = createRoutes(files, this.srcDir)
} else {
templateVars.router.routes = this.createRoutes.call(this, this.srcDir)
} }
if (typeof this.options.router.extendRoutes === 'function') { if (typeof this.options.router.extendRoutes === 'function') {
// let the user extend the routes // let the user extend the routes