@nx/gradle 22.1.0-rc.4 → 22.1.0

package/src/plugin/nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin/nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EAKpB,wBAAwB,EAEzB,MAAM,YAAY,CAAC;AAepB,OAAO,EACL,mBAAmB,EAEpB,MAAM,+BAA+B,CAAC;AAEvC,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC;AAMnE,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,QAE5E;AAED,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAoC5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAE3C,UAAU,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,EACvD,gBAAe,aAAkB,EACjC,gBAAe,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAM,MAG5D,mBAAc,EACd,SAAS,mBAAmB,GAAG,SAAS,EACxC,SAAS,oBAAoB;;;;;;;;EA+B9B,CAAC"}
+{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin/nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EAIpB,wBAAwB,EAEzB,MAAM,YAAY,CAAC;AAepB,OAAO,EACL,mBAAmB,EAEpB,MAAM,+BAA+B,CAAC;AAEvC,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC;AAoFnE,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,QAE5E;AAED,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAwF5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAE3C,UAAU,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,EACvD,gBAAe,aAAkB,EACjC,gBAAe,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAM,MAG5D,mBAAc,EACd,SAAS,mBAAmB,GAAG,SAAS,EACxC,SAAS,oBAAoB;;;;;;;;EA+B9B,CAAC"}

package/src/plugin/nodes.js

@@ -14,6 +14,63 @@ const gradle_plugin_options_1 = require("./utils/gradle-plugin-options");
 function readProjectsCache(cachePath) {
     return (0, node_fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
+/**
+ * Strips nxConfig from project and all targets, returning only Gradle-detected configuration.
+ */
+function stripNxConfig(project) {
+    const { nxConfig, targets, ...rest } = project;
+    const cleanedTargets = {};
+    if (targets) {
+        for (const [targetName, target] of Object.entries(targets)) {
+            const { nxConfig: targetNxConfig, ...targetRest } = target;
+            cleanedTargets[targetName] = targetRest;
+        }
+    }
+    return {
+        ...rest,
+        targets: cleanedTargets,
+    };
+}
+/**
+ * Extracts only nxConfig properties from project and targets.
+ * Returns undefined if no nxConfig exists.
+ */
+function extractNxConfigOnly(project) {
+    const projectWithNxConfig = project;
+    const projectLevelNxConfig = projectWithNxConfig.nxConfig;
+    const targetsWithNxConfig = {};
+    let hasAnyNxConfig = false;
+    // Extract target-level nxConfig
+    if (project.targets) {
+        for (const [targetName, target] of Object.entries(project.targets)) {
+            const targetNxConfig = target.nxConfig;
+            if (targetNxConfig && Object.keys(targetNxConfig).length > 0) {
+                targetsWithNxConfig[targetName] = targetNxConfig;
+                hasAnyNxConfig = true;
+            }
+        }
+    }
+    // Check if we have project-level nxConfig
+    if (projectLevelNxConfig && Object.keys(projectLevelNxConfig).length > 0) {
+        hasAnyNxConfig = true;
+    }
+    if (!hasAnyNxConfig) {
+        return undefined;
+    }
+    // Build result with only nxConfig properties
+    let result = {};
+    // Merge project-level nxConfig into root
+    if (projectLevelNxConfig) {
+        result = {
+            ...projectLevelNxConfig,
+        };
+    }
+    // Add target-level nxConfig if any exist
+    if (Object.keys(targetsWithNxConfig).length > 0) {
+        result.targets = targetsWithNxConfig;
+    }
+    return result;
+}
 function writeTargetsToCache(cachePath, results) {
     (0, devkit_1.writeJsonFile)(cachePath, results);
 }
@@ -26,11 +83,54 @@ exports.createNodesV2 = [
         const projectsCache = readProjectsCache(cachePath);
         await (0, get_project_graph_from_gradle_plugin_1.populateProjectGraph)(context.workspaceRoot, gradlewFiles.map((f) => (0, node_path_1.join)(context.workspaceRoot, f)), options);
         const report = (0, get_project_graph_from_gradle_plugin_1.getCurrentProjectGraphReport)();
-        const { nodes, externalNodes, buildFiles = [] } = report;
+        const { nodes, externalNodes = {}, buildFiles = [] } = report;
         // Combine buildFilesFromSplitConfigFiles and buildFiles, making each value distinct
         const allBuildFiles = Array.from(new Set([...buildFilesFromSplitConfigFiles, ...buildFiles]));
         try {
-            return (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodesForGradleConfigFile)(nodes, projectsCache, externalNodes), allBuildFiles, options, context);
+            const results = [];
+            const normalizedOptions = (0, gradle_plugin_options_1.normalizeOptions)(options);
+            for (const gradleFilePath of allBuildFiles) {
+                // Skip on Vercel and Netlify
+                if (process.env.VERCEL || process.env.NETLIFY) {
+                    continue;
+                }
+                const projectRoot = (0, node_path_1.dirname)(gradleFilePath);
+                const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, normalizedOptions ?? {}, context);
+                // Get project from cache or nodes
+                projectsCache[hash] ??=
+                    nodes[projectRoot] ?? nodes[(0, node_path_1.join)(devkit_1.workspaceRoot, projectRoot)];
+                const project = projectsCache[hash];
+                if (!project) {
+                    continue;
+                }
+                const normalizedProjectRoot = (0, devkit_1.normalizePath)(projectRoot);
+                // Result 1: Gradle-detected configuration (without nxConfig)
+                const gradleConfig = stripNxConfig(project);
+                gradleConfig.root = normalizedProjectRoot;
+                results.push([
+                    gradleFilePath,
+                    {
+                        projects: {
+                            [normalizedProjectRoot]: gradleConfig,
+                        },
+                        externalNodes: externalNodes,
+                    },
+                ]);
+                // Result 2: nxConfig-only configuration (if exists)
+                const nxConfigOnly = extractNxConfigOnly(project);
+                if (nxConfigOnly) {
+                    nxConfigOnly.root = normalizedProjectRoot;
+                    results.push([
+                        gradleFilePath,
+                        {
+                            projects: {
+                                [normalizedProjectRoot]: nxConfigOnly,
+                            },
+                        },
+                    ]);
+                }
+            }
+            return results;
         }
         finally {
             writeTargetsToCache(cachePath, projectsCache);