From 318de920757678889b283c9f5737bb5f73b9a6cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20G=C3=B3mez?= <hector.gomez.varela@gmail.com>
Date: Wed, 24 Aug 2022 15:22:28 +0200
Subject: [PATCH] Fix prettier/eslint integration (#46)

* Configure code line max-len

* Remove prettier config from eslint config file

* Fix format

* Format adjustment

* Format adjustment

* Format adjustment

* Format adjustment

* Integrate with eslint max-len

* Integrate with eslint max-len

* Integrate with eslint max-len

* Dont enforce eslint prettier rules

* Test prettier

* Test prettier 2

* Separate responsibilities between eslint and prettier

* Set 80 chars per line format

* Update eslint-config-prettier

* Rollback format changes

* Rollback format changes
---
 .eslintrc.js |  2 +-
 .prettierrc  |  2 +-
 package.json |  3 +--
 yarn.lock    | 36 ++----------------------------------
 4 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 259de13c73..4101a9d8a3 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -8,7 +8,7 @@ module.exports = {
   plugins: ['@typescript-eslint/eslint-plugin'],
   extends: [
     'plugin:@typescript-eslint/recommended',
-    'plugin:prettier/recommended',
+    'prettier',
   ],
   root: true,
   env: {
diff --git a/.prettierrc b/.prettierrc
index dcb72794f5..a20502b7f0 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,4 +1,4 @@
 {
   "singleQuote": true,
   "trailingComma": "all"
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 6a80e22b2d..483ced19db 100644
--- a/package.json
+++ b/package.json
@@ -46,8 +46,7 @@
     "@typescript-eslint/eslint-plugin": "^5.32.0",
     "@typescript-eslint/parser": "^5.32.0",
     "eslint": "^8.21.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-config-prettier": "^8.5.0",
     "husky": "^8.0.0",
     "jest": "28.1.2",
     "prettier": "^2.3.2",
diff --git a/yarn.lock b/yarn.lock
index 4c9eb69ba2..e0caf6c0b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2896,7 +2896,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-config-prettier@npm:^8.3.0":
+"eslint-config-prettier@npm:^8.5.0":
   version: 8.5.0
   resolution: "eslint-config-prettier@npm:8.5.0"
   peerDependencies:
@@ -2907,21 +2907,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-prettier@npm:^4.0.0":
-  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-scope@npm:5.1.1, eslint-scope@npm:^5.1.1":
   version: 5.1.1
   resolution: "eslint-scope@npm:5.1.1"
@@ -3201,13 +3186,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-diff@npm:^1.1.2":
-  version: 1.2.0
-  resolution: "fast-diff@npm:1.2.0"
-  checksum: 1b5306eaa9e826564d9e5ffcd6ebd881eb5f770b3f977fcbf38f05c824e42172b53c79920e8429c54eb742ce15a0caf268b0fdd5b38f6de52234c4a8368131ae
-  languageName: node
-  linkType: hard
-
 "fast-glob@npm:^3.2.9":
   version: 3.2.11
   resolution: "fast-glob@npm:3.2.11"
@@ -5447,15 +5425,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier-linter-helpers@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "prettier-linter-helpers@npm:1.0.0"
-  dependencies:
-    fast-diff: ^1.1.2
-  checksum: 00ce8011cf6430158d27f9c92cfea0a7699405633f7f1d4a45f07e21bf78e99895911cbcdc3853db3a824201a7c745bd49bfea8abd5fb9883e765a90f74f8392
-  languageName: node
-  linkType: hard
-
 "prettier@npm:^2.3.2":
   version: 2.7.1
   resolution: "prettier@npm:2.7.1"
@@ -5837,8 +5806,7 @@ __metadata:
     "@typescript-eslint/parser": ^5.32.0
     axios: ^0.27.2
     eslint: ^8.21.0
-    eslint-config-prettier: ^8.3.0
-    eslint-plugin-prettier: ^4.0.0
+    eslint-config-prettier: ^8.5.0
     husky: ^8.0.0
     jest: 28.1.2
     prettier: ^2.3.2