webpack-dev-server 4.7.1 → 4.7.2

package/client/modules/sockjs-client/index.js

@@ -6459,7 +6459,7 @@ function Url(address, location, parser) {
 
   if (url.auth) {
     instruction = url.auth.split(':');
-    url.username = instruction[0] || '';
+    url.username = instruction[0];
     url.password = instruction[1] || '';
   }
 
@@ -6544,8 +6544,15 @@ function set(part, value, fn) {
 
       break;
 
-    default:
-      url[part] = value;
+    case 'username':
+    case 'password':
+      url[part] = encodeURIComponent(value);
+      break;
+
+    case 'auth':
+      var splits = value.split(':');
+      url.username = splits[0];
+      url.password = splits.length === 2 ? splits[1] : '';
   }
 
   for (var i = 0; i < rules.length; i++) {
@@ -6553,6 +6560,7 @@ function set(part, value, fn) {
     if (ins[4]) url[ins[1]] = url[ins[1]].toLowerCase();
   }
 
+  url.auth = url.password ? url.username + ':' + url.password : url.username;
   url.origin = url.protocol !== 'file:' && isSpecial(url.protocol) && url.host ? url.protocol + '//' + url.host : 'null';
   url.href = url.toString();
   return url;
@@ -6572,12 +6580,15 @@ function toString(stringify) {
       url = this,
       protocol = url.protocol;
   if (protocol && protocol.charAt(protocol.length - 1) !== ':') protocol += ':';
-  var result = protocol + (url.slashes || isSpecial(url.protocol) ? '//' : '');
+  var result = protocol + (url.protocol && url.slashes || isSpecial(url.protocol) ? '//' : '');
 
   if (url.username) {
     result += url.username;
     if (url.password) result += ':' + url.password;
     result += '@';
+  } else if (url.password) {
+    result += ':' + url.password;
+    result += '@';
   }
 
   result += url.host + url.pathname;

package/lib/Server.js

@@ -2375,10 +2375,6 @@ class Server {
       });
     }
 
-    if (typeof this.options.onAfterSetupMiddleware === "function") {
-      this.options.onAfterSetupMiddleware(this);
-    }
-
     if (typeof this.options.setupMiddlewares === "function") {
       middlewares = this.options.setupMiddlewares(middlewares, this);
     }
@@ -2395,6 +2391,10 @@ class Server {
         (this.app).use(middleware.middleware);
       }
     });
+
+    if (typeof this.options.onAfterSetupMiddleware === "function") {
+      this.options.onAfterSetupMiddleware(this);
+    }
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-dev-server",
-  "version": "4.7.1",
+  "version": "4.7.2",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "bin": "bin/webpack-dev-server.js",
   "main": "lib/Server.js",
@@ -73,8 +73,8 @@
     "@babel/plugin-transform-runtime": "^7.14.5",
     "@babel/preset-env": "^7.14.5",
     "@babel/runtime": "^7.14.5",
-    "@commitlint/cli": "^15.0.0",
-    "@commitlint/config-conventional": "^15.0.0",
+    "@commitlint/cli": "^16.0.1",
+    "@commitlint/config-conventional": "^16.0.0",
     "@types/compression": "^1.7.2",
     "@types/default-gateway": "^3.0.1",
     "@types/sockjs-client": "^1.5.1",