Skip to content

Commit 094f7ed

Browse files
snitin315snitin315
committed
test: update snaps
1 parent 84451c8 commit 094f7ed

File tree

4 files changed

+78
-20
lines changed

4 files changed

+78
-20
lines changed

‎test/__snapshots__/validate-options.test.js.snap.webpack4

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,14 @@ exports[`options validate should throw an error on the "client" option with '{"t
110110
exports[`options validate should throw an error on the "client" option with '{"unknownOption":true}' value 1`] = `
111111
"ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
112112
- configuration.client has an unknown property 'unknownOption'. These properties are valid:
113-
<<<<<<< HEAD
114-
object { transport?, host?, path?, port?, logging?, progress?, overlay?, needClientEntry?, needHotEntry? }
115-
=======
116-
object { host?, path?, port?, logging?, progress?, overlay?, needClientEntry?, hotEntry? }
117-
>>>>>>> test: updates
113+
object { transport?, host?, path?, port?, logging?, progress?, overlay?, needClientEntry?, hotEntry? }
118114
-> Specifies client properties. https://webpack.js.org/configuration/dev-server/#devserverclient"
119115
`;
120116

121117
exports[`options validate should throw an error on the "client" option with 'whoops!' value 1`] = `
122118
"ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
123119
- configuration.client should be an object:
124-
<<<<<<< HEAD
125-
object { transport?, host?, path?, port?, logging?, progress?, overlay?, needClientEntry?, needHotEntry? }
126-
=======
127-
object { host?, path?, port?, logging?, progress?, overlay?, needClientEntry?, hotEntry? }
128-
>>>>>>> test: updates
120+
object { transport?, host?, path?, port?, logging?, progress?, overlay?, needClientEntry?, hotEntry? }
129121
-> Specifies client properties. https://webpack.js.org/configuration/dev-server/#devserverclient"
130122
`;
131123

‎test/__snapshots__/validate-options.test.js.snap.webpack5

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,14 @@ exports[`options validate should throw an error on the "client" option with '{"t
110110
exports[`options validate should throw an error on the "client" option with '{"unknownOption":true}' value 1`] = `
111111
"ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
112112
- configuration.client has an unknown property 'unknownOption'. These properties are valid:
113-
<<<<<<< HEAD
114-
object { transport?, host?, path?, port?, logging?, progress?, overlay?, needClientEntry?, needHotEntry? }
115-
=======
116-
object { host?, path?, port?, logging?, progress?, overlay?, needClientEntry?, hotEntry? }
117-
>>>>>>> test: updates
113+
object { transport?, host?, path?, port?, logging?, progress?, overlay?, needClientEntry?, hotEntry? }
118114
-> Specifies client properties. https://webpack.js.org/configuration/dev-server/#devserverclient"
119115
`;
120116

121117
exports[`options validate should throw an error on the "client" option with 'whoops!' value 1`] = `
122118
"ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
123119
- configuration.client should be an object:
124-
<<<<<<< HEAD
125-
object { transport?, host?, path?, port?, logging?, progress?, overlay?, needClientEntry?, needHotEntry? }
126-
=======
127-
object { host?, path?, port?, logging?, progress?, overlay?, needClientEntry?, hotEntry? }
128-
>>>>>>> test: updates
120+
object { transport?, host?, path?, port?, logging?, progress?, overlay?, needClientEntry?, hotEntry? }
129121
-> Specifies client properties. https://webpack.js.org/configuration/dev-server/#devserverclient"
130122
`;
131123

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
exports[`normalizeOptions client custom transport path should set correct options 1`] = `
44
Object {
55
"client": Object {
6+
"hotEntry": true,
67
"overlay": true,
78
"transport": "/path/to/custom/client/",
89
},
@@ -37,6 +38,7 @@ exports[`normalizeOptions client host and port should set correct options 1`] =
3738
Object {
3839
"client": Object {
3940
"host": "my.host",
41+
"hotEntry": true,
4042
"overlay": true,
4143
"port": 9000,
4244
},
@@ -70,6 +72,7 @@ Object {
7072
exports[`normalizeOptions client path should set correct options 1`] = `
7173
Object {
7274
"client": Object {
75+
"hotEntry": true,
7376
"overlay": true,
7477
"path": "/custom/path/",
7578
},
@@ -103,6 +106,7 @@ Object {
103106
exports[`normalizeOptions client path without leading/ending slashes should set correct options 1`] = `
104107
Object {
105108
"client": Object {
109+
"hotEntry": true,
106110
"overlay": true,
107111
"path": "custom/path",
108112
},
@@ -136,6 +140,7 @@ Object {
136140
exports[`normalizeOptions client.transport sockjs string should set correct options 1`] = `
137141
Object {
138142
"client": Object {
143+
"hotEntry": true,
139144
"overlay": true,
140145
"transport": "sockjs",
141146
},
@@ -169,6 +174,7 @@ Object {
169174
exports[`normalizeOptions client.transport ws string and webSocketServer ws string should set correct options 1`] = `
170175
Object {
171176
"client": Object {
177+
"hotEntry": true,
172178
"overlay": true,
173179
"transport": "ws",
174180
},
@@ -202,6 +208,7 @@ Object {
202208
exports[`normalizeOptions client.transport ws string should set correct options 1`] = `
203209
Object {
204210
"client": Object {
211+
"hotEntry": true,
205212
"overlay": true,
206213
"transport": "ws",
207214
},
@@ -235,6 +242,7 @@ Object {
235242
exports[`normalizeOptions dev is set should set correct options 1`] = `
236243
Object {
237244
"client": Object {
245+
"hotEntry": true,
238246
"overlay": true,
239247
},
240248
"devMiddleware": Object {
@@ -269,6 +277,7 @@ Object {
269277
exports[`normalizeOptions firewall is set should set correct options 1`] = `
270278
Object {
271279
"client": Object {
280+
"hotEntry": true,
272281
"overlay": true,
273282
},
274283
"devMiddleware": Object {},
@@ -301,6 +310,7 @@ Object {
301310
exports[`normalizeOptions hot is false should set correct options 1`] = `
302311
Object {
303312
"client": Object {
313+
"hotEntry": false,
304314
"overlay": true,
305315
},
306316
"devMiddleware": Object {},
@@ -333,6 +343,7 @@ Object {
333343
exports[`normalizeOptions hot is only should set correct options 1`] = `
334344
Object {
335345
"client": Object {
346+
"hotEntry": "only",
336347
"overlay": true,
337348
},
338349
"devMiddleware": Object {},
@@ -365,6 +376,7 @@ Object {
365376
exports[`normalizeOptions hot is true should set correct options 1`] = `
366377
Object {
367378
"client": Object {
379+
"hotEntry": true,
368380
"overlay": true,
369381
},
370382
"devMiddleware": Object {},
@@ -397,6 +409,7 @@ Object {
397409
exports[`normalizeOptions liveReload is false should set correct options 1`] = `
398410
Object {
399411
"client": Object {
412+
"hotEntry": true,
400413
"overlay": true,
401414
},
402415
"devMiddleware": Object {},
@@ -429,6 +442,7 @@ Object {
429442
exports[`normalizeOptions liveReload is true should set correct options 1`] = `
430443
Object {
431444
"client": Object {
445+
"hotEntry": true,
432446
"overlay": true,
433447
},
434448
"devMiddleware": Object {},
@@ -461,6 +475,7 @@ Object {
461475
exports[`normalizeOptions multi compiler watchOptions is set should set correct options 1`] = `
462476
Object {
463477
"client": Object {
478+
"hotEntry": true,
464479
"overlay": true,
465480
},
466481
"devMiddleware": Object {},
@@ -495,6 +510,7 @@ Object {
495510
exports[`normalizeOptions no options should set correct options 1`] = `
496511
Object {
497512
"client": Object {
513+
"hotEntry": true,
498514
"overlay": true,
499515
},
500516
"devMiddleware": Object {},
@@ -527,6 +543,7 @@ Object {
527543
exports[`normalizeOptions single compiler watchOptions is object should set correct options 1`] = `
528544
Object {
529545
"client": Object {
546+
"hotEntry": true,
530547
"overlay": true,
531548
},
532549
"devMiddleware": Object {},
@@ -561,6 +578,7 @@ Object {
561578
exports[`normalizeOptions single compiler watchOptions is object with static watch overriding it should set correct options 1`] = `
562579
Object {
563580
"client": Object {
581+
"hotEntry": true,
564582
"overlay": true,
565583
},
566584
"devMiddleware": Object {},
@@ -595,6 +613,7 @@ Object {
595613
exports[`normalizeOptions single compiler watchOptions is object with static watch true should set correct options 1`] = `
596614
Object {
597615
"client": Object {
616+
"hotEntry": true,
598617
"overlay": true,
599618
},
600619
"devMiddleware": Object {},
@@ -629,6 +648,7 @@ Object {
629648
exports[`normalizeOptions single compiler watchOptions is object with watch false should set correct options 1`] = `
630649
Object {
631650
"client": Object {
651+
"hotEntry": true,
632652
"overlay": true,
633653
},
634654
"devMiddleware": Object {},
@@ -661,6 +681,7 @@ Object {
661681
exports[`normalizeOptions static is an array of static objects should set correct options 1`] = `
662682
Object {
663683
"client": Object {
684+
"hotEntry": true,
664685
"overlay": true,
665686
},
666687
"devMiddleware": Object {},
@@ -704,6 +725,7 @@ Object {
704725
exports[`normalizeOptions static is an array of strings and static objects should set correct options 1`] = `
705726
Object {
706727
"client": Object {
728+
"hotEntry": true,
707729
"overlay": true,
708730
},
709731
"devMiddleware": Object {},
@@ -747,6 +769,7 @@ Object {
747769
exports[`normalizeOptions static is an array of strings should set correct options 1`] = `
748770
Object {
749771
"client": Object {
772+
"hotEntry": true,
750773
"overlay": true,
751774
},
752775
"devMiddleware": Object {},
@@ -790,6 +813,7 @@ Object {
790813
exports[`normalizeOptions static is an object should set correct options 1`] = `
791814
Object {
792815
"client": Object {
816+
"hotEntry": true,
793817
"overlay": true,
794818
},
795819
"devMiddleware": Object {},
@@ -822,6 +846,7 @@ Object {
822846
exports[`normalizeOptions static is false should set correct options 1`] = `
823847
Object {
824848
"client": Object {
849+
"hotEntry": true,
825850
"overlay": true,
826851
},
827852
"devMiddleware": Object {},
@@ -842,6 +867,7 @@ Object {
842867
exports[`normalizeOptions static is string should set correct options 1`] = `
843868
Object {
844869
"client": Object {
870+
"hotEntry": true,
845871
"overlay": true,
846872
},
847873
"devMiddleware": Object {},
@@ -874,6 +900,7 @@ Object {
874900
exports[`normalizeOptions static is true should set correct options 1`] = `
875901
Object {
876902
"client": Object {
903+
"hotEntry": true,
877904
"overlay": true,
878905
},
879906
"devMiddleware": Object {},
@@ -906,6 +933,7 @@ Object {
906933
exports[`normalizeOptions static publicPath is a string should set correct options 1`] = `
907934
Object {
908935
"client": Object {
936+
"hotEntry": true,
909937
"overlay": true,
910938
},
911939
"devMiddleware": Object {},
@@ -938,6 +966,7 @@ Object {
938966
exports[`normalizeOptions static publicPath is an array should set correct options 1`] = `
939967
Object {
940968
"client": Object {
969+
"hotEntry": true,
941970
"overlay": true,
942971
},
943972
"devMiddleware": Object {},
@@ -971,6 +1000,7 @@ Object {
9711000
exports[`normalizeOptions static serveIndex is an object should set correct options 1`] = `
9721001
Object {
9731002
"client": Object {
1003+
"hotEntry": true,
9741004
"overlay": true,
9751005
},
9761006
"devMiddleware": Object {},
@@ -1003,6 +1033,7 @@ Object {
10031033
exports[`normalizeOptions static serveIndex is false should set correct options 1`] = `
10041034
Object {
10051035
"client": Object {
1036+
"hotEntry": true,
10061037
"overlay": true,
10071038
},
10081039
"devMiddleware": Object {},
@@ -1033,6 +1064,7 @@ Object {
10331064
exports[`normalizeOptions static serveIndex is true should set correct options 1`] = `
10341065
Object {
10351066
"client": Object {
1067+
"hotEntry": true,
10361068
"overlay": true,
10371069
},
10381070
"devMiddleware": Object {},
@@ -1065,6 +1097,7 @@ Object {
10651097
exports[`normalizeOptions static watch is an object should set correct options 1`] = `
10661098
Object {
10671099
"client": Object {
1100+
"hotEntry": true,
10681101
"overlay": true,
10691102
},
10701103
"devMiddleware": Object {},
@@ -1099,6 +1132,7 @@ Object {
10991132
exports[`normalizeOptions static watch is false should set correct options 1`] = `
11001133
Object {
11011134
"client": Object {
1135+
"hotEntry": true,
11021136
"overlay": true,
11031137
},
11041138
"devMiddleware": Object {},
@@ -1131,6 +1165,7 @@ Object {
11311165
exports[`normalizeOptions static watch is true should set correct options 1`] = `
11321166
Object {
11331167
"client": Object {
1168+
"hotEntry": true,
11341169
"overlay": true,
11351170
},
11361171
"devMiddleware": Object {},
@@ -1163,6 +1198,7 @@ Object {
11631198
exports[`normalizeOptions webSocketServer custom server class should set correct options 1`] = `
11641199
Object {
11651200
"client": Object {
1201+
"hotEntry": true,
11661202
"overlay": true,
11671203
},
11681204
"devMiddleware": Object {},
@@ -1195,6 +1231,7 @@ Object {
11951231
exports[`normalizeOptions webSocketServer custom server path should set correct options 1`] = `
11961232
Object {
11971233
"client": Object {
1234+
"hotEntry": true,
11981235
"overlay": true,
11991236
},
12001237
"devMiddleware": Object {},

0 commit comments

Comments
 (0)