Merge pull request #56 from Jacksonmills/feature/add-prettier-eslint

feat: standardize formatting and linting setup
adamcohenhillel · Feb 16, 2024 · 3d9ddab · 3d9ddab
2 parents b7b9644 + 679f268
commit 3d9ddab
Show file tree

Hide file tree

Showing 40 changed files with 554 additions and 391 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,29 @@
+node_modules
+.pnp
+.pnp.js
+coverage
+
+.changeset
+.github
+
+.next/
+**/next-env.d.ts
+out/
+build
+
+.DS_Store
+*.pem
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+.turbo
+
+dist
+.solid
+docs/
+*.yaml
+*.yml
+*.md
diff --git a/app/.eslintignore b/app/.eslintignore
@@ -0,0 +1,5 @@
+dist/*
+.cache
+public
+node_modules
+*.esm.js
diff --git a/app/.eslintrc.json b/app/.eslintrc.json
@@ -1,3 +1,30 @@
 {
-  "extends": "next/core-web-vitals"
+  "$schema": "https://json.schemastore.org/eslintrc",
+  "root": true,
+  "extends": [
+    "next/core-web-vitals",
+    "prettier",
+    "plugin:tailwindcss/recommended"
+  ],
+  "plugins": ["tailwindcss"],
+  "rules": {
+    "@next/next/no-html-link-for-pages": "off",
+    "react/jsx-key": "off",
+    "tailwindcss/no-custom-classname": "off"
+  },
+  "settings": {
+    "tailwindcss": {
+      "callees": ["cn"],
+      "config": "tailwind.config.js"
+    },
+    "next": {
+      "rootDir": ["./"]
+    }
+  },
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx"],
+      "parser": "@typescript-eslint/parser"
+    }
+  ]
 }
diff --git a/app/capacitor.config.ts b/app/capacitor.config.ts
@@ -5,8 +5,8 @@ const config: CapacitorConfig = {
   appName: 'adeus',
   webDir: 'out',
   server: {
-    androidScheme: 'https'
-  }
+    androidScheme: 'https',
+  },
 };
 
 export default config;
diff --git a/app/components.json b/app/components.json
@@ -14,4 +14,4 @@
     "components": "@/components",
     "utils": "@/utils/cnHelper"
   }
-}
+}
diff --git a/app/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json b/app/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,14 +1,14 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
+      "filename": "[email protected]",
+      "idiom": "universal",
+      "platform": "ios",
+      "size": "1024x1024"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/app/ios/App/App/Assets.xcassets/Contents.json b/app/ios/App/App/Assets.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
+  "info": {
+    "version": 1,
+    "author": "xcode"
   }
-}
+}
diff --git a/app/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json b/app/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json
@@ -1,23 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "idiom" : "universal",
-      "filename" : "splash-2732x2732-2.png",
-      "scale" : "1x"
+      "idiom": "universal",
+      "filename": "splash-2732x2732-2.png",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "splash-2732x2732-1.png",
-      "scale" : "2x"
+      "idiom": "universal",
+      "filename": "splash-2732x2732-1.png",
+      "scale": "2x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "splash-2732x2732.png",
-      "scale" : "3x"
+      "idiom": "universal",
+      "filename": "splash-2732x2732.png",
+      "scale": "3x"
     }
   ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
+  "info": {
+    "version": 1,
+    "author": "xcode"
   }
-}
+}
diff --git a/app/next.config.mjs b/app/next.config.mjs
@@ -3,8 +3,8 @@ const nextConfig = {
   reactStrictMode: false,
   output: 'export',
   images: {
-    unoptimized: true
-  }
+    unoptimized: true,
+  },
 };
 
 export default nextConfig;
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -7,6 +7,11 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
+    "lint:fix": "next lint --fix",
+    "format:check": "prettier --check .",
+    "format": "prettier --write . --list-different",
+    "check": "npm run lint && npm run format:check",
+    "fix": "npm run lint:fix && npm run format",
     "app": "npm run build && npx cap sync",
     "ios": "npm run app && npx cap open ios",
     "android": "npm run app && npx cap open android"
@@ -45,7 +50,12 @@
     "autoprefixer": "^10.0.1",
     "eslint": "^8",
     "eslint-config-next": "14.1.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-tailwindcss": "^3.14.2",
     "postcss": "^8",
+    "prettier": "^3.2.5",
+    "prettier-plugin-organize-imports": "^3.2.4",
     "tailwindcss": "^3.3.0",
     "typescript": "^5"
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ @@
         "components": "@/components",
         "utils": "@/utils/cnHelper"
       }
-    }
+    }