webpack-dev-server 4.2.1 → 4.5.0

package/client/modules/logger/index.js

@@ -91,33 +91,61 @@ function _createClass(Constructor, protoProps, staticProps) {
 }
 
 var LogType = Object.freeze({
-  error: "error",
+  error:
+  /** @type {"error"} */
+  "error",
   // message, c style arguments
-  warn: "warn",
+  warn:
+  /** @type {"warn"} */
+  "warn",
   // message, c style arguments
-  info: "info",
+  info:
+  /** @type {"info"} */
+  "info",
   // message, c style arguments
-  log: "log",
+  log:
+  /** @type {"log"} */
+  "log",
   // message, c style arguments
-  debug: "debug",
+  debug:
+  /** @type {"debug"} */
+  "debug",
   // message, c style arguments
-  trace: "trace",
+  trace:
+  /** @type {"trace"} */
+  "trace",
   // no arguments
-  group: "group",
+  group:
+  /** @type {"group"} */
+  "group",
   // [label]
-  groupCollapsed: "groupCollapsed",
+  groupCollapsed:
+  /** @type {"groupCollapsed"} */
+  "groupCollapsed",
   // [label]
-  groupEnd: "groupEnd",
+  groupEnd:
+  /** @type {"groupEnd"} */
+  "groupEnd",
   // [label]
-  profile: "profile",
+  profile:
+  /** @type {"profile"} */
+  "profile",
   // [profileName]
-  profileEnd: "profileEnd",
+  profileEnd:
+  /** @type {"profileEnd"} */
+  "profileEnd",
   // [profileName]
-  time: "time",
+  time:
+  /** @type {"time"} */
+  "time",
   // name, time as [seconds, nanoseconds]
-  clear: "clear",
+  clear:
+  /** @type {"clear"} */
+  "clear",
   // no arguments
-  status: "status" // message, arguments
+  status:
+  /** @type {"status"} */
+  "status" // message, arguments
 
 });
 exports.LogType = LogType;
@@ -314,6 +342,7 @@ var WebpackLogger = /*#__PURE__*/function () {
       if (this[TIMERS_AGGREGATES_SYMBOL] === undefined) return;
       var time = this[TIMERS_AGGREGATES_SYMBOL].get(label);
       if (time === undefined) return;
+      this[TIMERS_AGGREGATES_SYMBOL].delete(label);
       this[LOG_SYMBOL](LogType.time, [label].concat(_toConsumableArray(time)));
     }
   }]);

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

