From 2e32a90054463175a14744039b09e770ebded1e6 Mon Sep 17 00:00:00 2001
From: Uraz Akgultan <uraz@akgultan.com>
Date: Tue, 30 Jul 2024 15:01:25 +0200
Subject: [PATCH] fix: fix prettier and lint

---
 package.json                             |   8 +-
 patches/@prettier+plugin-xml+1.2.0.patch |  13 ---
 yarn.lock                                | 113 ++++++++++-------------
 3 files changed, 52 insertions(+), 82 deletions(-)
 delete mode 100644 patches/@prettier+plugin-xml+1.2.0.patch

diff --git a/package.json b/package.json
index b97e993c1..9e1247c8a 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
     "deepmerge": "^4.2.2",
     "detox": "^19.13.0",
     "eslint": "^7.20.0",
+    "eslint-plugin-prettier": "4.2.1",
     "husky": "^7.0.0",
     "identity-obj-proxy": "^3.0.0",
     "image-js": "^0.33.0",
@@ -75,8 +76,8 @@
     "lint-staged": "^10.5.0",
     "mendix-client": "^7.15.8",
     "patch-package": "^6.4.7",
-    "prettier": "2.5.1",
-    "pretty-quick": "3.1.0",
+    "prettier": "^2.5.1",
+    "pretty-quick": "^3.1.0",
     "recursive-copy": "^2.0.11",
     "ts-node": "^10.9.1"
   },
@@ -96,7 +97,8 @@
     "react-dom": "18.2.0",
     "react-native": "0.73.8",
     "typescript": "^4.9.5",
-    "ts-node": "^10.9.1"
+    "ts-node": "^10.9.1",
+    "@prettier/plugin-xml": "2.2.0"
   },
   "packageManager": "yarn@3.4.1"
 }
