Merge branch 'dev' of github.com:nuxt/nuxt.js into dev

This commit is contained in:
Sebastien Chopin 2017-08-18 15:44:46 +02:00
commit 71c34b1d7a
1 changed files with 3 additions and 1 deletions

View File

@ -26,12 +26,14 @@ export default class Generator extends Tapable {
const s = Date.now() const s = Date.now()
let errors = [] let errors = []
// Add flag to set process.generate
this.builder.forGenerate()
// Wait for nuxt be ready // Wait for nuxt be ready
await this.nuxt.ready() await this.nuxt.ready()
// Start build process // Start build process
if (build) { if (build) {
this.builder.forGenerate() // Add flag to set process.generate
await this.builder.build() await this.builder.build()
} }