fix: use server port for websocket connection by default (#3185)

webpack · Apr 29, 2021 · 0c3f817 · 0c3f817
1 parent 1f0c3ac
commit 0c3f817
Show file tree

Hide file tree

Showing 6 changed files with 357 additions and 278 deletions.
diff --git a/lib/Server.js b/lib/Server.js
@@ -758,6 +758,7 @@ class Server {
         // eslint-disable-next-line no-shadow
         .then((port) => {
           this.port = port;
+
           return this.server.listen(port, this.hostname, (error) => {
             if (this.options.hot || this.options.liveReload) {
               this.createSocketServer();

diff --git a/lib/utils/DevServerPlugin.js b/lib/utils/DevServerPlugin.js
@@ -49,8 +49,8 @@ class DevServerPlugin {
 
     /** @type {string} */
     const port =
-      options.client && options.client.port
-        ? `&port=${options.client.port}`
+      (options.client && options.client.port) || options.port
+        ? `&port=${options.client.port || options.port}`
         : '';
 
     /** @type {string} */