Skip to content

Commit 02a1c6d

Browse files
alexander-akaitalexander-akait
authoredSep 3, 2024··
feat: allow the server option to be Function (#5275)
·
v5.2.1v5.1.0
1 parent 530db07 commit 02a1c6d

26 files changed

+1089
-632
lines changed
 

‎.cspell.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@
6767
"subsubcomain",
6868
"noselect",
6969
"commitlint",
70-
"eslintcache"
70+
"eslintcache",
71+
"hono",
72+
"privkey"
7173
],
7274
"ignorePaths": [
7375
"CHANGELOG.md",

‎examples/app/connect/README.md

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# `app` Option
2+
3+
Serve using [`connect`](https://github.com/senchalabs/connect) as an application.
4+
5+
**webpack.config.js**
6+
7+
```js
8+
const connect = require("connect");
9+
10+
module.exports = {
11+
// ...
12+
devServer: {
13+
server: {
14+
app: () => connect(),
15+
},
16+
},
17+
};
18+
```
19+
20+
## What Should Happen
21+
22+
1. The script should open `https://localhost:8080/` in your default browser.
23+
2. You should see the text on the page itself change to read `Success!`.

‎examples/app/connect/app.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"use strict";
2+
3+
const target = document.querySelector("#target");
4+
5+
target.classList.add("pass");
6+
target.innerHTML = "Success!";

‎examples/app/connect/webpack.config.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
"use strict";
2+
3+
// our setup function adds behind-the-scenes bits to the config that all of our
4+
// examples need
5+
const connect = require("connect");
6+
const { setup } = require("../../util");
7+
8+
module.exports = setup({
9+
context: __dirname,
10+
entry: "./app.js",
11+
devServer: {
12+
app: () => connect(),
13+
},
14+
});

‎examples/app/hono/README.md

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# `app` Option
2+
3+
Serve using [`hono`](https://github.com/honojs/hono) as an application.
4+
5+
**webpack.config.js**
6+
7+
```js
8+
const connect = require("connect");
9+
10+
module.exports = {
11+
// ...
12+
devServer: {
13+
server: {
14+
app: () => connect(),
15+
},
16+
},
17+
};
18+
```
19+
20+
## What Should Happen
21+
22+
1. The script should open `https://localhost:8080/` in your default browser.
23+
2. You should see the text on the page itself change to read `Success!`.

‎examples/app/hono/app.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"use strict";
2+
3+
const target = document.querySelector("#target");
4+
5+
target.classList.add("pass");
6+
target.innerHTML = "Success!";

‎examples/app/hono/ssl/localhost-cert.pem

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDCTCCAfGgAwIBAgIUevWiuCfenWuq9KyC8aQ/tc1Io14wDQYJKoZIhvcNAQEL
3+
BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI0MDQyNDE2MDYyMloXDTI0MDUy
4+
NDE2MDYyMlowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
5+
AAOCAQ8AMIIBCgKCAQEA1v/lb9u9WkqkF7zjIKe2R+b4S0sQnWIfBFZ0ggtaOL0a
6+
ntud/EuaGQgLtJgSwO2M2xIqKx+yoLhoM+273EJe0KmfJMxYNAkhwP9h6vrKnaQJ
7+
mpAhoalfEGyCrnHHMKISAAn4Rlc8NXnULoFhHzNm8bdqvP33rCmsJ+tNYC5kwzyt
8+
HvRNFyg9BOUfACiPW17opFH0rao3IfZrQ6yRbknef1pX1x2pbDAH14rCT/vXaTs6
9+
VGuqLE/wRsSt+7nMHy/PmXxMyb4G4/UflYtnKfmXpDRw+TDEGzvTZedtoOz+rrJC
10+
e989R9qYGrlPfyfZbI+O348FV66I+jcD+/EUQs+HkwIDAQABo1MwUTAdBgNVHQ4E
11+
FgQU6bk4LSwtVQEt7V/ev+Zj270zdAkwHwYDVR0jBBgwFoAU6bk4LSwtVQEt7V/e
12+
v+Zj270zdAkwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAUBgo
13+
E3CZrrc/MaadFg1meNk+eKACmTsIa5cT6zi7MsvoKakXEd4bGd+iLifUzlAa1ygj
14+
dQppfprb5t68I7oO9/lkh2DfKrXxW/RpdhB05KslUd8q/3XY5kyao5quzeiVoMHR
15+
u+XYjoy2mTwdUC2uzFy6rkHsAkJy2vJJoDdlNsrKn6AZmh+voHHKrAtOL4gnanQV
16+
wR1u8eBVfk2MKIl2pNSCA4bD16uZyp3+oqq097BEoVa1pR+l8nwbsh/YfALifq/d
17+
P3yiN5+EqgiOIF9b8PZORe+Ry1O7uvPnU2ZRkVWPJ1S17Ms0lnr7IY3qjSBTuK66
18+
5uYi7ojrb5Vf0UL5oQ==
19+
-----END CERTIFICATE-----

‎examples/app/hono/ssl/localhost-privkey.pem

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEugIBADANBgkqhkiG9w0BAQEFAASCBKQwggSgAgEAAoIBAQDW/+Vv271aSqQX
3+
vOMgp7ZH5vhLSxCdYh8EVnSCC1o4vRqe2538S5oZCAu0mBLA7YzbEiorH7KguGgz
4+
7bvcQl7QqZ8kzFg0CSHA/2Hq+sqdpAmakCGhqV8QbIKucccwohIACfhGVzw1edQu
5+
gWEfM2bxt2q8/fesKawn601gLmTDPK0e9E0XKD0E5R8AKI9bXuikUfStqjch9mtD
6+
rJFuSd5/WlfXHalsMAfXisJP+9dpOzpUa6osT/BGxK37ucwfL8+ZfEzJvgbj9R+V
7+
i2cp+ZekNHD5MMQbO9Nl522g7P6uskJ73z1H2pgauU9/J9lsj47fjwVXroj6NwP7
8+
8RRCz4eTAgMBAAECggEAA+zbFv43iEj5kvdfXC7DrK9iVBmUPZNXhqA/c0paxNNr
9+
A4B182+76f4UHKF0IjKUEkHUJEJpY/bJ7DzIY76QdZXLMoRKjfSmuZvQAVa/0T33
10+
8Or1ujpZ4nZgsmegX9ptorOL5VjdYAqP3aN+DvBEzl/vYnDujyWZn4bzvDBMpaXS
11+
39qW1MkcZ8UiP1fRad76+S57WnieBV+NRHYEAiDdMFKXLuw/igX/xOSZgq5Jh3I2
12+
hLS49S41dN1P9l9H2bPMw0CthNvMPPaemwKHz+84hSS+P4VJOWJzlGnXEdIFuqBR
13+
GFBESQzcemfS9DDB22Yt06YujBCbwTVVAxj73lnKkQKBgQDvYXK36J9y/NphDAWi
14+
Cwti5oE3eSfV0YazQwm+rRwC64wbpBFAm9ujwjUmaYBg75lBLF5nOOe8s1n95g5I
15+
tLfFb+zuZh8NNLjhfNE9/SNmRnnMvbcaDHeIE2RMAz+PuLN/gFLmsVIwK2X1LRC2
16+
0vHjw9Yzh6JLiOajAchzhZiCEQKBgQDl7R6Wfggo8myETA8Uv5tWot3IcquRkEl/
17+
TRCyao2/79rAGexS7piwD7FPdSDOk1zfZFYUOMzyMjj60sGcPRPqRX6D0usEODLQ
18+
TwsTJSCNgPnIOkqKkccwtqlTimbRIrPUSQfFPj56RzKKWdrJ/P3LPRjzkK7i3vLV
19+
EGlAENaLYwKBgHKSOnzpWr+HY+IFBgErthRs7LWnSDifYxATauuXIQwIvvNP0G4S
20+
6snzHss2vZonszstSDWxV8DKOq052eZUkIxv6H+l4wDIFiDeQ6uep73Ax3UF7EgM
21+
ZX18gombGGXqagcBXSxK/GJPsynomtJWHi38Ql5BcZ0jdffY157q9zZxAoGAPZtD
22+
Tt+GIDKUkP4wLEcKwDPzaPoQrngSuWFUz/ls8bi6zC4l/DKiBsqtn7Sqja8+ezzP
23+
M6vkfiCm084UwmA7LdJhC8E/52mHc/k55m9UQZYFV3kG8AoPbSYESLYUxoSd2ouW
24+
4WrEIs9g42EgFm8LMaG1Rc3GjlNejWhQSzI3yjECf3v7VoAcUwVfuVkwbm9W24vR
25+
neFTF8QBl//fxIdxZwoj5SrSgMOjmZ3pXA/ZbFJ0pB4Rh5dmKTYqdpfXsOTiBuwB
26+
XlqPVpN8UZEl3edpufLDyPldNej/9kEAkK5FS3YVyIQEg75739bCTlfzzCX1HdMx
27+
q98XYm/n5LWYFezsAt0=
28+
-----END PRIVATE KEY-----

‎examples/app/hono/webpack.config.js

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
"use strict";
2+
3+
const wdm = require("webpack-dev-middleware");
4+
const { Hono } = require("hono");
5+
const { serve } = require("@hono/node-server");
6+
// eslint-disable-next-line import/extensions, import/no-unresolved
7+
const { serveStatic } = require("@hono/node-server/serve-static");
8+
const { setup } = require("../../util");
9+
10+
// our setup function adds behind-the-scenes bits to the config that all of our
11+
// examples need
12+
module.exports = setup({
13+
context: __dirname,
14+
entry: "./app.js",
15+
devServer: {
16+
// WARNING:
17+
//
18+
// You always need to set up middlewares which you required for your app,
19+
// built-in middlewares (like `history-api-fallback`/etc) doesn't work by default with `hono`
20+
setupMiddlewares: (_, devServer) => [
21+
{
22+
name: "webpack-dev-middleware",
23+
middleware: wdm.honoWrapper(devServer.compiler),
24+
},
25+
{
26+
name: "static",
27+
path: "/.assets/*",
28+
middleware: serveStatic({
29+
root: "../../.assets",
30+
rewriteRequestPath: (item) => item.replace(/^\/\.assets\//, "/"),
31+
}),
32+
},
33+
],
34+
app: () => new Hono(),
35+
server: (_, app) =>
36+
serve({
37+
fetch: app.fetch,
38+
//
39+
// Uncomment for `https`
40+
// createServer: require('node:https').createServer,
41+
// serverOptions: {
42+
// key: fs.readFileSync("./ssl/localhost-privkey.pem"),
43+
// cert: fs.readFileSync("./ssl/localhost-cert.pem"),
44+
// },
45+
//
46+
// Uncomment for `http2`
47+
// createServer: require("node:http2").createSecureServer,
48+
// serverOptions: {
49+
// allowHTTP1: true,
50+
// key: require("fs").readFileSync("./ssl/localhost-privkey.pem"),
51+
// cert: require("fs").readFileSync("./ssl/localhost-cert.pem"),
52+
// },
53+
}),
54+
},
55+
});

‎examples/server/http2/README.md

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# HTTP2 server
2+
3+
**webpack.config.js**
4+
5+
```js
6+
const connect = require("connect");
7+
8+
module.exports = {
9+
// ...
10+
devServer: {
11+
server: {
12+
server: "http2",
13+
app: () => connect(),
14+
},
15+
},
16+
};
17+
```
18+
19+
## What Should Happen
20+
21+
1. The script should open `https://localhost:8080/` in your default browser.
22+
2. You should see the text on the page itself change to read `Success!`.

‎examples/server/http2/app.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"use strict";
2+
3+
const target = document.querySelector("#target");
4+
5+
target.classList.add("pass");
6+
target.innerHTML = "Success!";

‎examples/server/http2/webpack.config.js

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
"use strict";
2+
3+
// our setup function adds behind-the-scenes bits to the config that all of our
4+
// examples need
5+
const connect = require("connect");
6+
const { setup } = require("../../util");
7+
8+
module.exports = setup({
9+
context: __dirname,
10+
entry: "./app.js",
11+
devServer: {
12+
server: "http2",
13+
// Only `connect` supports `http2`
14+
app: () => connect(),
15+
},
16+
});

‎examples/util.js

+13-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
const path = require("path");
66
const fs = require("graceful-fs");
7+
const mime = require("mime");
78
const HtmlWebpackPlugin = require("html-webpack-plugin");
89
const { marked } = require("marked");
910

@@ -25,9 +26,18 @@ module.exports = {
2526

2627
const result = { ...defaults, ...config };
2728
const onBeforeSetupMiddleware = ({ app }) => {
28-
app.get("/.assets/*", (req, res) => {
29-
const filename = path.join(__dirname, "/", req.path);
30-
res.sendFile(filename);
29+
app.use("/.assets/", (req, res, next) => {
30+
if (req.method !== "GET" && req.method !== "HEAD") {
31+
next();
32+
return;
33+
}
34+
35+
res.setHeader("Content-Type", mime.lookup(req.url));
36+
37+
const filename = path.join(__dirname, "/.assets/", req.url);
38+
const stream = fs.createReadStream(filename);
39+
40+
stream.pipe(res);
3141
});
3242
};
3343
const renderer = new marked.Renderer();

‎lib/Server.js

+334-283
Large diffs are not rendered by default.

‎lib/options.json

+9
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,9 @@
515515
{
516516
"$ref": "#/definitions/ServerEnum"
517517
},
518+
{
519+
"$ref": "#/definitions/ServerFn"
520+
},
518521
{
519522
"$ref": "#/definitions/ServerString"
520523
},
@@ -528,6 +531,9 @@
528531
"ServerType": {
529532
"enum": ["http", "https", "spdy", "http2"]
530533
},
534+
"ServerFn": {
535+
"instanceof": "Function"
536+
},
531537
"ServerEnum": {
532538
"enum": ["http", "https", "spdy", "http2"],
533539
"cli": {
@@ -551,6 +557,9 @@
551557
},
552558
{
553559
"$ref": "#/definitions/ServerString"
560+
},
561+
{
562+
"$ref": "#/definitions/ServerFn"
554563
}
555564
]
556565
},

‎package-lock.json

+182-151
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+20-18
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,22 @@
7272
"serve-index": "^1.9.1",
7373
"sockjs": "^0.3.24",
7474
"spdy": "^4.0.2",
75-
"webpack-dev-middleware": "^7.4.0",
75+
"webpack-dev-middleware": "^7.4.2",
7676
"ws": "^8.18.0"
7777
},
7878
"devDependencies": {
79-
"@babel/cli": "^7.22.5",
80-
"@babel/core": "^7.22.5",
81-
"@babel/eslint-parser": "^7.22.5",
82-
"@babel/plugin-transform-object-assign": "^7.22.5",
83-
"@babel/plugin-transform-runtime": "^7.22.5",
84-
"@babel/preset-env": "^7.22.5",
85-
"@babel/runtime": "^7.22.5",
86-
"@commitlint/cli": "^19.0.3",
87-
"@commitlint/config-conventional": "^19.0.3",
79+
"@babel/cli": "^7.25.6",
80+
"@babel/core": "^7.25.2",
81+
"@babel/eslint-parser": "^7.25.1",
82+
"@babel/plugin-transform-object-assign": "^7.24.7",
83+
"@babel/plugin-transform-runtime": "^7.25.4",
84+
"@babel/preset-env": "^7.25.4",
85+
"@babel/runtime": "^7.25.6",
86+
"@commitlint/cli": "^19.4.1",
87+
"@commitlint/config-conventional": "^19.4.1",
88+
"@hono/node-server": "^1.12.2",
8889
"@types/compression": "^1.7.2",
89-
"@types/node": "^22.3.0",
90+
"@types/node": "^22.5.2",
9091
"@types/node-forge": "^1.3.1",
9192
"@types/sockjs-client": "^1.5.1",
9293
"@types/trusted-types": "^2.0.2",
@@ -95,28 +96,29 @@
9596
"babel-loader": "^9.1.0",
9697
"body-parser": "^1.19.2",
9798
"connect": "^3.7.0",
98-
"core-js": "^3.31.0",
99-
"cspell": "^8.3.2",
99+
"core-js": "^3.38.1",
100+
"cspell": "^8.14.2",
100101
"css-loader": "^7.1.1",
101102
"eslint": "^8.43.0",
102103
"eslint-config-prettier": "^9.1.0",
103104
"eslint-config-webpack": "^1.2.5",
104-
"eslint-plugin-import": "^2.23.2",
105+
"eslint-plugin-import": "^2.30.0",
105106
"execa": "^5.1.1",
107+
"hono": "^4.5.11",
106108
"html-webpack-plugin": "^5.5.3",
107109
"http-proxy": "^1.18.1",
108-
"husky": "^9.1.3",
110+
"husky": "^9.1.5",
109111
"jest": "^29.5.0",
110112
"jest-environment-jsdom": "^29.5.0",
111113
"klona": "^2.0.4",
112114
"less": "^4.1.1",
113115
"less-loader": "^12.1.0",
114-
"lint-staged": "^15.2.0",
116+
"lint-staged": "^15.2.10",
115117
"marked": "^12.0.0",
116118
"memfs": "^4.6.0",
117119
"npm-run-all": "^4.1.5",
118120
"prettier": "^3.2.4",
119-
"puppeteer": "^23.1.0",
121+
"puppeteer": "^23.2.2",
120122
"readable-stream": "^4.5.2",
121123
"require-from-string": "^2.0.2",
122124
"rimraf": "^5.0.5",
@@ -128,7 +130,7 @@
128130
"tcp-port-used": "^1.0.2",
129131
"typescript": "^5.5.4",
130132
"wait-for-expect": "^3.0.2",
131-
"webpack": "^5.91.0",
133+
"webpack": "^5.94.0",
132134
"webpack-cli": "^5.0.1",
133135
"webpack-merge": "^6.0.1"
134136
},

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ exports[`options validate should throw an error on the "server" option with '{"t
533533
exports[`options validate should throw an error on the "server" option with '{"type":"https","options":{"ca":true}}' value 1`] = `
534534
"ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
535535
- options.server should be one of these:
536-
"http" | "https" | "spdy" | "http2" | non-empty string | object { type?, options? }
536+
"http" | "https" | "spdy" | "http2" | function | non-empty string | object { type?, options? }
537537
-> Allows to set server and options (by default 'http').
538538
-> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
539539
Details:
@@ -550,7 +550,7 @@ exports[`options validate should throw an error on the "server" option with '{"t
550550
exports[`options validate should throw an error on the "server" option with '{"type":"https","options":{"cert":true}}' value 1`] = `
551551
"ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
552552
- options.server should be one of these:
553-
"http" | "https" | "spdy" | "http2" | non-empty string | object { type?, options? }
553+
"http" | "https" | "spdy" | "http2" | function | non-empty string | object { type?, options? }
554554
-> Allows to set server and options (by default 'http').
555555
-> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
556556
Details:
@@ -567,7 +567,7 @@ exports[`options validate should throw an error on the "server" option with '{"t
567567
exports[`options validate should throw an error on the "server" option with '{"type":"https","options":{"key":10}}' value 1`] = `
568568
"ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
569569
- options.server should be one of these:
570-
"http" | "https" | "spdy" | "http2" | non-empty string | object { type?, options? }
570+
"http" | "https" | "spdy" | "http2" | function | non-empty string | object { type?, options? }
571571
-> Allows to set server and options (by default 'http').
572572
-> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
573573
Details:
@@ -590,7 +590,7 @@ exports[`options validate should throw an error on the "server" option with '{"t
590590
exports[`options validate should throw an error on the "server" option with '{"type":"https","options":{"pfx":10}}' value 1`] = `
591591
"ValidationError: Invalid options object. Dev Server has been initialized using an options object that does not match the API schema.
592592
- options.server should be one of these:
593-
"http" | "https" | "spdy" | "http2" | non-empty string | object { type?, options? }
593+
"http" | "https" | "spdy" | "http2" | function | non-empty string | object { type?, options? }
594594
-> Allows to set server and options (by default 'http').
595595
-> Read more at https://webpack.js.org/configuration/dev-server/#devserverserver
596596
Details:

‎test/e2e/__snapshots__/app.test.js.snap.webpack5

+49-49
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ exports[`app option should work using "connect (async)" application and "http" s
2828
"
2929
`;
3030

31-
exports[`app option should work using "connect (async)" application and "http2" server should handle GET request to index route (/): console messages 1`] = `
31+
exports[`app option should work using "connect" application and "http" server should handle GET request to index route (/): console messages 1`] = `
3232
[
3333
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
3434
"[HMR] Waiting for update signal from WDS...",
3535
"Hey.",
3636
]
3737
`;
3838

39-
exports[`app option should work using "connect (async)" application and "http2" server should handle GET request to index route (/): page errors 1`] = `[]`;
39+
exports[`app option should work using "connect" application and "http" server should handle GET request to index route (/): page errors 1`] = `[]`;
4040

41-
exports[`app option should work using "connect (async)" application and "http2" server should handle GET request to index route (/): response status 1`] = `200`;
41+
exports[`app option should work using "connect" application and "http" server should handle GET request to index route (/): response status 1`] = `200`;
4242

43-
exports[`app option should work using "connect (async)" application and "http2" server should handle GET request to index route (/): response text 1`] = `
43+
exports[`app option should work using "connect" application and "http" server should handle GET request to index route (/): response text 1`] = `
4444
"
4545
<!DOCTYPE html>
4646
<html>
@@ -56,19 +56,19 @@ exports[`app option should work using "connect (async)" application and "http2"
5656
"
5757
`;
5858

59-
exports[`app option should work using "connect (async)" application and "https" server should handle GET request to index route (/): console messages 1`] = `
59+
exports[`app option should work using "connect" application and "http2" server should handle GET request to index route (/): console messages 1`] = `
6060
[
6161
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
6262
"[HMR] Waiting for update signal from WDS...",
6363
"Hey.",
6464
]
6565
`;
6666

67-
exports[`app option should work using "connect (async)" application and "https" server should handle GET request to index route (/): page errors 1`] = `[]`;
67+
exports[`app option should work using "connect" application and "http2" server should handle GET request to index route (/): page errors 1`] = `[]`;
6868

69-
exports[`app option should work using "connect (async)" application and "https" server should handle GET request to index route (/): response status 1`] = `200`;
69+
exports[`app option should work using "connect" application and "http2" server should handle GET request to index route (/): response status 1`] = `200`;
7070

71-
exports[`app option should work using "connect (async)" application and "https" server should handle GET request to index route (/): response text 1`] = `
71+
exports[`app option should work using "connect" application and "http2" server should handle GET request to index route (/): response text 1`] = `
7272
"
7373
<!DOCTYPE html>
7474
<html>
@@ -84,19 +84,19 @@ exports[`app option should work using "connect (async)" application and "https"
8484
"
8585
`;
8686

87-
exports[`app option should work using "connect (async)" application and "spdy" server should handle GET request to index route (/): console messages 1`] = `
87+
exports[`app option should work using "connect" application and "https" server should handle GET request to index route (/): console messages 1`] = `
8888
[
8989
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
9090
"[HMR] Waiting for update signal from WDS...",
9191
"Hey.",
9292
]
9393
`;
9494

95-
exports[`app option should work using "connect (async)" application and "spdy" server should handle GET request to index route (/): page errors 1`] = `[]`;
95+
exports[`app option should work using "connect" application and "https" server should handle GET request to index route (/): page errors 1`] = `[]`;
9696

97-
exports[`app option should work using "connect (async)" application and "spdy" server should handle GET request to index route (/): response status 1`] = `200`;
97+
exports[`app option should work using "connect" application and "https" server should handle GET request to index route (/): response status 1`] = `200`;
9898

99-
exports[`app option should work using "connect (async)" application and "spdy" server should handle GET request to index route (/): response text 1`] = `
99+
exports[`app option should work using "connect" application and "https" server should handle GET request to index route (/): response text 1`] = `
100100
"
101101
<!DOCTYPE html>
102102
<html>
@@ -112,19 +112,19 @@ exports[`app option should work using "connect (async)" application and "spdy" s
112112
"
113113
`;
114114

115-
exports[`app option should work using "connect" application and "http" server should handle GET request to index route (/): console messages 1`] = `
115+
exports[`app option should work using "connect" application and "spdy" server should handle GET request to index route (/): console messages 1`] = `
116116
[
117117
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
118118
"[HMR] Waiting for update signal from WDS...",
119119
"Hey.",
120120
]
121121
`;
122122

123-
exports[`app option should work using "connect" application and "http" server should handle GET request to index route (/): page errors 1`] = `[]`;
123+
exports[`app option should work using "connect" application and "spdy" server should handle GET request to index route (/): page errors 1`] = `[]`;
124124

125-
exports[`app option should work using "connect" application and "http" server should handle GET request to index route (/): response status 1`] = `200`;
125+
exports[`app option should work using "connect" application and "spdy" server should handle GET request to index route (/): response status 1`] = `200`;
126126

127-
exports[`app option should work using "connect" application and "http" server should handle GET request to index route (/): response text 1`] = `
127+
exports[`app option should work using "connect" application and "spdy" server should handle GET request to index route (/): response text 1`] = `
128128
"
129129
<!DOCTYPE html>
130130
<html>
@@ -140,19 +140,19 @@ exports[`app option should work using "connect" application and "http" server sh
140140
"
141141
`;
142142

143-
exports[`app option should work using "connect" application and "http2" server should handle GET request to index route (/): console messages 1`] = `
143+
exports[`app option should work using "express" application and "http" server should handle GET request to index route (/): console messages 1`] = `
144144
[
145145
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
146146
"[HMR] Waiting for update signal from WDS...",
147147
"Hey.",
148148
]
149149
`;
150150

151-
exports[`app option should work using "connect" application and "http2" server should handle GET request to index route (/): page errors 1`] = `[]`;
151+
exports[`app option should work using "express" application and "http" server should handle GET request to index route (/): page errors 1`] = `[]`;
152152

153-
exports[`app option should work using "connect" application and "http2" server should handle GET request to index route (/): response status 1`] = `200`;
153+
exports[`app option should work using "express" application and "http" server should handle GET request to index route (/): response status 1`] = `200`;
154154

155-
exports[`app option should work using "connect" application and "http2" server should handle GET request to index route (/): response text 1`] = `
155+
exports[`app option should work using "express" application and "http" server should handle GET request to index route (/): response text 1`] = `
156156
"
157157
<!DOCTYPE html>
158158
<html>
@@ -168,19 +168,19 @@ exports[`app option should work using "connect" application and "http2" server s
168168
"
169169
`;
170170

171-
exports[`app option should work using "connect" application and "https" server should handle GET request to index route (/): console messages 1`] = `
171+
exports[`app option should work using "express" application and "https" server should handle GET request to index route (/): console messages 1`] = `
172172
[
173173
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
174174
"[HMR] Waiting for update signal from WDS...",
175175
"Hey.",
176176
]
177177
`;
178178

179-
exports[`app option should work using "connect" application and "https" server should handle GET request to index route (/): page errors 1`] = `[]`;
179+
exports[`app option should work using "express" application and "https" server should handle GET request to index route (/): page errors 1`] = `[]`;
180180

181-
exports[`app option should work using "connect" application and "https" server should handle GET request to index route (/): response status 1`] = `200`;
181+
exports[`app option should work using "express" application and "https" server should handle GET request to index route (/): response status 1`] = `200`;
182182

183-
exports[`app option should work using "connect" application and "https" server should handle GET request to index route (/): response text 1`] = `
183+
exports[`app option should work using "express" application and "https" server should handle GET request to index route (/): response text 1`] = `
184184
"
185185
<!DOCTYPE html>
186186
<html>
@@ -196,19 +196,19 @@ exports[`app option should work using "connect" application and "https" server s
196196
"
197197
`;
198198

199-
exports[`app option should work using "connect" application and "spdy" server should handle GET request to index route (/): console messages 1`] = `
199+
exports[`app option should work using "express" application and "spdy" server should handle GET request to index route (/): console messages 1`] = `
200200
[
201201
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
202202
"[HMR] Waiting for update signal from WDS...",
203203
"Hey.",
204204
]
205205
`;
206206

207-
exports[`app option should work using "connect" application and "spdy" server should handle GET request to index route (/): page errors 1`] = `[]`;
207+
exports[`app option should work using "express" application and "spdy" server should handle GET request to index route (/): page errors 1`] = `[]`;
208208

209-
exports[`app option should work using "connect" application and "spdy" server should handle GET request to index route (/): response status 1`] = `200`;
209+
exports[`app option should work using "express" application and "spdy" server should handle GET request to index route (/): response status 1`] = `200`;
210210

211-
exports[`app option should work using "connect" application and "spdy" server should handle GET request to index route (/): response text 1`] = `
211+
exports[`app option should work using "express" application and "spdy" server should handle GET request to index route (/): response text 1`] = `
212212
"
213213
<!DOCTYPE html>
214214
<html>
@@ -224,19 +224,19 @@ exports[`app option should work using "connect" application and "spdy" server sh
224224
"
225225
`;
226226

227-
exports[`app option should work using "express" application and "http" server should handle GET request to index route (/): console messages 1`] = `
227+
exports[`app option should work using "hono" application and "[object Object]" server should handle GET request to index route (/): console messages 1`] = `
228228
[
229229
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
230230
"[HMR] Waiting for update signal from WDS...",
231231
"Hey.",
232232
]
233233
`;
234234

235-
exports[`app option should work using "express" application and "http" server should handle GET request to index route (/): page errors 1`] = `[]`;
235+
exports[`app option should work using "hono" application and "[object Object]" server should handle GET request to index route (/): page errors 1`] = `[]`;
236236

237-
exports[`app option should work using "express" application and "http" server should handle GET request to index route (/): response status 1`] = `200`;
237+
exports[`app option should work using "hono" application and "[object Object]" server should handle GET request to index route (/): response status 1`] = `200`;
238238

239-
exports[`app option should work using "express" application and "http" server should handle GET request to index route (/): response text 1`] = `
239+
exports[`app option should work using "hono" application and "[object Object]" server should handle GET request to index route (/): response text 1`] = `
240240
"
241241
<!DOCTYPE html>
242242
<html>
@@ -252,19 +252,31 @@ exports[`app option should work using "express" application and "http" server sh
252252
"
253253
`;
254254

255-
exports[`app option should work using "express" application and "https" server should handle GET request to index route (/): console messages 1`] = `
255+
exports[`app option should work using "hono" application and "custom server" server should handle GET request to index route (/): console messages 1`] = `
256256
[
257257
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
258258
"[HMR] Waiting for update signal from WDS...",
259259
"Hey.",
260260
]
261261
`;
262262

263-
exports[`app option should work using "express" application and "https" server should handle GET request to index route (/): page errors 1`] = `[]`;
263+
exports[`app option should work using "hono" application and "custom server" server should handle GET request to index route (/): console messages 2`] = `
264+
[
265+
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
266+
"[HMR] Waiting for update signal from WDS...",
267+
"Hey.",
268+
]
269+
`;
264270

265-
exports[`app option should work using "express" application and "https" server should handle GET request to index route (/): response status 1`] = `200`;
271+
exports[`app option should work using "hono" application and "custom server" server should handle GET request to index route (/): page errors 1`] = `[]`;
266272

267-
exports[`app option should work using "express" application and "https" server should handle GET request to index route (/): response text 1`] = `
273+
exports[`app option should work using "hono" application and "custom server" server should handle GET request to index route (/): page errors 2`] = `[]`;
274+
275+
exports[`app option should work using "hono" application and "custom server" server should handle GET request to index route (/): response status 1`] = `200`;
276+
277+
exports[`app option should work using "hono" application and "custom server" server should handle GET request to index route (/): response status 2`] = `200`;
278+
279+
exports[`app option should work using "hono" application and "custom server" server should handle GET request to index route (/): response text 1`] = `
268280
"
269281
<!DOCTYPE html>
270282
<html>
@@ -280,19 +292,7 @@ exports[`app option should work using "express" application and "https" server s
280292
"
281293
`;
282294

283-
exports[`app option should work using "express" application and "spdy" server should handle GET request to index route (/): console messages 1`] = `
284-
[
285-
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
286-
"[HMR] Waiting for update signal from WDS...",
287-
"Hey.",
288-
]
289-
`;
290-
291-
exports[`app option should work using "express" application and "spdy" server should handle GET request to index route (/): page errors 1`] = `[]`;
292-
293-
exports[`app option should work using "express" application and "spdy" server should handle GET request to index route (/): response status 1`] = `200`;
294-
295-
exports[`app option should work using "express" application and "spdy" server should handle GET request to index route (/): response text 1`] = `
295+
exports[`app option should work using "hono" application and "custom server" server should handle GET request to index route (/): response text 2`] = `
296296
"
297297
<!DOCTYPE html>
298298
<html>

‎test/e2e/__snapshots__/overlay.test.js.snap.webpack5

+1-1
Original file line numberDiff line numberDiff line change
@@ -2474,7 +2474,7 @@ exports[`overlay should show overlay when "Content-Security-Policy" is "default-
24742474
border: none;
24752475
"
24762476
>
2477-
×
2477+
X
24782478
</button>
24792479
<div>
24802480
<div

‎test/e2e/app.test.js

+150-78
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
"use strict";
22

3+
const fs = require("fs");
34
const path = require("path");
45
const webpack = require("webpack");
6+
const wdm = require("webpack-dev-middleware");
57
const Server = require("../../lib/Server");
68
const config = require("../fixtures/client-config/webpack.config");
79
const runBrowser = require("../helpers/run-browser");
@@ -13,94 +15,164 @@ const staticDirectory = path.resolve(
1315
);
1416

1517
const apps = [
16-
["express", () => require("express")()],
17-
["connect", () => require("connect")()],
18-
["connect (async)", () => require("connect")()],
18+
["express", () => require("express")(), "http"],
19+
["express", () => require("express")(), "https"],
20+
["express", () => require("express")(), "spdy"],
21+
["connect", () => require("connect")(), "http"],
22+
["connect", () => require("connect")(), "https"],
23+
["connect", () => require("connect")(), "spdy"],
24+
["connect", () => require("connect")(), "http2"],
25+
["connect (async)", () => require("connect")(), "http"],
26+
[
27+
"hono",
28+
() => new (require("hono").Hono)(),
29+
(_, app) => require("@hono/node-server").serve({ fetch: app.fetch }),
30+
(_, devServer) => [
31+
{
32+
name: "webpack-dev-middleware",
33+
middleware: wdm.honoWrapper(devServer.compiler),
34+
},
35+
],
36+
],
37+
[
38+
"hono",
39+
() => new (require("hono").Hono)(),
40+
(_, app) =>
41+
require("@hono/node-server").serve({
42+
fetch: app.fetch,
43+
createServer: require("node:https").createServer,
44+
serverOptions: {
45+
key: fs.readFileSync(
46+
path.resolve(__dirname, "../fixtures/ssl/localhost-privkey.pem"),
47+
),
48+
cert: fs.readFileSync(
49+
path.resolve(__dirname, "../fixtures/ssl/localhost-cert.pem"),
50+
),
51+
},
52+
}),
53+
(_, devServer) => [
54+
{
55+
name: "webpack-dev-middleware",
56+
middleware: wdm.honoWrapper(devServer.compiler),
57+
},
58+
],
59+
],
60+
[
61+
"hono",
62+
() => new (require("hono").Hono)(),
63+
{
64+
type: (options, app) =>
65+
require("@hono/node-server").serve({
66+
fetch: app.fetch,
67+
createServer: require("node:http2").createSecureServer,
68+
serverOptions: options,
69+
}),
70+
options: {
71+
allowHTTP1: true,
72+
key: fs.readFileSync(
73+
path.resolve(__dirname, "../fixtures/ssl/localhost-privkey.pem"),
74+
),
75+
cert: fs.readFileSync(
76+
path.resolve(__dirname, "../fixtures/ssl/localhost-cert.pem"),
77+
),
78+
},
79+
},
80+
(_, devServer) => [
81+
{
82+
name: "webpack-dev-middleware",
83+
middleware: wdm.honoWrapper(devServer.compiler),
84+
},
85+
],
86+
],
1987
];
2088

21-
const servers = ["http", "https", "spdy", "http2"];
22-
2389
describe("app option", () => {
24-
for (const [appName, app] of apps) {
25-
for (const server of servers) {
26-
if (appName === "express" && server === "http2") {
27-
// eslint-disable-next-line no-continue
28-
continue;
29-
}
30-
31-
let compiler;
32-
let devServer;
33-
let page;
34-
let browser;
35-
let pageErrors;
36-
let consoleMessages;
37-
38-
describe(`should work using "${appName}" application and "${server}" server`, () => {
39-
beforeEach(async () => {
40-
compiler = webpack(config);
41-
42-
devServer = new Server(
43-
{
44-
static: {
45-
directory: staticDirectory,
46-
watch: false,
47-
},
48-
app,
49-
server,
50-
port,
90+
for (const [appName, app, server, setupMiddlewares] of apps) {
91+
let compiler;
92+
let devServer;
93+
let page;
94+
let browser;
95+
let pageErrors;
96+
let consoleMessages;
97+
98+
describe(`should work using "${appName}" application and "${typeof server === "function" ? "custom server" : server}" server`, () => {
99+
beforeEach(async () => {
100+
compiler = webpack(config);
101+
102+
devServer = new Server(
103+
{
104+
static: {
105+
directory: staticDirectory,
106+
watch: false,
51107
},
52-
compiler,
53-
);
54-
55-
await devServer.start();
56-
57-
({ page, browser } = await runBrowser());
58-
59-
pageErrors = [];
60-
consoleMessages = [];
61-
});
108+
app,
109+
server,
110+
port,
111+
setupMiddlewares:
112+
typeof setupMiddlewares !== "undefined"
113+
? setupMiddlewares
114+
: // eslint-disable-next-line no-undefined
115+
undefined,
116+
},
117+
compiler,
118+
);
119+
120+
await devServer.start();
121+
122+
({ page, browser } = await runBrowser());
123+
124+
pageErrors = [];
125+
consoleMessages = [];
126+
});
62127

63-
afterEach(async () => {
64-
await browser.close();
65-
await devServer.stop();
128+
afterEach(async () => {
129+
await browser.close();
130+
await devServer.stop();
131+
await new Promise((resolve) => {
132+
compiler.close(() => {
133+
resolve();
134+
});
66135
});
136+
});
67137

68-
it("should handle GET request to index route (/)", async () => {
69-
page
70-
.on("console", (message) => {
71-
consoleMessages.push(message);
72-
})
73-
.on("pageerror", (error) => {
74-
pageErrors.push(error);
75-
});
76-
77-
const pageUrl =
78-
server === "https" || server === "spdy" || server === "http2"
79-
? `https://127.0.0.1:${port}/`
80-
: `http://127.0.0.1:${port}/`;
81-
82-
const response = await page.goto(pageUrl, {
83-
waitUntil: "networkidle0",
138+
it("should handle GET request to index route (/)", async () => {
139+
page
140+
.on("console", (message) => {
141+
consoleMessages.push(message);
142+
})
143+
.on("pageerror", (error) => {
144+
pageErrors.push(error);
84145
});
85146

86-
const HTTPVersion = await page.evaluate(
87-
() => performance.getEntries()[0].nextHopProtocol,
88-
);
89-
90-
if (server === "spdy" || server === "http2") {
91-
expect(HTTPVersion).toEqual("h2");
92-
} else {
93-
expect(HTTPVersion).toEqual("http/1.1");
94-
}
95-
96-
expect(response.status()).toMatchSnapshot("response status");
97-
expect(await response.text()).toMatchSnapshot("response text");
98-
expect(
99-
consoleMessages.map((message) => message.text()),
100-
).toMatchSnapshot("console messages");
101-
expect(pageErrors).toMatchSnapshot("page errors");
147+
const pageUrl = devServer.isTlsServer
148+
? `https://127.0.0.1:${port}/`
149+
: `http://127.0.0.1:${port}/`;
150+
151+
const response = await page.goto(pageUrl, {
152+
waitUntil: "networkidle0",
102153
});
154+
155+
const HTTPVersion = await page.evaluate(
156+
() => performance.getEntries()[0].nextHopProtocol,
157+
);
158+
159+
if (
160+
server === "spdy" ||
161+
server === "http2" ||
162+
(server.options && server.options.allowHTTP1)
163+
) {
164+
expect(HTTPVersion).toEqual("h2");
165+
} else {
166+
expect(HTTPVersion).toEqual("http/1.1");
167+
}
168+
169+
expect(response.status()).toMatchSnapshot("response status");
170+
expect(await response.text()).toMatchSnapshot("response text");
171+
expect(
172+
consoleMessages.map((message) => message.text()),
173+
).toMatchSnapshot("console messages");
174+
expect(pageErrors).toMatchSnapshot("page errors");
103175
});
104-
}
176+
});
105177
}
106178
});

‎test/e2e/overlay.test.js

+10-4
Original file line numberDiff line numberDiff line change
@@ -1978,10 +1978,16 @@ describe("overlay", () => {
19781978
}),
19791979
).toMatchSnapshot("page html");
19801980
expect(
1981-
await prettier.format(overlayHtml, {
1982-
parser: "html",
1983-
plugins: [prettierHTML, prettierCSS],
1984-
}),
1981+
await prettier.format(
1982+
overlayHtml.replace(
1983+
/<button ([^>]+)>.+<\/button>/m,
1984+
"<button $1>X</button>",
1985+
),
1986+
{
1987+
parser: "html",
1988+
plugins: [prettierHTML, prettierCSS],
1989+
},
1990+
),
19851991
).toMatchSnapshot("overlay html");
19861992
} catch (error) {
19871993
throw error;

‎test/e2e/web-socket-server-url.test.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -2688,7 +2688,9 @@ describe("web socket server URL", () => {
26882688
consoleMessages.map((message) => message.text()),
26892689
).toMatchSnapshot("console messages");
26902690
expect(
2691-
pageErrors.map((pageError) => pageError.message.split("\n")[0]),
2691+
pageErrors.map((pageError) =>
2692+
pageError.message.split("\n")[0].replace("SyntaxError: ", ""),
2693+
),
26922694
).toMatchSnapshot("page errors");
26932695
} catch (error) {
26942696
throw error;

‎test/fixtures/ssl/localhost-cert.pem

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDCTCCAfGgAwIBAgIUevWiuCfenWuq9KyC8aQ/tc1Io14wDQYJKoZIhvcNAQEL
3+
BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI0MDQyNDE2MDYyMloXDTI0MDUy
4+
NDE2MDYyMlowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
5+
AAOCAQ8AMIIBCgKCAQEA1v/lb9u9WkqkF7zjIKe2R+b4S0sQnWIfBFZ0ggtaOL0a
6+
ntud/EuaGQgLtJgSwO2M2xIqKx+yoLhoM+273EJe0KmfJMxYNAkhwP9h6vrKnaQJ
7+
mpAhoalfEGyCrnHHMKISAAn4Rlc8NXnULoFhHzNm8bdqvP33rCmsJ+tNYC5kwzyt
8+
HvRNFyg9BOUfACiPW17opFH0rao3IfZrQ6yRbknef1pX1x2pbDAH14rCT/vXaTs6
9+
VGuqLE/wRsSt+7nMHy/PmXxMyb4G4/UflYtnKfmXpDRw+TDEGzvTZedtoOz+rrJC
10+
e989R9qYGrlPfyfZbI+O348FV66I+jcD+/EUQs+HkwIDAQABo1MwUTAdBgNVHQ4E
11+
FgQU6bk4LSwtVQEt7V/ev+Zj270zdAkwHwYDVR0jBBgwFoAU6bk4LSwtVQEt7V/e
12+
v+Zj270zdAkwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAUBgo
13+
E3CZrrc/MaadFg1meNk+eKACmTsIa5cT6zi7MsvoKakXEd4bGd+iLifUzlAa1ygj
14+
dQppfprb5t68I7oO9/lkh2DfKrXxW/RpdhB05KslUd8q/3XY5kyao5quzeiVoMHR
15+
u+XYjoy2mTwdUC2uzFy6rkHsAkJy2vJJoDdlNsrKn6AZmh+voHHKrAtOL4gnanQV
16+
wR1u8eBVfk2MKIl2pNSCA4bD16uZyp3+oqq097BEoVa1pR+l8nwbsh/YfALifq/d
17+
P3yiN5+EqgiOIF9b8PZORe+Ry1O7uvPnU2ZRkVWPJ1S17Ms0lnr7IY3qjSBTuK66
18+
5uYi7ojrb5Vf0UL5oQ==
19+
-----END CERTIFICATE-----

‎test/fixtures/ssl/localhost-privkey.pem

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEugIBADANBgkqhkiG9w0BAQEFAASCBKQwggSgAgEAAoIBAQDW/+Vv271aSqQX
3+
vOMgp7ZH5vhLSxCdYh8EVnSCC1o4vRqe2538S5oZCAu0mBLA7YzbEiorH7KguGgz
4+
7bvcQl7QqZ8kzFg0CSHA/2Hq+sqdpAmakCGhqV8QbIKucccwohIACfhGVzw1edQu
5+
gWEfM2bxt2q8/fesKawn601gLmTDPK0e9E0XKD0E5R8AKI9bXuikUfStqjch9mtD
6+
rJFuSd5/WlfXHalsMAfXisJP+9dpOzpUa6osT/BGxK37ucwfL8+ZfEzJvgbj9R+V
7+
i2cp+ZekNHD5MMQbO9Nl522g7P6uskJ73z1H2pgauU9/J9lsj47fjwVXroj6NwP7
8+
8RRCz4eTAgMBAAECggEAA+zbFv43iEj5kvdfXC7DrK9iVBmUPZNXhqA/c0paxNNr
9+
A4B182+76f4UHKF0IjKUEkHUJEJpY/bJ7DzIY76QdZXLMoRKjfSmuZvQAVa/0T33
10+
8Or1ujpZ4nZgsmegX9ptorOL5VjdYAqP3aN+DvBEzl/vYnDujyWZn4bzvDBMpaXS
11+
39qW1MkcZ8UiP1fRad76+S57WnieBV+NRHYEAiDdMFKXLuw/igX/xOSZgq5Jh3I2
12+
hLS49S41dN1P9l9H2bPMw0CthNvMPPaemwKHz+84hSS+P4VJOWJzlGnXEdIFuqBR
13+
GFBESQzcemfS9DDB22Yt06YujBCbwTVVAxj73lnKkQKBgQDvYXK36J9y/NphDAWi
14+
Cwti5oE3eSfV0YazQwm+rRwC64wbpBFAm9ujwjUmaYBg75lBLF5nOOe8s1n95g5I
15+
tLfFb+zuZh8NNLjhfNE9/SNmRnnMvbcaDHeIE2RMAz+PuLN/gFLmsVIwK2X1LRC2
16+
0vHjw9Yzh6JLiOajAchzhZiCEQKBgQDl7R6Wfggo8myETA8Uv5tWot3IcquRkEl/
17+
TRCyao2/79rAGexS7piwD7FPdSDOk1zfZFYUOMzyMjj60sGcPRPqRX6D0usEODLQ
18+
TwsTJSCNgPnIOkqKkccwtqlTimbRIrPUSQfFPj56RzKKWdrJ/P3LPRjzkK7i3vLV
19+
EGlAENaLYwKBgHKSOnzpWr+HY+IFBgErthRs7LWnSDifYxATauuXIQwIvvNP0G4S
20+
6snzHss2vZonszstSDWxV8DKOq052eZUkIxv6H+l4wDIFiDeQ6uep73Ax3UF7EgM
21+
ZX18gombGGXqagcBXSxK/GJPsynomtJWHi38Ql5BcZ0jdffY157q9zZxAoGAPZtD
22+
Tt+GIDKUkP4wLEcKwDPzaPoQrngSuWFUz/ls8bi6zC4l/DKiBsqtn7Sqja8+ezzP
23+
M6vkfiCm084UwmA7LdJhC8E/52mHc/k55m9UQZYFV3kG8AoPbSYESLYUxoSd2ouW
24+
4WrEIs9g42EgFm8LMaG1Rc3GjlNejWhQSzI3yjECf3v7VoAcUwVfuVkwbm9W24vR
25+
neFTF8QBl//fxIdxZwoj5SrSgMOjmZ3pXA/ZbFJ0pB4Rh5dmKTYqdpfXsOTiBuwB
26+
XlqPVpN8UZEl3edpufLDyPldNej/9kEAkK5FS3YVyIQEg75739bCTlfzzCX1HdMx
27+
q98XYm/n5LWYFezsAt0=
28+
-----END PRIVATE KEY-----

‎types/lib/Server.d.ts

+46-39
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,9 @@ declare class Server<
602602
ServerType: {
603603
enum: string[];
604604
};
605+
ServerFn: {
606+
instanceof: string;
607+
};
605608
ServerEnum: {
606609
enum: string[];
607610
cli: {
@@ -1264,12 +1267,18 @@ declare class Server<
12641267
* @private
12651268
* @returns {void}
12661269
*/
1267-
private setupHostHeaderCheck;
1270+
private setupWatchStaticFiles;
12681271
/**
12691272
* @private
12701273
* @returns {void}
12711274
*/
1272-
private setupDevMiddleware;
1275+
private setupWatchFiles;
1276+
/**
1277+
* @private
1278+
* @returns {void}
1279+
*/
1280+
private setupMiddlewares;
1281+
/** @type {import("webpack-dev-middleware").API<Request, Response>} */
12731282
middleware:
12741283
| import("webpack-dev-middleware").API<
12751284
import("express").Request<
@@ -1281,35 +1290,15 @@ declare class Server<
12811290
>,
12821291
import("express").Response<any, Record<string, any>>
12831292
>
1284-
| null
12851293
| undefined;
12861294
/**
12871295
* @private
1288-
* @returns {void}
1289-
*/
1290-
private setupBuiltInRoutes;
1291-
/**
1292-
* @private
1293-
* @returns {void}
1294-
*/
1295-
private setupWatchStaticFiles;
1296-
/**
1297-
* @private
1298-
* @returns {void}
1299-
*/
1300-
private setupWatchFiles;
1301-
/**
1302-
* @private
1303-
* @returns {void}
1304-
*/
1305-
private setupMiddlewares;
1306-
/**
1307-
* @private
1308-
* @returns {void}
1296+
* @returns {Promise<void>}
13091297
*/
13101298
private createServer;
1311-
/** @type {S | null | undefined}*/
1312-
server: S | null | undefined;
1299+
/** @type {S | undefined}*/
1300+
server: S | undefined;
1301+
isTlsServer: boolean | undefined;
13131302
/**
13141303
* @private
13151304
* @returns {void}
@@ -1473,6 +1462,7 @@ declare namespace Server {
14731462
ClientConfiguration,
14741463
Headers,
14751464
MiddlewareHandler,
1465+
MiddlewareObject,
14761466
Middleware,
14771467
BasicServer,
14781468
Configuration,
@@ -1589,9 +1579,27 @@ type NormalizedStatic = {
15891579
staticOptions: ServeStaticOptions;
15901580
watch: false | WatchOptions;
15911581
};
1592-
type ServerType = "http" | "https" | "spdy" | "http2" | string;
1593-
type ServerConfiguration = {
1594-
type?: string | undefined;
1582+
type ServerType<
1583+
A extends BasicApplication = import("express").Application,
1584+
S extends BasicServer = import("http").Server<
1585+
typeof import("http").IncomingMessage,
1586+
typeof import("http").ServerResponse
1587+
>,
1588+
> =
1589+
| "http"
1590+
| "https"
1591+
| "spdy"
1592+
| "http2"
1593+
| string
1594+
| ((arg0: ServerOptions, arg1: A) => S);
1595+
type ServerConfiguration<
1596+
A extends BasicApplication = import("express").Application,
1597+
S extends BasicServer = import("http").Server<
1598+
typeof import("http").IncomingMessage,
1599+
typeof import("http").ServerResponse
1600+
>,
1601+
> = {
1602+
type?: ServerType<A, S> | undefined;
15951603
options?: ServerOptions | undefined;
15961604
};
15971605
type WebSocketServerConfiguration = {
@@ -1683,14 +1691,13 @@ type MiddlewareHandler<
16831691
> = T extends ExpressApplication
16841692
? ExpressRequestHandler | ExpressErrorRequestHandler
16851693
: HandleFunction;
1686-
type Middleware =
1687-
| {
1688-
name?: string;
1689-
path?: string;
1690-
middleware: MiddlewareHandler;
1691-
}
1692-
| MiddlewareHandler;
1693-
type BasicServer = import("net").Server;
1694+
type MiddlewareObject = {
1695+
name?: string;
1696+
path?: string;
1697+
middleware: MiddlewareHandler;
1698+
};
1699+
type Middleware = MiddlewareObject | MiddlewareHandler;
1700+
type BasicServer = import("net").Server | import("tls").Server;
16941701
type Configuration<
16951702
A extends BasicApplication = import("express").Application,
16961703
S extends BasicServer = import("http").Server<
@@ -1733,7 +1740,7 @@ type Configuration<
17331740
| (string | WatchFiles)[]
17341741
| undefined;
17351742
static?: string | boolean | Static | (string | Static)[] | undefined;
1736-
server?: string | ServerConfiguration | undefined;
1743+
server?: ServerType<A, S> | ServerConfiguration<A, S> | undefined;
17371744
app?: (() => Promise<A>) | undefined;
17381745
webSocketServer?: string | boolean | WebSocketServerConfiguration | undefined;
17391746
proxy?: ProxyConfigArray | undefined;
@@ -1745,7 +1752,7 @@ type Configuration<
17451752
| ((
17461753
req: Request,
17471754
res: Response,
1748-
context: DevMiddlewareContext<Request, Response>,
1755+
context: DevMiddlewareContext<Request, Response> | undefined,
17491756
) => Headers)
17501757
| undefined;
17511758
onListening?: ((devServer: Server<A, S>) => void) | undefined;

0 commit comments

Comments
 (0)
Please sign in to comment.