webpack-dev-server 4.11.1 → 4.12.0

package/bin/webpack-dev-server.js

@@ -58,6 +58,18 @@ const isInstalled = (packageName) => {
     // eslint-disable-next-line no-cond-assign
   } while (dir !== (dir = path.dirname(dir)));
 
+  // https://github.com/nodejs/node/blob/v18.9.1/lib/internal/modules/cjs/loader.js#L1274
+  // @ts-ignore
+  for (const internalPath of require("module").globalPaths) {
+    try {
+      if (fs.statSync(path.join(internalPath, packageName)).isDirectory()) {
+        return true;
+      }
+    } catch (_error) {
+      // Nothing
+    }
+  }
+
   return false;
 };
 

package/client/clients/SockJSClient.js

@@ -1,22 +1,18 @@
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import SockJS from "../modules/sockjs-client/index.js";
 import { log } from "../utils/log.js";
-
 var SockJSClient = /*#__PURE__*/function () {
   /**
    * @param {string} url
    */
   function SockJSClient(url) {
     _classCallCheck(this, SockJSClient);
-
     // SockJS requires `http` and `https` protocols
     this.sock = new SockJS(url.replace(/^ws:/i, "http:").replace(/^wss:/i, "https:"));
-
     this.sock.onerror =
     /**
      * @param {Error} error
@@ -25,30 +21,29 @@ var SockJSClient = /*#__PURE__*/function () {
       log.error(error);
     };
   }
+
   /**
    * @param {(...args: any[]) => void} f
    */
-
-
   _createClass(SockJSClient, [{
     key: "onOpen",
     value: function onOpen(f) {
       this.sock.onopen = f;
     }
+
     /**
      * @param {(...args: any[]) => void} f
      */
-
   }, {
     key: "onClose",
     value: function onClose(f) {
       this.sock.onclose = f;
-    } // call f with the message string as the first argument
+    }
 
+    // call f with the message string as the first argument
     /**
      * @param {(...args: any[]) => void} f
      */
-
   }, {
     key: "onMessage",
     value: function onMessage(f) {
@@ -61,8 +56,6 @@ var SockJSClient = /*#__PURE__*/function () {
       };
     }
   }]);
-
   return SockJSClient;
 }();
-
 export { SockJSClient as default };

package/client/clients/WebSocketClient.js

@@ -1,48 +1,43 @@
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { log } from "../utils/log.js";
-
 var WebSocketClient = /*#__PURE__*/function () {
   /**
    * @param {string} url
    */
   function WebSocketClient(url) {
     _classCallCheck(this, WebSocketClient);
-
     this.client = new WebSocket(url);
-
     this.client.onerror = function (error) {
       log.error(error);
     };
   }
+
   /**
    * @param {(...args: any[]) => void} f
    */
-
-
   _createClass(WebSocketClient, [{
     key: "onOpen",
     value: function onOpen(f) {
       this.client.onopen = f;
     }
+
     /**
      * @param {(...args: any[]) => void} f
      */
-
   }, {
     key: "onClose",
     value: function onClose(f) {
       this.client.onclose = f;
-    } // call f with the message string as the first argument
+    }
 
+    // call f with the message string as the first argument
     /**
      * @param {(...args: any[]) => void} f
      */
-
   }, {
     key: "onMessage",
     value: function onMessage(f) {
@@ -51,8 +46,6 @@ var WebSocketClient = /*#__PURE__*/function () {
       };
     }
   }]);
-
   return WebSocketClient;
 }();
-
 export { WebSocketClient as default };

package/client/index.js

@@ -1,20 +1,20 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /* global __resourceQuery, __webpack_hash__ */
 /// <reference types="webpack/module" />
 import webpackHotLog from "webpack/hot/log.js";
 import stripAnsi from "./utils/stripAnsi.js";
 import parseURL from "./utils/parseURL.js";
 import socket from "./socket.js";
-import { formatProblem, show, hide } from "./overlay.js";
+import { formatProblem, createOverlay } from "./overlay.js";
 import { log, logEnabledFeatures, setLogLevel } from "./utils/log.js";
 import sendMessage from "./utils/sendMessage.js";
 import reloadApp from "./utils/reloadApp.js";
 import createSocketURL from "./utils/createSocketURL.js";
