@nx/gradle 22.7.0-beta.3 → 22.7.0-beta.5

package/src/migrations/22-7-0/change-plugin-version-0-1-17.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export default function update(tree: Tree): Promise<void>;
+//# sourceMappingURL=change-plugin-version-0-1-17.d.ts.map

package/src/migrations/22-7-0/change-plugin-version-0-1-17.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-plugin-version-0-1-17.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/migrations/22-7-0/change-plugin-version-0-1-17.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,MAAM,YAAY,CAAC;AAO9C,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,iBAgB9C"}

package/src/migrations/22-7-0/change-plugin-version-0-1-17.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const devkit_1 = require("@nx/devkit");
+const has_gradle_plugin_1 = require("../../utils/has-gradle-plugin");
+const gradle_project_graph_plugin_utils_1 = require("../../generators/init/gradle-project-graph-plugin-utils");
+const version_catalog_ast_utils_1 = require("../../utils/version-catalog-ast-utils");
+/* Change the plugin version to 0.1.17
+ */
+async function update(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson) {
+        return;
+    }
+    if (!(0, has_gradle_plugin_1.hasGradlePlugin)(tree)) {
+        return;
+    }
+    const gradlePluginVersionToUpdate = '0.1.17';
+    // Update version in version catalogs using AST-based approach to preserve formatting
+    await (0, version_catalog_ast_utils_1.updateNxPluginVersionInCatalogsAst)(tree, gradlePluginVersionToUpdate);
+    // Then update in build.gradle(.kts) files
+    await (0, gradle_project_graph_plugin_utils_1.addNxProjectGraphPlugin)(tree, gradlePluginVersionToUpdate);
+}

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

@@ -1,3 +1,4 @@
 import { GradlePluginOptions } from './gradle-plugin-options';
+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":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,MAAM,EAAE,CAAC,CA0EnB"}
+{"version":3,"file":"get-project-graph-lines.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/get-project-graph-lines.ts"],"names":[],"mappings":"AAEA,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"}

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

@@ -1,11 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGraphTimeoutMs = getGraphTimeoutMs;
 exports.getNxProjectGraphLines = getNxProjectGraphLines;
 const devkit_1 = require("@nx/devkit");
 const exec_gradle_1 = require("../../utils/exec-gradle");
+const DEFAULT_GRAPH_TIMEOUT_SECONDS = 60;
+function getGraphTimeoutMs() {
+    const envTimeout = process.env.NX_GRADLE_PROJECT_GRAPH_TIMEOUT;
+    if (envTimeout) {
+        const parsed = Number(envTimeout);
+        if (!Number.isNaN(parsed) && parsed > 0) {
+            return parsed * 1000;
+        }
+    }
+    return DEFAULT_GRAPH_TIMEOUT_SECONDS * 1000;
+}
 async function getNxProjectGraphLines(gradlewFile, gradleConfigHash, gradlePluginOptions) {
     let nxProjectGraphBuffer;
     const gradlePluginOptionsArgs = Object.entries(gradlePluginOptions ?? {})?.map(([key, value]) => `-P${key}=${value}`) ?? [];
+    const timeoutMs = getGraphTimeoutMs();
+    const timeoutSeconds = timeoutMs / 1000;
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
     try {
         nxProjectGraphBuffer = await (0, exec_gradle_1.execGradleAsync)(gradlewFile, [
             'nxProjectGraph',
@@ -18,10 +34,21 @@ async function getNxProjectGraphLines(gradlewFile, gradleConfigHash, gradlePlugi
             ...gradlePluginOptionsArgs,
             `-PworkspaceRoot=${devkit_1.workspaceRoot}`,
             process.env.NX_GRADLE_VERBOSE_LOGGING ? '--info' : '',
-        ]);
+        ], { signal: controller.signal });
     }
     catch (e) {
-        if (e.toString()?.includes('ERROR: JAVA_HOME')) {
+        if (controller.signal.aborted) {
+            throw new devkit_1.AggregateCreateNodesError([
+                [
+                    gradlewFile,
+                    new Error(`Gradle project graph generation timed out after ${timeoutSeconds} ${timeoutSeconds === 1 ? 'second' : 'seconds'}.\n` +
+                        `  1. Run "gradlew --stop" to stop the Gradle daemon, then run "gradlew clean" to clear the build cache.\n` +
+                        `  2. If the issue persists, set the environment variable NX_GRADLE_PROJECT_GRAPH_TIMEOUT to a higher value (in seconds) to increase the timeout.\n` +
+                        `  3. If the issue still persists, set NX_GRADLE_DISABLE=true to disable the Gradle plugin entirely.`),
+                ],
+            ], []);
+        }
+        else if (e.toString()?.includes('ERROR: JAVA_HOME')) {
             throw new devkit_1.AggregateCreateNodesError([
                 [
                     gradlewFile,
@@ -46,6 +73,9 @@ async function getNxProjectGraphLines(gradlewFile, gradleConfigHash, gradlePlugi
             ], []);
         }
     }
+    finally {
+        clearTimeout(timer);
+    }
     const projectGraphLines = nxProjectGraphBuffer
         .toString()
         .split(exec_gradle_1.newLineSeparator)

package/src/utils/versions.d.ts

@@ -1,4 +1,4 @@
 export declare const nxVersion: any;
 export declare const gradleProjectGraphPluginName = "dev.nx.gradle.project-graph";
-export declare const gradleProjectGraphVersion = "0.1.16";
+export declare const gradleProjectGraphVersion = "0.1.17";
 //# sourceMappingURL=versions.d.ts.map

package/src/utils/versions.js

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.gradleProjectGraphVersion = exports.gradleProjectGraphPluginName = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.gradleProjectGraphPluginName = 'dev.nx.gradle.project-graph';
-exports.gradleProjectGraphVersion = '0.1.16';
+exports.gradleProjectGraphVersion = '0.1.17';