webpack-dev-server 2.9.3 → 2.9.4

package/bin/webpack-dev-server.js

@@ -390,8 +390,9 @@ function startDevServer(webpackOptions, options) {
 
   ['SIGINT', 'SIGTERM'].forEach((sig) => {
     process.on(sig, () => {
-      server.close();
-      process.exit(); // eslint-disable-line no-process-exit
+      server.close(() => {
+        process.exit(); // eslint-disable-line no-process-exit
+      });
     });
   });
 

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');
@@ -474,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) {
@@ -610,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/package.json

@@ -1,11 +1,11 @@
 {
   "name": "webpack-dev-server",
-  "version": "2.9.3",
+  "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",
@@ -54,6 +54,7 @@
     "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",
@@ -73,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",

package/ssl/server.pem

@@ -1,46 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAtoS4CpKBMmqAuoOv0P+RNWctGnwjxLmB/LSNy4rGHiF+f+t/
-qr5OWSeZbns/Qn6XMRaC4PaZkE0Y8Gpp8ZzbQPSaOaTeK8N8ZvnfwEcjJApOgW/k
-ZJwBx6GfqeRy6ecXpMWZjkiKLT+cz0g9wZDFQBWEOzOjWTk9Oy8ptF9babi2Rbd9
-WGFMGEVZI8OI4grP/KDHs0xu20fkeefnJ6CIPjVdmcCF3JhF5Cbh856RID8MunST
-lArTY9kWWCtTyI4PFik3xUrTZ48CFduwb+xOYrBysQJcrZxZlbHMfMrIdVdmGhz9
-WM8OdgfcT3tsqnSS5HyISpt1YtGFcG7HQAF1fwIDAQABAoIBACPyx/ztFh1D9M7H
-mR1k+Mi35Z5NzQ22K/AF79ejIZpVpoCzdZW/ndbZgdLM24zROh4k/OoqJ9zQEpVn
-oC5CYrzMcIPiARBFlH8DwBoy6Kz0irnbu/RE9eTH5JaltCx1o6aEdNYdW3nGCbCZ
-3e/9/5u7oSu34/hy2aiKhYBNN8f+j23Sm8DIm8p8Gf42t5JjIuIlI15CUklYilPr
-Ygja3xzMWyuFhhkTANDjsCRqaFHr8OEELTPZ9c2LyvIsXeclOo9j11CgHTBIkEPv
-I5HSpbm8lFu4LqZhFMewsCXE2IiuxVMsVez7qlSwZUECz2OoY0A/jLZZEEvNTu2O
-PI+F1kECgYEA+v/ZhV3YHQZejDcREnRa/4Ps52y19kzFjoe3sOssCrhCKMeG+CL0
-c13K6ig9N8e4miMUUK0OptzCQEy2dPwWlbAHTxMeQ3m686EaVnDPcnguyzvdOUEJ
-R8Z7LUyLfF9EflwHxpUNcPM+MGgUMdmKlT3xLPEJ6WGu+pQEGIeEjYcCgYEAuiea
-B8cLCWfl6xqJQSz6hMO/vuO1UdmURVtYyld9I1SyPDOMvUWi/dds2ExSQvfQ4jDH
-0rpq905+q5BZV0/GsROpCOUdnLGAlvloboYrOhLrXD8H5dAPegjbja/e3WPAmXvj
-X1sWbu/QN6gYmup2gc2E/cgKeUPmRr0O2t94lkkCgYBwhK87ZSVTZZ6O1sS1dCmy
-764M1KQBpMrPKTIEgng82fr2kvODWxAgg4RKUf2XetXbayxZOiseTEpcTsdgS/3H
-3qB4J0bi0rgnLSpEY8/rLcs0WkLCvs/tOCHR3cWN3Js01ga6U+kxoClZw96Btla0
-ro7mKavazmqFdEMdx+p5EwKBgAVdmNn6ib3mqcDiDey8ACiNf9xfsd0/GT/6hw+l
-/+xhx5Vmovrdo/oPGIsPgBuACxxJ7aiMSQMB1zLYwUp7+S0ndOrVt8nJb/xqCfGN
-mnddDj2lb3PXUGrjEHkABbt54ZZK9N3NwVLHRMgl5zen5GyPYPLzriGarGuDjYcP
-g+lJAoGBAJwxpSW/R5NPMYT3tu9SFJMmAy7noMW5AA4GGE8lhvRAYOWOsZXAek4c
-n+8IFJCOe+gwGyqWw6CqOuM+3siAFT4gkA+AKTp/CRBK251dHXdFsGw13xuWXS3O
-gG0VbpK/3Z/Ma/+HWygSzJwigIKWgzJLPUiI0Rx1Vd7sTyftK2ur
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIDJjCCAg6gAwIBAgIJcBBuut3aIvmUMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
-BAMTCWxvY2FsaG9zdDAeFw0xNzEwMDEyMTU3MjNaFw0xNzEwMzEyMTU3MjNaMBQx
-EjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALaEuAqSgTJqgLqDr9D/kTVnLRp8I8S5gfy0jcuKxh4hfn/rf6q+TlknmW57
-P0J+lzEWguD2mZBNGPBqafGc20D0mjmk3ivDfGb538BHIyQKToFv5GScAcehn6nk
-cunnF6TFmY5Iii0/nM9IPcGQxUAVhDszo1k5PTsvKbRfW2m4tkW3fVhhTBhFWSPD
-iOIKz/ygx7NMbttH5Hnn5yegiD41XZnAhdyYReQm4fOekSA/DLp0k5QK02PZFlgr
-U8iODxYpN8VK02ePAhXbsG/sTmKwcrECXK2cWZWxzHzKyHVXZhoc/VjPDnYH3E97
-bKp0kuR8iEqbdWLRhXBux0ABdX8CAwEAAaN7MHkwDAYDVR0TBAUwAwEB/zALBgNV
-HQ8EBAMCAvQwXAYDVR0RBFUwU4IJbG9jYWxob3N0ghVsb2NhbGhvc3QubG9jYWxk
-b21haW6CBmx2aC5tZYIIKi5sdmgubWWCBVs6OjFdhwR/AAABhxD+gAAAAAAAAAAA
-AAAAAAABMA0GCSqGSIb3DQEBCwUAA4IBAQABcNBUVzSJXbNGZ4mR8jDX+098nI6n
-noEyQ/kcMRLqP7X2eXS9ks4jcNrFztpKxSheEqU5rB7AVDaerNiOKMlkw9NYKmer
-RmlY3SpqtN2h1lJLX1dXRmfUaKwLm+hRGLOjrPPQyFihauzf2t6CeYBZFToqLv0M
-BSsvNrrEHJCzM37kcfu7e4fKHPF+hzaxx8acOk7dD2FffgeGzsir0V1mTpoRq6St
-LHwOvslK82P3OyDRCWfE6R+YwIz8x2IPFvrRdglZyFfWDKpqDZOf6TKm11dGmulI
-5VnO4SHNk52113QMybBn8ReiKYE+mIUkQ0G7uVyCj5+lGKP6NvP83Nsx
------END CERTIFICATE-----