Merge pull request #5 from Excali-Studio/exd-117

EXD-117 Added prettier working prettier with eslint
Excali-Studio · Aug 30, 2024 · 9972a8c · 9972a8c
2 parents 3e9cd74 + ff4ca0b
commit 9972a8c
Show file tree

Hide file tree

Showing 85 changed files with 4,217 additions and 3,341 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -5,14 +5,18 @@ module.exports = {
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended',
     'plugin:react-hooks/recommended',
+    'plugin:prettier/recommended'
   ],
   ignorePatterns: ['dist', '.eslintrc.cjs'],
   parser: '@typescript-eslint/parser',
-  plugins: ['react-refresh'],
+  plugins: ['react-refresh', 'prettier', 'import'],
   rules: {
     'react-refresh/only-export-components': [
       'warn',
       { allowConstantExport: true },
     ],
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    'no-console': ['error'],
+    'prettier/prettier': 'error'
   },
 }
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,9 @@
+{
+  "trailingComma": "es5",
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "useTabs": true,
+  "endOfLine": "lf",
+  "plugins": ["prettier-plugin-tailwindcss"]
+}
diff --git a/README.md b/README.md
@@ -1,10 +1,8 @@
 <h1 align="center">Excali Studio</h1>
 
-
 ## Description
 
-Main front-end wrapper for the excali draw studio app. 
-
+Main front-end wrapper for the excali draw studio app.
 
 ## Installation
 

diff --git a/components.json b/components.json
@@ -14,4 +14,4 @@
     "components": "@/components",
     "utils": "@/lib/utils"
   }
-}
+}
diff --git a/index.html b/index.html
@@ -1,13 +1,13 @@
 <!doctype html>
 <html lang="en">
-<head>
-    <meta charset="UTF-8"/>
-    <link rel="icon" type="image/svg+xml" href="/vite.svg"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Excali Studio</title>
-</head>
-<body>
-<div id="root"></div>
-<script type="module" src="/src/main.tsx"></script>
-</body>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
 </html>
diff --git a/package.json b/package.json
@@ -45,14 +45,18 @@
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "cmdk": "^0.2.1",
+    "eslint-plugin-import": "^2.29.1",
     "flowbite": "^2.3.0",
     "immer": "^10.1.1",
     "js-cookie": "^3.0.5",
     "lodash.debounce": "^4.0.8",
     "lucide-react": "^0.376.0",
     "prettier-plugin-tailwindcss": "^0.6.6",
+    "prettier": "^3.3.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-config-prettier": "^9.1.0",
     "react-hook-form": "^7.51.5",
     "react-router-dom": "^6.22.3",
     "tailwind-merge": "^2.3.0",