feat: simplify addProjects function (#1444)

* feat: update graph calculation to fit complex cases * build: work in progress
khalilou88 · Dec 11, 2024 · 51e0665 · 51e0665
1 parent f7a0d5b
commit 51e0665
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/packages/nx-maven/src/graph/graph-utils.ts b/packages/nx-maven/src/graph/graph-utils.ts
@@ -72,12 +72,7 @@ export function getWorkspaceData(opts: NxMavenPluginOptions | undefined) {
     : false;
 
   const projects: MavenProjectType[] = [];
-  addProjects(
-    skipProjectWithoutProjectJson,
-    mavenRootDirAbsolutePath,
-    projects,
-    '',
-  );
+  addProjects(skipProjectWithoutProjectJson, projects, mavenRootDirectory);
 
   //TODO calculate versions here
 
@@ -110,16 +105,12 @@ export function removeWorkspaceDataCache() {
 
 export function addProjects(
   skipProjectWithoutProjectJson: boolean,
-  mavenRootDirAbsolutePath: string,
   projects: MavenProjectType[],
   projectRelativePath: string,
   aggregatorProjectArtifactId?: string,
 ) {
   //projectAbsolutePath
-  const projectAbsolutePath = path.join(
-    mavenRootDirAbsolutePath,
-    projectRelativePath,
-  );
+  const projectAbsolutePath = path.join(workspaceRoot, projectRelativePath);
   const pomXmlPath = path.join(projectAbsolutePath, 'pom.xml');
   const pomXmlContent = readXml(pomXmlPath);
 
@@ -183,7 +174,6 @@ export function addProjects(
     );
     addProjects(
       skipProjectWithoutProjectJson,
-      mavenRootDirAbsolutePath,
       projects,
       moduleRelativePath,
       artifactId,