webpack-dev-server 3.5.1 → 3.7.2

package/client/index.js

@@ -3,25 +3,22 @@
 
 /* eslint prefer-destructuring: off */
 
-var querystring = require('querystring');
-
-var url = require('url');
-
 var stripAnsi = require('strip-ansi');
 
-var log = require('loglevel').getLogger('webpack-dev-server');
-
 var socket = require('./socket');
 
 var overlay = require('./overlay');
 
+var _require = require('./utils/log'),
+    log = _require.log,
+    setLogLevel = _require.setLogLevel;
+
 var sendMessage = require('./utils/sendMessage');
 
 var reloadApp = require('./utils/reloadApp');
 
-var getCurrentScriptSource = require('./utils/getCurrentScriptSource');
+var createSocketUrl = require('./utils/createSocketUrl');
 
-var urlParts;
 var status = {
   isUnloading: false,
   currentHash: ''
@@ -35,6 +32,7 @@ var options = {
   useErrorOverlay: false,
   useProgress: false
 };
+var socketUrl = createSocketUrl(__resourceQuery);
 self.addEventListener('beforeunload', function () {
   status.isUnloading = true;
 });
@@ -44,35 +42,7 @@ if (typeof window !== 'undefined') {
   options.hotReload = qs.indexOf('hotreload=false') === -1;
 }
 
-if (typeof __resourceQuery === 'string' && __resourceQuery) {
-  // If this bundle is inlined, use the resource query to get the correct url.
-  urlParts = url.parse(__resourceQuery.substr(1));
-} else {
-  // Else, get the url from the <script> this file was called with.
-  var scriptHost = getCurrentScriptSource(); // eslint-disable-next-line no-useless-escape
-
-  scriptHost = scriptHost.replace(/\/[^\/]+$/, '');
-  urlParts = url.parse(scriptHost || '/', false, true);
-}
-
-if (!urlParts.port || urlParts.port === '0') {
-  urlParts.port = self.location.port;
-}
-
-var INFO = 'info';
-var WARN = 'warn';
-var ERROR = 'error';
-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
-
-var WARNING = 'warning';
-var NONE = 'none'; // Set the default log level
-
-log.setDefaultLevel(INFO);
-var onSocketMsg = {
+var onSocketMessage = {
   hot: function hot() {
     options.hot = true;
     log.info('[WDS] Hot Module Replacement enabled.');
@@ -109,30 +79,7 @@ var onSocketMsg = {
       hotCtx('./log').setLogLevel(level);
     }
 
-    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;
-
-      default:
-        log.error("[WDS] Unknown clientLogLevel '".concat(level, "'"));
-    }
+    setLogLevel(level);
   },
   overlay: function overlay(value) {
     if (typeof document !== 'undefined') {
@@ -226,52 +173,4 @@ var onSocketMsg = {
     sendMessage('Close');
   }
 };
-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?
-  // hostname n/a for file protocol (example, when using electron, ionic)
-  // see: https://github.com/webpack/webpack-dev-server/pull/384
-  // eslint-disable-next-line no-bitwise
-  if (self.location.hostname && !!~self.location.protocol.indexOf('http')) {
-    hostname = self.location.hostname;
-  }
-} // `hostname` can be empty when the script path is relative. In that case, specifying
-// a protocol would result in an invalid URL.
-// When https is used in the app, secure websockets are always necessary
-// because the browser doesn't accept non-secure websockets.
-
-
-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: 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: sockPath
-});
-socket(socketUrl, onSocketMsg);
+socket(socketUrl, onSocketMessage);