Skip to content

Commit d86e06d

Browse files
snitin315alexander-akait
snitin315
authored and
alexander-akait
committed
refactor: drop webpack v4 from tests, packages, and CI (#3338)
1 parent 1dabdd8 commit d86e06d

File tree

29 files changed

+342
-583
lines changed

29 files changed

+342
-583
lines changed

‎.cspell.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@
9494
"Nitin",
9595
"smoketest",
9696
"dbaeumer",
97-
"esbenp"
97+
"esbenp",
98+
"msuccessfully",
99+
"mfirst",
100+
"msecond"
98101
],
99102
"dictionaries": ["npm", "software-terms"],
100103
"ignorePaths": [

‎packages/configtest/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"lib"
2121
],
2222
"peerDependencies": {
23-
"webpack": "4.x.x || 5.x.x",
23+
"webpack": "5.x.x",
2424
"webpack-cli": "4.x.x"
2525
}
2626
}

‎packages/generators/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"yeoman-generator": "^4.12.0"
3131
},
3232
"peerDependencies": {
33-
"webpack": "4.x.x || 5.x.x"
33+
"webpack": "5.x.x",
34+
"webpack-cli": "4.x.x"
3435
},
3536
"peerDependenciesMeta": {
3637
"prettier": {

‎packages/info/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
},
2525
"gitHead": "fb50f766851f500ca12867a2aa9de81fa6e368f9",
2626
"peerDependencies": {
27+
"webpack": "5.x.x",
2728
"webpack-cli": "4.x.x"
2829
},
2930
"devDependencies": {

‎packages/serve/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"lib"
2222
],
2323
"peerDependencies": {
24+
"webpack": "5.x.x",
2425
"webpack-cli": "4.x.x"
2526
},
2627
"peerDependenciesMeta": {

‎packages/serve/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// eslint-disable-next-line node/no-extraneous-import
21
import type { Compiler, cli } from "webpack";
32
import { IWebpackCLI, WebpackDevServerOptions } from "webpack-cli";
43

‎packages/webpack-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"webpack-merge": "^5.7.3"
4949
},
5050
"peerDependencies": {
51-
"webpack": "4.x.x || 5.x.x"
51+
"webpack": "5.x.x"
5252
},
5353
"peerDependenciesMeta": {
5454
"@webpack-cli/generators": {

‎test/build/cache/cache.test.js

Lines changed: 55 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const path = require("path");
44
// eslint-disable-next-line node/no-unpublished-require
55
const rimraf = require("rimraf");
6-
const { run, isWebpack5 } = require("../../utils/test-utils");
6+
const { run } = require("../../utils/test-utils");
77

88
describe("cache", () => {
99
it("should work", async () => {
@@ -14,25 +14,19 @@ describe("cache", () => {
1414
let { exitCode, stderr, stdout } = await run(__dirname, ["-c", "./webpack.config.js"]);
1515

1616
expect(exitCode).toEqual(0);
17-
18-
if (isWebpack5) {
19-
expect(stderr.match(/No pack exists at/g)).toHaveLength(1);
20-
expect(stderr.match(/Stored pack/g)).toHaveLength(1);
21-
expect(stderr).toBeTruthy();
22-
expect(stdout).toBeTruthy();
23-
}
17+
expect(stderr.match(/No pack exists at/g)).toHaveLength(1);
18+
expect(stderr.match(/Stored pack/g)).toHaveLength(1);
19+
expect(stderr).toBeTruthy();
20+
expect(stdout).toBeTruthy();
2421

2522
({ exitCode, stderr, stdout } = await run(__dirname, ["-c", "./webpack.config.js"]));
2623

2724
expect(exitCode).toEqual(0);
28-
29-
if (isWebpack5) {
30-
expect(stderr.match(/restore cache container:/g)).toHaveLength(1);
31-
expect(stderr.match(/restore cache content metadata:/g)).toHaveLength(1);
32-
expect(stderr.match(/restore cache content \d+ \(.+\):/g)).toHaveLength(1);
33-
expect(stderr).toBeTruthy();
34-
expect(stdout).toBeTruthy();
35-
}
25+
expect(stderr.match(/restore cache container:/g)).toHaveLength(1);
26+
expect(stderr.match(/restore cache content metadata:/g)).toHaveLength(1);
27+
expect(stderr.match(/restore cache content \d+ \(.+\):/g)).toHaveLength(1);
28+
expect(stderr).toBeTruthy();
29+
expect(stdout).toBeTruthy();
3630
});
3731

3832
it("should work in multi compiler mode", async () => {
@@ -46,25 +40,19 @@ describe("cache", () => {
4640
let { exitCode, stderr, stdout } = await run(__dirname, ["-c", "./multi.config.js"]);
4741

4842
expect(exitCode).toEqual(0);
49-
50-
if (isWebpack5) {
51-
expect(stderr.match(/No pack exists at/g)).toHaveLength(2);
52-
expect(stderr.match(/Stored pack/g)).toHaveLength(2);
53-
expect(stderr).toBeTruthy();
54-
expect(stdout).toBeTruthy();
55-
}
43+
expect(stderr.match(/No pack exists at/g)).toHaveLength(2);
44+
expect(stderr.match(/Stored pack/g)).toHaveLength(2);
45+
expect(stderr).toBeTruthy();
46+
expect(stdout).toBeTruthy();
5647

5748
({ exitCode, stderr, stdout } = await run(__dirname, ["-c", "./multi.config.js"]));
5849

5950
expect(exitCode).toEqual(0);
60-
61-
if (isWebpack5) {
62-
expect(stderr.match(/restore cache container:/g)).toHaveLength(2);
63-
expect(stderr.match(/restore cache content metadata:/g)).toHaveLength(2);
64-
expect(stderr.match(/restore cache content \d+ \(.+\):/g)).toHaveLength(2);
65-
expect(stderr).toBeTruthy();
66-
expect(stdout).toBeTruthy();
67-
}
51+
expect(stderr.match(/restore cache container:/g)).toHaveLength(2);
52+
expect(stderr.match(/restore cache content metadata:/g)).toHaveLength(2);
53+
expect(stderr.match(/restore cache content \d+ \(.+\):/g)).toHaveLength(2);
54+
expect(stderr).toBeTruthy();
55+
expect(stdout).toBeTruthy();
6856
});
6957

7058
it("should work in multi compiler mode with the `--config-name` argument", async () => {
@@ -82,13 +70,10 @@ describe("cache", () => {
8270
]);
8371

8472
expect(exitCode).toEqual(0);
85-
86-
if (isWebpack5) {
87-
expect(stderr.match(/No pack exists at/g)).toHaveLength(1);
88-
expect(stderr.match(/Stored pack/g)).toHaveLength(1);
89-
expect(stderr).toBeTruthy();
90-
expect(stdout).toBeTruthy();
91-
}
73+
expect(stderr.match(/No pack exists at/g)).toHaveLength(1);
74+
expect(stderr.match(/Stored pack/g)).toHaveLength(1);
75+
expect(stderr).toBeTruthy();
76+
expect(stdout).toBeTruthy();
9277

9378
({ exitCode, stderr, stdout } = await run(__dirname, [
9479
"-c",
@@ -100,14 +85,11 @@ describe("cache", () => {
10085
]));
10186

10287
expect(exitCode).toEqual(0);
103-
104-
if (isWebpack5) {
105-
expect(stderr.match(/restore cache container:/g)).toHaveLength(1);
106-
expect(stderr.match(/restore cache content metadata:/g)).toHaveLength(1);
107-
expect(stderr.match(/restore cache content \d+ \(.+\):/g)).toHaveLength(1);
108-
expect(stderr).toBeTruthy();
109-
expect(stdout).toBeTruthy();
110-
}
88+
expect(stderr.match(/restore cache container:/g)).toHaveLength(1);
89+
expect(stderr.match(/restore cache content metadata:/g)).toHaveLength(1);
90+
expect(stderr.match(/restore cache content \d+ \(.+\):/g)).toHaveLength(1);
91+
expect(stderr).toBeTruthy();
92+
expect(stdout).toBeTruthy();
11193
});
11294

11395
it("should work with the `--merge` argument", async () => {
@@ -126,13 +108,10 @@ describe("cache", () => {
126108
]);
127109

128110
expect(exitCode).toEqual(0);
129-
130-
if (isWebpack5) {
131-
expect(stderr.match(/No pack exists at/g)).toHaveLength(1);
132-
expect(stderr.match(/Stored pack/g)).toHaveLength(1);
133-
expect(stderr).toBeTruthy();
134-
expect(stdout).toBeTruthy();
135-
}
111+
expect(stderr.match(/No pack exists at/g)).toHaveLength(1);
112+
expect(stderr.match(/Stored pack/g)).toHaveLength(1);
113+
expect(stderr).toBeTruthy();
114+
expect(stdout).toBeTruthy();
136115

137116
({ exitCode, stderr, stdout } = await run(__dirname, [
138117
"-c",
@@ -145,14 +124,11 @@ describe("cache", () => {
145124
]));
146125

147126
expect(exitCode).toEqual(0);
148-
149-
if (isWebpack5) {
150-
expect(stderr.match(/restore cache container:/g)).toHaveLength(1);
151-
expect(stderr.match(/restore cache content metadata:/g)).toHaveLength(1);
152-
expect(stderr.match(/restore cache content \d+ \(.+\):/g)).toHaveLength(1);
153-
expect(stderr).toBeTruthy();
154-
expect(stdout).toBeTruthy();
155-
}
127+
expect(stderr.match(/restore cache container:/g)).toHaveLength(1);
128+
expect(stderr.match(/restore cache content metadata:/g)).toHaveLength(1);
129+
expect(stderr.match(/restore cache content \d+ \(.+\):/g)).toHaveLength(1);
130+
expect(stderr).toBeTruthy();
131+
expect(stdout).toBeTruthy();
156132
});
157133

158134
it("should work with the `--config-name` and `--merge` argument", async () => {
@@ -175,13 +151,10 @@ describe("cache", () => {
175151
]);
176152

177153
expect(exitCode).toEqual(0);
178-
179-
if (isWebpack5) {
180-
expect(stderr.match(/No pack exists at/g)).toHaveLength(1);
181-
expect(stderr.match(/Stored pack/g)).toHaveLength(1);
182-
expect(stderr).toBeTruthy();
183-
expect(stdout).toBeTruthy();
184-
}
154+
expect(stderr.match(/No pack exists at/g)).toHaveLength(1);
155+
expect(stderr.match(/Stored pack/g)).toHaveLength(1);
156+
expect(stderr).toBeTruthy();
157+
expect(stdout).toBeTruthy();
185158

186159
({ exitCode, stderr, stdout } = await run(__dirname, [
187160
"-c",
@@ -198,14 +171,11 @@ describe("cache", () => {
198171
]));
199172

200173
expect(exitCode).toEqual(0);
201-
202-
if (isWebpack5) {
203-
expect(stderr.match(/restore cache container:/g)).toHaveLength(1);
204-
expect(stderr.match(/restore cache content metadata:/g)).toHaveLength(1);
205-
expect(stderr.match(/restore cache content \d+ \(.+\):/g)).toHaveLength(1);
206-
expect(stderr).toBeTruthy();
207-
expect(stdout).toBeTruthy();
208-
}
174+
expect(stderr.match(/restore cache container:/g)).toHaveLength(1);
175+
expect(stderr.match(/restore cache content metadata:/g)).toHaveLength(1);
176+
expect(stderr.match(/restore cache content \d+ \(.+\):/g)).toHaveLength(1);
177+
expect(stderr).toBeTruthy();
178+
expect(stdout).toBeTruthy();
209179
});
210180

211181
it("should work with autoloading configuration", async () => {
@@ -219,24 +189,18 @@ describe("cache", () => {
219189
let { exitCode, stderr, stdout } = await run(__dirname, ["--name", "cache-test-autoloading"]);
220190

221191
expect(exitCode).toEqual(0);
222-
223-
if (isWebpack5) {
224-
expect(stderr.match(/No pack exists at/g)).toHaveLength(1);
225-
expect(stderr.match(/Stored pack/g)).toHaveLength(1);
226-
expect(stderr).toBeTruthy();
227-
expect(stdout).toBeTruthy();
228-
}
192+
expect(stderr.match(/No pack exists at/g)).toHaveLength(1);
193+
expect(stderr.match(/Stored pack/g)).toHaveLength(1);
194+
expect(stderr).toBeTruthy();
195+
expect(stdout).toBeTruthy();
229196

230197
({ exitCode, stderr, stdout } = await run(__dirname, ["--name", "cache-test-autoloading"]));
231198

232199
expect(exitCode).toEqual(0);
233-
234-
if (isWebpack5) {
235-
expect(stderr.match(/restore cache container:/g)).toHaveLength(1);
236-
expect(stderr.match(/restore cache content metadata:/g)).toHaveLength(1);
237-
expect(stderr.match(/restore cache content \d+ \(.+\):/g)).toHaveLength(1);
238-
expect(stderr).toBeTruthy();
239-
expect(stdout).toBeTruthy();
240-
}
200+
expect(stderr.match(/restore cache container:/g)).toHaveLength(1);
201+
expect(stderr.match(/restore cache content metadata:/g)).toHaveLength(1);
202+
expect(stderr.match(/restore cache content \d+ \(.+\):/g)).toHaveLength(1);
203+
expect(stderr).toBeTruthy();
204+
expect(stdout).toBeTruthy();
241205
});
242206
});

0 commit comments

Comments
 (0)