fix: logic

Author: alexander-akait

bin/cli-flags.js

@@ -396,7 +396,7 @@ module.exports = {
     },
     {
       name: 'allowed-hosts',
-      type: [Boolean, String],
+      type: String,
       configs: [
         {
           type: 'string',

lib/Server.js

@@ -900,7 +900,7 @@ class Server {
   checkHeaders(headers, headerToCheck) {
     // allow user to opt out of this security check, at their own risk
     // by explicitly enabling allowedHosts
-    if (this.options.allowedHosts.includes('auto')) {
+    if (this.options.allowedHosts === 'all') {
       return true;
     }
 

lib/options.json

@@ -343,17 +343,19 @@
           "enum": ["auto", "all"]
         },
         {
-          "type": "string"
+          "type": "string",
+          "minLength": 1
         },
         {
           "type": "array",
           "items": {
-            "type": "string"
+            "type": "string",
+            "minLength": 1
           },
           "minItems": 1
         }
       ],
-      "description": "Defines routes which are enabled by default, on by default and allows localhost. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts"
+      "description": "Defines routes which are enabled by default, on by default and allows localhost/value from the 'host' option/value from the 'client.webSocketURL' option. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts"
     },
     "headers": {
       "anyOf": [

test/__snapshots__/validate-options.test.js.snap.webpack4

@@ -3,40 +3,40 @@
 exports[`options validate should throw an error on the "allowedHosts" option with '123' value 1`] = `
 "ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
  - configuration.allowedHosts should be one of these:
-   \\"auto\\" | \\"all\\" | string | [string, ...] (should not have fewer than 1 item)
-   -> Defines routes which are enabled by default, on by default and allows localhost. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts
+   \\"auto\\" | \\"all\\" | non-empty string | [non-empty string, ...] (should not have fewer than 1 item)
+   -> Defines routes which are enabled by default, on by default and allows localhost/value from the 'host' option/value from the 'client.webSocketURL' option. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts
    Details:
     * configuration.allowedHosts should be one of these:
       \\"auto\\" | \\"all\\"
-    * configuration.allowedHosts should be a string.
+    * configuration.allowedHosts should be a non-empty string.
     * configuration.allowedHosts should be an array:
-      [string, ...] (should not have fewer than 1 item)"
+      [non-empty string, ...] (should not have fewer than 1 item)"
 `;
 
 exports[`options validate should throw an error on the "allowedHosts" option with 'false' value 1`] = `
 "ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
  - configuration.allowedHosts should be one of these:
-   \\"auto\\" | \\"all\\" | string | [string, ...] (should not have fewer than 1 item)
-   -> Defines routes which are enabled by default, on by default and allows localhost. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts
+   \\"auto\\" | \\"all\\" | non-empty string | [non-empty string, ...] (should not have fewer than 1 item)
+   -> Defines routes which are enabled by default, on by default and allows localhost/value from the 'host' option/value from the 'client.webSocketURL' option. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts
    Details:
     * configuration.allowedHosts should be one of these:
       \\"auto\\" | \\"all\\"
-    * configuration.allowedHosts should be a string.
+    * configuration.allowedHosts should be a non-empty string.
     * configuration.allowedHosts should be an array:
-      [string, ...] (should not have fewer than 1 item)"
+      [non-empty string, ...] (should not have fewer than 1 item)"
 `;
 
 exports[`options validate should throw an error on the "allowedHosts" option with 'true' value 1`] = `
 "ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
  - configuration.allowedHosts should be one of these:
-   \\"auto\\" | \\"all\\" | string | [string, ...] (should not have fewer than 1 item)
-   -> Defines routes which are enabled by default, on by default and allows localhost. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts
+   \\"auto\\" | \\"all\\" | non-empty string | [non-empty string, ...] (should not have fewer than 1 item)
+   -> Defines routes which are enabled by default, on by default and allows localhost/value from the 'host' option/value from the 'client.webSocketURL' option. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts
    Details:
     * configuration.allowedHosts should be one of these:
       \\"auto\\" | \\"all\\"
-    * configuration.allowedHosts should be a string.
+    * configuration.allowedHosts should be a non-empty string.
     * configuration.allowedHosts should be an array:
-      [string, ...] (should not have fewer than 1 item)"
+      [non-empty string, ...] (should not have fewer than 1 item)"
 `;
 
 exports[`options validate should throw an error on the "bonjour" option with '' value 1`] = `

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

@@ -3,40 +3,40 @@
 exports[`options validate should throw an error on the "allowedHosts" option with '123' value 1`] = `
 "ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
  - configuration.allowedHosts should be one of these:
-   \\"auto\\" | \\"all\\" | string | [string, ...] (should not have fewer than 1 item)
-   -> Defines routes which are enabled by default, on by default and allows localhost. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts
+   \\"auto\\" | \\"all\\" | non-empty string | [non-empty string, ...] (should not have fewer than 1 item)
+   -> Defines routes which are enabled by default, on by default and allows localhost/value from the 'host' option/value from the 'client.webSocketURL' option. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts
    Details:
     * configuration.allowedHosts should be one of these:
       \\"auto\\" | \\"all\\"
-    * configuration.allowedHosts should be a string.
+    * configuration.allowedHosts should be a non-empty string.
     * configuration.allowedHosts should be an array:
-      [string, ...] (should not have fewer than 1 item)"
+      [non-empty string, ...] (should not have fewer than 1 item)"
 `;
 
 exports[`options validate should throw an error on the "allowedHosts" option with 'false' value 1`] = `
 "ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
  - configuration.allowedHosts should be one of these:
-   \\"auto\\" | \\"all\\" | string | [string, ...] (should not have fewer than 1 item)
-   -> Defines routes which are enabled by default, on by default and allows localhost. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts
+   \\"auto\\" | \\"all\\" | non-empty string | [non-empty string, ...] (should not have fewer than 1 item)
+   -> Defines routes which are enabled by default, on by default and allows localhost/value from the 'host' option/value from the 'client.webSocketURL' option. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts
    Details:
     * configuration.allowedHosts should be one of these:
       \\"auto\\" | \\"all\\"
-    * configuration.allowedHosts should be a string.
+    * configuration.allowedHosts should be a non-empty string.
     * configuration.allowedHosts should be an array:
-      [string, ...] (should not have fewer than 1 item)"
+      [non-empty string, ...] (should not have fewer than 1 item)"
 `;
 
 exports[`options validate should throw an error on the "allowedHosts" option with 'true' value 1`] = `
 "ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
  - configuration.allowedHosts should be one of these:
-   \\"auto\\" | \\"all\\" | string | [string, ...] (should not have fewer than 1 item)
-   -> Defines routes which are enabled by default, on by default and allows localhost. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts
+   \\"auto\\" | \\"all\\" | non-empty string | [non-empty string, ...] (should not have fewer than 1 item)
+   -> Defines routes which are enabled by default, on by default and allows localhost/value from the 'host' option/value from the 'client.webSocketURL' option. https://webpack.js.org/configuration/dev-server/#devserverallowedhosts
    Details:
     * configuration.allowedHosts should be one of these:
       \\"auto\\" | \\"all\\"
-    * configuration.allowedHosts should be a string.
+    * configuration.allowedHosts should be a non-empty string.
     * configuration.allowedHosts should be an array:
-      [string, ...] (should not have fewer than 1 item)"
+      [non-empty string, ...] (should not have fewer than 1 item)"
 `;
 
 exports[`options validate should throw an error on the "bonjour" option with '' value 1`] = `

test/cli/__snapshots__/cli.test.js.snap.webpack4

@@ -271,7 +271,7 @@ Options:
                                    Page Applications.
   --compress                       Enable gzip compression.
   --no-compress                    Disable gzip compression.
-  --allowed-hosts [value...]       Set hosts that are allowed to access the dev
+  --allowed-hosts <value...>       Set hosts that are allowed to access the dev
                                    server.
   --watch-files <value...>         Watch static files for file changes.
 

test/cli/__snapshots__/cli.test.js.snap.webpack5

@@ -10,7 +10,8 @@ exports[`CLI --bonjour 1`] = `
 `;
 
 exports[`CLI --bonjour and --https 1`] = `
-"<i> [webpack-dev-server] Project is running at:
+"<i> [webpack-dev-server] Generating SSL Certificate
+<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: https://localhost:<port>/
 <i> [webpack-dev-server] On Your Network (IPv4): https://<network-ip-v4>:<port>/
 <i> [webpack-dev-server] On Your Network (IPv6): https://[<network-ip-v6>]:<port>/
@@ -272,7 +273,7 @@ Options:
                                    Page Applications.
   --compress                       Enable gzip compression.
   --no-compress                    Disable gzip compression.
-  --allowed-hosts [value...]       Set hosts that are allowed to access the dev
+  --allowed-hosts <value...>       Set hosts that are allowed to access the dev
                                    server.
   --watch-files <value...>         Watch static files for file changes.
 

test/validate-options.test.js

@@ -163,7 +163,7 @@ const tests = {
     failure: [''],
   },
   allowedHosts: {
-    success: ['auto', 'all', [''], ''],
+    success: ['auto', 'all', ['foo'], 'bar'],
     failure: [true, false, 123],
   },
   headers: {