webpack-dev-server 3.5.0 → 3.5.1

package/client/index.js

@@ -15,31 +15,33 @@ var socket = require('./socket');
 
 var overlay = require('./overlay');
 
-function getCurrentScriptSource() {
-  // `document.currentScript` is the most accurate way to find the current script,
-  // but is not supported in all browsers.
-  if (document.currentScript) {
-    return document.currentScript.getAttribute('src');
-  } // Fall back to getting all scripts in the document.
+var sendMessage = require('./utils/sendMessage');
 
+var reloadApp = require('./utils/reloadApp');
 
-  var scriptElements = document.scripts || [];
-  var currentScript = scriptElements[scriptElements.length - 1];
-
-  if (currentScript) {
-    return currentScript.getAttribute('src');
-  } // Fail as there was no script to use.
-
-
-  throw new Error('[WDS] Failed to get current script source.');
-}
+var getCurrentScriptSource = require('./utils/getCurrentScriptSource');
 
 var urlParts;
-var hotReload = true;
+var status = {
+  isUnloading: false,
+  currentHash: ''
+};
+var options = {
+  hot: false,
+  hotReload: true,
+  liveReload: false,
+  initial: true,
+  useWarningOverlay: false,
+  useErrorOverlay: false,
+  useProgress: false
+};
+self.addEventListener('beforeunload', function () {
+  status.isUnloading = true;
+});
 
 if (typeof window !== 'undefined') {
   var qs = window.location.search.toLowerCase();
-  hotReload = qs.indexOf('hotreload=false') === -1;
+  options.hotReload = qs.indexOf('hotreload=false') === -1;
 }
 
 if (typeof __resourceQuery === 'string' && __resourceQuery) {
@@ -57,13 +59,6 @@ if (!urlParts.port || urlParts.port === '0') {
   urlParts.port = self.location.port;
 }
 
-var _hot = false;
-var _liveReload = false;
-var initial = true;
-var currentHash = '';
-var useWarningOverlay = false;
-var useErrorOverlay = false;
-var useProgress = false;
 var INFO = 'info';
 var WARN = 'warn';
 var ERROR = 'error';
@@ -76,46 +71,36 @@ var SILENT = 'silent'; // deprecated
 var WARNING = 'warning';
 var NONE = 'none'; // Set the default log level
 
-log.setDefaultLevel(INFO); // Send messages to the outside, so plugins can consume it.
-
-function sendMsg(type, data) {
-  if (typeof self !== 'undefined' && (typeof WorkerGlobalScope === 'undefined' || !(self instanceof WorkerGlobalScope))) {
-    self.postMessage({
-      type: "webpack".concat(type),
-      data: data
-    }, '*');
-  }
-}
-
+log.setDefaultLevel(INFO);
 var onSocketMsg = {
   hot: function hot() {
-    _hot = true;
+    options.hot = true;
     log.info('[WDS] Hot Module Replacement enabled.');
   },
   liveReload: function liveReload() {
-    _liveReload = true;
+    options.liveReload = true;
     log.info('[WDS] Live Reloading enabled.');
   },
   invalid: function invalid() {
     log.info('[WDS] App updated. Recompiling...'); // fixes #1042. overlay doesn't clear if errors are fixed but warnings remain.
 
-    if (useWarningOverlay || useErrorOverlay) {
+    if (options.useWarningOverlay || options.useErrorOverlay) {
       overlay.clear();
     }
 
-    sendMsg('Invalid');
+    sendMessage('Invalid');
   },
   hash: function hash(_hash) {
-    currentHash = _hash;
+    status.currentHash = _hash;
   },
   'still-ok': function stillOk() {
     log.info('[WDS] Nothing changed.');
 
-    if (useWarningOverlay || useErrorOverlay) {
+    if (options.useWarningOverlay || options.useErrorOverlay) {
       overlay.clear();
     }
 
-    sendMsg('StillOk');
+    sendMessage('StillOk');
   },
   'log-level': function logLevel(level) {
     var hotCtx = require.context('webpack/hot', false, /^\.\/log$/);
@@ -152,39 +137,39 @@ var onSocketMsg = {
   overlay: function overlay(value) {
     if (typeof document !== 'undefined') {
       if (typeof value === 'boolean') {
-        useWarningOverlay = false;
-        useErrorOverlay = value;
+        options.useWarningOverlay = false;
+        options.useErrorOverlay = value;
       } else if (value) {
-        useWarningOverlay = value.warnings;
-        useErrorOverlay = value.errors;
+        options.useWarningOverlay = value.warnings;
+        options.useErrorOverlay = value.errors;
       }
     }
   },
   progress: function progress(_progress) {
     if (typeof document !== 'undefined') {
-      useProgress = _progress;
+      options.useProgress = _progress;
     }
   },
   'progress-update': function progressUpdate(data) {
-    if (useProgress) {
+    if (options.useProgress) {
       log.info("[WDS] ".concat(data.percent, "% - ").concat(data.msg, "."));
     }
 
-    sendMsg('Progress', data);
+    sendMessage('Progress', data);
   },
   ok: function ok() {
-    sendMsg('Ok');
+    sendMessage('Ok');
 
-    if (useWarningOverlay || useErrorOverlay) {
+    if (options.useWarningOverlay || options.useErrorOverlay) {
       overlay.clear();
     }
 
-    if (initial) {
-      return initial = false;
+    if (options.initial) {
+      return options.initial = false;
     } // eslint-disable-line no-return-assign
 
 
-    reloadApp();
+    reloadApp(options, status);
   },
   'content-changed': function contentChanged() {
     log.info('[WDS] Content base changed. Reloading...');
@@ -197,22 +182,22 @@ var onSocketMsg = {
       return stripAnsi(warning);
     });
 
-    sendMsg('Warnings', strippedWarnings);
+    sendMessage('Warnings', strippedWarnings);
 
     for (var i = 0; i < strippedWarnings.length; i++) {
       log.warn(strippedWarnings[i]);
     }
 
-    if (useWarningOverlay) {
+    if (options.useWarningOverlay) {
       overlay.showMessage(_warnings);
     }
 
-    if (initial) {
-      return initial = false;
+    if (options.initial) {
+      return options.initial = false;
     } // eslint-disable-line no-return-assign
 
 
-    reloadApp();
+    reloadApp(options, status);
   },
   errors: function errors(_errors) {
     log.error('[WDS] Errors while compiling. Reload prevented.');
@@ -221,28 +206,29 @@ var onSocketMsg = {
       return stripAnsi(error);
     });
 
-    sendMsg('Errors', strippedErrors);
+    sendMessage('Errors', strippedErrors);
 
     for (var i = 0; i < strippedErrors.length; i++) {
       log.error(strippedErrors[i]);
     }
 
-    if (useErrorOverlay) {
+    if (options.useErrorOverlay) {
       overlay.showMessage(_errors);
     }
 
-    initial = false;
+    options.initial = false;
   },
   error: function error(_error) {
     log.error(_error);
   },
   close: function close() {
     log.error('[WDS] Disconnected!');
-    sendMsg('Close');
+    sendMessage('Close');
   }
 };
-var hostname = urlParts.hostname;
-var protocol = urlParts.protocol; // check ipv4 and ipv6 `all hostname`
+var _urlParts = urlParts,
+    hostname = _urlParts.hostname,
+    protocol = _urlParts.protocol; // check ipv4 and ipv6 `all hostname`
 
 if (hostname === '0.0.0.0' || hostname === '::') {
   // why do we need this check?
@@ -288,50 +274,4 @@ var socketUrl = url.format({
   // client to open the socket to the correct location.
   pathname: sockPath
 });
-socket(socketUrl, onSocketMsg);
-var isUnloading = false;
-self.addEventListener('beforeunload', function () {
-  isUnloading = true;
-});
-
-function reloadApp() {
-  if (isUnloading || !hotReload) {
-    return;
-  }
-
-  if (_hot) {
-    log.info('[WDS] App hot update...'); // eslint-disable-next-line global-require
-
-    var hotEmitter = require('webpack/hot/emitter');
-
-    hotEmitter.emit('webpackHotUpdate', currentHash);
-
-    if (typeof self !== 'undefined' && self.window) {
-      // broadcast update to window
-      self.postMessage("webpackHotUpdate".concat(currentHash), '*');
-    }
-  } // allow refreshing the page only if liveReload isn't disabled
-  else if (_liveReload) {
-      var rootWindow = self; // use parent window for reload (in case we're in an iframe with no valid src)
-
-      var intervalId = self.setInterval(function () {
-        if (rootWindow.location.protocol !== 'about:') {
-          // reload immediately if protocol is valid
-          applyReload(rootWindow, intervalId);
-        } else {
-          rootWindow = rootWindow.parent;
-
-          if (rootWindow.parent === rootWindow) {
-            // if parent equals current window we've reached the root which would continue forever, so trigger a reload anyways
-            applyReload(rootWindow, intervalId);
-          }
-        }
-      });
-    }
-
-  function applyReload(rootWindow, intervalId) {
-    clearInterval(intervalId);
-    log.info('[WDS] App updated. Reloading...');
-    rootWindow.location.reload();
-  }
-}
+socket(socketUrl, onSocketMsg);

package/client/utils/getCurrentScriptSource.js

@@ -0,0 +1,22 @@
+'use strict';
+
+function getCurrentScriptSource() {
+  // `document.currentScript` is the most accurate way to find the current script,
+  // but is not supported in all browsers.
+  if (document.currentScript) {
+    return document.currentScript.getAttribute('src');
+  } // Fall back to getting all scripts in the document.
+
+
+  var scriptElements = document.scripts || [];
+  var currentScript = scriptElements[scriptElements.length - 1];
+
+  if (currentScript) {
+    return currentScript.getAttribute('src');
+  } // Fail as there was no script to use.
+
+
+  throw new Error('[WDS] Failed to get current script source.');
+}
+
+module.exports = getCurrentScriptSource;

package/client/utils/reloadApp.js

@@ -0,0 +1,54 @@
+'use strict';
+/* global WorkerGlobalScope self */
+
+var log = require('loglevel').getLogger('webpack-dev-server');
+
+function reloadApp(_ref, _ref2) {
+  var hotReload = _ref.hotReload,
+      hot = _ref.hot,
+      liveReload = _ref.liveReload;
+  var isUnloading = _ref2.isUnloading,
+      currentHash = _ref2.currentHash;
+
+  if (isUnloading || !hotReload) {
+    return;
+  }
+
+  if (hot) {
+    log.info('[WDS] App hot update...'); // eslint-disable-next-line global-require
+
+    var hotEmitter = require('webpack/hot/emitter');
+
+    hotEmitter.emit('webpackHotUpdate', currentHash);
+
+    if (typeof self !== 'undefined' && self.window) {
+      // broadcast update to window
+      self.postMessage("webpackHotUpdate".concat(currentHash), '*');
+    }
+  } // allow refreshing the page only if liveReload isn't disabled
+  else if (liveReload) {
+      var rootWindow = self; // use parent window for reload (in case we're in an iframe with no valid src)
+
+      var intervalId = self.setInterval(function () {
+        if (rootWindow.location.protocol !== 'about:') {
+          // reload immediately if protocol is valid
+          applyReload(rootWindow, intervalId);
+        } else {
+          rootWindow = rootWindow.parent;
+
+          if (rootWindow.parent === rootWindow) {
+            // if parent equals current window we've reached the root which would continue forever, so trigger a reload anyways
+            applyReload(rootWindow, intervalId);
+          }
+        }
+      });
+    }
+
+  function applyReload(rootWindow, intervalId) {
+    clearInterval(intervalId);
+    log.info('[WDS] App updated. Reloading...');
+    rootWindow.location.reload();
+  }
+}
+
+module.exports = reloadApp;

package/client/utils/sendMessage.js

@@ -0,0 +1,14 @@
+'use strict';
+/* global __resourceQuery WorkerGlobalScope self */
+// Send messages to the outside, so plugins can consume it.
+
+function sendMsg(type, data) {
+  if (typeof self !== 'undefined' && (typeof WorkerGlobalScope === 'undefined' || !(self instanceof WorkerGlobalScope))) {
+    self.postMessage({
+      type: "webpack".concat(type),
+      data: data
+    }, '*');
+  }
+}
+
+module.exports = sendMsg;

package/lib/Server.js

@@ -711,6 +711,21 @@ class Server {
     });
   }
 
+  showStatus() {
+    const suffix =
+      this.options.inline !== false || this.options.lazy === true
+        ? '/'
+        : '/webpack-dev-server/';
+    const uri = `${createDomain(this.options, this.listeningApp)}${suffix}`;
+
+    status(
+      uri,
+      this.options,
+      this.log,
+      this.options.stats && this.options.stats.colors
+    );
+  }
+
   listen(port, hostname, fn) {
     this.hostname = hostname;
 
@@ -878,21 +893,6 @@ class Server {
     return false;
   }
 
-  showStatus() {
-    const suffix =
-      this.options.inline !== false || this.options.lazy === true
-        ? '/'
-        : '/webpack-dev-server/';
-    const uri = `${createDomain(this.options, this.listeningApp)}${suffix}`;
-
-    status(
-      uri,
-      this.options,
-      this.log,
-      this.options.stats && this.options.stats.colors
-    );
-  }
-
   // eslint-disable-next-line
   sockWrite(sockets, type, data) {
     sockets.forEach((socket) => {

package/lib/utils/processOptions.js

@@ -6,12 +6,14 @@ const defaultPort = require('./defaultPort');
 function processOptions(config, argv, callback) {
   // processOptions {Promise}
   if (typeof config.then === 'function') {
-    config.then(processOptions).catch((err) => {
-      // eslint-disable-next-line no-console
-      console.error(err.stack || err);
-      // eslint-disable-next-line no-process-exit
-      process.exit();
-    });
+    config
+      .then((conf) => processOptions(conf, argv, callback))
+      .catch((err) => {
+        // eslint-disable-next-line no-console
+        console.error(err.stack || err);
+        // eslint-disable-next-line no-process-exit
+        process.exit(1);
+      });
 
     return;
   }

package/lib/utils/runOpen.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const open = require('opn');
+
+function runOpen(uri, options, log) {
+  let openOptions = {};
+  let openMessage = 'Unable to open browser';
+
+  if (typeof options.open === 'string') {
+    openOptions = { app: options.open };
+    openMessage += `: ${options.open}`;
+  }
+
+  open(`${uri}${options.openPage || ''}`, openOptions).catch(() => {
+    log.warn(
+      `${openMessage}. If you are running in a headless environment, please do not use the --open flag`
+    );
+  });
+}
+
+module.exports = runOpen;

package/lib/utils/status.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const open = require('opn');
 const colors = require('./colors');
+const runOpen = require('./runOpen');
 
 // TODO: don't emit logs when webpack-dev-server is used via Node.js API
 function status(uri, options, log, useColor) {
@@ -44,19 +44,7 @@ function status(uri, options, log, useColor) {
   }
 
   if (options.open) {
-    let openOptions = {};
-    let openMessage = 'Unable to open browser';
-
-    if (typeof options.open === 'string') {
-      openOptions = { app: options.open };
-      openMessage += `: ${options.open}`;
-    }
-
-    open(`${uri}${options.openPage || ''}`, openOptions).catch(() => {
-      log.warn(
-        `${openMessage}. If you are running in a headless environment, please do not use the --open flag`
-      );
-    });
+    runOpen(uri, options, log);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-dev-server",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "bin": "bin/webpack-dev-server.js",
   "main": "lib/Server.js",
@@ -91,7 +91,7 @@
     "less-loader": "^5.0.0",
     "lint-staged": "^8.1.7",
     "marked": "^0.6.2",
-    "memfs": "^2.15.2",
+    "memfs": "^2.15.4",
     "npm-run-all": "^4.1.5",
     "nyc": "^14.1.1",
     "prettier": "^1.17.1",