chore: rebase

Author: rishabh3112

lib/Server.js

@@ -735,8 +735,11 @@ class Server {
     }
 
     if (this.options.bonjour) {
+      const protocol =
+        this.options.bonjour.type || this.options.https ? 'https' : 'http';
+
       this.logger.info(
-        'Broadcasting "http" with subtype of "webpack" via ZeroConf DNS (Bonjour)'
+        `Broadcasting "${protocol}" with subtype of "webpack" via ZeroConf DNS (Bonjour)`
       );
     }
 

package-lock.json

@@ -71,13 +71,13 @@
     "@commitlint/cli": "^12.1.1",
     "@commitlint/config-conventional": "^12.1.1",
     "@jest/test-sequencer": "^26.6.3",
-    "acorn": "^8.1.1",
+    "acorn": "^8.2.0",
     "babel-jest": "^26.6.3",
     "babel-loader": "^8.2.2",
     "body-parser": "^1.19.0",
     "core-js": "^3.11.0",
     "css-loader": "^5.2.4",
-    "eslint": "^7.24.0",
+    "eslint": "^7.25.0",
     "eslint-config-prettier": "^8.2.0",
     "eslint-config-webpack": "^1.2.5",
     "eslint-plugin-import": "^2.22.1",

package.json

@@ -9,6 +9,15 @@ exports[`CLI --bonjour 1`] = `
 <i> [webpack-dev-server] Broadcasting \\"http\\" with subtype of \\"webpack\\" via ZeroConf DNS (Bonjour)"
 `;
 
+exports[`CLI --bonjour and --https 1`] = `
+"<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>/
+<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory
+<i> [webpack-dev-server] Broadcasting \\"https\\" with subtype of \\"webpack\\" via ZeroConf DNS (Bonjour)"
+`;
+
 exports[`CLI --history-api-fallback 1`] = `
 "<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: http://localhost:<port>/

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

@@ -9,6 +9,15 @@ exports[`CLI --bonjour 1`] = `
 <i> [webpack-dev-server] Broadcasting \\"http\\" with subtype of \\"webpack\\" via ZeroConf DNS (Bonjour)"
 `;
 
+exports[`CLI --bonjour and --https 1`] = `
+"<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>/
+<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory
+<i> [webpack-dev-server] Broadcasting \\"https\\" with subtype of \\"webpack\\" via ZeroConf DNS (Bonjour)"
+`;
+
 exports[`CLI --history-api-fallback 1`] = `
 "<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: http://localhost:<port>/

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

@@ -56,6 +56,19 @@ describe('CLI', () => {
       .catch(done);
   });
 
+  it('--bonjour and --https', (done) => {
+    testBin('--bonjour --https')
+      .then((output) => {
+        expect(output.exitCode).toEqual(0);
+        expect(
+          normalizeStderr(output.stderr, { ipv6: true, https: true })
+        ).toMatchSnapshot();
+
+        done();
+      })
+      .catch(done);
+  });
+
   it('--no-bonjour', (done) => {
     testBin('--no-bonjour')
       .then((output) => {