nx 21.6.9 → 21.6.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "21.6.9",
+  "version": "21.6.10",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "21.6.9",
-    "@nx/nx-darwin-x64": "21.6.9",
-    "@nx/nx-freebsd-x64": "21.6.9",
-    "@nx/nx-linux-arm-gnueabihf": "21.6.9",
-    "@nx/nx-linux-arm64-gnu": "21.6.9",
-    "@nx/nx-linux-arm64-musl": "21.6.9",
-    "@nx/nx-linux-x64-gnu": "21.6.9",
-    "@nx/nx-linux-x64-musl": "21.6.9",
-    "@nx/nx-win32-arm64-msvc": "21.6.9",
-    "@nx/nx-win32-x64-msvc": "21.6.9"
+    "@nx/nx-darwin-arm64": "21.6.10",
+    "@nx/nx-darwin-x64": "21.6.10",
+    "@nx/nx-freebsd-x64": "21.6.10",
+    "@nx/nx-linux-arm-gnueabihf": "21.6.10",
+    "@nx/nx-linux-arm64-gnu": "21.6.10",
+    "@nx/nx-linux-arm64-musl": "21.6.10",
+    "@nx/nx-linux-x64-gnu": "21.6.10",
+    "@nx/nx-linux-x64-musl": "21.6.10",
+    "@nx/nx-win32-arm64-msvc": "21.6.10",
+    "@nx/nx-win32-x64-msvc": "21.6.10"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/executors/run-commands/running-tasks.js

@@ -322,20 +322,20 @@ class RunningNodeProcess {
         });
         // Terminate any task processes on exit
         process.on('exit', () => {
-            this.childProcess.kill();
+            this.kill();
         });
         process.on('SIGINT', () => {
-            this.childProcess.kill('SIGTERM');
+            this.kill('SIGTERM');
             // we exit here because we don't need to write anything to cache.
             process.exit((0, exit_codes_1.signalToCode)('SIGINT'));
         });
         process.on('SIGTERM', () => {
-            this.childProcess.kill('SIGTERM');
+            this.kill('SIGTERM');
             // no exit here because we expect child processes to terminate which
             // will store results to the cache and will terminate this process
         });
         process.on('SIGHUP', () => {
-            this.childProcess.kill('SIGTERM');
+            this.kill('SIGTERM');
             // no exit here because we expect child processes to terminate which
             // will store results to the cache and will terminate this process
         });

package/src/tasks-runner/running-tasks/node-child-process.d.ts

@@ -1,5 +1,5 @@
-import { ChildProcess, Serializable } from 'child_process';
-import { RunningTask } from './running-task';
+import type { ChildProcess, Serializable } from 'child_process';
+import type { RunningTask } from './running-task';
 export declare class NodeChildProcessWithNonDirectOutput implements RunningTask {
     private childProcess;
     private terminalOutput;

package/src/tasks-runner/running-tasks/node-child-process.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-child-process.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/running-tasks/node-child-process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAK7C,qBAAa,mCAAoC,YAAW,WAAW;IASnE,OAAO,CAAC,YAAY;IARtB,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,aAAa,CAChB;IACL,OAAO,CAAC,eAAe,CAAuC;IAE9D,OAAO,CAAC,QAAQ,CAAS;gBAGf,YAAY,EAAE,YAAY,EAClC,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;IAwDrE,MAAM,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,IAAI;IAIzD,QAAQ,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI;IAI/B,UAAU,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;IAcrE,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAK1B,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO;CAKpC;AA2DD,qBAAa,gCAAiC,YAAW,WAAW;IAQhE,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,mBAAmB;IAR7B,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,aAAa,CAAqD;IAE1E,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAS;gBAGf,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,MAAM;IAqBrC,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAMjC,MAAM,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI;IAInD,UAAU,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;IAQrE,WAAW;IAMX,iBAAiB;IAKjB,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI;CAKpC"}
+{"version":3,"file":"node-child-process.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/running-tasks/node-child-process.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAKhE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,qBAAa,mCAAoC,YAAW,WAAW;IASnE,OAAO,CAAC,YAAY;IARtB,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,aAAa,CAChB;IACL,OAAO,CAAC,eAAe,CAAuC;IAE9D,OAAO,CAAC,QAAQ,CAAS;gBAGf,YAAY,EAAE,YAAY,EAClC,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;IAwDrE,MAAM,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,IAAI;IAIzD,QAAQ,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI;IAI/B,UAAU,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;IAcrE,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAK1B,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO;CAOpC;AA2DD,qBAAa,gCAAiC,YAAW,WAAW;IAQhE,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,mBAAmB;IAR7B,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,aAAa,CAAqD;IAE1E,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAS;gBAGf,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,MAAM;IAqBrC,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAMjC,MAAM,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI;IAInD,UAAU,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;IAQrE,WAAW;IAMX,iBAAiB;IAKjB,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI;CAOpC"}

package/src/tasks-runner/running-tasks/node-child-process.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeChildProcessWithDirectOutput = exports.NodeChildProcessWithNonDirectOutput = void 0;
-const exit_codes_1 = require("../../utils/exit-codes");
-const stream_1 = require("stream");
 const chalk = require("chalk");
 const fs_1 = require("fs");
+const stream_1 = require("stream");
+const treeKill = require("tree-kill");
+const exit_codes_1 = require("../../utils/exit-codes");
 class NodeChildProcessWithNonDirectOutput {
     constructor(childProcess, { streamOutput, prefix }) {
         this.childProcess = childProcess;
@@ -89,8 +90,10 @@ class NodeChildProcessWithNonDirectOutput {
         }
     }
     kill(signal) {
-        if (this.childProcess.connected) {
-            this.childProcess.kill(signal);
+        if (this.childProcess?.pid) {
+            treeKill(this.childProcess.pid, signal, () => {
+                // Ignore errors - process may have already exited
+            });
         }
     }
 }
@@ -190,8 +193,10 @@ class NodeChildProcessWithDirectOutput {
         return this.terminalOutput;
     }
     kill(signal) {
-        if (this.childProcess.connected) {
-            this.childProcess.kill(signal);
+        if (this.childProcess?.pid) {
+            treeKill(this.childProcess.pid, signal, () => {
+                // Ignore errors - process may have already exited
+            });
         }
     }
 }