init() ~> ready()

bin/nuxt-build

@@ -61,7 +61,7 @@ if (argv.analyze) {
 
 console.log('[nuxt] Building...') // eslint-disable-line no-console
 var nuxt = module.exports = new Nuxt(options)
-nuxt.init()
+nuxt.ready()
 .then(() => {
   console.log('[nuxt] Building done') // eslint-disable-line no-console
 })

lib/generator.js

@@ -31,7 +31,7 @@ export default class Generator extends Tapable {
     let distNuxtPath = join(distPath, (isUrl(this.options.build.publicPath) ? '' : this.options.build.publicPath))
 
     // Wait for nuxt be ready
-    await this.nuxt.init()
+    await this.nuxt.ready()
 
     // Clean destination folder
     await remove(distPath)

lib/nuxt.js

@@ -36,12 +36,12 @@ export default class Nuxt extends Tapable {
       }
     })
 
-    this._init = this.init().catch(this.errorHandler)
+    this._ready = this.ready().catch(this.errorHandler)
   }
 
-  async init () {
+  async ready () {
-    if (this._init) {
+    if (this._ready) {
-      return this._init
+      return this._ready
     }
 
     // Wait for all components to be ready

lib/renderer.js

@@ -41,19 +41,19 @@ export default class Renderer extends Tapable {
 
     if (nuxt.initialized) {
       // If nuxt already initialized
-      this._init = this.init().catch(this.nuxt.errorHandler)
+      this._ready = this.ready().catch(this.nuxt.errorHandler)
     } else {
       // Wait for hook
       this.nuxt.plugin('afterInit', () => {
-        this._init = this.init()
+        this._ready = this.ready()
-        return this._init
+        return this._ready
       })
     }
   }
 
-  async init () {
+  async ready () {
-    if (this._init) {
+    if (this._ready) {
-      return this._init
+      return this._ready
     }
 
     // For serving static/ files to /

lib/server.js

@@ -10,7 +10,7 @@ class Server {
     // Initialize
     this.app = connect()
     this.server = http.createServer(this.app)
-    this.nuxt.init()
+    this.nuxt.ready()
       .then(() => {
         // Add Middleware
         this.options.serverMiddleware.forEach(m => {
@@ -48,7 +48,7 @@ class Server {
   listen (port, host) {
     host = host || 'localhost'
     port = port || 3000
-    this.nuxt.init()
+    this.nuxt.ready()
     .then(() => {
       this.server.listen(port, host, () => {
         let _host = host === '0.0.0.0' ? 'localhost' : host

test/basic.dev.test.js

@@ -15,7 +15,7 @@ test.before('Init Nuxt.js', async t => {
     dev: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.init()
+  await nuxt.ready()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })

test/basic.test.js

@@ -18,7 +18,7 @@ test.before('Init Nuxt.js', async t => {
     runBuild: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.init()
+  await nuxt.ready()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })

test/children.test.js

@@ -16,7 +16,7 @@ test.before('Init Nuxt.js', async t => {
     runBuild: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.init()
+  await nuxt.ready()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })

test/dynamic-routes.test.js

@@ -12,7 +12,7 @@ test.before('Init Nuxt.js', async t => {
     dev: false,
     runBuild: true
   })
-  await nuxt.init()
+  await nuxt.ready()
 })
 
 test('Check .nuxt/router.js', t => {

test/error.test.js

@@ -16,7 +16,7 @@ test.before('Init Nuxt.js', async t => {
     runBuild: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.init()
+  await nuxt.ready()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })

test/index.test.js

@@ -15,8 +15,8 @@ test.serial('Nuxt.js Instance', async t => {
   t.is(nuxt.options.dev, true)
   t.is(typeof nuxt.generate, 'function')
   t.is(typeof nuxt._init.then, 'function')
-  await nuxt.init()
+  await nuxt.ready()
-  t.is(nuxt.initialized, true)
+  t.is(nuxt.readyialized, true)
 })
 
 test.serial('Fail to build when no pages/ directory but is in the parent', t => {
@@ -25,7 +25,7 @@ test.serial('Fail to build when no pages/ directory but is in the parent', t =>
     runBuild: true,
     rootDir: resolve(__dirname, 'fixtures', 'empty', 'pages')
   })
-  return nuxt.init().catch(err => {
+  return nuxt.ready().catch(err => {
     let s = String(err)
     t.true(s.includes('No `pages` directory found'))
     t.true(s.includes('Did you mean to run `nuxt` in the parent (`../`) directory?'))
@@ -38,7 +38,7 @@ test.serial('Fail to build when no pages/ directory', t => {
     runBuild: true,
     rootDir: resolve(__dirname)
   })
-  return nuxt.init().catch(err => {
+  return nuxt.ready().catch(err => {
     let s = String(err)
     t.true(s.includes('Couldn\'t find a `pages` directory'))
     t.true(s.includes('Please create one under the project root'))

test/module.test.js

@@ -17,7 +17,7 @@ test.before('Init Nuxt.js', async t => {
   config.dev = false
   config.runBuild = true
   nuxt = new Nuxt(config)
-  await nuxt.init()
+  await nuxt.ready()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })

test/with-config.test.js

@@ -17,7 +17,7 @@ test.before('Init Nuxt.js', async t => {
   config.dev = false
   config.runBuild = true
   nuxt = new Nuxt(config)
-  await nuxt.init()
+  await nuxt.ready()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
@@ -113,5 +113,5 @@ test.after('Should be able to start Nuxt with build done', async t => {
   config.dev = false
   config.runBuild = true
   nuxt = new Nuxt(config)
-  await nuxt.init()
+  await nuxt.ready()
 })