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

Author: bjohansebas

lib/Server.js

@@ -1469,6 +1469,23 @@ class Server {
     }
   }
 
+  /**
+   * @returns { { isColorSupported: () => boolean, colors: import("webpack").Colors } } colors support
+   */
+  #getColors() {
+    const compilerOptions =
+      /** @type {MultiCompiler} */
+      (this.compiler).compilers
+        ? /** @type {MultiCompiler} */ (this.compiler).compilers[0].webpack
+        : /** @type {Compiler} */ (this.compiler).webpack;
+
+    const colors = compilerOptions.cli.createColors({
+      useColor: compilerOptions.cli.isColorSupported(),
+    });
+
+    return { isColorSupported: compilerOptions.cli.isColorSupported, colors };
+  }
+
   /**
    * @private
    * @returns {string} client transport
@@ -2687,7 +2704,10 @@ class Server {
    * @returns {Promise<void>}
    */
   async logStatus() {
-    const { cyan, isColorSupported, red } = require("colorette");
+    const {
+      isColorSupported,
+      colors: { cyan, red },
+    } = this.#getColors();
 
     /**
      * @param {Compiler["options"]} compilerOptions compiler options
@@ -2708,7 +2728,7 @@ class Server {
           /** @type {boolean} */
           (/** @type {StatsOptions} */ (compilerOptions.stats).colors);
       } else {
-        colorsEnabled = isColorSupported;
+        colorsEnabled = isColorSupported();
       }
 
       return colorsEnabled;
@@ -3002,6 +3022,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
@@ -3026,15 +3072,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;
@@ -3048,8 +3086,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)
@@ -3084,9 +3121,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;
@@ -3106,13 +3141,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;