Revert "update"

This reverts commit 73d1b41.

.eslintrc.json

@@ -1,11 +1,17 @@
 {
+<<<<<<< HEAD
   "extends": [
     "next",
     "next/core-web-vitals",
     "eslint:recommended",
     "plugin:react/recommended",
     "plugin:@typescript-eslint/recommended",
     "prettier"
+=======
+  "extends": "next/core-web-vitals",
+  "plugins": [
+    "eslint-plugin-react-compiler"
+>>>>>>> parent of 73d1b41 (update)
   ],
   "plugins": ["eslint-plugin-react-compiler", "react", "@typescript-eslint"],
   "rules": {

.github/workflows/node.js.yml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 name: Node.js Workflow
 
 on:
@@ -46,3 +47,30 @@ jobs:
           commit_author: Author <[email protected]>
           commit_message: '[ci] Format changes'
           push: ${{ steps.auto-commit-action.outputs.changes_detected }}
+=======
+name: Node.js Workflow
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Bun Env
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: "latest"
+
+      - name: Install
+        run: bun install
+
+      - name: Lint
+        run: bun run lint
+>>>>>>> parent of 73d1b41 (update)

package.json

@@ -7,8 +7,11 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
+<<<<<<< HEAD
     "check-types": "tsc --noEmit",
     "format": "prettier --write .",
+=======
+>>>>>>> parent of 73d1b41 (update)
     "db:generate": "drizzle-kit generate:pg --schema db/schema.ts --out ./drizzle",
     "db:migrate": "bun ./scripts/migrate.ts",
     "db:studio": "drizzle-kit studio"
@@ -52,6 +55,7 @@
     "@types/react-dom": "^18",
     "dotenv": "^16.4.5",
     "drizzle-kit": "0.20.17",
+<<<<<<< HEAD
 <<<<<<< HEAD
     "eslint": "8",
     "eslint-config-next": "14.2.4",
@@ -62,10 +66,12 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-react": "^7.34.1",
+=======
+    "eslint": "^8",
+    "eslint-config-next": "14.2.3",
+>>>>>>> parent of 73d1b41 (update)
     "pg": "^8.11.5",
     "postcss": "^8",
-    "prettier": "^3.2.5",
-    "prettier-plugin-tailwindcss": "^0.5.14",
     "tailwindcss": "^3.4.1",
     "typescript": "^5"
   }