fixes + improvements

lib/builder.js

@@ -53,38 +53,43 @@ export default class Builder extends Tapable {
     }
 
     // Register lifecycle hooks
-    this.nuxt.plugin('afterInit', () => {
+    if (this.nuxt.options.dev) {
-      if (this.nuxt.dev) {
+      // Don't await for build on dev (faster startup)
-        // But don't await for builder on dev (faster startup)
+      this.nuxt.plugin('afterInit', () => {
-        this.build().catch(err => {
+        this.build().catch(this.nuxt.errorHandler)
-          // eslint-disable-next-line no-console
+      })
-          console.error(err)
+    } else {
-        })
+      this.nuxt.plugin('init', () => {
-      } else {
+        // Guess it is build or production
-        return this.production()
+        // If build is not called it may be nuxt.start
-      }
+        if (this._buildStatus === STATUS.INITIAL) {
-    })
+          return this.production()
+        }
+      })
+    }
 
     this._buildStatus = STATUS.INITIAL
   }
 
   async build () {
-    // Ensure nuxt initialized
-    await this.nuxt.init()
     // Avoid calling this method multiple times
     if (this._buildStatus === STATUS.BUILD_DONE) {
       return this
     }
+
     // If building
     if (this._buildStatus === STATUS.BUILDING) {
       return new Promise((resolve) => {
         setTimeout(() => {
           resolve(this.build())
-        }, 300)
+        }, 1000)
       })
     }
     this._buildStatus = STATUS.BUILDING
 
+    // Ensure nuxt initialized
+    await this.nuxt.init()
+
     // Check if pages dir exists and warn if not
     this._nuxtPages = typeof this.options.build.createRoutes !== 'function'
 
@@ -92,11 +97,10 @@ export default class Builder extends Tapable {
       if (!fs.existsSync(join(this.options.srcDir, 'pages'))) {
         let dir = this.options.srcDir
         if (fs.existsSync(join(this.options.srcDir, '..', 'pages'))) {
-          console.error(`> No 'pages' directory found in ${dir}. Did you mean to run 'nuxt' in the parent ('../') directory?`) // eslint-disable-line no-console
+          throw new Error(`No \`pages\` directory found in ${dir}. Did you mean to run \`nuxt\` in the parent (\`../\`) directory?`)
         } else {
-          console.error(`> Couldn't find a 'pages' directory in ${dir}. Please create one under the project root`) // eslint-disable-line no-console
+          throw new Error(`Couldn't find a \`pages\` directory in ${dir}. Please create one under the project root`)
         }
-        process.exit(1)
       }
     }
 
