Merge branch 'master' into publicPath-output

Author: adubrouski

.github/workflows/nodejs.yml

@@ -69,7 +69,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: [18.x, 20.x, 22.x, 23.x]
+        node-version: [18.x, 20.x, 22.x, 24.x]
         shard: ["1/4", "2/4", "3/4", "4/4"]
         webpack-version: [latest]
 

client-src/index.js

@@ -183,7 +183,7 @@ if (parsedResourceQuery.overlay) {
 
     decodeOverlayOptions(options.overlay);
   }
-  enabledFeatures.Overlay = true;
+  enabledFeatures.Overlay = options.overlay !== false;
 }
 
 if (parsedResourceQuery.logging) {

lib/Server.js

@@ -3143,17 +3143,14 @@ class Server {
     // always allow localhost host, for convenience
     // allow if value is in allowedHosts
     if (Array.isArray(allowedHosts) && allowedHosts.length > 0) {
-      for (let hostIdx = 0; hostIdx < allowedHosts.length; hostIdx++) {
-        /** @type {string} */
-        const allowedHost = allowedHosts[hostIdx];
-
+      for (const allowedHost of allowedHosts) {
         if (allowedHost === value) {
           return true;
         }
 
         // support "." as a subdomain wildcard
         // e.g. ".example.com" will allow "example.com", "www.example.com", "subdomain.example.com", etc
-        if (allowedHost[0] === ".") {
+        if (allowedHost.startsWith(".")) {
           // "example.com"  (value === allowedHost.substring(1))
           // "*.example.com"  (value.endsWith(allowedHost))
           if (
@@ -3240,12 +3237,7 @@ class Server {
       hostname.endsWith(".localhost") ||
       hostname === this.options.host;
 
-    if (isValidHostname) {
-      return true;
-    }
-
-    // disallow
-    return false;
+    return isValidHostname;
   }
 
   /**

package-lock.json

@@ -62,7 +62,7 @@
     "connect-history-api-fallback": "^2.0.0",
     "express": "^4.21.2",
     "graceful-fs": "^4.2.6",
-    "http-proxy-middleware": "^2.0.7",
+    "http-proxy-middleware": "^2.0.9",
     "ipaddr.js": "^2.1.0",
     "launch-editor": "^2.6.1",
     "open": "^10.0.3",

package.json

@@ -46,19 +46,24 @@ describe('"server" CLI options', () => {
     ).toMatchSnapshot();
   });
 
-  it('should work using "--server-type spdy"', async () => {
-    const { exitCode, stderr } = await testBin([
-      "--port",
-      port,
-      "--server-type",
-      "spdy",
-    ]);
-
-    expect(exitCode).toEqual(0);
-    expect(
-      normalizeStderr(stderr, { ipv6: true, https: true }),
-    ).toMatchSnapshot();
-  });
+  const [major] = process.versions.node.split(".").map(Number);
+
+  (major >= 24 ? it.skip : it)(
+    'should work using "--server-type spdy"',
+    async () => {
+      const { exitCode, stderr } = await testBin([
+        "--port",
+        port,
+        "--server-type",
+        "spdy",
+      ]);
+
+      expect(exitCode).toEqual(0);
+      expect(
+        normalizeStderr(stderr, { ipv6: true, https: true }),
+      ).toMatchSnapshot();
+    },
+  );
 
   it('should work using "--server-options-key <path> --server-options-pfx <path> --server-options-passphrase webpack-dev-server --server-options-cert <path>"', async () => {
     const pfxFile = path.join(httpsCertificateDirectory, "server.pfx");