feat: use tree-kill instead of terminate (#169)

tree-kill license is more permissive.
argos-ci · Dec 11, 2018 · bb2e27b · bb2e27b
1 parent be650a3
commit bb2e27b
Show file tree

Hide file tree

Showing 5 changed files with 1,022 additions and 69 deletions.
diff --git a/packages/jest-dev-server/package.json b/packages/jest-dev-server/package.json
@@ -23,7 +23,7 @@
     "find-process": "^1.2.1",
     "inquirer": "^6.2.0",
     "spawnd": "^3.5.2",
-    "terminate": "^2.1.2",
+    "tree-kill": "^1.2.1",
     "wait-port": "^0.2.2"
   }
 }
diff --git a/packages/jest-dev-server/src/global.js b/packages/jest-dev-server/src/global.js
@@ -7,7 +7,7 @@ import cwd from 'cwd'
 import waitPort from 'wait-port'
 import findProcess from 'find-process'
 import { promisify } from 'util'
-import terminate from 'terminate'
+import treeKill from 'tree-kill'
 import inquirer from 'inquirer'
 
 const DEFAULT_CONFIG = {
@@ -20,7 +20,7 @@ const DEFAULT_CONFIG = {
   usedPortAction: 'ask',
 }
 
-const pterminate = promisify(terminate)
+const pTreeKill = promisify(treeKill)
 
 const serverLogPrefixer = new stream.Transform({
   transform(chunk, encoding, callback) {
@@ -51,7 +51,7 @@ function logProcDetection(proc, port) {
 
 async function killProc(proc) {
   console.log(chalk.yellow(`Killing process ${proc.name}...`))
-  await pterminate(proc.pid)
+  await pTreeKill(proc.pid)
   console.log(chalk.green(`Successfully killed process ${proc.name}`))
 }
 

diff --git a/packages/spawnd/package.json b/packages/spawnd/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "exit": "^0.1.2",
     "signal-exit": "^3.0.2",
-    "terminate": "^2.1.2",
+    "tree-kill": "^1.2.1",
     "wait-port": "^0.2.2"
   }
 }
diff --git a/packages/spawnd/src/index.js b/packages/spawnd/src/index.js
@@ -1,15 +1,15 @@
 import { promisify } from 'util'
 import { spawn } from 'child_process'
-import terminate from 'terminate'
+import treeKill from 'tree-kill'
 import exit from 'exit'
 import onExit from 'signal-exit'
 
-const pterminate = promisify(terminate)
+const pTreeKill = promisify(treeKill)
 
 function spawnd(command, options) {
   function cleanExit(code = 1) {
     if (proc && proc.pid) {
-      terminate(proc.pid, () => exit(code))
+      treeKill(proc.pid, () => exit(code))
     } else {
       exit(code)
     }
@@ -28,7 +28,7 @@ function spawnd(command, options) {
     removeExitHandler()
     proc.removeAllListeners('exit')
     proc.removeAllListeners('error')
-    return pterminate(proc.pid).catch(() => {
+    return pTreeKill(proc.pid).catch(() => {
       /* ignore error */
     })
   }