feat: env based config defaults

Author: evenstensberg

lib/groups/basic.js

@@ -24,7 +24,7 @@ class BasicGroup extends GroupHelper {
             }
         });
         if (this.opts.outputOptions['dev']) {
-            this.opts.outputOptions['prod'] = false;
+            this.opts.outputOptions['prod'] = undefined;
         }
     }
 

lib/groups/output.js

@@ -6,6 +6,11 @@ const DEFAULT_FILENAME = 'bundle.js';
 class OutputGroup extends GroupHelper {
     constructor(options) {
         super(options);
+        this.opts = {
+            options: {
+                output: {},
+            },
+        };
     }
 
     parseDirectory(metaData) {
@@ -15,16 +20,8 @@ class OutputGroup extends GroupHelper {
         }
     }
 
-    parseFile() {}
-
     resolveOptions() {
         const { args } = this;
-
-        this.opts = {
-            options: {
-                output: {},
-            },
-        };
         if (args) {
             const { output } = args;
             const outputInfo = path.parse(output);

lib/groups/stats.js

@@ -4,14 +4,6 @@ class StatsGroup extends GroupHelper {
     constructor(options) {
         super(options);
     }
-    resolveOption(opt) {
-        const key = Object.keys(opt)[0];
-        if (key == 's') {
-            opt[key]();
-            return null;
-        }
-        return opt;
-    }
 
     resolveOptions() {
         Object.keys(this.args).forEach(arg => {

lib/utils/cli-flags.js

@@ -161,15 +161,15 @@ module.exports = {
             name: 'dev',
             alias: 'd',
             type: Boolean,
-            defaultValue: false,
+            defaultValue: undefined,
             group: BASIC_GROUP,
             description: 'Run development build',
         },
         {
             name: 'prod',
             alias: 'p',
             type: Boolean,
-            defaultValue: true,
+            defaultValue: undefined,
             group: BASIC_GROUP,
             description: 'Run production build',
         },

lib/utils/dev-config.js lib/utils/development-config.jslib/utils/dev-config.js renamed to lib/utils/development-config.js

@@ -3,7 +3,7 @@ const JsConfigWebpackPlugin = require('js-config-webpack-plugin');
 
 module.exports = {
     mode: 'production',
-
+    entry: './index.js',
     plugins: [new JsConfigWebpackPlugin()],
 
     optimization: {

lib/utils/prod-config.js lib/utils/production-config.jslib/utils/prod-config.js renamed to lib/utils/production-config.js

@@ -1,18 +1,37 @@
-function mergeObjectOrArrayConfig(defaults, config) {
-    const merge = require('webpack-merge');
-    if(Array.isArray(config)) {
-        return config.map(arrayObject => merge(defaults, arrayObject));
+function getEnvFromOptionsAndMode(mode, optionsObject) {
+    const optionsDevFlag = optionsObject.dev;
+    const optionsProdFlag = optionsObject.prod;
+    if(!optionsDevFlag && !optionsProdFlag && mode) {
+        return mode;
+    }
+    else if(optionsProdFlag) {
+        return 'production';
     }
-    return merge(defaults, config);
+    else if(optionsDevFlag) {
+        return 'development';
+    }
+    return 'production';
 }
 
-module.exports = function(webpackObject, isDevMode) {
-    if (!isDevMode) {
-        const prodConfig = require('./prod-config');
-        webpackObject.options = mergeObjectOrArrayConfig(prodConfig, webpackObject.options);
-    } else {
-        const devConfig = require('./dev-config');
-        webpackObject.options = mergeObjectOrArrayConfig(devConfig, webpackObject.options);
+module.exports = function setDefaultConfigBasedOnEnvironment(webpackObject) {
+    const merge = require('webpack-merge');
+    if(Array.isArray(webpackObject.options)) {
+        const newArrayConfigurations = webpackObject.options.map(arrayObject => {
+            const modeFlag = arrayObject.mode;
+            const defaultConfigType = getEnvFromOptionsAndMode(modeFlag, webpackObject.outputOptions);
+            const defaultConfig = require(`./${defaultConfigType}-config`);
+            const newConfig = merge(defaultConfig, arrayObject);
+            newConfig.mode = defaultConfigType;
+            return newConfig;
+        });
+        webpackObject.options = newArrayConfigurations;
+        return webpackObject;
     }
+    const modeFlag = webpackObject.options.mode;
+    const defaultConfigType = getEnvFromOptionsAndMode(modeFlag, webpackObject.outputOptions);
+    const defaultConfig = require(`./${defaultConfigType}-config`);
+    const newConfig = merge(defaultConfig, webpackObject.options);
+    newConfig.mode = defaultConfigType;
+    webpackObject.options = newConfig;
     return webpackObject;
 };

lib/utils/zero-config.js

@@ -125,9 +125,7 @@ class WebpackCLI extends GroupHelper {
             }
             groupResult.options = webpackMerge(groupResult.options, e.options);
         });
-        // TODO: Arrays needs to be searched for this first then default back to cli
-        const isDevMode = groupResult.outputOptions['dev'];
-        const wrappedConfig = require('./utils/zero-config')(groupResult, isDevMode);
+        const wrappedConfig = require('./utils/zero-config')(groupResult);
         wrappedConfig.options = this.checkDefaults(wrappedConfig.options);
         return wrappedConfig;
     }

lib/webpack-cli.js

@@ -4,7 +4,7 @@ const { resolve, sep } = require('path');
 const { run, extractSummary } = require('../../../utils/test-utils');
 
 describe('promise configuration', () => {
-    it.skip('is able to understand a configuration file as a promise', done => {
+    it('is able to understand a configuration file as a promise', done => {
         const { stdout } = run(__dirname, ['-c', resolve(__dirname, 'webpack.config.js')], false);
         const summary = extractSummary(stdout);
         const outputDir = 'type/promise/binary';

test/config/type/promise/promise-config.test.js

@@ -1,12 +1,14 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
 module.exports = () => {
     return new Promise(resolve => {
-        resolve({
-            entry: './a',
-            output: {
-                path: __dirname + '/binary',
-                filename: 'promise.js',
-            },
-        });
+        setTimeout(() => {
+            resolve({
+                entry: './a',
+                output: {
+                    path: __dirname + '/binary',
+                    filename: 'promise.js',
+                },
+            });
+        }, 5000);
     });
 };