From d739f914f2e3b358db79f896c98bca241c50ec48 Mon Sep 17 00:00:00 2001
From: Quentin <quentin.monmert@gmail.com>
Date: Thu, 18 Jan 2024 10:06:30 +0100
Subject: [PATCH] Prettier 3.2.4

---
 .prettierrc                                            | 3 +++
 generators/common/__snapshots__/generator.spec.js.snap | 5 ++++-
 generators/common/templates/.prettierrc.ejs            | 7 ++++++-
 package-lock.json                                      | 8 ++++----
 package.json                                           | 2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.prettierrc b/.prettierrc
index 80d255a48bf8..7a1216a56466 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -16,6 +16,9 @@ plugins:
   - prettier-plugin-java
 
 overrides:
+  - files: "tsconfig.json"
+    options:
+      parser: "json"
   # java rules:
   - files: "*.java"
     options:
diff --git a/generators/common/__snapshots__/generator.spec.js.snap b/generators/common/__snapshots__/generator.spec.js.snap
index ede4cf8e0961..9439e264046e 100644
--- a/generators/common/__snapshots__/generator.spec.js.snap
+++ b/generators/common/__snapshots__/generator.spec.js.snap
@@ -70,9 +70,12 @@ bracketSameLine: false
 plugins:
   - prettier-plugin-packagejson
   - prettier-plugin-java
-  
+
 # java rules:
 overrides:
+  - files: "tsconfig.json"
+    options:
+      parser: "json"
   - files: "*.java"
     options:
       tabWidth: 4
diff --git a/generators/common/templates/.prettierrc.ejs b/generators/common/templates/.prettierrc.ejs
index f3aa52d3d94e..d1139c48e0d2 100644
--- a/generators/common/templates/.prettierrc.ejs
+++ b/generators/common/templates/.prettierrc.ejs
@@ -15,9 +15,14 @@ plugins:
   - prettier-plugin-packagejson
 <%_ if (backendTypeJavaAny) { _%>
   - prettier-plugin-java
-  
+<%_ } _%>
+
 # java rules:
 overrides:
+  - files: "tsconfig.json"
+    options:
+      parser: "json"
+<%_ if (backendTypeJavaAny) { _%>
   - files: "*.java"
     options:
       tabWidth: 4
diff --git a/package-lock.json b/package-lock.json
index e2684b04c0c0..c77a788782bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,7 +52,7 @@
         "p-transform": "4.1.5",
         "parse-gitignore": "2.0.0",
         "pluralize": "8.0.0",
-        "prettier": "3.2.2",
+        "prettier": "3.2.4",
         "prettier-plugin-java": "2.5.0",
         "prettier-plugin-packagejson": "2.4.9",
         "prettier-plugin-properties": "0.3.0",
@@ -12030,9 +12030,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.2.tgz",
-      "integrity": "sha512-HTByuKZzw7utPiDO523Tt2pLtEyK7OibUD9suEJQrPUCYQqrHr74GGX6VidMrovbf/I50mPqr8j/II6oBAuc5A==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.4.tgz",
+      "integrity": "sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==",
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
diff --git a/package.json b/package.json
index 357cfc3681dc..9c4780599a6a 100644
--- a/package.json
+++ b/package.json
@@ -154,7 +154,7 @@
     "p-transform": "4.1.5",
     "parse-gitignore": "2.0.0",
     "pluralize": "8.0.0",
-    "prettier": "3.2.2",
+    "prettier": "3.2.4",
     "prettier-plugin-java": "2.5.0",
     "prettier-plugin-packagejson": "2.4.9",
     "prettier-plugin-properties": "0.3.0",