Merge remote-tracking branch 'origin/refactor-client-and-server-transport-mode-options' into refactor-client-and-server-transport-mode-options

Author: alexander-akait

lib/options.json

@@ -225,7 +225,7 @@
               "type": "string"
             },
             {
-              "type": "null"
+              "enum": ["auto"]
             }
           ],
           "description": "Tells clients connected to devServer to use the provided path to connect."
@@ -492,7 +492,7 @@
           "type": "string"
         },
         {
-          "type": "null"
+          "enum": ["auto"]
         }
       ],
       "description": "Specify a port number to listen for requests on. https://webpack.js.org/configuration/dev-server/#devserverport"

lib/utils/findPort.js

@@ -18,7 +18,7 @@ function runPortFinder() {
 }
 
 function findPort(port) {
-  if (port) {
+  if (port && port !== 'auto') {
     return Promise.resolve(port);
   }
 

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

@@ -82,12 +82,12 @@ exports[`options validate should throw an error on the "client" option with '{"p
 exports[`options validate should throw an error on the "client" option with '{"port":true}' value 1`] = `
 "ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
  - configuration.client.port should be one of these:
-   number | string | null
-   -> Tells clients connected to devServer to use the provided path to connect.
+   number | string | \\"auto\\"
+   -> Tells clients connected to devServer to use the provided port.
    Details:
     * configuration.client.port should be a number.
     * configuration.client.port should be a string.
-    * configuration.client.port should be a null."
+    * configuration.client.port should be \\"auto\\"."
 `;
 
 exports[`options validate should throw an error on the "client" option with '{"progress":""}' value 1`] = `
@@ -372,12 +372,23 @@ exports[`options validate should throw an error on the "open" option with '{"tar
 exports[`options validate should throw an error on the "port" 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.port should be one of these:
-   number | string | null
+   number | string | \\"auto\\"
    -> Specify a port number to listen for requests on. https://webpack.js.org/configuration/dev-server/#devserverport
    Details:
     * configuration.port should be a number.
     * configuration.port should be a string.
-    * configuration.port should be a null."
+    * configuration.port should be \\"auto\\"."
+`;
+
+exports[`options validate should throw an error on the "port" option with 'null' value 1`] = `
+"ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
+ - configuration.port should be one of these:
+   number | string | \\"auto\\"
+   -> Specify a port number to listen for requests on. https://webpack.js.org/configuration/dev-server/#devserverport
+   Details:
+    * configuration.port should be a number.
+    * configuration.port should be a string.
+    * configuration.port should be \\"auto\\"."
 `;
 
 exports[`options validate should throw an error on the "proxy" option with '[]' value 1`] = `

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

@@ -82,12 +82,12 @@ exports[`options validate should throw an error on the "client" option with '{"p
 exports[`options validate should throw an error on the "client" option with '{"port":true}' value 1`] = `
 "ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
  - configuration.client.port should be one of these:
-   number | string | null
-   -> Tells clients connected to devServer to use the provided path to connect.
+   number | string | \\"auto\\" 
+   -> Tells clients connected to devServer to use the provided port.
    Details:
     * configuration.client.port should be a number.
     * configuration.client.port should be a string.
-    * configuration.client.port should be a null."
+    * configuration.client.port should be \\"auto\\"."
 `;
 
 exports[`options validate should throw an error on the "client" option with '{"progress":""}' value 1`] = `
@@ -372,12 +372,23 @@ exports[`options validate should throw an error on the "open" option with '{"tar
 exports[`options validate should throw an error on the "port" 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.port should be one of these:
-   number | string | null
+   number | string | \\"auto\\"
    -> Specify a port number to listen for requests on. https://webpack.js.org/configuration/dev-server/#devserverport
    Details:
     * configuration.port should be a number.
     * configuration.port should be a string.
-    * configuration.port should be a null."
+    * configuration.port should be \\"auto\\"."
+`;
+
+exports[`options validate should throw an error on the "port" option with 'null' value 1`] = `
+"ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
+ - configuration.port should be one of these:
+   number | string | \\"auto\\"
+   -> Specify a port number to listen for requests on. https://webpack.js.org/configuration/dev-server/#devserverport
+   Details:
+    * configuration.port should be a number.
+    * configuration.port should be a string.
+    * configuration.port should be \\"auto\\"."
 `;
 
 exports[`options validate should throw an error on the "proxy" option with '[]' value 1`] = `

test/server/host-option.test.js

@@ -2,6 +2,7 @@
 
 const path = require('path');
 const request = require('supertest');
+const internalIp = require('internal-ip');
 const config = require('../fixtures/simple-config/webpack.config');
 const testServer = require('../helpers/test-server');
 const port = require('../ports-map')['host-option'];
@@ -200,4 +201,68 @@ describe('host option', () => {
 
     afterAll(testServer.close);
   });
+
+  describe('is local-ip', () => {
+    beforeAll((done) => {
+      server = testServer.start(
+        config,
+        {
+          static: {
+            directory: staticDirectory,
+            watch: false,
+          },
+          host: 'local-ip',
+          port,
+        },
+        done
+      );
+      req = request(server.app);
+    });
+
+    it('server address', () => {
+      const address = server.server.address();
+      const networkIP = internalIp.v4.sync();
+
+      expect(address.address).toBe(networkIP);
+      expect(address.port).toBe(port);
+    });
+
+    it('Request to index', (done) => {
+      req.get('/').expect(200, done);
+    });
+
+    afterAll(testServer.close);
+  });
+
+  describe('is local-ipv4', () => {
+    beforeAll((done) => {
+      server = testServer.start(
+        config,
+        {
+          static: {
+            directory: staticDirectory,
+            watch: false,
+          },
+          host: 'local-ipv4',
+          port,
+        },
+        done
+      );
+      req = request(server.app);
+    });
+
+    it('server address', () => {
+      const address = server.server.address();
+      const networkIP = internalIp.v4.sync();
+
+      expect(address.address).toBe(networkIP);
+      expect(address.port).toBe(port);
+    });
+
+    it('Request to index', (done) => {
+      req.get('/').expect(200, done);
+    });
+
+    afterAll(testServer.close);
+  });
 });

test/server/port-option.test.js

@@ -78,7 +78,7 @@ describe('port', () => {
     afterAll(testServer.close);
   });
 
-  describe('is null', () => {
+  describe('is auto', () => {
     beforeAll((done) => {
       server = testServer.start(
         config,
@@ -87,7 +87,7 @@ describe('port', () => {
             directory: staticDirectory,
             watch: false,
           },
-          port: null,
+          port: 'auto',
         },
         done
       );

test/validate-options.test.js

@@ -69,7 +69,7 @@ const tests = {
       {
         host: '',
         path: '',
-        port: null,
+        port: 'auto',
       },
       {
         progress: false,
@@ -255,8 +255,8 @@ const tests = {
     failure: ['', [], { foo: 'bar' }, { target: 90 }, { app: true }],
   },
   port: {
-    success: ['', 0, null],
-    failure: [false],
+    success: ['', 0, 'auto'],
+    failure: [false, null],
   },
   proxy: {
     success: [