webpack-dev-server 2.9.0 → 2.9.4

package/client/socket.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const SockJS = require('sockjs-client');
+const SockJS = require('sockjs-client/dist/sockjs');
 
 let retries = 0;
 let sock = null;

package/lib/Server.js

@@ -13,6 +13,7 @@ const del = require('del');
 const express = require('express');
 const httpProxyMiddleware = require('http-proxy-middleware');
 const ip = require('ip');
+const killable = require('killable');
 const serveIndex = require('serve-index');
 const historyApiFallback = require('connect-history-api-fallback');
 const selfsigned = require('selfsigned');
@@ -343,9 +344,10 @@ function Server(compiler, options) {
     },
 
     setup: () => {
-      log('Using "setup" is deprecated and will be removed in the next major version. Please use the "before" and "after" hooks instead.');
-      log('If "setup" was working fine for you until now, simply replace it with "before"');
-      if (typeof options.setup === 'function') { options.setup(app, this); }
+      if (typeof options.setup === 'function') {
+        log('The `setup` option is deprecated and will be removed in v3. Please update your config to use `before`');
+        options.setup(app, this);
+      }
     }
   };
 
@@ -473,6 +475,8 @@ function Server(compiler, options) {
     this.listeningApp = http.createServer(app);
   }
 
+  killable(this.listeningApp);
+
   // Proxy websockets without the initial http request
   // https://github.com/chimurai/http-proxy-middleware#external-websocket-upgrade
   websocketProxies.forEach(function (wsProxy) {
@@ -609,14 +613,15 @@ Server.prototype.close = function (callback) {
     sock.close();
   });
   this.sockets = [];
-  this.listeningApp.close(() => {
-    this.middleware.close(callback);
-  });
 
   this.contentBaseWatchers.forEach((watcher) => {
     watcher.close();
   });
   this.contentBaseWatchers = [];
+
+  this.listeningApp.kill(() => {
+    this.middleware.close(callback);
+  });
 };
 
 Server.prototype.sockWrite = function (sockets, type, data) {

package/lib/optionsSchema.json

@@ -64,9 +64,6 @@
     },
     "headers": {
       "description": "Response headers that are added to each response.",
-      "additionalProperties": {
-        "type": "string"
-      },
       "type": "object"
     },
     "clientLogLevel": {

package/lib/polyfills.js

@@ -1,9 +1,8 @@
 'use strict';
 
 /* polyfills for Node 4.8.x users */
-/* eslint no-extend-native: off, global-require: off */
 
 // internal-ip@2.x uses [].includes
-if (!Array.prototype.includes) {
-  Array.prototype.includes = require('array-includes');
-}
+const includes = require('array-includes');
+
+includes.shim();

package/lib/util/createDomain.js

@@ -10,8 +10,12 @@ module.exports = function createDomain(options, listeningApp) {
   const port = options.socket ? 0 : appPort;
   const hostname = options.useLocalIp ? internalIp.v4() : options.host;
 
+  // use explicitly defined public url (prefix with protocol if not explicitly given)
+  if (options.public) {
+    return /^[a-zA-Z]+:\/\//.test(options.public) ? `${options.public}` : `${protocol}://${options.public}`;
+  }
   // the formatted domain (url without path) of the webpack server
-  return options.public ? `${protocol}://${options.public}` : url.format({
+  return url.format({
     protocol,
     hostname,
     port

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "webpack-dev-server",
-  "version": "2.9.0",
+  "version": "2.9.4",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "license": "MIT",
   "repository": "webpack/webpack-dev-server",
   "author": "Tobias Koppers @sokra",
-  "homepage": "http://github.com/webpack/webpack-dev-server",
+  "homepage": "https://github.com/webpack/webpack-dev-server",
   "maintainers": [
     {
       "name": "Andrew Powell",
@@ -24,7 +24,7 @@
     "cover": "istanbul cover node_modules/mocha/bin/_mocha",
     "lint": "eslint bin lib test examples client/{index,live,socket,sockjs,overlay,webpack.config}.js",
     "mocha": "mocha --full-trace --check-leaks",
-    "prepublish": "npm run -s build:live && npm run -s build:index && npm run -s build:sockjs",
+    "prepublish": "(rm ssl/*.pem || true) && npm run -s build:live && npm run -s build:index && npm run -s build:sockjs",
     "test": "npm run lint && npm run mocha",
     "build:live": "webpack ./client/live.js client/live.bundle.js --color --config client/webpack.config.js",
     "build:index": "webpack ./client/index.js client/index.bundle.js --color --config client/webpack.config.js",
@@ -46,12 +46,15 @@
     "chokidar": "^1.6.0",
     "compression": "^1.5.2",
     "connect-history-api-fallback": "^1.3.0",
+    "debug": "^3.1.0",
     "del": "^3.0.0",
     "express": "^4.13.3",
     "html-entities": "^1.2.0",
     "http-proxy-middleware": "~0.17.4",
+    "import-local": "^0.1.1",
     "internal-ip": "1.2.0",
     "ip": "^1.1.5",
+    "killable": "^1.0.0",
     "loglevel": "^1.4.1",
     "opn": "^5.1.0",
     "portfinder": "^1.0.9",
@@ -71,6 +74,7 @@
     "eslint": "^4.5.0",
     "eslint-config-webpack": "^1.2.5",
     "eslint-plugin-import": "^2.7.0",
+    "execa": "^0.8.0",
     "file-loader": "^0.11.2",
     "istanbul": "^0.4.5",
     "jquery": "^3.2.1",