Merge branch 'master' into fix/socksjs-path-2

Author: evilebottnawi

.travis.yml

@@ -18,7 +18,9 @@ jobs:
       stage: Test (MacOS)
       os: 'osx'
       env: SCRIPT=test
-      node_js: 'stable'
+      # Node 10 instead of 'stable' since Node 11 segfaults
+      # https://github.com/webpack/webpack-dev-server/pull/1588
+      node_js: 10
     - <<: *osx
       node_js: 'lts/*'
     - <<: *osx

bin/options.js

@@ -57,7 +57,9 @@ const options = {
     type: 'boolean',
     alias: 'colors',
     default: function supportsColor() {
-      return require('supports-color');
+      // Use `require('supports-color').stdout` for supports-color >= 5.0.0.
+      // See https://github.com/webpack/webpack-dev-server/pull/1555.
+      return require('supports-color').stdout;
     },
     group: DISPLAY_GROUP,
     describe: 'Enables/Disables colors on the console'