Skip to content

Commit 60b3020

Browse files
snitin315alexander-akait
authored andcommitted
refactor: drop webpack-dev-server v3 form CI and tests (#3352)
1 parent b1af0dc commit 60b3020

14 files changed

+130
-347
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const WebpackCLITestPlugin = require("../../utils/webpack-cli-test-plugin");
2-
const { isDevServer4 } = require("../../utils/test-utils");
32

43
module.exports = (env, argv) => {
54
console.log(argv);
@@ -8,12 +7,10 @@ module.exports = (env, argv) => {
87
mode: "development",
98
devtool: false,
109
plugins: [new WebpackCLITestPlugin(["mode"], false, "hooks.compilation.taps")],
11-
devServer: isDevServer4
12-
? {
13-
client: {
14-
logging: "info",
15-
},
16-
}
17-
: {},
10+
devServer: {
11+
client: {
12+
logging: "info",
13+
},
14+
},
1815
};
1916
};
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const WebpackCLITestPlugin = require("../../utils/webpack-cli-test-plugin");
2-
const { isDevServer4 } = require("../../utils/test-utils");
32

43
module.exports = (env) => {
54
console.log(env);
@@ -8,12 +7,10 @@ module.exports = (env) => {
87
mode: "development",
98
devtool: false,
109
plugins: [new WebpackCLITestPlugin(["mode"], false, "hooks.compilation.taps")],
11-
devServer: isDevServer4
12-
? {
13-
client: {
14-
logging: "info",
15-
},
16-
}
17-
: {},
10+
devServer: {
11+
client: {
12+
logging: "info",
13+
},
14+
},
1815
};
1916
};
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
1-
const { isDevServer4 } = require("../../../utils/test-utils");
2-
3-
let devServerConfig = {};
4-
5-
if (isDevServer4) {
6-
devServerConfig = {
7-
devMiddleware: {
8-
publicPath: "/dev-server-my-public-path/",
9-
},
10-
client: {
11-
logging: "info",
12-
},
13-
};
14-
} else {
15-
devServerConfig = {
1+
const devServerConfig = {
2+
devMiddleware: {
163
publicPath: "/dev-server-my-public-path/",
17-
};
18-
}
4+
},
5+
client: {
6+
logging: "info",
7+
},
8+
};
199

2010
module.exports = devServerConfig;

test/serve/basic/log.config.js

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
const { isDevServer4 } = require("../../utils/test-utils");
2-
31
module.exports = {
42
mode: "development",
53
infrastructureLogging: {
64
level: "log",
75
},
8-
devServer: isDevServer4
9-
? {
10-
client: {
11-
logging: "info",
12-
},
13-
}
14-
: {},
6+
devServer: {
7+
client: {
8+
logging: "info",
9+
},
10+
},
1511
};

test/serve/basic/multi-dev-server-output-public-path.config.js

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const WebpackCLITestPlugin = require("../../utils/webpack-cli-test-plugin");
22
const { devServerConfig } = require("./helper/base-dev-server.config");
3-
const { isDevServer4 } = require("../../utils/test-utils");
43

54
module.exports = [
65
{
@@ -11,13 +10,11 @@ module.exports = [
1110
output: {
1211
filename: "first-output/[name].js",
1312
},
14-
devServer: isDevServer4
15-
? {
16-
client: {
17-
logging: "info",
18-
},
19-
}
20-
: {},
13+
devServer: {
14+
client: {
15+
logging: "info",
16+
},
17+
},
2118
plugins: [new WebpackCLITestPlugin(["mode", "output"], false, "hooks.compilation.taps")],
2219
},
2320
{

test/serve/basic/multi-output-public-path.config.js

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const WebpackCLITestPlugin = require("../../utils/webpack-cli-test-plugin");
2-
const { isDevServer4 } = require("../../utils/test-utils");
32

43
module.exports = [
54
{
@@ -11,13 +10,11 @@ module.exports = [
1110
filename: "first-output/[name].js",
1211
},
1312
plugins: [new WebpackCLITestPlugin(["mode", "output"], false, "hooks.compilation.taps")],
14-
devServer: isDevServer4
15-
? {
16-
client: {
17-
logging: "info",
18-
},
19-
}
20-
: {},
13+
devServer: {
14+
client: {
15+
logging: "info",
16+
},
17+
},
2118
},
2219
{
2320
name: "two",
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const WebpackCLITestPlugin = require("../../utils/webpack-cli-test-plugin");
2-
const { isDevServer4 } = require("../../utils/test-utils");
32

43
module.exports = {
54
mode: "development",
@@ -8,11 +7,9 @@ module.exports = {
87
publicPath: "/my-public-path/",
98
},
109
plugins: [new WebpackCLITestPlugin(["mode", "output"], false, "hooks.compilation.taps")],
11-
devServer: isDevServer4
12-
? {
13-
client: {
14-
logging: "info",
15-
},
16-
}
17-
: {},
10+
devServer: {
11+
client: {
12+
logging: "info",
13+
},
14+
},
1815
};

0 commit comments

Comments
 (0)