+
 /**
  * @typedef {Object} Options
  * @property {boolean} hot
@@ -35,15 +35,14 @@ import createSocketURL from "./utils/createSocketURL.js";
 /**
  * @type {Status}
  */
-
 var status = {
   isUnloading: false,
   // TODO Workaround for webpack v4, `__webpack_hash__` is not replaced without HotModuleReplacement
   // eslint-disable-next-line camelcase
   currentHash: typeof __webpack_hash__ !== "undefined" ? __webpack_hash__ : ""
 };
-/** @type {Options} */
 
+/** @type {Options} */
 var options = {
   hot: false,
   liveReload: false,
@@ -57,91 +56,84 @@ var enabledFeatures = {
   Progress: false,
   Overlay: false
 };
-
 if (parsedResourceQuery.hot === "true") {
   options.hot = true;
   enabledFeatures["Hot Module Replacement"] = true;
 }
-
 if (parsedResourceQuery["live-reload"] === "true") {
   options.liveReload = true;
   enabledFeatures["Live Reloading"] = true;
 }
-
 if (parsedResourceQuery.progress === "true") {
   options.progress = true;
   enabledFeatures.Progress = true;
 }
-
 if (parsedResourceQuery.overlay) {
   try {
     options.overlay = JSON.parse(parsedResourceQuery.overlay);
   } catch (e) {
     log.error("Error parsing overlay options from resource query:", e);
-  } // Fill in default "true" params for partially-specified objects.
-
+  }
 
+  // Fill in default "true" params for partially-specified objects.
   if (typeof options.overlay === "object") {
     options.overlay = _objectSpread({
       errors: true,
       warnings: true
     }, options.overlay);
   }
-
   enabledFeatures.Overlay = true;
 }
-
 if (parsedResourceQuery.logging) {
   options.logging = parsedResourceQuery.logging;
 }
-
 if (typeof parsedResourceQuery.reconnect !== "undefined") {
   options.reconnect = Number(parsedResourceQuery.reconnect);
 }
+
 /**
  * @param {string} level
  */
-
-
 function setAllLogLevel(level) {
   // This is needed because the HMR logger operate separately from dev server logger
   webpackHotLog.setLogLevel(level === "verbose" || level === "log" ? "info" : level);
   setLogLevel(level);
 }
-
 if (options.logging) {
   setAllLogLevel(options.logging);
 }
-
 logEnabledFeatures(enabledFeatures);
 self.addEventListener("beforeunload", function () {
   status.isUnloading = true;
 });
