From 42d967c27bf14c4bdd683f41e52c2dcd528ab11e Mon Sep 17 00:00:00 2001 From: Sebastien Chopin Date: Thu, 17 Aug 2017 14:43:51 +0200 Subject: [PATCH] Add process.generate --- lib/builder/builder.js | 5 +++++ lib/builder/generator.js | 3 ++- lib/builder/webpack/client.config.js | 3 ++- lib/builder/webpack/server.config.js | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/builder/builder.js b/lib/builder/builder.js index eda83eb6e..9f6acc8c0 100644 --- a/lib/builder/builder.js +++ b/lib/builder/builder.js @@ -27,6 +27,7 @@ export default class Builder extends Tapable { constructor (nuxt) { super() this.nuxt = nuxt + this.generate = false // Flag to know if the build is for a generated app this.options = nuxt.options // Fields that set on build @@ -88,6 +89,10 @@ export default class Builder extends Tapable { }) } + forGenerate() { + this.generate = true + } + async build () { // Avoid calling build() method multiple times when dev:true /* istanbul ignore if */ diff --git a/lib/builder/generator.js b/lib/builder/generator.js index 8333e06ca..a9f4d60bf 100644 --- a/lib/builder/generator.js +++ b/lib/builder/generator.js @@ -31,7 +31,8 @@ export default class Generator extends Tapable { await this.nuxt.ready() // Start build process - if (this.builder && build) { + if (build) { + this.builder.forGenerate() // Add flag to set process.generate await this.builder.build() } diff --git a/lib/builder/webpack/client.config.js b/lib/builder/webpack/client.config.js index eb498105c..401fbaff1 100644 --- a/lib/builder/webpack/client.config.js +++ b/lib/builder/webpack/client.config.js @@ -103,7 +103,8 @@ export default function webpackClientConfig () { 'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV || (this.options.dev ? 'development' : 'production')), 'process.env.VUE_ENV': JSON.stringify('client'), 'process.browser': true, - 'process.server': false + 'process.server': false, + 'process.generate': this.generate })) ) diff --git a/lib/builder/webpack/server.config.js b/lib/builder/webpack/server.config.js index 2dfaa511d..a26e61d79 100644 --- a/lib/builder/webpack/server.config.js +++ b/lib/builder/webpack/server.config.js @@ -44,7 +44,8 @@ export default function webpackServerConfig () { 'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV || (this.options.dev ? 'development' : 'production')), 'process.env.VUE_ENV': JSON.stringify('server'), 'process.browser': false, - 'process.server': true + 'process.server': true, + 'process.generate': this.generate })) ]) })