feat(client): delete none and warning because they are deprecated

ISSUE: #1901
webpack · Jun 8, 2019 · cb7e81a · cb7e81a
1 parent dfe1a4f
commit cb7e81a
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 42 deletions.
diff --git a/client-src/default/utils/log.js b/client-src/default/utils/log.js
@@ -8,11 +8,6 @@ const ERROR = 'error';
 const DEBUG = 'debug';
 const TRACE = 'trace';
 const SILENT = 'silent';
-// deprecated
-// TODO: remove these at major released
-// https://github.com/webpack/webpack-dev-server/pull/1825
-const WARNING = 'warning';
-const NONE = 'none';
 
 // Set the default log level
 log.setDefaultLevel(INFO);
@@ -26,17 +21,13 @@ export function setLogLevel(level) {
     case TRACE:
       log.setLevel(level);
       break;
-    // deprecated
-    case WARNING:
-      // loglevel's warning name is different from webpack's
-      log.setLevel('warn');
-      break;
-    // deprecated
-    case NONE:
     case SILENT:
       log.disableAll();
       break;
     default:
+      if (level === 'none' || level === 'warning') {
+        log.error('[WDS] "none" and "warning" have been deprecated.');
+      }
       log.error(`[WDS] Unknown clientLogLevel '${level}'`);
   }
 }
diff --git a/lib/options.json b/lib/options.json
@@ -37,16 +37,7 @@
       ]
     },
     "clientLogLevel": {
-      "enum": [
-        "info",
-        "warn",
-        "error",
-        "debug",
-        "trace",
-        "silent",
-        "none",
-        "warning"
-      ]
+      "enum": ["info", "warn", "error", "debug", "trace", "silent"]
     },
     "compress": {
       "type": "boolean"

diff --git a/test/client/utils/__snapshots__/log.test.js.snap b/test/client/utils/__snapshots__/log.test.js.snap
@@ -1,5 +1,22 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`log should output exception log when the level is deprecated 1`] = `
+Array [
+  Array [
+    "[WDS] \\"none\\" and \\"warning\\" have been deprecated.",
+  ],
+  Array [
+    "[WDS] Unknown clientLogLevel 'none'",
+  ],
+  Array [
+    "[WDS] \\"none\\" and \\"warning\\" have been deprecated.",
+  ],
+  Array [
+    "[WDS] Unknown clientLogLevel 'warning'",
+  ],
+]
+`;
+
 exports[`log should output exception log when the level is unknown 1`] = `"[WDS] Unknown clientLogLevel 'foo'"`;
 
 exports[`log should set log level via setLogLevel 1`] = `
@@ -19,8 +36,5 @@ Array [
   Array [
     "trace",
   ],
-  Array [
-    "warn",
-  ],
 ]
 `;
diff --git a/test/client/utils/log.test.js b/test/client/utils/log.test.js
@@ -35,7 +35,7 @@ describe('log', () => {
   });
 
   test('should set log level via setLogLevel', () => {
-    ['info', 'warn', 'error', 'debug', 'trace', 'warning'].forEach((level) => {
+    ['info', 'warn', 'error', 'debug', 'trace'].forEach((level) => {
       setLogLevel(level);
     });
 
@@ -44,14 +44,14 @@ describe('log', () => {
     ).toMatchSnapshot();
   });
 
-  test('should set none and silent via setLogLevel', () => {
-    ['none', 'silent'].forEach((level) => {
+  test('should set silent via setLogLevel', () => {
+    ['silent'].forEach((level) => {
       setLogLevel(level);
     });
 
     expect(
       logMock.getLogger.mock.results[0].value.disableAll.mock.results
-    ).toHaveLength(2);
+    ).toHaveLength(1);
   });
 
   test('should output exception log when the level is unknown', () => {
@@ -61,4 +61,14 @@ describe('log', () => {
       logMock.getLogger.mock.results[0].value.error.mock.calls[0][0]
     ).toMatchSnapshot();
   });
+
+  test('should output exception log when the level is deprecated', () => {
+    ['none', 'warning'].forEach((level) => {
+      setLogLevel(level);
+    });
+
+    expect(
+      logMock.getLogger.mock.results[0].value.error.mock.calls
+    ).toMatchSnapshot();
+  });
 });
diff --git a/test/options.test.js b/test/options.test.js
@@ -121,19 +121,8 @@ describe('options', () => {
         failure: [false],
       },
       clientLogLevel: {
-        success: [
-          'silent',
-          'info',
-          'error',
-          'warn',
-          'trace',
-          'debug',
-          // deprecated
-          'none',
-          // deprecated
-          'warning',
-        ],
-        failure: ['whoops!'],
+        success: ['silent', 'info', 'error', 'warn', 'trace', 'debug'],
+        failure: ['whoops!', 'none', 'warning'],
       },
       compress: {
         success: [true],