From ea5077376faac5269a9cea41e40d21b4045b81cf Mon Sep 17 00:00:00 2001
From: GreatBearShark <greatbearshark@protonmail.com>
Date: Mon, 31 Aug 2020 10:56:40 -0500
Subject: [PATCH] Add prettier to eslint config

---
 .eslintrc.json          | 24 +++++++++++++++++++-----
 package.json            |  3 ++-
 src/components/main.tsx | 16 ++++++++--------
 yarn.lock               |  4 ++--
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index d5e87261..141fd7c6 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -6,7 +6,8 @@
   },
   "plugins": [
     "@typescript-eslint",
-    "jane"
+    "jane",
+    "prettier"
   ],
   "settings": {
     "react": {
@@ -17,7 +18,9 @@
     "plugin:jane/recommended",
     "plugin:jane/react",
     "plugin:jane/typescript",
-    "plugin:@typescript-eslint/recommended"
+    "plugin:@typescript-eslint/recommended",
+    "prettier",
+    "prettier/react"
   ],
   "parser": "@typescript-eslint/parser",
   "rules": {
@@ -59,14 +62,25 @@
     "jsx-a11y/no-onchange": 0,
     "jsx-a11y/aria-role": 1,
     "jsx-a11y/click-events-have-key-events": 1,
-    "react/no-did-update-set-state": 0
+    "react/no-did-update-set-state": 0,
+    "prettier/prettier": [
+      "error",
+      {
+        "trailingComma": "es5",
+        "singleQuote": true,
+        "printWidth": 80,
+        "arrowParens": "avoid"
+      }
+    ]
   },
   "overrides": [
     {
-      "files": ["*.js"],
+      "files": [
+        "*.js"
+      ],
       "rules": {
         "@typescript-eslint/no-var-requires": 0
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 8646c376..eb4ca949 100644
--- a/package.json
+++ b/package.json
@@ -93,8 +93,10 @@
     "babel-preset-react-app": "^9.1.2",
     "cssnano": "^4.1.10",
     "eslint": "^7.6.0",
+    "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-inferno": "^7.20.1",
     "eslint-plugin-jane": "^8.0.5",
+    "eslint-plugin-prettier": "^3.1.4",
     "git-describe": "^4.0.4",
     "jest": "^26.4.0",
     "jest-environment-jsdom-fourteen": "^1.0.1",
@@ -126,7 +128,6 @@
   },
   "lint-staged": {
     "*.{ts,tsx,js}": [
-      "prettier --write",
       "eslint --fix"
     ],
     "../server/src/**/*.rs": [
diff --git a/src/components/main.tsx b/src/components/main.tsx
index 576764c8..dea8a3dd 100644
--- a/src/components/main.tsx
+++ b/src/components/main.tsx
@@ -101,15 +101,15 @@ function getMoscowTime(): string {
 function MoscowTime() {
   const [time, setTime] = useState(null);
 
-  useInterval(() => {
-    setTime(getMoscowTime)
-  }, 1000, true)
+  useInterval(
+    () => {
+      setTime(getMoscowTime);
+    },
+    1000,
+    true
+  );
 
-  return (
-    <>
-      It is currently {time} in Moscow
-    </>
-  )
+  return <>It is currently {time} in Moscow</>;
 }
 
 interface MainProps {
diff --git a/yarn.lock b/yarn.lock
index e1531508..adda9738 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6771,7 +6771,7 @@ eslint-ast-utils@^1.1.0:
     lodash.get "^4.4.2"
     lodash.zip "^4.2.0"
 
-eslint-config-prettier@6.11.0:
+eslint-config-prettier@6.11.0, eslint-config-prettier@^6.11.0:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz#f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1"
   integrity sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==
@@ -6900,7 +6900,7 @@ eslint-plugin-node@11.1.0:
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-plugin-prettier@3.1.4:
+eslint-plugin-prettier@3.1.4, eslint-plugin-prettier@^3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2"
   integrity sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==