webpack-dev-server 4.3.1 → 4.7.0

package/client/socket.js

@@ -1,20 +1,22 @@
 /* global __webpack_dev_server_client__ */
-import WebSocketClient from "./clients/WebSocketClient.js"; // this WebsocketClient is here as a default fallback, in case the client is not injected
+import WebSocketClient from "./clients/WebSocketClient.js";
+import { log } from "./utils/log.js"; // this WebsocketClient is here as a default fallback, in case the client is not injected
 
 /* eslint-disable camelcase */
 
-var Client = // eslint-disable-next-line camelcase, no-nested-ternary
-typeof __webpack_dev_server_client__ !== "undefined" ? // eslint-disable-next-line camelcase
-typeof __webpack_dev_server_client__.default !== "undefined" ? __webpack_dev_server_client__.default : __webpack_dev_server_client__ : WebSocketClient;
+var Client = // eslint-disable-next-line no-nested-ternary
+typeof __webpack_dev_server_client__ !== "undefined" ? typeof __webpack_dev_server_client__.default !== "undefined" ? __webpack_dev_server_client__.default : __webpack_dev_server_client__ : WebSocketClient;
 /* eslint-enable camelcase */
 
 var retries = 0;
+var maxRetries = 10;
 var client = null;
 
-var socket = function initSocket(url, handlers) {
+var socket = function initSocket(url, handlers, reconnect) {
   client = new Client(url);
   client.onOpen(function () {
     retries = 0;
+    maxRetries = reconnect;
   });
   client.onClose(function () {
     if (retries === 0) {
@@ -24,14 +26,15 @@ var socket = function initSocket(url, handlers) {
 
     client = null; // After 10 retries stop trying, to prevent logspam.
 
-    if (retries <= 10) {
+    if (retries < maxRetries) {
       // Exponentially increase timeout to reconnect.
       // Respectfully copied from the package `got`.
-      // eslint-disable-next-line no-mixed-operators, no-restricted-properties
+      // eslint-disable-next-line no-restricted-properties
       var retryInMs = 1000 * Math.pow(2, retries) + Math.random() * 100;
       retries += 1;
+      log.info("Trying to reconnect...");
       setTimeout(function () {
-        socket(url, handlers);
+        socket(url, handlers, reconnect);
       }, retryInMs);
     }
   });
@@ -39,7 +42,7 @@ var socket = function initSocket(url, handlers) {
     var message = JSON.parse(data);
 
     if (handlers[message.type]) {
-      handlers[message.type](message.data);
+      handlers[message.type](message.data, message.params);
     }
   });
 };

package/client/utils/log.js

@@ -2,7 +2,12 @@ import logger from "../modules/logger/index.js";
 var name = "webpack-dev-server"; // default level is set on the client side, so it does not need
 // to be set by the CLI or API
 
-var defaultLevel = "info";
+var defaultLevel = "info"; // options new options, merge with old options
+
+/**
+ * @param {false | true | "none" | "error" | "warn" | "info" | "log" | "verbose"} level
+ * @returns {void}
+ */
 
 function setLogLevel(level) {
   logger.configureDefaultLogger({

package/client/utils/sendMessage.js

@@ -1,5 +1,10 @@
 /* global __resourceQuery WorkerGlobalScope */
 // Send messages to the outside, so plugins can consume it.
+
+/**
+ * @param {string} type
+ * @param {any} data
+ */
 function sendMsg(type, data) {
   if (typeof self !== "undefined" && (typeof WorkerGlobalScope === "undefined" || !(self instanceof WorkerGlobalScope))) {
     self.postMessage({