@@ -1880,7 +1880,7 @@ module.exports = function (SockJS, availableTransports) {
 "use strict";
 
 
-var EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+var EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     JSON3 = __webpack_require__(/*! json3 */ "./node_modules/json3/lib/json3.js"),
     objectUtils = __webpack_require__(/*! ./utils/object */ "./node_modules/sockjs-client/lib/utils/object.js");
@@ -1941,7 +1941,7 @@ module.exports = InfoAjax;
 
 
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     JSON3 = __webpack_require__(/*! json3 */ "./node_modules/json3/lib/json3.js"),
     XHRLocalObject = __webpack_require__(/*! ./transport/sender/xhr-local */ "./node_modules/sockjs-client/lib/transport/sender/xhr-local.js"),
     InfoAjax = __webpack_require__(/*! ./info-ajax */ "./node_modules/sockjs-client/lib/info-ajax.js");
@@ -1981,7 +1981,7 @@ module.exports = InfoReceiverIframe;
 "use strict";
 
 
-var EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+var EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     JSON3 = __webpack_require__(/*! json3 */ "./node_modules/json3/lib/json3.js"),
     utils = __webpack_require__(/*! ./utils/event */ "./node_modules/sockjs-client/lib/utils/event.js"),
@@ -2062,7 +2062,7 @@ module.exports = InfoIframe;
 "use strict";
 
 
-var EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+var EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     urlUtils = __webpack_require__(/*! ./utils/url */ "./node_modules/sockjs-client/lib/utils/url.js"),
     XDR = __webpack_require__(/*! ./transport/sender/xdr */ "./node_modules/sockjs-client/lib/transport/sender/xdr.js"),
@@ -2958,7 +2958,8 @@ if ('ab'.split(/(?:ab)*/).length !== 2 || '.'.split(/(.?)(.?)/).length !== 4 ||
       }
 
       var output = [],
-          flags = (separator.ignoreCase ? 'i' : '') + (separator.multiline ? 'm' : '') + (separator.extended ? 'x' : '') + (separator.sticky ? 'y' : ''),
+          flags = (separator.ignoreCase ? 'i' : '') + (separator.multiline ? 'm' : '') + (separator.extended ? 'x' : '') + ( // Proposed for ES6
+      separator.sticky ? 'y' : ''),
           // Firefox 3+
       lastLastIndex = 0,
           // Make `global` and avoid `lastIndex` issues by working with a copy
@@ -3086,7 +3087,7 @@ __webpack_require__(/*! ./transport/websocket */ "./node_modules/sockjs-client/l
 "use strict";
 
 
-var EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+var EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     utils = __webpack_require__(/*! ../../utils/event */ "./node_modules/sockjs-client/lib/utils/event.js"),
     urlUtils = __webpack_require__(/*! ../../utils/url */ "./node_modules/sockjs-client/lib/utils/url.js"),
@@ -3415,7 +3416,7 @@ module.exports = HtmlFileTransport;
 
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     JSON3 = __webpack_require__(/*! json3 */ "./node_modules/json3/lib/json3.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     version = __webpack_require__(/*! ../version */ "./node_modules/sockjs-client/lib/version.js"),
     urlUtils = __webpack_require__(/*! ../utils/url */ "./node_modules/sockjs-client/lib/utils/url.js"),
     iframeUtils = __webpack_require__(/*! ../utils/iframe */ "./node_modules/sockjs-client/lib/utils/iframe.js"),
@@ -3659,7 +3660,7 @@ module.exports = AjaxBasedTransport;
 
 
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter;
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter);
 
 var debug = function debug() {};
 
@@ -3803,7 +3804,7 @@ module.exports = function (transport) {
 
 
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter;
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter);
 
 var debug = function debug() {};
 
@@ -3925,7 +3926,7 @@ module.exports = SenderReceiver;
 
 
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     EventSourceDriver = __webpack_require__(/*! eventsource */ "./node_modules/sockjs-client/lib/transport/browser/eventsource.js");
 
 var debug = function debug() {};
@@ -4006,7 +4007,7 @@ module.exports = EventSourceReceiver;
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     iframeUtils = __webpack_require__(/*! ../../utils/iframe */ "./node_modules/sockjs-client/lib/utils/iframe.js"),
     urlUtils = __webpack_require__(/*! ../../utils/url */ "./node_modules/sockjs-client/lib/utils/url.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     random = __webpack_require__(/*! ../../utils/random */ "./node_modules/sockjs-client/lib/utils/random.js");
 
 var debug = function debug() {};
@@ -4107,7 +4108,7 @@ var utils = __webpack_require__(/*! ../../utils/iframe */ "./node_modules/sockjs
     browser = __webpack_require__(/*! ../../utils/browser */ "./node_modules/sockjs-client/lib/utils/browser.js"),
     urlUtils = __webpack_require__(/*! ../../utils/url */ "./node_modules/sockjs-client/lib/utils/url.js"),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter;
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter);
 
 var debug = function debug() {};
 
@@ -4311,7 +4312,7 @@ module.exports = JsonpReceiver;
 
 
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter;
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter);
 
 var debug = function debug() {};
 
@@ -4513,7 +4514,7 @@ module.exports = function (url, payload, callback) {
 "use strict";
 
 
-var EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+var EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     eventUtils = __webpack_require__(/*! ../../utils/event */ "./node_modules/sockjs-client/lib/utils/event.js"),
     browser = __webpack_require__(/*! ../../utils/browser */ "./node_modules/sockjs-client/lib/utils/browser.js"),
@@ -4659,10 +4660,12 @@ module.exports = XHRCorsObject;
 "use strict";
 
 
-var EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+var EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js");
 
-function XHRFake() {
+function
+  /* method, url, payload, opts */
+XHRFake() {
   var self = this;
   EventEmitter.call(this);
   this.to = setTimeout(function () {
@@ -4719,7 +4722,7 @@ module.exports = XHRLocalObject;
 var utils = __webpack_require__(/*! ../utils/event */ "./node_modules/sockjs-client/lib/utils/event.js"),
     urlUtils = __webpack_require__(/*! ../utils/url */ "./node_modules/sockjs-client/lib/utils/url.js"),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     WebsocketDriver = __webpack_require__(/*! ./driver/websocket */ "./node_modules/sockjs-client/lib/transport/browser/websocket.js");
 
 var debug = function debug() {};

package/client/overlay.js

@@ -108,19 +108,44 @@ function hide() {
   document.body.removeChild(iframeContainerElement);
   iframeContainerElement = null;
   containerElement = null;
+}
+
+function formatProblem(type, item) {
+  var header = type === "warning" ? "WARNING" : "ERROR";
+  var body = "";
+
+  if (typeof item === "string") {
+    body += item;
+  } else {
+    var file = item.file || ""; // eslint-disable-next-line no-nested-ternary
+
+    var moduleName = item.moduleName ? item.moduleName.indexOf("!") !== -1 ? "".concat(item.moduleName.replace(/^(\s|\S)*!/, ""), " (").concat(item.moduleName, ")") : "".concat(item.moduleName) : "";
+    var loc = item.loc;
+    header += "".concat(moduleName || file ? " in ".concat(moduleName ? "".concat(moduleName).concat(file ? " (".concat(file, ")") : "") : file).concat(loc ? " ".concat(loc) : "") : "");
+    body += item.message || "";
+  }
+
+  return {
+    header: header,
+    body: body
+  };
 } // Compilation with errors (e.g. syntax error or missing modules).
 
 
-function show(messages, type) {
+function show(type, messages) {
   ensureOverlayExists(function () {
     messages.forEach(function (message) {
       var entryElement = document.createElement("div");
       var typeElement = document.createElement("span");
-      typeElement.innerText = type === "warnings" ? "Warning:" : "Error:";
+
+      var _formatProblem = formatProblem(type, message),
+          header = _formatProblem.header,
+          body = _formatProblem.body;
+
+      typeElement.innerText = header;
       typeElement.style.color = "#".concat(colors.red); // Make it look similar to our terminal.
 
-      var errorMessage = message.message || messages[0];
-      var text = ansiHTML(encode(errorMessage));
+      var text = ansiHTML(encode(body));
       var messageTextNode = document.createElement("div");
       messageTextNode.innerHTML = text;
       entryElement.appendChild(typeElement);
@@ -134,4 +159,4 @@ function show(messages, type) {
   });
 }
 
-export { show, hide };
+export { formatProblem, show, hide };

package/client/socket.js

@@ -1,5 +1,6 @@
 /* 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 */
 
@@ -9,12 +10,14 @@ typeof __webpack_dev_server_client__.default !== "undefined" ? __webpack_dev_ser
 /* 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,12 +27,13 @@ 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
       var retryInMs = 1000 * Math.pow(2, retries) + Math.random() * 100;
       retries += 1;
+      log.info("Trying to reconnect...");
       setTimeout(function () {
         socket(url, handlers);
       }, retryInMs);