From 48cb9046c4a0582668e167dd5b5314875157bc1d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 31 Aug 2023 13:27:28 -0500
Subject: [PATCH] Add eslint-config-prettier to solve conflicts between
 prettier and eslint

---
 .eslintrc.json | 1 +
 package.json   | 1 +
 yarn.lock      | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/.eslintrc.json b/.eslintrc.json
index 385516f..1542d93 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,5 +1,6 @@
 {
   "root": true,
+  "extends": ["prettier"],
 
   "parser": "@typescript-eslint/parser",
   "plugins": ["@typescript-eslint", "babel"],
diff --git a/package.json b/package.json
index 248a78b..064cd0f 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "esbuild": "0.16.9",
     "esbuild-plugin-alias": "^0.2.1",
     "eslint": "^8.40.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-jest": "^27.2.1",
     "esm-loader-typescript": "^1.0.3",
diff --git a/yarn.lock b/yarn.lock
index a15cc89..163c523 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1630,6 +1630,11 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
+eslint-config-prettier@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz#eb25485946dd0c66cd216a46232dc05451518d1f"
+  integrity sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==
+
 eslint-formatter-pretty@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz"