Skip to content

Commit 788f2ba

Browse files
fix: default cli arguments for webpack serve (#2965)
1 parent 5029dd6 commit 788f2ba

File tree

4 files changed

+42
-2
lines changed

4 files changed

+42
-2
lines changed

bin/cli-flags.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ module.exports = {
7878
type: Boolean,
7979
description: 'Close and exit the process on SIGINT and SIGTERM',
8080
group: ADVANCED_GROUP,
81-
defaultValue: true,
8281
negative: true,
8382
},
8483
{

lib/Server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ class Server {
6262
if (this.options.client.progress) {
6363
this.setupProgressPlugin();
6464
}
65+
6566
this.setupHooks();
6667
this.setupApp();
6768
this.setupCheckHostRoute();
@@ -72,7 +73,6 @@ class Server {
7273

7374
routes(this);
7475
killable(this.server);
75-
7676
setupExitSignals(this);
7777

7878
// Proxy WebSocket without the initial http request

lib/utils/normalizeOptions.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ function normalizeOptions(compiler, options) {
108108
// firewall is enabled by default
109109
options.firewall = true;
110110
}
111+
112+
if (typeof options.setupExitSignals === 'undefined') {
113+
options.setupExitSignals = true;
114+
}
111115
}
112116

113117
module.exports = normalizeOptions;

test/server/utils/__snapshots__/normalizeOptions.test.js.snap

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Object {
1111
"firewall": true,
1212
"hot": true,
1313
"liveReload": true,
14+
"setupExitSignals": true,
1415
"static": Array [
1516
Object {
1617
"directory": "CWD",
@@ -40,6 +41,7 @@ Object {
4041
"firewall": true,
4142
"hot": true,
4243
"liveReload": true,
44+
"setupExitSignals": true,
4345
"static": Array [
4446
Object {
4547
"directory": "CWD",
@@ -69,6 +71,7 @@ Object {
6971
"firewall": true,
7072
"hot": true,
7173
"liveReload": true,
74+
"setupExitSignals": true,
7275
"static": Array [
7376
Object {
7477
"directory": "CWD",
@@ -100,6 +103,7 @@ Object {
100103
"firewall": true,
101104
"hot": true,
102105
"liveReload": true,
106+
"setupExitSignals": true,
103107
"static": Array [
104108
Object {
105109
"directory": "CWD",
@@ -129,6 +133,7 @@ Object {
129133
"firewall": false,
130134
"hot": true,
131135
"liveReload": true,
136+
"setupExitSignals": true,
132137
"static": Array [
133138
Object {
134139
"directory": "CWD",
@@ -158,6 +163,7 @@ Object {
158163
"firewall": true,
159164
"hot": false,
160165
"liveReload": true,
166+
"setupExitSignals": true,
161167
"static": Array [
162168
Object {
163169
"directory": "CWD",
@@ -187,6 +193,7 @@ Object {
187193
"firewall": true,
188194
"hot": "only",
189195
"liveReload": true,
196+
"setupExitSignals": true,
190197
"static": Array [
191198
Object {
192199
"directory": "CWD",
@@ -216,6 +223,7 @@ Object {
216223
"firewall": true,
217224
"hot": true,
218225
"liveReload": true,
226+
"setupExitSignals": true,
219227
"static": Array [
220228
Object {
221229
"directory": "CWD",
@@ -245,6 +253,7 @@ Object {
245253
"firewall": true,
246254
"hot": true,
247255
"liveReload": false,
256+
"setupExitSignals": true,
248257
"static": Array [
249258
Object {
250259
"directory": "CWD",
@@ -274,6 +283,7 @@ Object {
274283
"firewall": true,
275284
"hot": true,
276285
"liveReload": true,
286+
"setupExitSignals": true,
277287
"static": Array [
278288
Object {
279289
"directory": "CWD",
@@ -303,6 +313,7 @@ Object {
303313
"firewall": true,
304314
"hot": true,
305315
"liveReload": true,
316+
"setupExitSignals": true,
306317
"static": Array [
307318
Object {
308319
"directory": "CWD",
@@ -334,6 +345,7 @@ Object {
334345
"firewall": true,
335346
"hot": true,
336347
"liveReload": true,
348+
"setupExitSignals": true,
337349
"static": Array [
338350
Object {
339351
"directory": "CWD",
@@ -363,6 +375,7 @@ Object {
363375
"firewall": true,
364376
"hot": true,
365377
"liveReload": true,
378+
"setupExitSignals": true,
366379
"static": Array [
367380
Object {
368381
"directory": "CWD",
@@ -394,6 +407,7 @@ Object {
394407
"firewall": true,
395408
"hot": true,
396409
"liveReload": true,
410+
"setupExitSignals": true,
397411
"static": Array [
398412
Object {
399413
"directory": "CWD",
@@ -425,6 +439,7 @@ Object {
425439
"firewall": true,
426440
"hot": true,
427441
"liveReload": true,
442+
"setupExitSignals": true,
428443
"static": Array [
429444
Object {
430445
"directory": "CWD",
@@ -456,6 +471,7 @@ Object {
456471
"firewall": true,
457472
"hot": true,
458473
"liveReload": true,
474+
"setupExitSignals": true,
459475
"static": Array [
460476
Object {
461477
"directory": "CWD",
@@ -485,6 +501,7 @@ Object {
485501
"firewall": true,
486502
"hot": true,
487503
"liveReload": true,
504+
"setupExitSignals": true,
488505
"static": Array [
489506
Object {
490507
"directory": "/static/path1",
@@ -525,6 +542,7 @@ Object {
525542
"firewall": true,
526543
"hot": true,
527544
"liveReload": true,
545+
"setupExitSignals": true,
528546
"static": Array [
529547
Object {
530548
"directory": "/static/path1",
@@ -565,6 +583,7 @@ Object {
565583
"firewall": true,
566584
"hot": true,
567585
"liveReload": true,
586+
"setupExitSignals": true,
568587
"static": Array [
569588
Object {
570589
"directory": "/static/path1",
@@ -605,6 +624,7 @@ Object {
605624
"firewall": true,
606625
"hot": true,
607626
"liveReload": true,
627+
"setupExitSignals": true,
608628
"static": Array [
609629
Object {
610630
"directory": "/static/path",
@@ -634,6 +654,7 @@ Object {
634654
"firewall": true,
635655
"hot": true,
636656
"liveReload": true,
657+
"setupExitSignals": true,
637658
"static": false,
638659
"transportMode": Object {
639660
"client": "ws",
@@ -651,6 +672,7 @@ Object {
651672
"firewall": true,
652673
"hot": true,
653674
"liveReload": true,
675+
"setupExitSignals": true,
654676
"static": Array [
655677
Object {
656678
"directory": "/static/path",
@@ -680,6 +702,7 @@ Object {
680702
"firewall": true,
681703
"hot": true,
682704
"liveReload": true,
705+
"setupExitSignals": true,
683706
"static": Array [
684707
Object {
685708
"directory": "CWD",
@@ -709,6 +732,7 @@ Object {
709732
"firewall": true,
710733
"hot": true,
711734
"liveReload": true,
735+
"setupExitSignals": true,
712736
"static": Array [
713737
Object {
714738
"directory": "CWD",
@@ -738,6 +762,7 @@ Object {
738762
"firewall": true,
739763
"hot": true,
740764
"liveReload": true,
765+
"setupExitSignals": true,
741766
"static": Array [
742767
Object {
743768
"directory": "CWD",
@@ -768,6 +793,7 @@ Object {
768793
"firewall": true,
769794
"hot": true,
770795
"liveReload": true,
796+
"setupExitSignals": true,
771797
"static": Array [
772798
Object {
773799
"directory": "CWD",
@@ -797,6 +823,7 @@ Object {
797823
"firewall": true,
798824
"hot": true,
799825
"liveReload": true,
826+
"setupExitSignals": true,
800827
"static": Array [
801828
Object {
802829
"directory": "CWD",
@@ -824,6 +851,7 @@ Object {
824851
"firewall": true,
825852
"hot": true,
826853
"liveReload": true,
854+
"setupExitSignals": true,
827855
"static": Array [
828856
Object {
829857
"directory": "CWD",
@@ -853,6 +881,7 @@ Object {
853881
"firewall": true,
854882
"hot": true,
855883
"liveReload": true,
884+
"setupExitSignals": true,
856885
"static": Array [
857886
Object {
858887
"directory": "CWD",
@@ -884,6 +913,7 @@ Object {
884913
"firewall": true,
885914
"hot": true,
886915
"liveReload": true,
916+
"setupExitSignals": true,
887917
"static": Array [
888918
Object {
889919
"directory": "CWD",
@@ -913,6 +943,7 @@ Object {
913943
"firewall": true,
914944
"hot": true,
915945
"liveReload": true,
946+
"setupExitSignals": true,
916947
"static": Array [
917948
Object {
918949
"directory": "CWD",
@@ -942,6 +973,7 @@ Object {
942973
"firewall": true,
943974
"hot": true,
944975
"liveReload": true,
976+
"setupExitSignals": true,
945977
"static": Array [
946978
Object {
947979
"directory": "CWD",
@@ -971,6 +1003,7 @@ Object {
9711003
"firewall": true,
9721004
"hot": true,
9731005
"liveReload": true,
1006+
"setupExitSignals": true,
9741007
"static": Array [
9751008
Object {
9761009
"directory": "CWD",
@@ -1000,6 +1033,7 @@ Object {
10001033
"firewall": true,
10011034
"hot": true,
10021035
"liveReload": true,
1036+
"setupExitSignals": true,
10031037
"static": Array [
10041038
Object {
10051039
"directory": "CWD",
@@ -1029,6 +1063,7 @@ Object {
10291063
"firewall": true,
10301064
"hot": true,
10311065
"liveReload": true,
1066+
"setupExitSignals": true,
10321067
"static": Array [
10331068
Object {
10341069
"directory": "CWD",
@@ -1058,6 +1093,7 @@ Object {
10581093
"firewall": true,
10591094
"hot": true,
10601095
"liveReload": true,
1096+
"setupExitSignals": true,
10611097
"static": Array [
10621098
Object {
10631099
"directory": "CWD",
@@ -1087,6 +1123,7 @@ Object {
10871123
"firewall": true,
10881124
"hot": true,
10891125
"liveReload": true,
1126+
"setupExitSignals": true,
10901127
"static": Array [
10911128
Object {
10921129
"directory": "CWD",

0 commit comments

Comments
 (0)