refactor(cli): change cli name to client logging

Author: knagaitsev

bin/cli-flags.js

@@ -65,7 +65,7 @@ module.exports = {
       describe: 'Open default browser with the specified page',
     },
     {
-      name: 'client-log-level',
+      name: 'client-logging',
       type: String,
       group: DISPLAY_GROUP,
       defaultValue: 'info',

bin/options.js

@@ -73,7 +73,7 @@ const options = {
     group: DISPLAY_GROUP,
     describe: 'Enables/Disables colors on the console',
   },
-  'client-log-level': {
+  'client-logging': {
     type: 'string',
     group: DISPLAY_GROUP,
     default: 'info',

client-src/default/index.js

@@ -67,7 +67,7 @@ const onSocketMessage = {
     }
     sendMessage('StillOk');
   },
-  'log-level': function logLevel(level) {
+  logging: function logging(level) {
     // this is needed because the HMR logger operate separately from
     // dev server logger
     const hotCtx = require.context('webpack/hot', false, /^\.\/log$/);

lib/Server.js

@@ -634,8 +634,12 @@ class Server {
         }
       });
 
-      if (this.options.clientLogLevel) {
-        this.sockWrite([connection], 'log-level', this.options.clientLogLevel);
+      if (this.options.clientOptions.logging) {
+        this.sockWrite(
+          [connection],
+          'logging',
+          this.options.clientOptions.logging
+        );
       }
 
       if (this.options.hot === true || this.options.hot === 'only') {

lib/options.json

@@ -10,9 +10,6 @@
     "bonjour": {
       "type": "boolean"
     },
-    "clientLogLevel": {
-      "enum": ["none", "error", "warn", "info", "log", "verbose"]
-    },
     "clientOptions": {
       "type": "object",
       "properties": {
@@ -34,6 +31,9 @@
               "type": "null"
             }
           ]
+        },
+        "logging": {
+          "enum": ["none", "error", "warn", "info", "log", "verbose"]
         }
       },
       "additionalProperties": false
@@ -390,7 +390,6 @@
     "properties": {
       "allowedHosts": "should be {Array} (https://webpack.js.org/configuration/dev-server/#devserverallowedhosts)",
       "bonjour": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserverbonjour)",
-      "clientLogLevel": "should be {String} and equal to one of the allowed values\n\n [ 'none', 'silent', 'info', 'debug', 'trace', 'error', 'warning', 'warn' ]\n\n (https://webpack.js.org/configuration/dev-server/#devserverclientloglevel)",
       "clientOptions": "should be {Object} (https://webpack.js.org/configuration/dev-server/#devserverclientoptions)",
       "compress": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devservercompress)",
       "contentBase": "should be {Number|String|Array} (https://webpack.js.org/configuration/dev-server/#devservercontentbase)",

lib/utils/createConfig.js

@@ -80,10 +80,14 @@ function createConfig(config, argv, { port }) {
     options.hot = hasHotOnly ? 'only' : argv.hot;
   }
 
-  // TODO https://github.com/webpack/webpack-dev-server/issues/616 (v4)
-  // We should prefer CLI arg under config, now we always prefer `clientLogLevel` from `devServer`
-  if (!options.clientLogLevel && argv.clientLogLevel) {
-    options.clientLogLevel = argv.clientLogLevel;
+  if (argv.clientLogging) {
+    if (options.clientOptions) {
+      options.clientOptions.logging = argv.clientLogging;
+    } else {
+      options.clientOptions = {
+        logging: argv.clientLogging,
+      };
+    }
   }
 
   if (argv.contentBase) {

test/client/__snapshots__/index.test.js.snap

@@ -94,7 +94,7 @@ Array [
     "hot": [Function],
     "invalid": [Function],
     "liveReload": [Function],
-    "log-level": [Function],
+    "logging": [Function],
     "ok": [Function],
     "overlay": [Function],
     "progress": [Function],

test/client/index.test.js

@@ -110,8 +110,8 @@ describe('index', () => {
   });
 
   // TODO: need to mock require.context
-  test.skip("should run onSocketMessage['log-level']", () => {
-    onSocketMessage['log-level']();
+  test.skip("should run onSocketMessage['logging']", () => {
+    onSocketMessage.logging();
   });
 
   test("should run onSocketMessage.progress and onSocketMessage['progress-update']", () => {