From 63c9a39e9b05b11e5da2ab7e293ad5976b93bdfd Mon Sep 17 00:00:00 2001
From: Khalil LAGRIDA <32600911+khalilou88@users.noreply.github.com>
Date: Sat, 3 Aug 2024 12:29:26 +0200
Subject: [PATCH] fix: update prettier version to 3 with init generator (#1216)

* fix: update prettier version to 3 with init generator

* build: fix variable name
---
 packages/common/src/lib/versions/index.ts           | 1 +
 packages/nx-gradle/src/generators/init/generator.ts | 7 +++++++
 packages/nx-maven/src/generators/init/generator.ts  | 7 +++++++
 3 files changed, 15 insertions(+)

diff --git a/packages/common/src/lib/versions/index.ts b/packages/common/src/lib/versions/index.ts
index bcf0c1e5a..28edd3c3b 100644
--- a/packages/common/src/lib/versions/index.ts
+++ b/packages/common/src/lib/versions/index.ts
@@ -23,6 +23,7 @@ export const jnxplusGradlePluginVersion = '0.4.0';
 
 //Prettier
 export const prettierVersion = '^3.2.4';
+export const prettier2VersionRegex = /^.*2\.(0|[1-9]\d*)\.(0|[1-9]\d*).*/;
 export const prettierPluginXmlVersion = '^3.4.1';
 export const prettierPluginJavaVersion = '2.5.0';
 
diff --git a/packages/nx-gradle/src/generators/init/generator.ts b/packages/nx-gradle/src/generators/init/generator.ts
index 752044a37..eb6c7a3d4 100644
--- a/packages/nx-gradle/src/generators/init/generator.ts
+++ b/packages/nx-gradle/src/generators/init/generator.ts
@@ -4,6 +4,7 @@ import {
   kotlinVersion,
   kspVersion,
   micronautVersion,
+  prettier2VersionRegex,
   prettierPluginJavaVersion,
   prettierVersion,
   prettierrcNameOptions,
@@ -198,6 +199,12 @@ function addPrettierToPackageJson(tree: Tree) {
 
     if (!packageJson.devDependencies['prettier']) {
       packageJson.devDependencies['prettier'] = prettierVersion;
+    } else {
+      const prettierV = packageJson.devDependencies['prettier'];
+
+      if (prettierV.match(prettier2VersionRegex)) {
+        packageJson.devDependencies['prettier'] = prettierVersion;
+      }
     }
 
     if (!packageJson.devDependencies['prettier-plugin-java']) {
diff --git a/packages/nx-maven/src/generators/init/generator.ts b/packages/nx-maven/src/generators/init/generator.ts
index 37f2a2acc..f01984c71 100644
--- a/packages/nx-maven/src/generators/init/generator.ts
+++ b/packages/nx-maven/src/generators/init/generator.ts
@@ -1,6 +1,7 @@
 import {
   getPluginVersion,
   micronautVersion,
+  prettier2VersionRegex,
   prettierPluginJavaVersion,
   prettierPluginXmlVersion,
   prettierVersion,
@@ -197,6 +198,12 @@ function addPrettierToPackageJson(tree: Tree) {
 
     if (!packageJson.devDependencies['prettier']) {
       packageJson.devDependencies['prettier'] = prettierVersion;
+    } else {
+      const prettierV = packageJson.devDependencies['prettier'];
+
+      if (prettierV.match(prettier2VersionRegex)) {
+        packageJson.devDependencies['prettier'] = prettierVersion;
+      }
     }
 
     if (!packageJson.devDependencies['@prettier/plugin-xml']) {