diff --git a/client-src/default/utils/log.js b/client-src/default/utils/log.js index 6ae76e069b..db9301cad1 100644 --- 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,13 +21,6 @@ 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; diff --git a/lib/options.json b/lib/options.json index 72e89c8136..2d34a66cd2 100644 --- 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 index a62894e923..8f120617a2 100644 --- a/test/client/utils/__snapshots__/log.test.js.snap +++ b/test/client/utils/__snapshots__/log.test.js.snap @@ -19,8 +19,5 @@ Array [ Array [ "trace", ], - Array [ - "warn", - ], ] `; diff --git a/test/client/utils/log.test.js b/test/client/utils/log.test.js index 79021d13d7..f72c6486b7 100644 --- 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,12 @@ describe('log', () => { ).toMatchSnapshot(); }); - test('should set none and silent via setLogLevel', () => { - ['none', 'silent'].forEach((level) => { - setLogLevel(level); - }); + test('should set silent via setLogLevel', () => { + setLogLevel('silent'); expect( logMock.getLogger.mock.results[0].value.disableAll.mock.results - ).toHaveLength(2); + ).toHaveLength(1); }); test('should output exception log when the level is unknown', () => { diff --git a/test/options.test.js b/test/options.test.js index c43adeafcf..b32b907179 100644 --- a/test/options.test.js +++ b/test/options.test.js @@ -53,19 +53,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],