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

atinux · atinux · commit 71c34b1d7afc · 2017-08-18T15:44:46.000+02:00
diff --git a/lib/builder/generator.js b/lib/builder/generator.js
@@ -26,12 +26,14 @@ export default class Generator extends Tapable {
     const s = Date.now()
     let errors = []
 
+    // Add flag to set process.generate
+    this.builder.forGenerate()
+
     // Wait for nuxt be ready
     await this.nuxt.ready()
 
     // Start build process
     if (build) {
-      this.builder.forGenerate() // Add flag to set process.generate
       await this.builder.build()
     }
 
