Skip to content

Commit 873a803

Browse files
authored
feat: bump to express 5 (#5564)
* feat: bump to express 5 Signed-off-by: Sebastian Beltran <bjohansebas@gmail.com> * fix: update webpack-dev-middleware to version 7.4.5 and adjust snapshot for response headers * test: remove TODO comment regarding content-type in range-header test * refactor: simplify logger assignment in proxy * test: update expectation for error logging in proxy option test * test: mock console.error for proxy option tests and verify error logging * refactor: replace logger string with server.logger in allowed hosts tests * refactor: update proxy middleware to use 'on' object for request handling * docs: update migration guide to clarify proxy options changes --------- Signed-off-by: Sebastian Beltran <bjohansebas@gmail.com>
1 parent cc0b931 commit 873a803

File tree

9 files changed

+444
-501
lines changed

9 files changed

+444
-501
lines changed

lib/Server.js

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,36 +1391,8 @@ class Server {
13911391
return item;
13921392
}
13931393

1394-
/**
1395-
* @param {"info" | "warn" | "error" | "debug" | "silent" | undefined | "none" | "log" | "verbose"} level level
1396-
* @returns {"info" | "warn" | "error" | "debug" | "silent" | undefined} log level for proxy
1397-
*/
1398-
const getLogLevelForProxy = (level) => {
1399-
if (level === "none") {
1400-
return "silent";
1401-
}
1402-
1403-
if (level === "log") {
1404-
return "info";
1405-
}
1406-
1407-
if (level === "verbose") {
1408-
return "debug";
1409-
}
1410-
1411-
return level;
1412-
};
1413-
1414-
if (typeof item.logLevel === "undefined") {
1415-
item.logLevel = getLogLevelForProxy(
1416-
compilerOptions.infrastructureLogging
1417-
? compilerOptions.infrastructureLogging.level
1418-
: "info",
1419-
);
1420-
}
1421-
1422-
if (typeof item.logProvider === "undefined") {
1423-
item.logProvider = () => this.logger;
1394+
if (typeof item.logger === "undefined") {
1395+
item.logger = this.logger;
14241396
}
14251397

14261398
return item;
@@ -2175,10 +2147,10 @@ class Server {
21752147
if (proxyConfig.target) {
21762148
const context = proxyConfig.context || proxyConfig.path;
21772149

2178-
return createProxyMiddleware(
2179-
/** @type {string} */ (context),
2180-
proxyConfig,
2181-
);
2150+
return createProxyMiddleware({
2151+
...proxyConfig,
2152+
pathFilter: /** @type {string} */ (context),
2153+
});
21822154
}
21832155

21842156
if (proxyConfig.router) {

migration-v6.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ This document serves as a migration guide for `webpack-dev-server@6.0.0`.
66

77
- Minimum supported `Node.js` version is `20.9.0`.
88
- Support for **SockJS** in the WebSocket transport has been removed. Now, only **native WebSocket** is supported, or **custom** client and server implementations can be used.
9+
- The options for passing to the `proxy` have changed. Please refer to the [http-proxy-middleware migration guide](https://github.com/chimurai/http-proxy-middleware/blob/master/MIGRATION.md) for details.
910

1011
## Deprecations
1112

0 commit comments

Comments
 (0)