fix: config lookup

Author: evenstensberg

.gitignore

@@ -26,6 +26,7 @@ coverage
 test/js/*
 test/**/bin/
 test/**/**/bin/
+test/config/basic/binary/**
 # lerna log
 lerna-debug.log
 

lib/bootstrap.js

@@ -49,7 +49,6 @@ async function runCLI(cli, commandIsUsed) {
                     const oldMapValue = argsMap[arg];
                     argsMap[arg] = {
                         value: process.argv[idx],
-                        type: (arg.charAt(0) === '-' && arg.charAt(1) === '-') ? 'dash' : 'cmd',
                         pos: idx
                     }
                     // Swap idx of overriden value
@@ -67,8 +66,10 @@ async function runCLI(cli, commandIsUsed) {
                     return;
                 }
                 process.cliLogger.warn(`duplicate flags found, defaulting to last set value`);
-            } else {
+            }
+            else {
                 process.cliLogger.error(err);
+                return;
             }
         }
     }

lib/groups/config.js

@@ -12,7 +12,6 @@ class ConfigGroup extends GroupHelper {
         this.configOptions = [];
     }
     getDefaultConfigFiles() {
-        const { mode } = this.args;
         let DEFAULT_FILES = ['.webpack/webpack.config', '.webpack/webpack.config.dev', '.webpack/webpack.config.prod', '.webpack/webpackfile', 'webpack.config'];
 
         return DEFAULT_FILES.map(filename =>
@@ -83,8 +82,8 @@ class ConfigGroup extends GroupHelper {
         }
         if (!this.configFiles) {
             const tmpConfigFiles = this.defaultConfigFiles
-                .filter(defaultFile => {
-                    return existsSync(defaultFile.path);
+                .filter(file => {
+                    return existsSync(file.path);
                 })
                 .map(this.mapConfigArg.bind(this));
             if (tmpConfigFiles.length) {

lib/utils/zero-config.js

@@ -1,10 +1,10 @@
 module.exports = function(groupResult, isDevMode) {
     if (!isDevMode) {
         const prodConfig = require('./prod-config');
-        groupResult.options = require('webpack-merge')(groupResult.options, prodConfig);
+        groupResult.options = require('webpack-merge')(prodConfig, groupResult.options);
     } else {
         const devConfig = require('./dev-config');
-        groupResult.options = require('webpack-merge')(groupResult.options, devConfig);
+        groupResult.options = require('webpack-merge')(devConfig, groupResult.options);
     }
     return groupResult;
 };

lib/webpack-cli.js

@@ -100,7 +100,8 @@ class webpackCLI extends GroupHelper {
             groupResult.options = webpackMerge(groupResult.options, e.options);
         });
         const isDevMode = groupResult.outputOptions['dev'];
-        return require('./utils/zero-config')(groupResult, isDevMode);
+        const wrappedConfig = require('./utils/zero-config')(groupResult, isDevMode);
+        return wrappedConfig;
     }
 
     async run(args, yargsOptions) {

test/config/.gitignore

@@ -4,9 +4,9 @@ const { resolve, sep } = require('path');
 const { run, extractSummary } = require('../../utils/test-utils');
 
 describe('basic config file', () => {
-    it.skip('is able to understand and parse a very basic configuration file', done => {
-        const { stdout, stderr } = run(__dirname, ['-c', resolve(__dirname, 'webpack.config.js')]);
-        expect(stderr).toBe(undefined);
+    it('is able to understand and parse a very basic configuration file', done => {
+        const { stdout, stderr } = run(__dirname, ['-c', resolve(__dirname, 'webpack.config.js'), '--output', './binary/a.bundle.js']);
+        expect(stderr).toContain('duplicate flags found, defaulting to last set value');
         expect(stdout).not.toBe(undefined);
         const summary = extractSummary(stdout);
         const outputDir = 'basic/binary';

test/config/basic/basic-config.test.js

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
 'use strict';
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
 const path = require('path');
 const fs = require('fs');
 const execa = require('execa');
@@ -26,7 +25,6 @@ function run(testCase, args = []) {
         reject: false,
         stdio: ENABLE_LOG_COMPILATION ? 'inherit' : 'pipe',
     });
-
     return result;
 }