Merge branch 'master' into issue-3234

Author: alexander-akait

lib/Server.js

@@ -771,7 +771,7 @@ class Server {
       findPort(port || this.options.port)
         // eslint-disable-next-line no-shadow
         .then((port) => {
-          this.port = port;
+          this.options.port = port;
 
           return this.server.listen(port, this.hostname, (error) => {
             if (this.options.hot || this.options.liveReload) {

package-lock.json

@@ -105,7 +105,7 @@
     "typescript": "^4.2.4",
     "url-loader": "^4.1.1",
     "webpack": "^5.36.2",
-    "webpack-cli": "^4.6.0",
+    "webpack-cli": "^4.7.0",
     "webpack-merge": "^5.7.3"
   },
   "peerDependencies": {

package.json

@@ -173,7 +173,7 @@ exports[`CLI https options 1`] = `
 `;
 
 exports[`CLI should generate correct cli flags 1`] = `
-"Usage: webpack serve|s [entries...] [options]
+"Usage: webpack serve|server|s [entries...] [options]
 
 Run the webpack dev server.
 

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

@@ -173,7 +173,7 @@ exports[`CLI https options 1`] = `
 `;
 
 exports[`CLI should generate correct cli flags 1`] = `
-"Usage: webpack serve|s [entries...] [options]
+"Usage: webpack serve|server|s [entries...] [options]
 
 Run the webpack dev server.