refactor: code

Author: alexander-akait

lib/options.json

@@ -154,10 +154,6 @@
               "description": "Tells clients connected to devServer to use the provided path to connect.",
               "type": "string"
             },
-            "username": {
-              "description": "Tells clients connected to devServer to use the provided username to authenticate.",
-              "type": "string"
-            },
             "password": {
               "description": "Tells clients connected to devServer to use the provided password to authenticate.",
               "type": "string"
@@ -185,6 +181,10 @@
                   "minLength": 1
                 }
               ]
+            },
+            "username": {
+              "description": "Tells clients connected to devServer to use the provided username to authenticate.",
+              "type": "string"
             }
           }
         }

lib/utils/DevServerPlugin.js

@@ -107,39 +107,32 @@ class DevServerPlugin {
     /** @type {string} */
     let username = '';
 
-    // We are proxying dev server and need to specify custom `path`
     if (typeof options.client.webSocketURL.username !== 'undefined') {
       username = options.client.webSocketURL.username;
     }
 
     /** @type {string} */
     let password = '';
 
-    // We are proxying dev server and need to specify custom `path`
     if (typeof options.client.webSocketURL.password !== 'undefined') {
       password = options.client.webSocketURL.password;
     }
 
-    /** @type {Record<string, any>} */
-    const searchParams = {};
+    const searchParams = new URLSearchParams();
 
     if (typeof options.client.logging !== 'undefined') {
-      searchParams.logging = options.client.logging;
+      searchParams.set('logging', options.client.logging);
     }
 
+    const searchParamsString = searchParams.toString();
+
     return encodeURIComponent(
       new URL(
         `${protocol}//${username}${password ? `:${password}` : ''}${
           username || password ? `@` : ''
         }${ipaddr.IPv6.isIPv6(host) ? `[${host}]` : host}${
           port ? `:${port}` : ''
-        }${path || '/'}${
-          Object.keys(searchParams).length > 0
-            ? `?${Object.entries(searchParams)
-                .map(([key, value]) => `${key}=${value}`)
-                .join('&')}`
-            : ''
-        }`
+        }${path || '/'}${searchParamsString ? `?${searchParamsString}` : ''}`
       ).toString()
     ).replace(
       /[!'()*]/g,