feat: add support for none config in dotfolder (#1637)

* feat: add support for none config in dotfolder

* feat: add support for picking config as per mode

* feat: add support for picking config as per mode

* tests: add config test for dev config in diff folders

* tests: prefer .webpack over root config

* tests: prefer .webpack over root config

packages/webpack-cli/lib/groups/ConfigGroup.js

@@ -4,14 +4,28 @@ const { extensions } = require('interpret');
 const GroupHelper = require('../utils/GroupHelper');
 const rechoir = require('rechoir');
 
+// Order defines the priority, in increasing order
+// example - config file lookup will be in order of .webpack/webpack.config.development.js -> webpack.config.development.js -> webpack.config.js
 const DEFAULT_CONFIG_LOC = [
+    'webpack.config',
+    'webpack.config.dev',
+    'webpack.config.development',
+    'webpack.config.prod',
+    'webpack.config.production',
     '.webpack/webpack.config',
+    '.webpack/webpack.config.none',
     '.webpack/webpack.config.dev',
+    '.webpack/webpack.config.development',
     '.webpack/webpack.config.prod',
+    '.webpack/webpack.config.production',
     '.webpack/webpackfile',
-    'webpack.config',
 ];
 
+const modeAlias = {
+    production: 'prod',
+    development: 'dev',
+};
+
 const fileTypes = {
     '.babel.js': ['@babel/register', 'babel-register', 'babel-core/register', 'babel/register'],
     '.babel.ts': ['@babel/register'],
@@ -136,10 +150,9 @@ class ConfigGroup extends GroupHelper {
 
         const configFiles = tmpConfigFiles.map(this.requireConfig.bind(this));
         if (configFiles.length) {
-            const defaultConfig = configFiles.find((p) => p.path.includes(mode));
+            const defaultConfig = configFiles.find((p) => p.path.includes(mode) || p.path.includes(modeAlias[mode]));
             if (defaultConfig) {
-                const envConfig = defaultConfig.map((c) => c.content);
-                this.opts = this.finalize(envConfig);
+                this.opts = this.finalize(defaultConfig);
                 return;
             }
             const foundConfig = configFiles.pop();

packages/webpack-cli/lib/webpack-cli.js

@@ -22,7 +22,7 @@ class WebpackCLI extends GroupHelper {
             `./src/${this.defaultEntry}.js`,
             `src/${this.defaultEntry}.js`,
         ];
-        this.compilerConfiguration = undefined;
+        this.compilerConfiguration = {};
         this.outputConfiguration = {};
     }
     setMappedGroups(args, inlineOptions) {
@@ -62,6 +62,11 @@ class WebpackCLI extends GroupHelper {
      */
     resolveGroups() {
         let mode;
+        // determine the passed mode for ConfigGroup
+        if (this.groupMap.has(groups.ZERO_CONFIG_GROUP)) {
+            const modePresent = this.groupMap.get(groups.ZERO_CONFIG_GROUP).find((t) => !!t.mode);
+            if (modePresent) mode = modePresent.mode;
+        }
         for (const [key, value] of this.groupMap.entries()) {
             switch (key) {
                 case groups.ZERO_CONFIG_GROUP: {

test/config/multiple/all/.webpack/webpack.config.none.js

@@ -0,0 +1,9 @@
+const { resolve } = require('path');
+
+module.exports = {
+    entry: './index.js',
+    output: {
+        path: resolve(__dirname, '../binary'),
+        filename: 'none.bundle.js',
+    },
+};

test/config/multiple/multiple-config.test.js → test/config/multiple/all/multiple-config.test.js

@@ -1,9 +1,15 @@
 'use strict';
 const { stat } = require('fs');
-const { resolve } = require('path');
-const { run } = require('../../utils/test-utils');
+const { resolve, join } = require('path');
+const { run } = require('../../../utils/test-utils');
+const rimraf = require('rimraf');
+
+const outputPath = join(__dirname, 'binary');
 
 describe('multiple config files', () => {
+    afterEach(() => rimraf.sync(outputPath));
+    beforeAll(() => rimraf.sync(outputPath));
+
     it('Uses prod config from dot folder if present', (done) => {
         const { stdout, stderr } = run(__dirname, [], false);
         expect(stderr).toBeFalsy();

test/config/multiple/multiple-location/.webpack/webpack.config.development.js

@@ -0,0 +1,9 @@
+const { resolve } = require('path');
+
+module.exports = {
+    entry: './index.js',
+    output: {
+        path: resolve(__dirname, '../binary'),
+        filename: 'dev.folder.js',
+    },
+};

test/config/multiple/multiple-location/index.js

@@ -0,0 +1 @@
+console.log("Tanjiro")

test/config/multiple/multiple-location/multiple-location-config.test.js

@@ -0,0 +1,23 @@
+'use strict';
+const { stat } = require('fs');
+const { resolve, join } = require('path');
+const { run } = require('../../../utils/test-utils');
+const rimraf = require('rimraf');
+
+const outputPath = join(__dirname, 'binary');
+
+describe('multiple dev config files with webpack.config.js', () => {
+    afterEach(() => rimraf.sync(outputPath));
+    beforeAll(() => rimraf.sync(outputPath));
+
+    it('Uses webpack.config.development.js', (done) => {
+        const { stdout, stderr } = run(__dirname, [], false);
+        expect(stderr).toBeFalsy();
+        expect(stdout).not.toBe(undefined);
+        stat(resolve(__dirname, './binary/dev.folder.js'), (err, stats) => {
+            expect(err).toBe(null);
+            expect(stats.isFile()).toBe(true);
+            done();
+        });
+    });
+});

test/config/multiple/multiple-location/webpack.config.development.js

@@ -0,0 +1,9 @@
+const { resolve } = require('path');
+
+module.exports = {
+    entry: './index.js',
+    output: {
+        path: resolve(__dirname, './binary'),
+        filename: 'development.bundle.js',
+    },
+};

test/config/multiple/multiple-location/webpack.config.js

@@ -0,0 +1,9 @@
+const { resolve } = require('path');
+
+module.exports = {
+    entry: './index.js',
+    output: {
+        path: resolve(__dirname, './binary'),
+        filename: 'root.bundle.js',
+    },
+};

test/config/multiple/none and dev/.webpack/webpack.config.dev.js

@@ -0,0 +1,9 @@
+const { resolve } = require('path');
+
+module.exports = {
+    entry: './index.js',
+    output: {
+        path: resolve(__dirname, '../binary'),
+        filename: 'dev.bundle.js',
+    },
+};

test/config/multiple/none and dev/.webpack/webpack.config.none.js

@@ -0,0 +1,9 @@
+const { resolve } = require('path');
+
+module.exports = {
+    entry: './index.js',
+    output: {
+        path: resolve(__dirname, '../binary'),
+        filename: 'none.bundle.js',
+    },
+};

test/config/multiple/none and dev/dev-none-config.test.js

@@ -0,0 +1,23 @@
+'use strict';
+const { stat } = require('fs');
+const { resolve, join } = require('path');
+const { run } = require('../../../utils/test-utils');
+const rimraf = require('rimraf');
+
+const outputPath = join(__dirname, 'binary');
+
+describe('multiple config files', () => {
+    afterEach(() => rimraf.sync(outputPath));
+    beforeAll(() => rimraf.sync(outputPath));
+
+    it('Uses dev config when both dev and none are present', (done) => {
+        const { stdout, stderr } = run(__dirname, [], false);
+        expect(stderr).toBeFalsy();
+        expect(stdout).not.toBe(undefined);
+        stat(resolve(__dirname, './binary/dev.bundle.js'), (err, stats) => {
+            expect(err).toBe(null);
+            expect(stats.isFile()).toBe(true);
+            done();
+        });
+    });
+});

test/config/multiple/none and dev/index.js

@@ -0,0 +1 @@
+console.log("Kageyama")

test/config/multiple/with-mode/index.js

@@ -0,0 +1 @@
+console.log("Iwaizumi")

test/config/multiple/with-mode/multiple-config.test.js

@@ -0,0 +1,23 @@
+'use strict';
+const { stat } = require('fs');
+const { resolve, join } = require('path');
+const { run } = require('../../../utils/test-utils');
+const rimraf = require('rimraf');
+
+const outputPath = join(__dirname, 'binary');
+
+describe('multiple config files', () => {
+    afterEach(() => rimraf.sync(outputPath));
+    beforeAll(() => rimraf.sync(outputPath));
+
+    it('Uses dev config when development mode is supplied', (done) => {
+        const { stdout, stderr } = run(__dirname, ['--mode', 'development'], false);
+        expect(stderr).toBeFalsy();
+        expect(stdout).not.toBe(undefined);
+        stat(resolve(__dirname, './binary/dev.bundle.js'), (err, stats) => {
+            expect(err).toBe(null);
+            expect(stats.isFile()).toBe(true);
+            done();
+        });
+    });
+});

test/config/multiple/with-mode/webpack.config.development.js

@@ -0,0 +1,9 @@
+const { resolve } = require('path');
+
+module.exports = {
+    entry: './index.js',
+    output: {
+        path: resolve(__dirname, './binary'),
+        filename: 'dev.bundle.js',
+    },
+};

test/config/multiple/with-mode/webpack.config.none.js

@@ -0,0 +1,9 @@
+const { resolve } = require('path');
+
+module.exports = {
+    entry: './index.js',
+    output: {
+        path: resolve(__dirname, './binary'),
+        filename: 'none.bundle.js',
+    },
+};

test/config/multiple/with-mode/webpack.config.production.js

@@ -0,0 +1,9 @@
+const { resolve } = require('path');
+
+module.exports = {
+    entry: './index.js',
+    output: {
+        path: resolve(__dirname, './binary'),
+        filename: 'prod.bundle.js',
+    },
+};