From 6f4d7df557c49f342c961a96890e8b7fa6e8217e Mon Sep 17 00:00:00 2001
From: Chris Hahn <chris+digital@chrishahn.me>
Date: Sat, 20 Mar 2021 09:10:57 -0400
Subject: [PATCH 1/2] Migrate to ESLint Config Prettier 8+

All configs merged into a single config :) Details in link below:
https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md#version-800-2021-02-21
---
 rules/react.js      | 1 -
 rules/typescript.js | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/rules/react.js b/rules/react.js
index edbdfb1..fc20d39 100644
--- a/rules/react.js
+++ b/rules/react.js
@@ -1,5 +1,4 @@
 module.exports = {
-    extends: ['prettier/react'],
     plugins: ['react-hooks'],
     settings: {
         react: {
diff --git a/rules/typescript.js b/rules/typescript.js
index d33e688..0862267 100644
--- a/rules/typescript.js
+++ b/rules/typescript.js
@@ -1,8 +1,5 @@
 module.exports = {
-    extends: [
-        'plugin:@typescript-eslint/recommended',
-        'prettier/@typescript-eslint',
-    ],
+    extends: ['plugin:@typescript-eslint/recommended'],
     plugins: ['@typescript-eslint'],
     parserOptions: {
         project: './tsconfig.json',

From 38a59e9dc491e15fc635ca49cc8a40b7359736ab Mon Sep 17 00:00:00 2001
From: Chris Hahn <chris+digital@chrishahn.me>
Date: Sat, 20 Mar 2021 09:11:24 -0400
Subject: [PATCH 2/2] Bump Version to 1.2.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bb92659..f400a27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@codingwithchris/eslint-config",
-    "version": "1.1.4",
+    "version": "1.2.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@codingwithchris/eslint-config",
-            "version": "1.1.4",
+            "version": "1.2.0",
             "license": "MIT",
             "devDependencies": {
                 "@types/react": "^17.0.3",
diff --git a/package.json b/package.json
index 6582790..4f4978d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@codingwithchris/eslint-config",
-    "version": "1.1.4",
+    "version": "1.2.0",
     "description": "My ESLint config for writing clean, consistent code",
     "private": false,
     "publishConfig": {