webpack-dev-server 3.4.1 → 3.7.0

package/CHANGELOG.md

@@ -2,6 +2,62 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.7.0](https://github.com/webpack/webpack-dev-server/compare/v3.5.1...v3.7.0) (2019-06-06)
+
+
+### Bug Fixes
+
+* change clientLogLevel order to be called first ([#1973](https://github.com/webpack/webpack-dev-server/issues/1973)) ([57c8c92](https://github.com/webpack/webpack-dev-server/commit/57c8c92))
+* es6 syntax in client ([#1982](https://github.com/webpack/webpack-dev-server/issues/1982)) ([802aa30](https://github.com/webpack/webpack-dev-server/commit/802aa30))
+
+
+### Features
+
+* **server:** add serverMode option ([#1937](https://github.com/webpack/webpack-dev-server/issues/1937)) ([44a8cde](https://github.com/webpack/webpack-dev-server/commit/44a8cde))
+
+
+
+## [3.6.0](https://github.com/webpack/webpack-dev-server/compare/v3.5.1...v3.6.0) (2019-06-05)
+
+
+### Bug Fixes
+
+* **config:** enable `--overlay` ([#1968](https://github.com/webpack/webpack-dev-server/issues/1968)) ([dc81e23](https://github.com/webpack/webpack-dev-server/commit/dc81e23))
+* **server:** don't ignore node_modules by default ([#1970](https://github.com/webpack/webpack-dev-server/issues/1970)) ([699f8b4](https://github.com/webpack/webpack-dev-server/commit/699f8b4)), closes [#1794](https://github.com/webpack/webpack-dev-server/issues/1794)
+
+
+### Features
+
+* **server:** add serverMode option ([#1937](https://github.com/webpack/webpack-dev-server/issues/1937)) ([44a8cde](https://github.com/webpack/webpack-dev-server/commit/44a8cde))
+
+
+
+### [3.5.1](https://github.com/webpack/webpack-dev-server/compare/v3.5.0...v3.5.1) (2019-06-01)
+
+
+### Bug Fixes
+
+* allow passing promise function of webpack.config.js ([#1947](https://github.com/webpack/webpack-dev-server/issues/1947)) ([8cf1053](https://github.com/webpack/webpack-dev-server/commit/8cf1053))
+
+
+
+## [3.5.0](https://github.com/webpack/webpack-dev-server/compare/v3.4.1...v3.5.0) (2019-05-31)
+
+
+### Bug Fixes
+
+* add client code for `electron-renderer` target ([#1935](https://github.com/webpack/webpack-dev-server/issues/1935)) ([9297988](https://github.com/webpack/webpack-dev-server/commit/9297988))
+* add client code for `node-webkit` target ([#1942](https://github.com/webpack/webpack-dev-server/issues/1942)) ([c6b2b1f](https://github.com/webpack/webpack-dev-server/commit/c6b2b1f))
+
+
+### Features
+
+* **server:** `onListening` option ([#1930](https://github.com/webpack/webpack-dev-server/issues/1930)) ([61d0cdf](https://github.com/webpack/webpack-dev-server/commit/61d0cdf))
+* **server:** add callback support for invalidate ([#1900](https://github.com/webpack/webpack-dev-server/issues/1900)) ([cd218ef](https://github.com/webpack/webpack-dev-server/commit/cd218ef))
+* **server:** add `WEBPACK_DEV_SERVER` env variable ([#1929](https://github.com/webpack/webpack-dev-server/issues/1929)) ([856169e](https://github.com/webpack/webpack-dev-server/commit/856169e))
+
+
+
 ### [3.4.1](https://github.com/webpack/webpack-dev-server/compare/v3.4.0...v3.4.1) (2019-05-17)
 
 

package/bin/webpack-dev-server.js

@@ -2,49 +2,26 @@
 
 'use strict';
 
-/* eslint-disable
-  import/order,
-  no-shadow,
-  no-console
-*/
-const debug = require('debug')('webpack-dev-server');
+/* eslint-disable no-shadow, no-console */
 
 const fs = require('fs');
 const net = require('net');
-
+const debug = require('debug')('webpack-dev-server');
 const importLocal = require('import-local');
-
 const yargs = require('yargs');
 const webpack = require('webpack');
-
-const options = require('./options');
 const Server = require('../lib/Server');
-
+const setupExitSignals = require('../lib/utils/setupExitSignals');
 const colors = require('../lib/utils/colors');
-const createConfig = require('../lib/utils/createConfig');
+const processOptions = require('../lib/utils/processOptions');
 const createLogger = require('../lib/utils/createLogger');
-const defaultTo = require('../lib/utils/defaultTo');
 const findPort = require('../lib/utils/findPort');
 const getVersions = require('../lib/utils/getVersions');
-const tryParseInt = require('../lib/utils/tryParseInt');
+const options = require('./options');
 
 let server;
 
-const signals = ['SIGINT', 'SIGTERM'];
-
-signals.forEach((signal) => {
-  process.on(signal, () => {
-    if (server) {
-      server.close(() => {
-        // eslint-disable-next-line no-process-exit
-        process.exit();
-      });
-    } else {
-      // eslint-disable-next-line no-process-exit
-      process.exit();
-    }
-  });
-});
+setupExitSignals(server);
 
 // Prefer the local installation of webpack-dev-server
 if (importLocal(__filename)) {
@@ -103,36 +80,6 @@ const config = require(convertArgvPath)(yargs, argv, {
   outputFilename: '/bundle.js',
 });
 
-// Taken out of yargs because we must know if
-// it wasn't given by the user, in which case
-// we should use portfinder.
-const DEFAULT_PORT = 8080;
-
-// Try to find unused port and listen on it for 3 times,
-// if port is not specified in options.
-// Because NaN == null is false, defaultTo fails if parseInt returns NaN
-// so the tryParseInt function is introduced to handle NaN
-const defaultPortRetry = defaultTo(
-  tryParseInt(process.env.DEFAULT_PORT_RETRY),
-  3
-);
-
-function processOptions(config) {
-  // processOptions {Promise}
-  if (typeof config.then === 'function') {
-    config.then(processOptions).catch((err) => {
-      console.error(err.stack || err);
-      // eslint-disable-next-line no-process-exit
-      process.exit();
-    });
-
-    return;
-  }
-
-  const options = createConfig(config, argv, { port: DEFAULT_PORT });
-  startDevServer(config, options);
-}
-
 function startDevServer(config, options) {
   const log = createLogger(options);
 
@@ -196,6 +143,7 @@ function startDevServer(config, options) {
       if (err) {
         throw err;
       }
+
       // chmod 666 (rw rw rw)
       const READ_WRITE = 438;
 
@@ -205,26 +153,22 @@ function startDevServer(config, options) {
         }
       });
     });
-  } else if (options.port) {
-    runServer();
   } else {
-    // only run port finder if no port as been specified
-    findPort(server, DEFAULT_PORT, defaultPortRetry, (err, port) => {
-      if (err) {
-        throw err;
-      }
-      options.port = port;
-      runServer();
-    });
-  }
-
-  function runServer() {
-    server.listen(options.port, options.host, (err) => {
-      if (err) {
+    findPort(options.port)
+      .then((port) => {
+        options.port = port;
+        server.listen(options.port, options.host, (err) => {
+          if (err) {
+            throw err;
+          }
+        });
+      })
+      .catch((err) => {
         throw err;
-      }
-    });
+      });
   }
 }
 
-processOptions(config);
+processOptions(config, argv, (config, options) => {
+  startDevServer(config, options);
+});

package/client/clients/BaseClient.js

@@ -0,0 +1,27 @@
+'use strict';
+/* eslint-disable
+  no-unused-vars
+*/
+
+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 _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+module.exports =
+/*#__PURE__*/
+function () {
+  function BaseClient() {
+    _classCallCheck(this, BaseClient);
+  }
+
+  _createClass(BaseClient, null, [{
+    key: "getClientPath",
+    value: function getClientPath(options) {
+      throw new Error('Client needs implementation');
+    }
+  }]);
+
+  return BaseClient;
+}();

package/client/clients/SockJSClient.js

@@ -0,0 +1,69 @@
+'use strict';
+/* eslint-disable
+  no-unused-vars
+*/
+
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+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 _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+var SockJS = require('sockjs-client/dist/sockjs');
+
+var BaseClient = require('./BaseClient');
+
+module.exports =
+/*#__PURE__*/
+function (_BaseClient) {
+  _inherits(SockJSClient, _BaseClient);
+
+  function SockJSClient(url) {
+    var _this;
+
+    _classCallCheck(this, SockJSClient);
+
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(SockJSClient).call(this));
+    _this.sock = new SockJS(url);
+    return _this;
+  }
+
+  _createClass(SockJSClient, [{
+    key: "onOpen",
+    value: function onOpen(f) {
+      this.sock.onopen = f;
+    }
+  }, {
+    key: "onClose",
+    value: function onClose(f) {
+      this.sock.onclose = f;
+    } // call f with the message string as the first argument
+
+  }, {
+    key: "onMessage",
+    value: function onMessage(f) {
+      this.sock.onmessage = function (e) {
+        f(e.data);
+      };
+    }
+  }], [{
+    key: "getClientPath",
+    value: function getClientPath(options) {
+      return require.resolve('./SockJSClient');
+    }
+  }]);
+
+  return SockJSClient;
+}(BaseClient);

package/client/clients/WebsocketClient.js

@@ -0,0 +1,31 @@
+'use strict';
+
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+var BaseClient = require('./BaseClient');
+
+module.exports =
+/*#__PURE__*/
+function (_BaseClient) {
+  _inherits(WebsocketClient, _BaseClient);
+
+  function WebsocketClient() {
+    _classCallCheck(this, WebsocketClient);
+
+    return _possibleConstructorReturn(this, _getPrototypeOf(WebsocketClient).apply(this, arguments));
+  }
+
+  return WebsocketClient;
+}(BaseClient);