@@ -124,10 +128,7 @@ export default class Builder extends Tapable {
     const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
     const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
     if (!fs.existsSync(bundlePath) || !fs.existsSync(manifestPath)) {
-      console.error('[warning] No build files found, trying to build for production') // eslint-disable-line no-console
+      throw new Error('No build files found, please run `nuxt build` before launching `nuxt start`')
-      return this.build().then(() => {
-        return this.production()
-      })
     }
     const bundle = fs.readFileSync(bundlePath, 'utf8')
     const manifest = fs.readFileSync(manifestPath, 'utf8')

lib/generator.js

@@ -24,9 +24,6 @@ export default class Generator extends Tapable {
     let errors = []
     let generateRoutes = []
 
-    // Wait for nuxt.js to be ready
-    await this.nuxt.init()
-
     // Set variables
     let srcStaticPath = resolve(this.options.srcDir, 'static')
     let srcBuiltPath = resolve(this.options.buildDir, 'dist')
@@ -55,7 +52,6 @@ export default class Generator extends Tapable {
       } catch (e) {
         console.error('Could not resolve routes') // eslint-disable-line no-console
         console.error(e) // eslint-disable-line no-console
-        process.exit(1)
         throw e // eslint-disable-line no-unreachable
       }
     }

lib/module-container.js

@@ -96,28 +96,20 @@ export default class ModuleContainer extends Tapable {
     const originalSrc = moduleOpts.src || moduleOpts
     // Resolve module
     let module = originalSrc
-    try {
+
-      if (typeof module === 'string') {
+    if (typeof module === 'string') {
-        // Using ~ or ./ shorthand modules are resolved from project srcDir
+      // Using ~ or ./ shorthand modules are resolved from project srcDir
-        if (module.indexOf('~') === 0 || module.indexOf('./') === 0) {
+      if (module.indexOf('~') === 0 || module.indexOf('./') === 0) {
-          module = path.join(this.options.srcDir, module.substr(1))
+        module = path.join(this.options.srcDir, module.substr(1))
-        }
-        // eslint-disable-next-line no-eval
-        module = eval('require')(module)
       }
-    } catch (e) /* istanbul ignore next */ {
+      // eslint-disable-next-line no-eval
-      // eslint-disable-next-line no-console
+      module = eval('require')(module)
-      console.error('[nuxt] Unable to resolve module', module)
-      // eslint-disable-next-line no-console
-      console.error(e)
-      process.exit(0)
     }
+
     // Validate module
     /* istanbul ignore if */
     if (typeof module !== 'function') {
-      // eslint-disable-next-line no-console
+      throw new Error(`[nuxt] Module ${JSON.stringify(originalSrc)} should export a function`)
-      console.error(`[nuxt] Module [${originalSrc}] should export a function`)
-      process.exit(1)
     }
     // Module meta
     if (!module.meta) {

lib/nuxt.js

@@ -62,11 +62,12 @@ export default class Nuxt extends Tapable {
     this.dir = options.rootDir
     this.srcDir = options.srcDir
     this.buildDir = options.buildDir
+    this.dev = options.dev
     this.Server = Nuxt.Server
     this.Utils = Nuxt.Utils
 
-    // eslint-disable-next-line no-console
+    this.errorHandler = this.errorHandler.bind(this)
-    this._init = this.init().catch(console.error)
+    this._init = this.init().catch(this.errorHandler)
     this.initialized = false
   }
 
@@ -74,14 +75,35 @@ export default class Nuxt extends Tapable {
     if (this._init) {
       return this._init
     }
+
     // Wait for all components to be ready
+    // Including modules
     await this.applyPluginsAsync('beforeInit')
+    // Including Build
     await this.applyPluginsAsync('init')
-    this.applyPluginsAsync('afterInit')
+    // Extra jobs
+    this.applyPluginsAsync('afterInit').catch(this.errorHandler)
+
     this.initialized = true
     return this
   }
 
+  errorHandler () {
+    // Global error handler
+    // Silent
+    if (this.options.errorHandler === false) {
+      return
+    }
+    // Custom eventHandler
+    if (typeof this.options.errorHandler === 'function') {
+      return this.options.errorHandler.apply(this, arguments)
+    }
+    // Default
+    // eslint-disable-next-line no-console
+    console.error.apply(this, arguments)
+    process.exit(1)
+  }
+
   async close (callback) {
     let promises = []
     /* istanbul ignore if */

lib/renderer.js

@@ -183,7 +183,7 @@ export default class Renderer extends Tapable {
         console.error('Fail when calling nuxt.renderAndGetWindow(url)') // eslint-disable-line no-console
         console.error('jsdom module is not installed') // eslint-disable-line no-console
         console.error('Please install jsdom with: npm install --save-dev jsdom') // eslint-disable-line no-console
-        process.exit(1)
+        throw e
       }
     }
     let options = {

test/basic.fail.generate.test.js

@@ -7,29 +7,14 @@ test('Fail with routes() which throw an error', async t => {
     rootDir: resolve(__dirname, 'fixtures/basic'),
     dev: false,
     generate: {
-      routes: function () {
+      async routes () {
-        return new Promise((resolve, reject) => {
+        throw new Error('Not today!')
-          reject(new Error('Not today!'))
-        })
       }
     }
   }
   const nuxt = new Nuxt(options)
-  return new Promise((resolve) => {
+  return nuxt.generate()
-    var oldExit = process.exit
-    var oldCE = console.error // eslint-disable-line no-console
-    var _log = ''
-    console.error = (s) => { _log += s } // eslint-disable-line no-console
-    process.exit = (code) => {
-      process.exit = oldExit
-      console.error = oldCE // eslint-disable-line no-console
-      t.is(code, 1)
-      t.true(_log.includes('Could not resolve routes'))
-      resolve()
-    }
-    nuxt.generate()
     .catch((e) => {
       t.true(e.message === 'Not today!')
     })
-  })
 })

test/index.test.js

@@ -21,44 +21,28 @@ test.serial('Nuxt.js Instance', async t => {
   t.is(nuxt.initialized, true)
 })
 
-test.serial('Fail to build when no pages/ directory but is in the parent', async t => {
+test.serial('Fail to build when no pages/ directory but is in the parent', t => {
   const nuxt = new Nuxt({
-    dev: true,
+    dev: false,
     rootDir: resolve(__dirname, 'fixtures', 'empty', 'pages')
   })
-  return new Promise((resolve) => {
+  return nuxt.build().catch(err => {
-    let oldExit = process.exit
+    let s = String(err)
-    let oldCE = console.error // eslint-disable-line no-console
+    t.true(s.includes('No `pages` directory found'))
-    let _log = ''
+    t.true(s.includes('Did you mean to run `nuxt` in the parent (`../`) directory?'))
-    console.error = (s) => { _log += s } // eslint-disable-line no-console
+    resolve()
-    process.exit = (code) => {
-      process.exit = oldExit
-      console.error = oldCE // eslint-disable-line no-console
-      t.is(code, 1)
-      t.true(_log.includes('No `pages` directory found. Did you mean to run `nuxt` in the parent (`../`) directory?'))
-      resolve()
-    }
-    nuxt.build()
   })
 })
 
-test.serial('Fail to build when no pages/ directory', async t => {
+test.serial('Fail to build when no pages/ directory', t => {
   const nuxt = new Nuxt({
-    dev: true,
+    dev: false,
     rootDir: resolve(__dirname)
   })
-  return new Promise((resolve) => {
+  return nuxt.build().catch(err => {
-    let oldExit = process.exit
+    let s = String(err)
-    let oldCE = console.error // eslint-disable-line no-console
+    t.true(s.includes('Couldn\'t find a `pages` directory'))
-    let _log = ''
+    t.true(s.includes('Please create one under the project root'))
-    console.error = (s) => { _log += s } // eslint-disable-line no-console
+    resolve()
-    process.exit = (code) => {
-      process.exit = oldExit
-      console.error = oldCE // eslint-disable-line no-console
-      t.is(code, 1)
-      t.true(_log.includes('Couldn\'t find a `pages` directory. Please create one under the project root'))
-      resolve()
-    }
-    nuxt.build()
   })
 })