Merge pull request #452 from mrfelton/build/webpack-environments

Leverage webpack v4 modes for managing NODE_ENV settings

internals/scripts/CheckNodeEnv.js

@@ -1,12 +0,0 @@
-// @flow
-import chalk from 'chalk'
-
-export default function CheckNodeEnv(expectedEnv: string) {
-  if (!expectedEnv) {
-    throw new Error('"expectedEnv" not set')
-  }
-
-  if (process.env.NODE_ENV !== expectedEnv) {
-    throw new Error(chalk.whiteBright.bgRed.bold(`"process.env.NODE_ENV" must be "${expectedEnv}" to use this webpack config`))
-  }
-}

package.json

@@ -5,9 +5,9 @@
   "description": "desktop application for the lightning network",
   "scripts": {
     "build": "concurrently --raw \"npm run build-main\" \"npm run build-renderer\"",
-    "build-dll": "cross-env NODE_ENV=development node --trace-warnings -r babel-register ./node_modules/webpack/bin/webpack --config webpack.config.renderer.dev.dll.js --colors",
-    "build-main": "cross-env NODE_ENV=production node --trace-warnings -r babel-register ./node_modules/webpack/bin/webpack --config webpack.config.main.prod.js --colors",
-    "build-renderer": "cross-env NODE_ENV=production node --trace-warnings -r babel-register ./node_modules/webpack/bin/webpack --config webpack.config.renderer.prod.js --colors",
+    "build-dll": "node --trace-warnings -r babel-register ./node_modules/webpack/bin/webpack --config webpack.config.renderer.dev.dll.js --colors",
+    "build-main": "node --trace-warnings -r babel-register ./node_modules/webpack/bin/webpack --config webpack.config.main.prod.js --colors",
+    "build-renderer": "node --trace-warnings -r babel-register ./node_modules/webpack/bin/webpack --config webpack.config.renderer.prod.js --colors",
     "dev": "cross-env START_HOT=1 npm run start-renderer-dev",
     "flow": "flow",
     "flow-typed": "rimraf flow-typed/npm && flow-typed install --overwrite || true",
@@ -29,7 +29,7 @@
     "prestart": "npm run build",
     "start": "cross-env NODE_ENV=production electron ./app/",
     "start-main-dev": "cross-env HOT=1 NODE_ENV=development electron -r babel-register ./app/main.dev",
-    "start-renderer-dev": "cross-env NODE_ENV=development node --trace-warnings -r babel-register ./node_modules/webpack-dev-server/bin/webpack-dev-server --config webpack.config.renderer.dev.js",
+    "start-renderer-dev": "node --trace-warnings -r babel-register ./node_modules/webpack-dev-server/bin/webpack-dev-server --config webpack.config.renderer.dev.js",
     "test": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 node --trace-warnings ./test/runTests.js",
     "test-ci": "npm run package && npm run test && npm run test-e2e",
     "test-all": "npm run lint && npm run lint-styles && npm run flow && npm run build && npm run test && npm run test-e2e",

webpack.config.base.js

@@ -3,7 +3,6 @@
  */
 
 import path from 'path'
-import webpack from 'webpack'
 import { dependencies as externals } from './app/package.json'
 
 export default {
@@ -39,12 +38,6 @@ export default {
     modules: [path.join(__dirname, 'app'), 'node_modules']
   },
 
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production')
-    })
-  ],
-
   optimization: {
     namedModules: true
   }

webpack.config.main.prod.js

@@ -6,9 +6,6 @@ import webpack from 'webpack'
 import merge from 'webpack-merge'
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
 import baseConfig from './webpack.config.base'
-import CheckNodeEnv from './internals/scripts/CheckNodeEnv'
-
-CheckNodeEnv('production')
 
 export default merge.smart(baseConfig, {
   devtool: 'source-map',
@@ -39,13 +36,9 @@ export default merge.smart(baseConfig, {
      *
      * Useful for allowing different behaviour between development builds and
      * release builds
-     *
-     * NODE_ENV should be production so that modules do not perform certain
-     * development checks
      */
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production'),
-      'process.env.DEBUG_PROD': JSON.stringify(process.env.DEBUG_PROD || 'false')
+    new webpack.EnvironmentPlugin({
+      DEBUG_PROD: false
     })
   ],
 

webpack.config.renderer.dev.dll.js

@@ -7,9 +7,6 @@ import path from 'path'
 import merge from 'webpack-merge'
 import baseConfig from './webpack.config.base'
 import { dependencies } from './package.json'
-import CheckNodeEnv from './internals/scripts/CheckNodeEnv'
-
-CheckNodeEnv('development')
 
 const dist = path.resolve(process.cwd(), 'dll')
 
@@ -178,19 +175,6 @@ export default merge.smart(baseConfig, {
       name: '[name]'
     }),
 
-    /**
-     * Create global constants which can be configured at compile time.
-     *
-     * Useful for allowing different behaviour between development builds and
-     * release builds
-     *
-     * NODE_ENV should be production so that modules do not perform certain
-     * development checks
-     */
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development')
-    }),
-
     new webpack.LoaderOptionsPlugin({
       debug: true,
       options: {

webpack.config.renderer.dev.js

@@ -14,11 +14,8 @@ import merge from 'webpack-merge'
 import { spawn, execSync } from 'child_process'
 import ExtractTextPlugin from 'extract-text-webpack-plugin'
 import baseConfig from './webpack.config.base'
-import CheckNodeEnv from './internals/scripts/CheckNodeEnv'
 import { mainLog } from './app/utils/log'
 
-CheckNodeEnv('development')
-
 const port = process.env.PORT || 1212
 const publicPath = `http://localhost:${port}/dist`
 const dll = path.resolve(process.cwd(), 'dll')
@@ -212,22 +209,6 @@ export default merge.smart(baseConfig, {
       // multiStep: true
     }),
 
-    /**
-     * Create global constants which can be configured at compile time.
-     *
-     * Useful for allowing different behaviour between development builds and
-     * release builds
-     *
-     * NODE_ENV should be production so that modules do not perform certain
-     * development checks
-     *
-     * By default, use 'development' as NODE_ENV. This can be overriden with
-     * 'staging', for example, by changing the ENV variables in the npm scripts
-     */
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development')
-    }),
-
     new webpack.LoaderOptionsPlugin({
       debug: true
     }),

webpack.config.renderer.prod.js

@@ -3,14 +3,10 @@
  */
 
 import path from 'path'
-import webpack from 'webpack'
 import ExtractTextPlugin from 'extract-text-webpack-plugin'
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
 import merge from 'webpack-merge'
 import baseConfig from './webpack.config.base'
-import CheckNodeEnv from './internals/scripts/CheckNodeEnv'
-
-CheckNodeEnv('production')
 
 export default merge.smart(baseConfig, {
   devtool: 'source-map',
@@ -143,19 +139,6 @@ export default merge.smart(baseConfig, {
   },
 
   plugins: [
-    /**
-     * Create global constants which can be configured at compile time.
-     *
-     * Useful for allowing different behaviour between development builds and
-     * release builds
-     *
-     * NODE_ENV should be production so that modules do not perform certain
-     * development checks
-     */
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production')
-    }),
-
     new ExtractTextPlugin('style.css'),
 
     new BundleAnalyzerPlugin({