Resolve linter/formatter conflict (#234)

approvers · Aug 26, 2024 · 8f169a0 · 8f169a0
1 parent cc96598
commit 8f169a0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/app/routes/dashboard.tsx b/app/routes/dashboard.tsx
@@ -27,10 +27,7 @@ export async function loader({ request, context }: LoaderFunctionArgs) {
 }
 
 const AccountIcon = ({ type }: { type: "github" | "twitter" }): JSX.Element =>
-    ({
-        github: <FaGithub />,
-        twitter: <FaTwitter />,
-    }[type]);
+    type === "github" ? <FaGithub /> : <FaTwitter />;
 
 const AccountList = ({ list }: { list: AssociationLinks }): JSX.Element =>
     list.length === 0 ? (

diff --git a/bun.lockb b/bun.lockb
diff --git a/eslint.config.js b/eslint.config.js
@@ -1,4 +1,5 @@
 import pluginJs from "@eslint/js";
+import eslintPluginPrettierRecommended from "eslint-plugin-prettier/recommended";
 import reactJSXRuntime from "eslint-plugin-react/configs/jsx-runtime.js";
 import reactRecommended from "eslint-plugin-react/configs/recommended.js";
 import simpleImportSort from "eslint-plugin-simple-import-sort";
@@ -44,4 +45,5 @@ export default [
             "simple-import-sort/exports": "error",
         },
     },
+    eslintPluginPrettierRecommended,
 ];
diff --git a/package.json b/package.json
@@ -32,6 +32,8 @@
         "@types/react": "^18.3.4",
         "autoprefixer": "^10.4.20",
         "eslint": "^9.9.1",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-prettier": "^5.2.1",
         "eslint-plugin-react": "^7.35.0",
         "eslint-plugin-simple-import-sort": "^12.1.1",
         "globals": "^15.9.0",