build: remove deprecated plugins (#458)

* build: remove deprecated plugins * build: work in progress --------- Co-authored-by: khalilou88 <[email protected]>
khalilou88 · Sep 23, 2023 · 86ac649 · 86ac649
1 parent 36e3bdb
commit 86ac649
Show file tree

Hide file tree

Showing 133 changed files with 20 additions and 5,538 deletions.
diff --git a/packages/common/src/lib/types/index.ts b/packages/common/src/lib/types/index.ts
@@ -7,12 +7,6 @@ export type MvnBuildCommandType = 'compile' | 'package' | 'install';
 export type ImageType = 'jvm' | 'legacy-jar' | 'native' | 'native-micro';
 export type GetVersionFunction = (dir: string) => string;
 
-export type MavenPluginType =
-  | '@jnxplus/nx-maven'
-  | '@jnxplus/nx-boot-maven'
-  | '@jnxplus/nx-quarkus-maven';
+export type MavenPluginType = '@jnxplus/nx-maven';
 
-export type GradlePluginType =
-  | '@jnxplus/nx-gradle'
-  | '@jnxplus/nx-boot-gradle'
-  | '@jnxplus/nx-quarkus-gradle';
+export type GradlePluginType = '@jnxplus/nx-gradle';
diff --git a/packages/gradle/src/generators/application/generator.ts b/packages/gradle/src/generators/application/generator.ts
@@ -97,10 +97,7 @@ function normalizeOptions(
   const kotlinExtension = dsl === 'kotlin' ? '.kts' : '';
 
   let qVersion = '';
-  if (
-    plugin === '@jnxplus/nx-quarkus-gradle' ||
-    options.framework === 'quarkus'
-  ) {
+  if (options.framework === 'quarkus') {
     const gradlePropertiesPath = path.join(workspaceRoot, 'gradle.properties');
     const gradlePropertiesContent = fs.readFileSync(
       gradlePropertiesPath,
@@ -135,17 +132,11 @@ function addFiles(
   tree: Tree,
   options: NormalizedSchema
 ) {
-  if (
-    plugin === '@jnxplus/nx-boot-gradle' ||
-    options.framework === 'spring-boot'
-  ) {
+  if (options.framework === 'spring-boot') {
     addBootFiles(d, tree, options);
   }
 
-  if (
-    plugin === '@jnxplus/nx-quarkus-gradle' ||
-    options.framework === 'quarkus'
-  ) {
+  if (options.framework === 'quarkus') {
     addQuarkusFiles(d, tree, options);
   }
 
@@ -416,10 +407,7 @@ export default async function (
 
   const targets = projectConfiguration.targets ?? {};
 
-  if (
-    plugin === '@jnxplus/nx-boot-gradle' ||
-    options.framework === 'spring-boot'
-  ) {
+  if (options.framework === 'spring-boot') {
     targets['build'].options = {
       ...targets['build'].options,
       task: normalizedOptions.packaging === 'war' ? 'bootWar' : 'bootJar',
@@ -439,10 +427,7 @@ export default async function (
     };
   }
 
-  if (
-    plugin === '@jnxplus/nx-quarkus-gradle' ||
-    options.framework === 'quarkus'
-  ) {
+  if (options.framework === 'quarkus') {
     targets['build'].options = {
       ...targets['build'].options,
       task: 'quarkusBuild',

diff --git a/packages/gradle/src/generators/library/generator.ts b/packages/gradle/src/generators/library/generator.ts
@@ -109,17 +109,11 @@ function addFiles(
   tree: Tree,
   options: NormalizedSchema
 ) {
-  if (
-    plugin === '@jnxplus/nx-boot-gradle' ||
-    options.framework === 'spring-boot'
-  ) {
+  if (options.framework === 'spring-boot') {
     addBootFiles(d, tree, options);
   }
 
-  if (
-    plugin === '@jnxplus/nx-quarkus-gradle' ||
-    options.framework === 'quarkus'
-  ) {
+  if (options.framework === 'quarkus') {
     addQuarkusFiles(d, tree, options);
   }
 
@@ -342,10 +336,7 @@ export default async function (
 
   const targets = projectConfiguration.targets ?? {};
 
-  if (
-    plugin === '@jnxplus/nx-boot-gradle' ||
-    options.framework === 'spring-boot'
-  ) {
+  if (options.framework === 'spring-boot') {
     targets['build'].options = {
       ...targets['build'].options,
       task: 'jar',

diff --git a/packages/maven/src/generators/application/generator.ts b/packages/maven/src/generators/application/generator.ts
@@ -133,10 +133,7 @@ function normalizeOptions(
   const isCustomPort = !!options.port && +options.port !== 8080;
 
   let quarkusVersion = '';
-  if (
-    plugin === '@jnxplus/nx-quarkus-maven' ||
-    options.framework === 'quarkus'
-  ) {
+  if (options.framework === 'quarkus') {
     quarkusVersion =
       rootPomXmlContent?.childNamed('properties')?.childNamed('quarkus.version')
         ?.val || 'quarkusVersion';
@@ -378,17 +375,11 @@ function addFiles(
   tree: Tree,
   options: NormalizedSchema
 ) {
-  if (
-    plugin === '@jnxplus/nx-boot-maven' ||
-    options.framework === 'spring-boot'
-  ) {
+  if (options.framework === 'spring-boot') {
     addBootFiles(d, tree, options);
   }
 
-  if (
-    plugin === '@jnxplus/nx-quarkus-maven' ||
-    options.framework === 'quarkus'
-  ) {
+  if (options.framework === 'quarkus') {
     addQuarkusFiles(d, tree, options);
   }
 
@@ -457,10 +448,7 @@ export default async function (
 
   const targets = projectConfiguration.targets ?? {};
 
-  if (
-    plugin === '@jnxplus/nx-boot-maven' ||
-    options.framework === 'spring-boot'
-  ) {
+  if (options.framework === 'spring-boot') {
     targets['build'].options = {
       ...targets['build'].options,
       task: 'package spring-boot:repackage -DskipTests=true',
@@ -480,10 +468,7 @@ export default async function (
     };
   }
 
-  if (
-    plugin === '@jnxplus/nx-quarkus-maven' ||
-    options.framework === 'quarkus'
-  ) {
+  if (options.framework === 'quarkus') {
     targets['build-image'] = {
       executor: `${plugin}:quarkus-build-image`,
     };

diff --git a/packages/maven/src/generators/library/generator.ts b/packages/maven/src/generators/library/generator.ts
@@ -320,17 +320,11 @@ function addFiles(
   tree: Tree,
   options: NormalizedSchema
 ) {
-  if (
-    plugin === '@jnxplus/nx-boot-maven' ||
-    options.framework === 'spring-boot'
-  ) {
+  if (options.framework === 'spring-boot') {
     addBootFiles(d, tree, options);
   }
 
-  if (
-    plugin === '@jnxplus/nx-quarkus-maven' ||
-    options.framework === 'quarkus'
-  ) {
+  if (options.framework === 'quarkus') {
     addQuarkusFiles(d, tree, options);
   }
 

diff --git a/packages/maven/src/lib/utils/generators.ts b/packages/maven/src/lib/utils/generators.ts
@@ -178,10 +178,7 @@ export function addMissedProperties(
     throw new Error('Properties tag undefined');
   }
 
-  if (
-    plugin === '@jnxplus/nx-boot-maven' ||
-    options.framework === 'spring-boot'
-  ) {
+  if (options.framework === 'spring-boot') {
     const b = isParentPomExits(xmldoc, 'spring-boot-starter-parent');
     if (!b) {
       const springBootVersion = properties.childNamed('spring.boot.version');
@@ -198,10 +195,7 @@ export function addMissedProperties(
     }
   }
 
-  if (
-    plugin === '@jnxplus/nx-quarkus-maven' ||
-    options.framework === 'quarkus'
-  ) {
+  if (options.framework === 'quarkus') {
     const quarkusVersion = properties.childNamed('quarkus.version');
     if (quarkusVersion === undefined) {
       properties.children.push(

diff --git a/packages/nx-boot-gradle/.babelrc b/packages/nx-boot-gradle/.babelrc
diff --git a/packages/nx-boot-gradle/.eslintrc.json b/packages/nx-boot-gradle/.eslintrc.json