From 0a8f8965fba4a46a862497f6e7d1ad9377040a15 Mon Sep 17 00:00:00 2001
From: Andrew Powell <shellscape@users.noreply.github.com>
Date: Sat, 21 Oct 2017 21:03:48 -0400
Subject: [PATCH] fixes #860: failure to exit on SIGINT race condition (#1157)

* fixes #860: failure to exit on SIGINT race condition

* correct test name

* increase test timeout
---
 bin/webpack-dev-server.js |  5 +++--
 package-lock.json         | 23 ++++++++++++++++++++---
 package.json              |  1 +
 test/cli.test.js          | 28 ++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 test/cli.test.js

diff --git a/bin/webpack-dev-server.js b/bin/webpack-dev-server.js
index 25f7bbab6a..05c2952455 100755
--- a/bin/webpack-dev-server.js
+++ b/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
+      });
     });
   });
 
diff --git a/package-lock.json b/package-lock.json
index bc3d16fd14..802b8a87f7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1997,9 +1997,9 @@
       }
     },
     "execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz",
+      "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=",
       "dev": true,
       "requires": {
         "cross-spawn": "5.1.0",
@@ -8009,6 +8009,23 @@
             "execa": "0.7.0",
             "lcid": "1.0.0",
             "mem": "1.1.0"
+          },
+          "dependencies": {
+            "execa": {
+              "version": "0.7.0",
+              "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+              "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+              "dev": true,
+              "requires": {
+                "cross-spawn": "5.1.0",
+                "get-stream": "3.0.0",
+                "is-stream": "1.1.0",
+                "npm-run-path": "2.0.2",
+                "p-finally": "1.0.0",
+                "signal-exit": "3.0.2",
+                "strip-eof": "1.0.0"
+              }
+            }
           }
         },
         "uglifyjs-webpack-plugin": {
diff --git a/package.json b/package.json
index 1ec497f25b..fef8c4fdfa 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,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",
diff --git a/test/cli.test.js b/test/cli.test.js
new file mode 100644
index 0000000000..159b330a68
--- /dev/null
+++ b/test/cli.test.js
@@ -0,0 +1,28 @@
+'use strict';
+
+const assert = require('assert');
+const path = require('path');
+const execa = require('execa');
+
+describe('SIGINT', () => {
+  it('should exit the process when SIGINT is detected', (done) => {
+    const cliPath = path.resolve(__dirname, '../bin/webpack-dev-server.js');
+    const examplePath = path.resolve(__dirname, '../examples/cli-public');
+    const nodePath = execa.shellSync('which node').stdout;
+
+    const proc = execa(nodePath, [cliPath], { cwd: examplePath });
+
+    proc.stdout.on('data', (data) => {
+      const bits = data.toString();
+
+      if (/webpack: Compiled successfully/.test(bits)) {
+        assert(proc.pid !== 0);
+        proc.kill('SIGINT');
+      }
+    });
+
+    proc.on('exit', () => {
+      done();
+    });
+  }).timeout(4000);
+});