@nx/gradle 22.7.7 → 22.7.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "22.7.7",
+  "version": "22.7.9",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -40,13 +40,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.7",
+    "@nx/devkit": "22.7.9",
     "toml-eslint-parser": "^0.10.0",
     "tree-kill": "^1.2.2",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.7"
+    "nx": "22.7.9"
   },
   "publishConfig": {
     "access": "public"

package/src/utils/exec-gradle.d.ts

@@ -1,5 +1,5 @@
 import { NxJsonConfiguration } from '@nx/devkit';
-import { ExecFileOptions } from 'node:child_process';
+import { SpawnOptions } from 'node:child_process';
 export declare const fileSeparator: string;
 export declare const newLineSeparator: string;
 /**
@@ -14,7 +14,7 @@ export declare function getGradleExecFile(): string;
  * @param execOptions exec options
  * @returns promise with the stdout buffer
  */
-export declare function execGradleAsync(gradleBinaryPath: string, args: ReadonlyArray<string>, execOptions?: ExecFileOptions): Promise<Buffer>;
+export declare function execGradleAsync(gradleBinaryPath: string, args: ReadonlyArray<string>, execOptions?: Omit<SpawnOptions, 'shell'>): Promise<Buffer>;
 export declare function getCustomGradleExecutableDirectoryFromPlugin(nxJson: NxJsonConfiguration): string | undefined;
 /**
  * This function recursively finds the nearest gradlew file in the workspace

package/src/utils/exec-gradle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exec-gradle.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/utils/exec-gradle.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,mBAAmB,EAEpB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,eAAe,EAAY,MAAM,oBAAoB,CAAC;AAQ/D,eAAO,MAAM,aAAa,QAEb,CAAC;AAEd,eAAO,MAAM,gBAAgB,QAErB,CAAC;AAET;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,EAC3B,WAAW,GAAE,eAAoB,GAChC,OAAO,CAAC,MAAM,CAAC,CA+CjB;AAED,wBAAgB,4CAA4C,CAC1D,MAAM,EAAE,mBAAmB,GAC1B,MAAM,GAAG,SAAS,CAWpB;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,EACrB,yBAAyB,CAAC,EAAE,MAAM,GACjC,MAAM,CASR;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,EACrB,iBAAiB,CAAC,EAAE,MAAM,UAoC3B;AAED,wBAAgB,yCAAyC,CACvD,+BAA+B,EAAE,MAAM,EACvC,aAAa,EAAE,MAAM,UAqCtB"}
+{"version":3,"file":"exec-gradle.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/utils/exec-gradle.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,mBAAmB,EAEpB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,eAAO,MAAM,aAAa,QAEb,CAAC;AAEd,eAAO,MAAM,gBAAgB,QAErB,CAAC;AAET;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,EAC3B,WAAW,GAAE,IAAI,CAAC,YAAY,EAAE,OAAO,CAAM,GAC5C,OAAO,CAAC,MAAM,CAAC,CA+CjB;AAED,wBAAgB,4CAA4C,CAC1D,MAAM,EAAE,mBAAmB,GAC1B,MAAM,GAAG,SAAS,CAWpB;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,EACrB,yBAAyB,CAAC,EAAE,MAAM,GACjC,MAAM,CASR;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,EACrB,iBAAiB,CAAC,EAAE,MAAM,UAoC3B;AAED,wBAAgB,yCAAyC,CACvD,+BAA+B,EAAE,MAAM,EACvC,aAAa,EAAE,MAAM,UAqCtB"}

package/src/utils/exec-gradle.js

@@ -9,11 +9,9 @@ exports.findGradlewUsingFilePathTraversal = findGradlewUsingFilePathTraversal;
 exports.findGradlewUsingCustomExecutableDirectory = findGradlewUsingCustomExecutableDirectory;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const run_commands_impl_1 = require("nx/src/executors/run-commands/run-commands.impl");
-const exit_codes_1 = require("nx/src/utils/exit-codes");
+const internal_1 = require("@nx/devkit/internal");
 const tree_kill_1 = tslib_1.__importDefault(require("tree-kill"));
 exports.fileSeparator = process.platform.startsWith('win')
     ? 'file:///'
@@ -40,16 +38,14 @@ function execGradleAsync(gradleBinaryPath, args, execOptions = {}) {
     // instead of Node's default which only kills the immediate child.
     const { signal, ...restOptions } = execOptions;
     return new Promise((res, rej) => {
-        const cp = (0, node_child_process_1.execFile)(gradleBinaryPath, args, {
+        // Without the filter, empty args reach gradle as literal empty arguments.
+        const cp = (0, internal_1.safeSpawn)(gradleBinaryPath, args.filter(Boolean), {
             cwd: (0, node_path_1.dirname)(gradleBinaryPath),
-            shell: true,
-            windowsHide: true,
             env: process.env,
-            maxBuffer: run_commands_impl_1.LARGE_BUFFER,
             ...restOptions,
-        }, undefined);
+        });
         // Use tree-kill on abort to kill the entire process tree
-        // (cmd.exe → gradlew.bat → java.exe), not just the shell.
+        // (gradlew spawns java), not just the direct child.
         const onAbort = () => {
             if (cp.pid) {
                 (0, tree_kill_1.default)(cp.pid);
@@ -63,10 +59,16 @@ function execGradleAsync(gradleBinaryPath, args, execOptions = {}) {
         cp.stderr?.on('data', (data) => {
             stdout += data;
         });
+        // Without a shell the child is gradlew itself, so spawn can fail outright —
+        // Node then emits `error` and never `exit`.
+        cp.on('error', (err) => {
+            signal?.removeEventListener('abort', onAbort);
+            rej(err);
+        });
         cp.on('exit', (code, s) => {
             signal?.removeEventListener('abort', onAbort);
             if (code === null)
-                code = (0, exit_codes_1.signalToCode)(s);
+                code = (0, internal_1.signalToCode)(s);
             if (code === 0) {
                 res(stdout);
             }