diff --git a/patches/@prettier+plugin-xml+1.2.0.patch b/patches/@prettier+plugin-xml+1.2.0.patch
deleted file mode 100644
index 80deb7646..000000000
--- a/patches/@prettier+plugin-xml+1.2.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/@prettier/plugin-xml/dist/plugin.js b/node_modules/@prettier/plugin-xml/dist/plugin.js
-index 8b3dbb8..48800bd 100644
---- a/node_modules/@prettier/plugin-xml/dist/plugin.js
-+++ b/node_modules/@prettier/plugin-xml/dist/plugin.js
-@@ -37,7 +37,7 @@ const options = {
- // it's not present so that it gets respected.
- if (!prettier_1.default
-     .getSupportInfo()
--    .options.some((opt) => opt.name === "bracketSameLine")) {
-+    .options?.some((opt) => opt.name === "bracketSameLine")) {
-     options.bracketSameLine = {
-         type: "boolean",
-         category: "Global",
diff --git a/yarn.lock b/yarn.lock
index 7d6a9ebea..203756ad8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2562,13 +2562,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@prettier/plugin-xml@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@prettier/plugin-xml@npm:1.2.0"
+"@prettier/plugin-xml@npm:2.2.0":
+  version: 2.2.0
+  resolution: "@prettier/plugin-xml@npm:2.2.0"
   dependencies:
     "@xml-tools/parser": ^1.0.11
-    prettier: ">=2.3"
-  checksum: 2f9958d7f910c7ee83b5e2dd207564992952b40fdd28aea3bd5bd4c77351a72308b916f1b8fd0c6de958d67324658c655a8521c58d5dca24ef338f9307ffb0bf
+    prettier: ">=2.4.0"
+  checksum: 480fb67fe711463ab6b5678ce996486873b4d6440c31338af3f8dd5054c7ae9539dd81621637c85eed904727cfe17b7213e717d451df2fee56c8c50251f6bb69
   languageName: node
   linkType: hard
 
@@ -3684,13 +3684,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/minimatch@npm:^3.0.3":
-  version: 3.0.5
-  resolution: "@types/minimatch@npm:3.0.5"
-  checksum: c41d136f67231c3131cf1d4ca0b06687f4a322918a3a5adddc87ce90ed9dbd175a3610adee36b106ae68c0b92c637c35e02b58c8a56c424f71d30993ea220b92
-  languageName: node
-  linkType: hard
-
 "@types/minimist@npm:^1.2.0":
   version: 1.2.5
   resolution: "@types/minimist@npm:1.2.5"
@@ -4596,13 +4589,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-differ@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "array-differ@npm:3.0.0"
-  checksum: 117edd9df5c1530bd116c6e8eea891d4bd02850fd89b1b36e532b6540e47ca620a373b81feca1c62d1395d9ae601516ba538abe5e8172d41091da2c546b05fb7
-  languageName: node
-  linkType: hard
-
 "array-find-index@npm:^1.0.2":
   version: 1.0.2
   resolution: "array-find-index@npm:1.0.2"
@@ -4715,13 +4701,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"arrify@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "arrify@npm:2.0.1"
-  checksum: 067c4c1afd182806a82e4c1cb8acee16ab8b5284fbca1ce29408e6e91281c36bb5b612f6ddfbd40a0f7a7e0c75bf2696eb94c027f6e328d6e9c52465c98e4209
-  languageName: node
-  linkType: hard
-
 "asap@npm:~2.0.3, asap@npm:~2.0.6":
   version: 2.0.6
   resolution: "asap@npm:2.0.6"
@@ -7384,6 +7363,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-prettier@npm:4.2.1":
+  version: 4.2.1
+  resolution: "eslint-plugin-prettier@npm:4.2.1"
+  dependencies:
+    prettier-linter-helpers: ^1.0.0
+  peerDependencies:
+    eslint: ">=7.28.0"
+    prettier: ">=2.0.0"
+  peerDependenciesMeta:
+    eslint-config-prettier:
+      optional: true
+  checksum: b9e839d2334ad8ec7a5589c5cb0f219bded260839a857d7a486997f9870e95106aa59b8756ff3f37202085ebab658de382b0267cae44c3a7f0eb0bcc03a4f6d6
+  languageName: node
+  linkType: hard
+
 "eslint-plugin-prettier@npm:^3.3.1":
   version: 3.4.1
   resolution: "eslint-plugin-prettier@npm:3.4.1"
@@ -7651,7 +7645,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"execa@npm:^4.0.0, execa@npm:^4.1.0":
+"execa@npm:^4.1.0":
   version: 4.1.0
   resolution: "execa@npm:4.1.0"
   dependencies:
@@ -8893,7 +8887,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.1.4, ignore@npm:^5.2.0":
+"ignore@npm:^5.2.0, ignore@npm:^5.3.0":
   version: 5.3.1
   resolution: "ignore@npm:5.3.1"
   checksum: 71d7bb4c1dbe020f915fd881108cbe85a0db3d636a0ea3ba911393c53946711d13a9b1143c7e70db06d571a5822c0a324a6bcde5c9904e7ca5047f01f1bf8cd3
@@ -12080,7 +12074,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mri@npm:^1.1.5":
+"mri@npm:^1.2.0":
   version: 1.2.0
   resolution: "mri@npm:1.2.0"
   checksum: 83f515abbcff60150873e424894a2f65d68037e5a7fcde8a9e2b285ee9c13ac581b63cfc1e6826c4732de3aeb84902f7c1e16b7aff46cd3f897a0f757a894e85
@@ -12108,19 +12102,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"multimatch@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "multimatch@npm:4.0.0"
-  dependencies:
-    "@types/minimatch": ^3.0.3
-    array-differ: ^3.0.0
-    array-union: ^2.1.0
-    arrify: ^2.0.1
-    minimatch: ^3.0.4
-  checksum: bdb6a98dad4e919d9a1a2a0db872f44fa2337315f2fd5827d91ae005cf22f4425782bdfa97c10b80d567f0cb3c226c31f4e85f8f6a4a4be4facf9af0de1bb0c2
-  languageName: node
-  linkType: hard
-
 "mv@npm:~2":
   version: 2.1.1
   resolution: "mv@npm:2.1.1"
@@ -12194,6 +12175,7 @@ __metadata:
     deepmerge: ^4.2.2
     detox: ^19.13.0
     eslint: ^7.20.0
+    eslint-plugin-prettier: 4.2.1
     husky: ^7.0.0
     identity-obj-proxy: ^3.0.0
     image-js: ^0.33.0
@@ -12203,8 +12185,8 @@ __metadata:
     lint-staged: ^10.5.0
     mendix-client: ^7.15.8
     patch-package: ^6.4.7
-    prettier: 2.5.1
-    pretty-quick: 3.1.0
+    prettier: ^2.5.1
+    pretty-quick: ^3.1.0
     recursive-copy: ^2.0.11
     ts-node: ^10.9.1
   languageName: unknown
@@ -12954,6 +12936,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"picomatch@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "picomatch@npm:3.0.1"
+  checksum: b7fe18174bcc05bbf0ea09cc85623ae395676b3e6bc25636d4c20db79a948586237e429905453bf1ba385bc7a7aa5b56f1b351680e650d2b5c305ceb98dfc914
+  languageName: node
+  linkType: hard
+
 "pie-doughnut-chart-native@workspace:packages/pluggableWidgets/pie-doughnut-chart-native":
   version: 0.0.0-use.local
   resolution: "pie-doughnut-chart-native@workspace:packages/pluggableWidgets/pie-doughnut-chart-native"
@@ -13541,16 +13530,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:2.5.1":
-  version: 2.5.1
-  resolution: "prettier@npm:2.5.1"
-  bin:
-    prettier: bin-prettier.js
-  checksum: 21b9408476ea1c544b0e45d51ceb94a84789ff92095abb710942d780c862d0daebdb29972d47f6b4d0f7ebbfb0ffbf56cc2cfa3e3e9d1cca54864af185b15b66
-  languageName: node
-  linkType: hard
-
-"prettier@npm:>=2.3":
+"prettier@npm:>=2.4.0":
   version: 3.3.3
   resolution: "prettier@npm:3.3.3"
   bin:
@@ -13602,21 +13582,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-quick@npm:3.1.0":
-  version: 3.1.0
-  resolution: "pretty-quick@npm:3.1.0"
+"pretty-quick@npm:^3.1.0":
+  version: 3.3.1
+  resolution: "pretty-quick@npm:3.3.1"
   dependencies:
-    chalk: ^3.0.0
-    execa: ^4.0.0
+    execa: ^4.1.0
     find-up: ^4.1.0
-    ignore: ^5.1.4
-    mri: ^1.1.5
-    multimatch: ^4.0.0
+    ignore: ^5.3.0
+    mri: ^1.2.0
+    picocolors: ^1.0.0
+    picomatch: ^3.0.1
+    tslib: ^2.6.2
   peerDependencies:
-    prettier: ">=2.0.0"
+    prettier: ^2.0.0
   bin:
-    pretty-quick: bin/pretty-quick.js
-  checksum: a0f6823ff3807c9ac15555509eafcd869c603851ba84b605d5cf77cf1c90e4ffe27ac96c2405c5ac173bb0159e76664c2979c72e47c58aa9974a5ab684692335
+    pretty-quick: dist/cli.js
+  checksum: ce6af6e0818916ec52b24bffa5f45b8623c0ab1e5d0855eb8e8d42a42e396be3ff8c400f7661097eed77d7638f4ad279cd86c6f5996384c7178c202c85f845ed
   languageName: node
   linkType: hard
 
@@ -16609,7 +16590,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2, tslib@npm:^2.0.1, tslib@npm:^2.1.0":
+"tslib@npm:^2, tslib@npm:^2.0.1, tslib@npm:^2.1.0, tslib@npm:^2.6.2":
   version: 2.6.3
   resolution: "tslib@npm:2.6.3"
   checksum: 74fce0e100f1ebd95b8995fbbd0e6c91bdd8f4c35c00d4da62e285a3363aaa534de40a80db30ecfd388ed7c313c42d930ee0eaf108e8114214b180eec3dbe6f5