fix(cli): verbose and stats verbose flag (rebase)

packages/webpack-cli/__tests__/StatsGroup.test.js

@@ -2,16 +2,19 @@ const StatsGroup = require('../lib/groups/StatsGroup');
 
 describe('StatsGroup', function () {
     {
-        StatsGroup.validOptions().map((option) => {
+        StatsGroup.validOptions().validArrayString.map((option) => {
             it(`should handle ${option} option`, () => {
-                const statsGroup = new StatsGroup([
-                    {
-                        stats: option,
-                    },
-                ]);
-
+                const statsGroup = new StatsGroup([{ stats: `${option}` }]);
+                const result = statsGroup.run();
+                expect(result.outputOptions.stats).toEqual(option);
+            });
+        });
+        StatsGroup.validOptions().validArrayObject.map((option) => {
+            let stats = option.stats ? option.stats : null;
+            it(`should handle verbose true with stats ${stats} option`, () => {
+                const statsGroup = new StatsGroup(option);
                 const result = statsGroup.run();
-                expect(result.options.stats).toEqual(option);
+                expect(result.outputOptions.stats).toEqual('verbose');
             });
         });
     }

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

@@ -5,7 +5,12 @@ const logger = require('../utils/logger');
  */
 class StatsGroup extends GroupHelper {
     static validOptions() {
-        return ['none', 'errors-only', 'minimal', 'normal', 'detailed', 'verbose', 'errors-warnings'];
+        const validArrayString = ['none', 'errors-only', 'minimal', 'normal', 'detailed', 'verbose', 'errors-warnings'];
+        const validArrayObject = validArrayString.map((e) => {
+            return { verbose: true, stats: `${e}` };
+        });
+        validArrayObject.push({ verbose: true });
+        return { validArrayString, validArrayObject };
     }
 
     constructor(options) {
@@ -15,19 +20,15 @@ class StatsGroup extends GroupHelper {
     resolveOptions() {
         if (this.args.verbose && this.args.stats) {
             logger.warn('Conflict between "verbose" and "stats" options. Using verbose.');
-            this.opts.option.stats = {
-                verbose: true,
-            };
+            this.opts.outputOptions.stats = 'verbose';
         } else {
             if (this.args.verbose) {
-                this.opts.option.stats = {
-                    verbose: true,
-                };
-            } else if (!StatsGroup.validOptions().includes(this.args.stats)) {
+                this.opts.outputOptions.stats = 'verbose';
+            } else if (!StatsGroup.validOptions().validArrayString.includes(this.args.stats)) {
                 logger.warn(`'${this.args.stats}' is invalid value for stats. Using 'normal' option for stats`);
                 this.opts.options.stats = 'normal';
             } else {
-                this.opts.options.stats = this.args.stats;
+                this.opts.outputOptions.stats = this.args.stats;
             }
         }
         if (this.args.json) {

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

@@ -8,7 +8,7 @@ class Compiler {
         this.output = new CompilerOutput();
         this.compilerOptions = {};
     }
-    setUpHookForCompilation(compilation, outputOptions, options) {
+    setUpHookForCompilation(compilation, outputOptions, options, idx) {
         const { ProgressPlugin } = webpack;
         let progressPluginExists;
         if (options.plugins) {
@@ -34,7 +34,7 @@ class Compiler {
                         process.stdout.write(`) ${percent}% : `);
                         process.stdout.write(`${cyanBright(msg)}`);
                         if (percent === 100) {
-                            process.stdout.write(`${cyanBright('Complilation completed\n')}`);
+                            process.stdout.write(`\n${cyanBright('Compilation completed\n')}`);
                         }
                     }
                 };
@@ -53,10 +53,9 @@ class Compiler {
                 }
             }
         });
-
-        if (outputOptions.infoVerbosity === 'verbose') {
+        if (outputOptions.stats === 'verbose') {
             const resolveCompilationName = (compilation) => {
-                return compilation.name ? compilation.name : '';
+                return compilation.name ? compilation.name : `${idx + 1}`;
             };
             if (outputOptions.watch) {
                 compilation.hooks.watchRun.tap('WebpackCLI', (compilation) => {
@@ -78,7 +77,7 @@ class Compiler {
     }
 
     generateOutput(outputOptions, stats) {
-        this.output.generateRawOutput(stats, this.compilerOptions);
+        this.output.generateRawOutput(stats, outputOptions);
         process.stdout.write('\n');
         if (outputOptions.watch) {
             logger.info('watching files for updates...');
@@ -165,7 +164,7 @@ class Compiler {
 
         if (this.compiler.compilers) {
             this.compiler.compilers.forEach((comp, idx) => {
-                this.setUpHookForCompilation(comp, outputOptions, options[idx]);
+                this.setUpHookForCompilation(comp, outputOptions, options[idx], idx);
             });
         } else {
             this.setUpHookForCompilation(this.compiler, outputOptions, options);

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

@@ -22,14 +22,15 @@ class GroupHelper {
     }
 
     arrayToObject(arr) {
-        if (!arr) {
-            return;
+        if (Array.isArray(arr)) {
+            return arr.reduce((result, currentItem) => {
+                const key = Object.keys(currentItem)[0];
+                result[this.hyphenToUpperCase(key)] = currentItem[key];
+                return result;
+            }, {});
         }
-        return arr.reduce((result, currentItem) => {
-            const key = Object.keys(currentItem)[0];
-            result[this.hyphenToUpperCase(key)] = currentItem[key];
-            return result;
-        }, {});
+        if (!arr) return;
+        return arr;
     }
 
     // TODO: to re implement