feat: don't set outputDirLocalRepo if present in target.options (#1439)

* feat: don't set outputDirLocalRepo if present in target.options * build: work in progress * build: work in progress
khalilou88 · Dec 4, 2024 · f83ad8b · f83ad8b
1 parent 4fd6cd0
commit f83ad8b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/packages/nx-maven/src/graph/create-nodes-v2.ts b/packages/nx-maven/src/graph/create-nodes-v2.ts
@@ -13,6 +13,7 @@ import {
   getOutputDirLocalRepo,
   getTask,
   getWorkspaceData,
+  ifOutputDirLocalRepoNotPresent,
   MavenProjectType,
   validateTargetInputs,
   WorkspaceDataType,
@@ -31,7 +32,6 @@ export const createNodesV2: CreateNodesV2<NxMavenPluginOptions> = [
   },
 ];
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function createNodesInternal(
   configFilePath: string,
   options: NxMavenPluginOptions | undefined,
@@ -72,10 +72,11 @@ async function createNodesInternal(
         validateTargetInputs(targetName, 'project.json', target.inputs);
 
         if (
-          workspaceData.targetDefaults.includes(targetName) ||
-          (target.outputs ?? []).some(
-            (element: string) => element === '{options.outputDirLocalRepo}',
-          )
+          ifOutputDirLocalRepoNotPresent(target?.options) &&
+          (workspaceData.targetDefaults.includes(targetName) ||
+            (target.outputs ?? []).some(
+              (element: string) => element === '{options.outputDirLocalRepo}',
+            ))
         ) {
           const effectiveVersion = getEffectiveVersion(project, workspaceData);
 

diff --git a/packages/nx-maven/src/graph/create-nodes.ts b/packages/nx-maven/src/graph/create-nodes.ts
@@ -9,6 +9,7 @@ import {
   getOutputDirLocalRepo,
   getTask,
   getWorkspaceData,
+  ifOutputDirLocalRepoNotPresent,
   validateTargetInputs,
 } from './graph-utils';
 
@@ -49,10 +50,11 @@ export const createNodes: CreateNodes<NxMavenPluginOptions> = [
           validateTargetInputs(targetName, 'project.json', target.inputs);
 
           if (
-            workspaceData.targetDefaults.includes(targetName) ||
-            (target.outputs ?? []).some(
-              (element: string) => element === '{options.outputDirLocalRepo}',
-            )
+            ifOutputDirLocalRepoNotPresent(target?.options) &&
+            (workspaceData.targetDefaults.includes(targetName) ||
+              (target.outputs ?? []).some(
+                (element: string) => element === '{options.outputDirLocalRepo}',
+              ))
           ) {
             const effectiveVersion = getEffectiveVersion(
               project,

diff --git a/packages/nx-maven/src/graph/graph-utils.ts b/packages/nx-maven/src/graph/graph-utils.ts
@@ -550,3 +550,16 @@ export function getTask(isRootProject: boolean) {
 
   return 'install';
 }
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function ifOutputDirLocalRepoNotPresent(options: any): boolean {
+  if (!options) {
+    return true;
+  }
+
+  if ('outputDirLocalRepo' in options) {
+    return false;
+  }
+
+  return true;
+}