Skip to content

Commit 271ac73

Browse files
committed
feat(client): delete none and warning from clientLogLevel (#1998)
ISSUE: #1901
1 parent 1fdb8f1 commit 271ac73

File tree

5 files changed

+7
-44
lines changed

5 files changed

+7
-44
lines changed

client-src/default/utils/log.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ const ERROR = 'error';
88
const DEBUG = 'debug';
99
const TRACE = 'trace';
1010
const SILENT = 'silent';
11-
// deprecated
12-
// TODO: remove these at major released
13-
// https://github.com/webpack/webpack-dev-server/pull/1825
14-
const WARNING = 'warning';
15-
const NONE = 'none';
1611

1712
// Set the default log level
1813
log.setDefaultLevel(INFO);
@@ -26,13 +21,6 @@ export function setLogLevel(level) {
2621
case TRACE:
2722
log.setLevel(level);
2823
break;
29-
// deprecated
30-
case WARNING:
31-
// loglevel's warning name is different from webpack's
32-
log.setLevel('warn');
33-
break;
34-
// deprecated
35-
case NONE:
3624
case SILENT:
3725
log.disableAll();
3826
break;

lib/options.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,7 @@
3737
]
3838
},
3939
"clientLogLevel": {
40-
"enum": [
41-
"info",
42-
"warn",
43-
"error",
44-
"debug",
45-
"trace",
46-
"silent",
47-
"none",
48-
"warning"
49-
]
40+
"enum": ["info", "warn", "error", "debug", "trace", "silent"]
5041
},
5142
"compress": {
5243
"type": "boolean"

test/client/utils/__snapshots__/log.test.js.snap

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,5 @@ Array [
1919
Array [
2020
"trace",
2121
],
22-
Array [
23-
"warn",
24-
],
2522
]
2623
`;

test/client/utils/log.test.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describe('log', () => {
3535
});
3636

3737
test('should set log level via setLogLevel', () => {
38-
['info', 'warn', 'error', 'debug', 'trace', 'warning'].forEach((level) => {
38+
['info', 'warn', 'error', 'debug', 'trace'].forEach((level) => {
3939
setLogLevel(level);
4040
});
4141

@@ -44,14 +44,12 @@ describe('log', () => {
4444
).toMatchSnapshot();
4545
});
4646

47-
test('should set none and silent via setLogLevel', () => {
48-
['none', 'silent'].forEach((level) => {
49-
setLogLevel(level);
50-
});
47+
test('should set silent via setLogLevel', () => {
48+
setLogLevel('silent');
5149

5250
expect(
5351
logMock.getLogger.mock.results[0].value.disableAll.mock.results
54-
).toHaveLength(2);
52+
).toHaveLength(1);
5553
});
5654

5755
test('should output exception log when the level is unknown', () => {

test/options.test.js

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,8 @@ describe('options', () => {
5555
failure: [false],
5656
},
5757
clientLogLevel: {
58-
success: [
59-
'silent',
60-
'info',
61-
'error',
62-
'warn',
63-
'trace',
64-
'debug',
65-
// deprecated
66-
'none',
67-
// deprecated
68-
'warning',
69-
],
70-
failure: ['whoops!'],
58+
success: ['silent', 'info', 'error', 'warn', 'trace', 'debug'],
59+
failure: ['whoops!', 'none', 'warning'],
7160
},
7261
compress: {
7362
success: [true],

0 commit comments

Comments
 (0)