refactor(stats): moved stats and colors handling to normalize options

Author: knagaitsev

lib/utils/createConfig.js

@@ -79,14 +79,6 @@ function createConfig(config, argv, { port }) {
     options.watchContentBase = true;
   }
 
-  if (
-    typeof options.stats === 'object' &&
-    typeof options.stats.colors === 'undefined' &&
-    argv.color
-  ) {
-    options.stats = Object.assign({}, options.stats, { colors: argv.color });
-  }
-
   if (argv.lazy) {
     options.lazy = true;
   }

lib/utils/normalizeOptions.js

@@ -6,6 +6,7 @@
 
 const path = require('path');
 const isAbsoluteUrl = require('is-absolute-url');
+const supportsColor = require('supports-color').stdout;
 const defaultTo = require('./defaultTo');
 
 function normalizeOptions(compiler, options) {
@@ -91,8 +92,20 @@ function normalizeOptions(compiler, options) {
     });
   }
 
-  // consider retrieving the webpack config's color option, and remove the dev server
-  // CLI color option entirely.
+  // the fallback for the color value is whether or not the user's console
+  // supports color, so usually true (supportsColor is an object but we just want a boolean)
+  let colors = !!supportsColor;
+  if (
+    typeof firstWpOpt.stats === 'object' &&
+    firstWpOpt.stats.colors !== undefined
+  ) {
+    // firstWpOpt.stats.colors could be an object but we just want a boolean
+    colors = !!firstWpOpt.stats.colors;
+  }
+
+  if (typeof options.stats === 'object' && options.stats.colors === undefined) {
+    options.stats = Object.assign({}, options.stats, { colors });
+  }
 
   if (options.openPage) {
     options.open = true;

test/server/utils/__snapshots__/createConfig.test.js.snap

@@ -639,18 +639,6 @@ Object {
 }
 `;
 
-exports[`createConfig stats option (colors) 1`] = `
-Object {
-  "hot": true,
-  "noInfo": true,
-  "port": 8080,
-  "stats": Object {
-    "colors": true,
-    "errors": true,
-  },
-}
-`;
-
 exports[`createConfig stats option 1`] = `
 Object {
   "hot": true,