Merge branch 'next' of github.com:webpack/webpack-dev-server into remove-cli-flags

Author: bjohansebas

bin/cli-flags.js

@@ -790,7 +790,7 @@ module.exports = {
         multiple: false,
         path: "server.type",
         type: "enum",
-        values: ["http", "https", "spdy"],
+        values: ["http", "https"],
       },
     ],
     description: "Allows to set server and options (by default 'http').",

examples/server/spdy/README.md

@@ -50,7 +50,7 @@ const schema = require("./options.json");
 /** @typedef {(err: EXPECTED_ANY, req: IncomingMessage, res: ServerResponse, next: NextFunction) => void} ErrorHandleFunction */
 /** @typedef {SimpleHandleFunction | NextHandleFunction | ErrorHandleFunction} HandleFunction */
 
-/** @typedef {import("https").ServerOptions & { spdy?: { plain?: boolean | undefined, ssl?: boolean | undefined, 'x-forwarded-for'?: string | undefined, protocol?: string | undefined, protocols?: string[] | undefined }}} ServerOptions */
+/** @typedef {import("https").ServerOptions} ServerOptions */
 
 /**
  * @template {BasicApplication} [T=ExpressApplication]
@@ -108,7 +108,7 @@ const schema = require("./options.json");
 /**
  * @template {BasicApplication} [A=ExpressApplication]
  * @template {BasicServer} [S=import("http").Server]
- * @typedef {"http" | "https" | "spdy" | "http2" | string | ((serverOptions: ServerOptions, application: A) => S)} ServerType
+ * @typedef {"http" | "https" | "http2" | string | ((serverOptions: ServerOptions, application: A) => S)} ServerType
  */
 
 /**
@@ -1107,18 +1107,7 @@ class Server {
 
     const serverOptions = /** @type {ServerOptions} */ (options.server.options);
 
-    if (
-      options.server.type === "spdy" &&
-      typeof serverOptions.spdy === "undefined"
-    ) {
-      serverOptions.spdy = { protocols: ["h2", "http/1.1"] };
-    }
-
-    if (
-      options.server.type === "https" ||
-      options.server.type === "http2" ||
-      options.server.type === "spdy"
-    ) {
+    if (options.server.type === "https" || options.server.type === "http2") {
       if (typeof serverOptions.requestCert === "undefined") {
         serverOptions.requestCert = false;
       }
@@ -1391,36 +1380,8 @@ class Server {
           return item;
         }
 
-        /**
-         * @param {"info" | "warn" | "error" | "debug" | "silent" | undefined | "none" | "log" | "verbose"} level level
-         * @returns {"info" | "warn" | "error" | "debug" | "silent" | undefined} log level for proxy
-         */
-        const getLogLevelForProxy = (level) => {
-          if (level === "none") {
-            return "silent";
-          }
-
-          if (level === "log") {
-            return "info";
-          }
-
-          if (level === "verbose") {
-            return "debug";
-          }
-
-          return level;
-        };
-
-        if (typeof item.logLevel === "undefined") {
-          item.logLevel = getLogLevelForProxy(
-            compilerOptions.infrastructureLogging
-              ? compilerOptions.infrastructureLogging.level
-              : "info",
-          );
-        }
-
-        if (typeof item.logProvider === "undefined") {
-          item.logProvider = () => this.logger;
+        if (typeof item.logger === "undefined") {
+          item.logger = this.logger;
         }
 
         return item;
@@ -2006,7 +1967,7 @@ class Server {
     }
 
     // compress is placed last and uses unshift so that it will be the first middleware used
-    if (this.options.compress && !isHTTP2) {
+    if (this.options.compress) {
       const compression = require("compression");
 
       middlewares.push({ name: "compression", middleware: compression() });
@@ -2175,10 +2136,10 @@ class Server {
         if (proxyConfig.target) {
           const context = proxyConfig.context || proxyConfig.path;
 
-          return createProxyMiddleware(
-            /** @type {string} */ (context),
-            proxyConfig,
-          );
+          return createProxyMiddleware({
+            ...proxyConfig,
+            pathFilter: /** @type {string} */ (context),
+          });
         }
 
         if (proxyConfig.router) {
@@ -3089,6 +3050,32 @@ class Server {
     return false;
   }
 
+  /**
+   * Extracts and normalizes the hostname from a header, removing brackets for IPv6.
+   * @param {string} header header value
+   * @returns {string|null} hostname or null
+   */
+  #parseHostnameFromHeader = function (header) {
+    if (!header) return null;
+    try {
+      // If the header does not have a scheme, prepend // so URL can parse it
+      const parseUrl = new URL(
+        /^(.+:)?\/\//.test(header) ? header : `//${header}`,
+        "http://localhost/",
+      );
+
+      let hostname = parseUrl.hostname;
+      // Normalize IPv6: remove brackets if present
+      if (hostname.startsWith("[") && hostname.endsWith("]")) {
+        hostname = hostname.slice(1, -1);
+      }
+
+      return hostname;
+    } catch {
+      return null;
+    }
+  };
+
   /**
    * @private
    * @param {{ [key: string]: string | undefined }} headers headers
@@ -3113,15 +3100,7 @@ class Server {
       return true;
     }
 
-    // use the node url-parser to retrieve the hostname from the host-header.
-    // TODO resolve me in the next major release
-    // eslint-disable-next-line n/no-deprecated-api
-    const { hostname } = url.parse(
-      // if header doesn't have scheme, add // for parsing.
-      /^(.+:)?\/\//.test(header) ? header : `//${header}`,
-      false,
-      true,
-    );
+    const hostname = this.#parseHostnameFromHeader(header);
 
     if (hostname === null) {
       return false;
@@ -3135,8 +3114,7 @@ class Server {
     // A note on IPv6 addresses:
     // header will always contain the brackets denoting
     // an IPv6-address in URLs,
-    // these are removed from the hostname in url.parse(),
-    // so we have the pure IPv6-address in hostname.
+    // these aren't removed from the hostname in new URL(),
     // For convenience, always allow localhost (hostname === 'localhost')
     // and its subdomains (hostname.endsWith(".localhost")).
     // allow hostname of listening address  (hostname === this.options.host)
@@ -3171,9 +3149,7 @@ class Server {
       return true;
     }
 
-    // TODO resolve me in the next major release
-    // eslint-disable-next-line n/no-deprecated-api
-    const origin = url.parse(originHeader, false, true).hostname;
+    const origin = this.#parseHostnameFromHeader(originHeader);
 
     if (origin === null) {
       return false;
@@ -3193,13 +3169,7 @@ class Server {
       return true;
     }
 
-    // eslint-disable-next-line n/no-deprecated-api
-    const host = url.parse(
-      // if hostHeader doesn't have scheme, add // for parsing.
-      /^(.+:)?\/\//.test(hostHeader) ? hostHeader : `//${hostHeader}`,
-      false,
-      true,
-    ).hostname;
+    const host = this.#parseHostnameFromHeader(hostHeader);
 
     if (host === null) {
       return false;

examples/server/spdy/app.js

@@ -529,13 +529,13 @@
       "description": "Allows to set server and options (by default 'http')."
     },
     "ServerType": {
-      "enum": ["http", "https", "spdy", "http2"]
+      "enum": ["http", "https", "http2"]
     },
     "ServerFn": {
       "instanceof": "Function"
     },
     "ServerEnum": {
-      "enum": ["http", "https", "spdy", "http2"],
+      "enum": ["http", "https", "http2"],
       "cli": {
         "exclude": true
       }