@nx/gradle 19.1.0-canary.20240523-261b0ff → 19.1.0-canary.20240524-12c6a73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "19.1.0-canary.20240523-261b0ff",
+  "version": "19.1.0-canary.20240524-12c6a73",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -34,7 +34,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.1.0-canary.20240523-261b0ff"
+    "@nx/devkit": "19.1.0-canary.20240524-12c6a73"
   },
   "publishConfig": {
     "access": "public"

package/src/plugin/dependencies.js

@@ -24,7 +24,7 @@ const createDependencies = async (_, context) => {
     }
     const gradleDependenciesEnd = performance.mark('gradleDependencies:end');
     performance.measure('gradleDependencies', gradleDependenciesStart.name, gradleDependenciesEnd.name);
-    (0, nodes_1.writeTargetsToCache)(nodes_1.calculatedTargets);
+    (0, nodes_1.writeTargetsToCache)();
     if (dependencies.length) {
         (0, get_gradle_report_1.invalidateGradleReportCache)();
     }

package/src/plugin/nodes.d.ts

@@ -1,18 +1,9 @@
-import { CreateNodes, ProjectConfiguration, TargetConfiguration } from '@nx/devkit';
+import { CreateNodes } from '@nx/devkit';
 export interface GradlePluginOptions {
     testTargetName?: string;
     classesTargetName?: string;
     buildTargetName?: string;
     [taskTargetName: string]: string | undefined;
 }
-export declare const calculatedTargets: Record<string, {
-    name: string;
-    targets: Record<string, TargetConfiguration>;
-    metadata: ProjectConfiguration['metadata'];
-}>;
-export declare function writeTargetsToCache(targets: Record<string, {
-    name: string;
-    targets: Record<string, TargetConfiguration>;
-    metadata: ProjectConfiguration['metadata'];
-}>): void;
+export declare function writeTargetsToCache(): void;
 export declare const createNodes: CreateNodes<GradlePluginOptions>;

package/src/plugin/nodes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.writeTargetsToCache = exports.calculatedTargets = void 0;
+exports.createNodes = exports.writeTargetsToCache = void 0;
 const devkit_1 = require("@nx/devkit");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const node_fs_1 = require("node:fs");
@@ -15,13 +15,16 @@ const dependsOnMap = {
     classes: ['^classes'],
 };
 const cachePath = (0, node_path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'gradle.hash');
-const targetsCache = (0, node_fs_1.existsSync)(cachePath) ? readTargetsCache() : {};
-exports.calculatedTargets = {};
+const targetsCache = readTargetsCache();
 function readTargetsCache() {
-    return (0, devkit_1.readJsonFile)(cachePath);
+    return (0, node_fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
-function writeTargetsToCache(targets) {
-    (0, devkit_1.writeJsonFile)(cachePath, targets);
+function writeTargetsToCache() {
+    const oldCache = readTargetsCache();
+    (0, devkit_1.writeJsonFile)(cachePath, {
+        ...oldCache,
+        ...targetsCache,
+    });
 }
 exports.writeTargetsToCache = writeTargetsToCache;
 exports.createNodes = [
@@ -29,52 +32,51 @@ exports.createNodes = [
     (gradleFilePath, options, context) => {
         const projectRoot = (0, node_path_1.dirname)(gradleFilePath);
         const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options ?? {}, context);
-        if (targetsCache[hash]) {
-            exports.calculatedTargets[hash] = targetsCache[hash];
-            return {
-                projects: {
-                    [projectRoot]: targetsCache[hash],
-                },
-            };
-        }
-        try {
-            const { gradleProjectToTasksTypeMap, gradleFileToOutputDirsMap, gradleFileToGradleProjectMap, gradleProjectToProjectName, } = (0, get_gradle_report_1.getGradleReport)();
-            const gradleProject = gradleFileToGradleProjectMap.get(gradleFilePath);
-            const projectName = gradleProjectToProjectName.get(gradleProject);
-            if (!projectName) {
-                return;
-            }
-            const tasksTypeMap = gradleProjectToTasksTypeMap.get(gradleProject);
-            let tasks = [];
-            for (let [taskName, taskType] of tasksTypeMap.entries()) {
-                tasks.push({
-                    type: taskType,
-                    name: taskName,
-                });
-            }
-            const outputDirs = gradleFileToOutputDirsMap.get(gradleFilePath);
-            const { targets, targetGroups } = createGradleTargets(tasks, options, context, outputDirs, gradleProject);
-            const project = {
-                name: projectName,
-                targets,
-                metadata: {
-                    targetGroups,
-                    technologies: ['gradle'],
-                },
-            };
-            exports.calculatedTargets[hash] = project;
-            return {
-                projects: {
-                    [projectRoot]: project,
-                },
-            };
-        }
-        catch (e) {
-            console.error(e);
+        targetsCache[hash] ??= createGradleProject(gradleFilePath, options, context);
+        const project = targetsCache[hash];
+        if (!project) {
             return {};
         }
+        return {
+            projects: {
+                [projectRoot]: project,
+            },
+        };
     },
 ];
+function createGradleProject(gradleFilePath, options, context) {
+    try {
+        const { gradleProjectToTasksTypeMap, gradleFileToOutputDirsMap, gradleFileToGradleProjectMap, gradleProjectToProjectName, } = (0, get_gradle_report_1.getGradleReport)();
+        const gradleProject = gradleFileToGradleProjectMap.get(gradleFilePath);
+        const projectName = gradleProjectToProjectName.get(gradleProject);
+        if (!projectName) {
+            return;
+        }
+        const tasksTypeMap = gradleProjectToTasksTypeMap.get(gradleProject);
+        let tasks = [];
+        for (let [taskName, taskType] of tasksTypeMap.entries()) {
+            tasks.push({
+                type: taskType,
+                name: taskName,
+            });
+        }
+        const outputDirs = gradleFileToOutputDirsMap.get(gradleFilePath);
+        const { targets, targetGroups } = createGradleTargets(tasks, options, context, outputDirs, gradleProject);
+        const project = {
+            name: projectName,
+            targets,
+            metadata: {
+                targetGroups,
+                technologies: ['gradle'],
+            },
+        };
+        return project;
+    }
+    catch (e) {
+        console.error(e);
+        return undefined;
+    }
+}
 function createGradleTargets(tasks, options, context, outputDirs, gradleProject) {
     const inputsMap = createInputsMap(context);
     const targets = {};