+var trustedTypesPolicyName = typeof options.overlay === "object" && options.overlay.trustedTypesPolicyName;
+var overlay = createOverlay({
+  trustedTypesPolicyName: trustedTypesPolicyName
+});
 var onSocketMessage = {
   hot: function hot() {
     if (parsedResourceQuery.hot === "false") {
       return;
     }
-
     options.hot = true;
   },
   liveReload: function liveReload() {
     if (parsedResourceQuery["live-reload"] === "false") {
       return;
     }
-
     options.liveReload = true;
   },
   invalid: function invalid() {
-    log.info("App updated. Recompiling..."); // Fixes #1042. overlay doesn't clear if errors are fixed but warnings remain.
+    log.info("App updated. Recompiling...");
 
+    // Fixes #1042. overlay doesn't clear if errors are fixed but warnings remain.
     if (options.overlay) {
-      hide();
+      overlay.send({
+        type: "DISMISS"
+      });
     }
-
     sendMessage("Invalid");
   },
-
   /**
    * @param {string} hash
    */
@@ -150,7 +142,6 @@ var onSocketMessage = {
     status.currentHash = _hash;
   },
   logging: setAllLogLevel,
-
   /**
    * @param {boolean} value
    */
@@ -158,10 +149,8 @@ var onSocketMessage = {
     if (typeof document === "undefined") {
       return;
     }
-
     options.overlay = value;
   },
-
   /**
    * @param {number} value
    */
@@ -169,17 +158,14 @@ var onSocketMessage = {
     if (parsedResourceQuery.reconnect === "false") {
       return;
     }
-
     options.reconnect = value;
   },
-
   /**
    * @param {boolean} value
    */
   progress: function progress(value) {
     options.progress = value;
   },
-
   /**
    * @param {{ pluginName?: string, percent: number, msg: string }} data
    */
@@ -187,29 +173,27 @@ var onSocketMessage = {
     if (options.progress) {
       log.info("".concat(data.pluginName ? "[".concat(data.pluginName, "] ") : "").concat(data.percent, "% - ").concat(data.msg, "."));
     }
-
     sendMessage("Progress", data);
   },
   "still-ok": function stillOk() {
     log.info("Nothing changed.");
-
     if (options.overlay) {
-      hide();
+      overlay.send({
+        type: "DISMISS"
+      });
     }
-
     sendMessage("StillOk");
   },
   ok: function ok() {
     sendMessage("Ok");
-
     if (options.overlay) {
-      hide();
+      overlay.send({
+        type: "DISMISS"
+      });
     }
-
     reloadApp(options, status);
   },
   // TODO: remove in v5 in favor of 'static-changed'
-
   /**
    * @param {string} file
    */
@@ -217,7 +201,6 @@ var onSocketMessage = {
     log.info("".concat(file ? "\"".concat(file, "\"") : "Content", " from static directory was changed. Reloading..."));
     self.location.reload();
   },
-
   /**
    * @param {string} file
    */
@@ -225,70 +208,59 @@ var onSocketMessage = {
     log.info("".concat(file ? "\"".concat(file, "\"") : "Content", " from static directory was changed. Reloading..."));
     self.location.reload();
   },
-
   /**
    * @param {Error[]} warnings
    * @param {any} params
    */
   warnings: function warnings(_warnings, params) {
     log.warn("Warnings while compiling.");
-
     var printableWarnings = _warnings.map(function (error) {
       var _formatProblem = formatProblem("warning", error),
-          header = _formatProblem.header,
-          body = _formatProblem.body;
-
+        header = _formatProblem.header,
+        body = _formatProblem.body;
       return "".concat(header, "\n").concat(stripAnsi(body));
     });
-
     sendMessage("Warnings", printableWarnings);
-
     for (var i = 0; i < printableWarnings.length; i++) {
       log.warn(printableWarnings[i]);
     }
-
     var needShowOverlayForWarnings = typeof options.overlay === "boolean" ? options.overlay : options.overlay && options.overlay.warnings;
-
     if (needShowOverlayForWarnings) {
-      var trustedTypesPolicyName = typeof options.overlay === "object" && options.overlay.trustedTypesPolicyName;
-      show("warning", _warnings, trustedTypesPolicyName || null);
+      overlay.send({
+        type: "BUILD_ERROR",
+        level: "warning",
+        messages: _warnings
+      });
     }
-
     if (params && params.preventReloading) {
       return;
     }
-
     reloadApp(options, status);
   },
-
   /**
    * @param {Error[]} errors
    */
   errors: function errors(_errors) {
     log.error("Errors while compiling. Reload prevented.");
-
     var printableErrors = _errors.map(function (error) {
       var _formatProblem2 = formatProblem("error", error),
-          header = _formatProblem2.header,
-          body = _formatProblem2.body;
-
+        header = _formatProblem2.header,
+        body = _formatProblem2.body;
       return "".concat(header, "\n").concat(stripAnsi(body));
     });
-
     sendMessage("Errors", printableErrors);
-
     for (var i = 0; i < printableErrors.length; i++) {
       log.error(printableErrors[i]);
     }
-
     var needShowOverlayForErrors = typeof options.overlay === "boolean" ? options.overlay : options.overlay && options.overlay.errors;
-
     if (needShowOverlayForErrors) {
-      var trustedTypesPolicyName = typeof options.overlay === "object" && options.overlay.trustedTypesPolicyName;
-      show("error", _errors, trustedTypesPolicyName || null);
+      overlay.send({
+        type: "BUILD_ERROR",
+        level: "error",
+        messages: _errors
+      });
     }
   },
-
   /**
    * @param {Error} error
    */
@@ -297,11 +269,11 @@ var onSocketMessage = {
   },
   close: function close() {
     log.info("Disconnected!");
-
     if (options.overlay) {
-      hide();
+      overlay.send({
+        type: "DISMISS"
+      });
     }
-
     sendMessage("Close");
   }
 };