@nx/gradle 22.6.4 → 22.6.5

package/src/executors/gradle/gradle-batch.impl.js

@@ -4,7 +4,6 @@ exports.batchRunnerPath = void 0;
 exports.default = gradleBatch;
 exports.getGradlewTasksToRun = getGradlewTasksToRun;
 const devkit_1 = require("@nx/devkit");
-const run_commands_impl_1 = require("nx/src/executors/run-commands/run-commands.impl");
 const exec_gradle_1 = require("../../utils/exec-gradle");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
@@ -111,20 +110,40 @@ function getGradlewTasksToRun(taskIds, taskGraph, inputs, nodes) {
 }
 async function runTasksInBatch(gradlewTasksToRun, excludeTasks, excludeTestTasks, args, root) {
     const gradlewBatchStart = performance.mark(`gradlew-batch:start`);
-    const debugOptions = ' ' + (process.env.NX_GRADLE_BATCH_DEBUG ?? '');
-    const command = `java${debugOptions} -jar ${exports.batchRunnerPath} --tasks='${JSON.stringify(gradlewTasksToRun)}' --workspaceRoot=${root} --args='${args
-        .join(' ')
-        .replaceAll("'", '"')}' --excludeTasks='${Array.from(excludeTasks).join(',')}' --excludeTestTasks='${Array.from(excludeTestTasks).join(',')}' ${process.env.NX_VERBOSE_LOGGING === 'true' ? '' : '--quiet'}`;
+    const debugOptions = (process.env.NX_GRADLE_BATCH_DEBUG ?? '').trim();
+    const spawnArgs = [
+        ...(debugOptions ? debugOptions.split(/\s+/) : []),
+        '-jar',
+        exports.batchRunnerPath,
+        `--tasks=${JSON.stringify(gradlewTasksToRun)}`,
+        `--workspaceRoot=${root}`,
+        `--args=${args.join(' ').replaceAll("'", '"')}`,
+        `--excludeTasks=${Array.from(excludeTasks).join(',')}`,
+        `--excludeTestTasks=${Array.from(excludeTestTasks).join(',')}`,
+        ...(process.env.NX_VERBOSE_LOGGING === 'true' ? [] : ['--quiet']),
+    ];
     // Use 'inherit' for stderr so Gradle output (tee'd to System.err
     // by TeeOutputStream) flows to the terminal in real-time.
     // stdout is piped to capture the JSON batch results.
-    const batchResults = (0, child_process_1.execSync)(command, {
-        cwd: devkit_1.workspaceRoot,
-        windowsHide: true,
-        env: process.env,
-        stdio: ['pipe', 'pipe', 'inherit'],
-        maxBuffer: run_commands_impl_1.LARGE_BUFFER,
-    }).toString();
+    const batchResults = await new Promise((resolve, reject) => {
+        const cp = (0, child_process_1.spawn)('java', spawnArgs, {
+            cwd: devkit_1.workspaceRoot,
+            windowsHide: true,
+            env: process.env,
+            stdio: ['pipe', 'pipe', 'inherit'],
+        });
+        const chunks = [];
+        cp.stdout.on('data', (chunk) => chunks.push(chunk));
+        cp.on('error', reject);
+        cp.on('close', (code) => {
+            if (code !== 0) {
+                reject(new Error(`Gradle batch runner exited with code ${code}`));
+            }
+            else {
+                resolve(Buffer.concat(chunks).toString());
+            }
+        });
+    });
     const gradlewBatchEnd = performance.mark(`gradlew-batch:end`);
     performance.measure(`gradlew-batch`, gradlewBatchStart.name, gradlewBatchEnd.name);
     const gradlewBatchResults = JSON.parse(batchResults);

package/src/plugin/utils/get-project-graph-from-gradle-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-project-graph-from-gradle-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/get-project-graph-from-gradle-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,oBAAoB,EACpB,wBAAwB,EAExB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,mBAAmB,EAAoB,MAAM,yBAAyB,CAAC;AAIhF,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE;QACL,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;KAClD,CAAC;IACF,YAAY,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACzD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,uBAAwB,SAAQ,kBAAkB;IACjE,IAAI,EAAE,MAAM,CAAC;CACd;AAiBD,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kBAAkB,EAC3B,IAAI,EAAE,MAAM,QAgBb;AAQD,wBAAgB,4BAA4B,IAAI,kBAAkB,CAejE;AAED,wBAAgB,oBAAoB,IAAI,MAAM,EAAE,CAG/C;AAED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA6Df;AAED,wBAAgB,qBAAqB,CACnC,iBAAiB,EAAE,MAAM,EAAE,GAC1B,kBAAkB,CAkDpB"}
+{"version":3,"file":"get-project-graph-from-gradle-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/get-project-graph-from-gradle-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,oBAAoB,EACpB,wBAAwB,EAExB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,mBAAmB,EAAoB,MAAM,yBAAyB,CAAC;AAIhF,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE;QACL,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;KAClD,CAAC;IACF,YAAY,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACzD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,uBAAwB,SAAQ,kBAAkB;IACjE,IAAI,EAAE,MAAM,CAAC;CACd;AAiBD,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kBAAkB,EAC3B,IAAI,EAAE,MAAM,QAgBb;AAOD,wBAAgB,4BAA4B,IAAI,kBAAkB,CAejE;AAED,wBAAgB,oBAAoB,IAAI,MAAM,EAAE,CAG/C;AAED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAyEf;AAED,wBAAgB,qBAAqB,CACnC,iBAAiB,EAAE,MAAM,EAAE,GAC1B,kBAAkB,CAkDpB"}

package/src/plugin/utils/get-project-graph-from-gradle-plugin.js

@@ -75,14 +75,25 @@ async function populateProjectGraph(workspaceRoot, gradlewFiles, options) {
         return;
     }
     const gradleProjectGraphReportStart = performance.mark('gradleProjectGraphReport:start');
-    const projectGraphLines = await gradlewFiles.reduce(async (projectGraphLines, gradlewFile) => {
-        const getNxProjectGraphLinesStart = performance.mark(`${gradlewFile}GetNxProjectGraphLines:start`);
-        const allLines = await projectGraphLines;
-        const currentLines = await (0, get_project_graph_lines_1.getNxProjectGraphLines)(gradlewFile, gradleConfigHash, normalizedOptions);
-        const getNxProjectGraphLinesEnd = performance.mark(`${gradlewFile}GetNxProjectGraphLines:end`);
-        performance.measure(`${gradlewFile}GetNxProjectGraphLines`, getNxProjectGraphLinesStart.name, getNxProjectGraphLinesEnd.name);
-        return [...allLines, ...currentLines];
-    }, Promise.resolve([]));
+    let projectGraphLines;
+    try {
+        projectGraphLines = await gradlewFiles.reduce(async (projectGraphLines, gradlewFile) => {
+            const getNxProjectGraphLinesStart = performance.mark(`${gradlewFile}GetNxProjectGraphLines:start`);
+            const allLines = await projectGraphLines;
+            const currentLines = await (0, get_project_graph_lines_1.getNxProjectGraphLines)(gradlewFile, gradleConfigHash, normalizedOptions);
+            const getNxProjectGraphLinesEnd = performance.mark(`${gradlewFile}GetNxProjectGraphLines:end`);
+            performance.measure(`${gradlewFile}GetNxProjectGraphLines`, getNxProjectGraphLinesStart.name, getNxProjectGraphLinesEnd.name);
+            return [...allLines, ...currentLines];
+        }, Promise.resolve([]));
+    }
+    catch (e) {
+        if (e instanceof Error &&
+            e.message === 'Gradle project graph generation was cancelled') {
+            // Cancelled by a newer populateProjectGraph call — silently return
+            return;
+        }
+        throw e;
+    }
     const gradleProjectGraphReportEnd = performance.mark('gradleProjectGraphReport:end');
     performance.measure('gradleProjectGraphReport', gradleProjectGraphReportStart.name, gradleProjectGraphReportEnd.name);
     projectGraphReportCache = processNxProjectGraph(projectGraphLines);

package/src/plugin/utils/get-project-graph-lines.d.ts

@@ -1,4 +1,9 @@
 import { GradlePluginOptions } from './gradle-plugin-options';
+/**
+ * Cancel any in-flight Gradle project graph process.
+ * Safe to call even if nothing is running.
+ */
+export declare function cancelPendingProjectGraphRequest(): void;
 export declare function getGraphTimeoutMs(): number;
 export declare function getNxProjectGraphLines(gradlewFile: string, gradleConfigHash: string, gradlePluginOptions: GradlePluginOptions): Promise<string[]>;
 //# sourceMappingURL=get-project-graph-lines.d.ts.map

package/src/plugin/utils/get-project-graph-lines.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-project-graph-lines.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/get-project-graph-lines.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAI9D,wBAAgB,iBAAiB,IAAI,MAAM,CAS1C;AAED,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,MAAM,EAAE,CAAC,CAoGnB"}
+{"version":3,"file":"get-project-graph-lines.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/get-project-graph-lines.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D;;;GAGG;AACH,wBAAgB,gCAAgC,IAAI,IAAI,CAKvD;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAS1C;AAED,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,MAAM,EAAE,CAAC,CA6GnB"}

package/src/plugin/utils/get-project-graph-lines.js

@@ -1,11 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cancelPendingProjectGraphRequest = cancelPendingProjectGraphRequest;
 exports.getGraphTimeoutMs = getGraphTimeoutMs;
 exports.getNxProjectGraphLines = getNxProjectGraphLines;
 const devkit_1 = require("@nx/devkit");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const exec_gradle_1 = require("../../utils/exec-gradle");
 const DEFAULT_GRAPH_TIMEOUT_SECONDS = (0, devkit_internals_1.isCI)() ? 600 : 120;
+let currentAbortController;
+/**
+ * Cancel any in-flight Gradle project graph process.
+ * Safe to call even if nothing is running.
+ */
+function cancelPendingProjectGraphRequest() {
+    if (currentAbortController) {
+        currentAbortController.abort('cancelled');
+        currentAbortController = undefined;
+    }
+}
 function getGraphTimeoutMs() {
     const envTimeout = process.env.NX_GRADLE_PROJECT_GRAPH_TIMEOUT;
     if (envTimeout) {
@@ -21,7 +33,11 @@ async function getNxProjectGraphLines(gradlewFile, gradleConfigHash, gradlePlugi
     const gradlePluginOptionsArgs = Object.entries(gradlePluginOptions ?? {})?.map(([key, value]) => `-P${key}=${value}`) ?? [];
     const timeoutMs = getGraphTimeoutMs();
     const timeoutSeconds = timeoutMs / 1000;
+    // Cancel any in-flight Gradle process from a previous call, then create a fresh controller.
+    cancelPendingProjectGraphRequest();
     const controller = new AbortController();
+    currentAbortController = controller;
+    const signal = controller.signal;
     const timer = setTimeout(() => controller.abort(), timeoutMs);
     try {
         nxProjectGraphBuffer = await (0, exec_gradle_1.execGradleAsync)(gradlewFile, [
@@ -35,10 +51,14 @@ async function getNxProjectGraphLines(gradlewFile, gradleConfigHash, gradlePlugi
             ...gradlePluginOptionsArgs,
             `-PworkspaceRoot=${devkit_1.workspaceRoot}`,
             process.env.NX_GRADLE_VERBOSE_LOGGING ? '--info' : '',
-        ], { signal: controller.signal });
+        ], { signal });
     }
     catch (e) {
-        if (controller.signal.aborted) {
+        // Cancelled by a newer populateProjectGraph call — let the caller handle it
+        if (signal.reason === 'cancelled') {
+            throw new Error('Gradle project graph generation was cancelled');
+        }
+        if (signal.aborted) {
             throw new devkit_1.AggregateCreateNodesError([
                 [
                     gradlewFile,

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;AAO/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,CAiCjB;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,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"}

package/src/utils/exec-gradle.js

@@ -13,6 +13,7 @@ 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 treeKill = require("tree-kill");
 exports.fileSeparator = process.platform.startsWith('win')
     ? 'file:///'
     : 'file://';
@@ -34,6 +35,9 @@ function getGradleExecFile() {
  * @returns promise with the stdout buffer
  */
 function execGradleAsync(gradleBinaryPath, args, execOptions = {}) {
+    // Extract signal so we can handle cancellation with tree-kill
+    // 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, {
             cwd: (0, node_path_1.dirname)(gradleBinaryPath),
@@ -41,8 +45,16 @@ function execGradleAsync(gradleBinaryPath, args, execOptions = {}) {
             windowsHide: true,
             env: process.env,
             maxBuffer: run_commands_impl_1.LARGE_BUFFER,
-            ...execOptions,
+            ...restOptions,
         }, undefined);
+        // Use tree-kill on abort to kill the entire process tree
+        // (cmd.exe → gradlew.bat → java.exe), not just the shell.
+        const onAbort = () => {
+            if (cp.pid) {
+                treeKill(cp.pid);
+            }
+        };
+        signal?.addEventListener('abort', onAbort, { once: true });
         let stdout = Buffer.from('');
         cp.stdout?.on('data', (data) => {
             stdout += data;
@@ -50,9 +62,10 @@ function execGradleAsync(gradleBinaryPath, args, execOptions = {}) {
         cp.stderr?.on('data', (data) => {
             stdout += data;
         });
-        cp.on('exit', (code, signal) => {
+        cp.on('exit', (code, s) => {
+            signal?.removeEventListener('abort', onAbort);
             if (code === null)
-                code = (0, exit_codes_1.signalToCode)(signal);
+                code = (0, exit_codes_1.signalToCode)(s);
             if (code === 0) {
                 res(stdout);
             }