fix(plugin-webpack): lazily load config generator so isProd is set co…

…rrectly (#1480)
electron · Feb 5, 2020 · 9f6a445 · 9f6a445
1 parent b1f3b72
commit 9f6a445
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/packages/plugin/webpack/src/WebpackConfig.ts b/packages/plugin/webpack/src/WebpackConfig.ts
@@ -1,3 +1,4 @@
+import debug from 'debug';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import path from 'path';
 import webpack, { Configuration } from 'webpack';
@@ -7,6 +8,8 @@ import { WebpackPluginConfig, WebpackPluginEntryPoint, WebpackPreloadEntryPoint
 
 type EntryType = string | string[] | Record<string, string | string[]>;
 
+const d = debug('electron-forge:plugin:webpack:webpackconfig');
+
 export default class WebpackConfigGenerator {
   private isProd: boolean;
 
@@ -29,6 +32,8 @@ export default class WebpackConfigGenerator {
     this.webpackDir = path.resolve(projectDir, '.webpack');
     this.isProd = isProd;
     this.port = port;
+
+    d('Config mode:', this.mode);
   }
 
   resolveConfig(config: Configuration | string) {

diff --git a/packages/plugin/webpack/src/WebpackPlugin.ts b/packages/plugin/webpack/src/WebpackPlugin.ts
@@ -29,7 +29,7 @@ export default class WebpackPlugin extends PluginBase<WebpackPluginConfig> {
 
   private baseDir!: string;
 
-  private configGenerator!: WebpackConfigGenerator;
+  private _configGenerator!: WebpackConfigGenerator;
 
   private watchers: webpack.Compiler.Watching[] = [];
 
@@ -128,13 +128,22 @@ export default class WebpackPlugin extends PluginBase<WebpackPluginConfig> {
   setDirectories = (dir: string) => {
     this.projectDir = dir;
     this.baseDir = path.resolve(dir, '.webpack');
+  }
 
-    this.configGenerator = new WebpackConfigGenerator(
-      this.config,
-      this.projectDir,
-      this.isProd,
-      this.port,
-    );
+  get configGenerator() {
+    // eslint-disable-next-line no-underscore-dangle
+    if (!this._configGenerator) {
+    // eslint-disable-next-line no-underscore-dangle
+      this._configGenerator = new WebpackConfigGenerator(
+        this.config,
+        this.projectDir,
+        this.isProd,
+        this.port,
+      );
+    }
+
+    // eslint-disable-next-line no-underscore-dangle
+    return this._configGenerator;
   }
 
   private loggedOutputUrl = false;