feat: bonjour options

webpack · Apr 19, 2021 · a669762 · a669762
1 parent 3fb7e0b
commit a669762
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/lib/options.json b/lib/options.json
@@ -140,7 +140,14 @@
   },
   "properties": {
     "bonjour": {
-      "type": "boolean",
+      "anyOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "object"
+        }
+      ],
       "description": "Broadcasts the server via ZeroConf networking on start. https://webpack.js.org/configuration/dev-server/#devserverbonjour"
     },
     "client": {

diff --git a/lib/utils/runBonjour.js b/lib/utils/runBonjour.js
@@ -1,14 +1,15 @@
 'use strict';
 
-function runBonjour({ port }) {
+function runBonjour(options) {
   const bonjour = require('bonjour')();
   const os = require('os');
-
+  const { https, port } = options;
   bonjour.publish({
     name: `Webpack Dev Server ${os.hostname()}:${port}`,
     port,
-    type: 'http',
+    type: https ? 'https' : 'http',
     subtypes: ['webpack'],
+    ...(typeof options.bonjour === 'object' && options.bonjour),
   });
 
   process.on('exit', () => {

diff --git a/test/__snapshots__/validate-options.test.js.snap.webpack4 b/test/__snapshots__/validate-options.test.js.snap.webpack4
@@ -2,8 +2,13 @@
 
 exports[`options validate should throw an error on the "bonjour" option with '' value 1`] = `
 "ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
- - configuration.bonjour should be a boolean.
-   -> Broadcasts the server via ZeroConf networking on start. https://webpack.js.org/configuration/dev-server/#devserverbonjour"
+ - configuration.bonjour should be one of these:
+   boolean | object { … }
+   -> Broadcasts the server via ZeroConf networking on start. https://webpack.js.org/configuration/dev-server/#devserverbonjour
+   Details:
+    * configuration.bonjour should be a boolean.
+    * configuration.bonjour should be an object:
+      object { … }"
 `;
 
 exports[`options validate should throw an error on the "client" option with '{"host":true,"path":"","port":8080}' value 1`] = `

diff --git a/test/__snapshots__/validate-options.test.js.snap.webpack5 b/test/__snapshots__/validate-options.test.js.snap.webpack5
@@ -2,8 +2,13 @@
 
 exports[`options validate should throw an error on the "bonjour" option with '' value 1`] = `
 "ValidationError: Invalid configuration object. Object has been initialized using a configuration object that does not match the API schema.
- - configuration.bonjour should be a boolean.
-   -> Broadcasts the server via ZeroConf networking on start. https://webpack.js.org/configuration/dev-server/#devserverbonjour"
+ - configuration.bonjour should be one of these:
+   boolean | object { … }
+   -> Broadcasts the server via ZeroConf networking on start. https://webpack.js.org/configuration/dev-server/#devserverbonjour
+   Details:
+    * configuration.bonjour should be a boolean.
+    * configuration.bonjour should be an object:
+      object { … }"
 `;
 
 exports[`options validate should throw an error on the "client" option with '{"host":true,"path":"","port":8080}' value 1`] = `

diff --git a/test/validate-options.test.js b/test/validate-options.test.js
@@ -23,7 +23,7 @@ const tests = {
     failure: [false],
   },
   bonjour: {
-    success: [false, true],
+    success: [false, true, { type: 'https' }],
     failure: [''],
   },
   client: {