feat(executors): use run-task instead of others executors

khalilou88 · Jul 27, 2023 · ea31aeb · ea31aeb
1 parent 85a1f5d
commit ea31aeb
Show file tree

Hide file tree

Showing 13 changed files with 203 additions and 265 deletions.
diff --git a/packages/gradle/src/generators/application/generator.ts b/packages/gradle/src/generators/application/generator.ts
@@ -389,19 +389,31 @@ export default async function (
     sourceRoot: `${normalizedOptions.projectRoot}/src`,
     targets: {
       build: {
-        executor: `${plugin}:build`,
+        executor: `${plugin}:run-task`,
         outputs: [`${normalizedOptions.projectRoot}/build`],
+        options: {
+          task: 'build',
+        },
       },
       'build-image': {},
-      serve: {},
+      serve: {
+        executor: `${plugin}:run-task`,
+        options: {
+          task: 'run',
+          keepItRunning: true,
+        },
+      },
       lint: {
         executor: `${plugin}:lint`,
         options: {
           linter: `${normalizedOptions.linter}`,
         },
       },
       test: {
-        executor: `${plugin}:test`,
+        executor: `${plugin}:run-task`,
+        options: {
+          task: 'test',
+        },
       },
       ktformat: {},
     },
@@ -416,43 +428,50 @@ export default async function (
   ) {
     targets['build'].options = {
       ...targets['build'].options,
-      packaging: `${normalizedOptions.packaging}`,
+      task: normalizedOptions.packaging === 'war' ? 'bootWar' : 'bootJar',
     };
-  }
 
-  if (options.framework === 'none') {
-    targets['serve'] = {
-      executor: `${plugin}:run-task`,
-      options: {
-        task: 'run',
-      },
+    targets['serve'].options = {
+      ...targets['serve'].options,
+      task: 'bootRun',
     };
-  }
 
-  if (options.framework !== 'none') {
     targets['build-image'] = {
-      executor: `${plugin}:build-image`,
-    };
-
-    targets['serve'] = {
-      executor: `${plugin}:serve`,
+      executor: `${plugin}:run-task`,
+      options: {
+        task: 'bootBuildImage',
+      },
     };
   }
 
-  if (options.framework && options.framework !== 'none') {
+  if (
+    plugin === '@jnxplus/nx-quarkus-gradle' ||
+    options.framework === 'quarkus'
+  ) {
     targets['build'].options = {
       ...targets['build'].options,
-      framework: options.framework,
-    };
-
-    targets['build-image'].options = {
-      ...targets['build-image'].options,
-      framework: options.framework,
+      task: 'quarkusBuild',
     };
 
     targets['serve'].options = {
       ...targets['serve'].options,
-      framework: options.framework,
+      task: 'quarkusDev',
+    };
+
+    targets['build-image'] = {
+      executor: `${plugin}:quarkus-build-image`,
+    };
+  }
+
+  if (
+    plugin === '@jnxplus/nx-micronaut-gradle' ||
+    options.framework === 'micronaut'
+  ) {
+    targets['build-image'] = {
+      executor: `${plugin}:run-task`,
+      options: {
+        task: 'dockerBuild',
+      },
     };
   }
 

diff --git a/packages/gradle/src/generators/library/generator.ts b/packages/gradle/src/generators/library/generator.ts
@@ -321,7 +321,10 @@ export default async function (
     sourceRoot: `${normalizedOptions.projectRoot}/src`,
     targets: {
       build: {
-        executor: `${plugin}:build`,
+        executor: `${plugin}:run-task`,
+        options: {
+          command: 'build',
+        },
         outputs: [`${normalizedOptions.projectRoot}/build`],
       },
       lint: {
@@ -331,19 +334,24 @@ export default async function (
         },
       },
       test: {
-        executor: `${plugin}:test`,
+        executor: `${plugin}:run-task`,
+        options: {
+          task: 'test',
+        },
       },
     },
     tags: normalizedOptions.parsedTags,
   };
 
   const targets = projectConfiguration.targets ?? {};
 
-  //this is important because in case of spring boot we use jar task to build libraries
-  if (options.framework && options.framework !== 'none') {
+  if (
+    plugin === '@jnxplus/nx-boot-gradle' ||
+    options.framework === 'spring-boot'
+  ) {
     targets['build'].options = {
       ...targets['build'].options,
-      framework: options.framework,
+      task: 'jar',
     };
   }
 

diff --git a/packages/maven/src/generators/application/generator.ts b/packages/maven/src/generators/application/generator.ts
@@ -403,19 +403,32 @@ export default async function (
     sourceRoot: `${normalizedOptions.projectRoot}/src`,
     targets: {
       build: {
-        executor: `${plugin}:build`,
+        executor: `${plugin}:run-task`,
         outputs: [`${normalizedOptions.projectRoot}/target`],
+        options: {
+          task: 'compile',
+        },
       },
       'build-image': {},
-      serve: {},
+      serve: {
+        executor: `${plugin}:run-task`,
+        options: {
+          task: 'exec:java',
+          keepItRunning: true,
+        },
+        dependsOn: ['build'],
+      },
       lint: {
         executor: `${plugin}:lint`,
         options: {
           linter: `${normalizedOptions.linter}`,
         },
       },
       test: {
-        executor: `${plugin}:test`,
+        executor: `${plugin}:run-task`,
+        options: {
+          task: 'test',
+        },
         dependsOn: ['build'],
       },
       ktformat: {},
@@ -425,41 +438,56 @@ export default async function (
 
   const targets = projectConfiguration.targets ?? {};
 
-  if (options.framework === 'none') {
-    targets['serve'] = {
+  if (
+    plugin === '@jnxplus/nx-boot-maven' ||
+    options.framework === 'spring-boot'
+  ) {
+    targets['build'].options = {
+      ...targets['build'].options,
+      task: 'package spring-boot:repackage',
+    };
+
+    targets['build-image'] = {
       executor: `${plugin}:run-task`,
       options: {
-        task: 'exec:java',
+        task: 'spring-boot:build-image',
       },
-      dependsOn: ['build'],
+    };
+
+    targets['serve'].options = {
+      ...targets['serve'].options,
+      task: 'spring-boot:run',
     };
   }
 
-  if (options.framework !== 'none') {
+  if (
+    plugin === '@jnxplus/nx-quarkus-maven' ||
+    options.framework === 'quarkus'
+  ) {
     targets['build-image'] = {
-      executor: `${plugin}:build-image`,
+      executor: `${plugin}:quarkus-build-image`,
     };
 
-    targets['serve'] = {
-      executor: `${plugin}:serve`,
-      dependsOn: ['build'],
+    targets['serve'].options = {
+      ...targets['serve'].options,
+      task: 'quarkus:dev',
     };
   }
 
-  if (options.framework && options.framework !== 'none') {
-    targets['build'].options = {
-      ...targets['build'].options,
-      framework: options.framework,
-    };
-
-    targets['build-image'].options = {
-      ...targets['build-image'].options,
-      framework: options.framework,
+  if (
+    plugin === '@jnxplus/nx-micronaut-maven' ||
+    options.framework === 'micronaut'
+  ) {
+    targets['build-image'] = {
+      executor: `${plugin}:run-task`,
+      options: {
+        task: 'package -Dpackaging=docker',
+      },
     };
 
     targets['serve'].options = {
       ...targets['serve'].options,
-      framework: options.framework,
+      task: 'mn:run',
     };
   }
 

diff --git a/packages/maven/src/generators/library/generator.ts b/packages/maven/src/generators/library/generator.ts
@@ -346,8 +346,11 @@ export default async function (
     sourceRoot: `${normalizedOptions.projectRoot}/src`,
     targets: {
       build: {
-        executor: `${plugin}:build`,
+        executor: `${plugin}:run-task`,
         outputs: [`${normalizedOptions.projectRoot}/target`],
+        options: {
+          command: 'install',
+        },
       },
       lint: {
         executor: `${plugin}:lint`,
@@ -356,21 +359,17 @@ export default async function (
         },
       },
       test: {
-        executor: `${plugin}:test`,
+        executor: `${plugin}:run-task`,
+        options: {
+          task: 'test',
+        },
       },
     },
     tags: normalizedOptions.parsedTags,
   };
 
   const targets = projectConfiguration.targets ?? {};
 
-  if (options.framework && options.framework !== 'none') {
-    targets['build'].options = {
-      ...targets['build'].options,
-      framework: options.framework,
-    };
-  }
-
   if (options.language === 'kotlin') {
     targets['ktformat'] = {
       executor: `${plugin}:ktformat`,

diff --git a/packages/maven/src/generators/parent-project/generator.ts b/packages/maven/src/generators/parent-project/generator.ts
@@ -126,7 +126,10 @@ export default async function (
     projectType: normalizedOptions.projectType,
     targets: {
       build: {
-        executor: `${plugin}:build`,
+        executor: `${plugin}:run-task`,
+        options: {
+          task: 'install',
+        },
       },
     },
     tags: normalizedOptions.parsedTags,

diff --git a/packages/maven/src/lib/graph/index.ts b/packages/maven/src/lib/graph/index.ts
@@ -72,7 +72,10 @@ function addProjects(
         projectType: projectGraphNodeType === 'app' ? 'application' : 'library',
         targets: {
           build: {
-            executor: `${pluginName}:build`,
+            executor: `${pluginName}:run-task`,
+            options: {
+              task: getTask(projectRoot, projectGraphNodeType),
+            },
           },
           'run-task': {
             executor: `${pluginName}:run-task`,
@@ -208,3 +211,18 @@ function getDependencyProjects(
 ) {
   return projects.filter((p) => project.dependencies.includes(p.artifactId));
 }
+
+function getTask(
+  projectRoot: string,
+  projectGraphNodeType: 'app' | 'e2e' | 'lib'
+) {
+  if (!projectRoot) {
+    return 'install -N';
+  }
+
+  if (projectGraphNodeType === 'app') {
+    return 'compile';
+  }
+
+  return 'install';
+}