fix: update prettier version to 3 with init generator (#1216)

* fix: update prettier version to 3 with init generator * build: fix variable name
khalilou88 · Aug 3, 2024 · 63c9a39 · 63c9a39
1 parent 9c001cc
commit 63c9a39
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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']) {