webpack-dev-server 3.3.1 → 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,53 +59,48 @@ if (!urlParts.port || urlParts.port === '0') {
   urlParts.port = self.location.port;
 }
 
-var _hot = false;
-var initial = true;
-var currentHash = '';
-var useWarningOverlay = false;
-var useErrorOverlay = false;
-var useProgress = false;
 var INFO = 'info';
-var WARNING = 'warning';
+var WARN = 'warn';
 var ERROR = 'error';
-var NONE = 'none'; // Set the default log level
-
-log.setDefaultLevel(INFO); // Send messages to the outside, so plugins can consume it.
+var DEBUG = 'debug';
+var TRACE = 'trace';
+var SILENT = 'silent'; // deprecated
+// TODO: remove these at major released
+// https://github.com/webpack/webpack-dev-server/pull/1825
 
-function sendMsg(type, data) {
-  if (typeof self !== 'undefined' && (typeof WorkerGlobalScope === 'undefined' || !(self instanceof WorkerGlobalScope))) {
-    self.postMessage({
-      type: "webpack".concat(type),
-      data: data
-    }, '*');
-  }
-}
+var WARNING = 'warning';
+var NONE = 'none'; // Set the default log level
 
+log.setDefaultLevel(INFO);
 var onSocketMsg = {
   hot: function hot() {
-    _hot = true;
+    options.hot = true;
     log.info('[WDS] Hot Module Replacement enabled.');
   },
+  liveReload: function liveReload() {
+    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$/);
@@ -114,16 +111,22 @@ var onSocketMsg = {
 
     switch (level) {
       case INFO:
+      case WARN:
+      case DEBUG:
+      case TRACE:
       case ERROR:
         log.setLevel(level);
         break;
+      // deprecated
 
       case WARNING:
         // loglevel's warning name is different from webpack's
         log.setLevel('warn');
         break;
+      // deprecated
 
       case NONE:
+      case SILENT:
         log.disableAll();
         break;
 
@@ -134,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...');
@@ -179,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.');
@@ -203,29 +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;
-var port = urlParts.port; // 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?
@@ -234,7 +237,6 @@ if (hostname === '0.0.0.0' || hostname === '::') {
   // eslint-disable-next-line no-bitwise
   if (self.location.hostname && !!~self.location.protocol.indexOf('http')) {
     hostname = self.location.hostname;
-    port = self.location.port;
   }
 } // `hostname` can be empty when the script path is relative. In that case, specifying
 // a protocol would result in an invalid URL.
@@ -244,61 +246,32 @@ if (hostname === '0.0.0.0' || hostname === '::') {
 
 if (hostname && (self.location.protocol === 'https:' || urlParts.hostname === '0.0.0.0')) {
   protocol = self.location.protocol;
+} // default values of the sock url if they are not provided
+
+
+var sockHost = hostname;
+var sockPath = '/sockjs-node';
+var sockPort = urlParts.port;
+
+if (urlParts.path !== null && // eslint-disable-next-line no-undefined
+urlParts.path !== undefined && urlParts.path !== '/') {
+  var parsedQuery = querystring.parse(urlParts.path); // all of these sock url params are optionally passed in through
+  // __resourceQuery, so we need to fall back to the default if
+  // they are not provided
+
+  sockHost = parsedQuery.sockHost || sockHost;
+  sockPath = parsedQuery.sockPath || sockPath;
+  sockPort = parsedQuery.sockPort || sockPort;
 }
 
 var socketUrl = url.format({
   protocol: protocol,
   auth: urlParts.auth,
-  hostname: hostname,
-  port: port,
+  hostname: sockHost,
+  port: sockPort,
   // If sockPath is provided it'll be passed in via the __resourceQuery as a
   // query param so it has to be parsed out of the querystring in order for the
   // client to open the socket to the correct location.
-  pathname: urlParts.path == null || urlParts.path === '/' ? '/sockjs-node' : querystring.parse(urlParts.path).sockPath || urlParts.path
-});
-socket(socketUrl, onSocketMsg);
-var isUnloading = false;
-self.addEventListener('beforeunload', function () {
-  isUnloading = true;
+  pathname: sockPath
 });
-
-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), '*');
-    }
-  } else {
-    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);