merge

package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "mask": "npx tsx app/masks/build.ts",
     "mask:watch": "npx watch 'yarn mask' app/masks",
-    "dev": "yarn run mask:watch && npx prisma generate && npx prisma db push && next dev --hostname 0.0.0.0 --port 23000",
+    "dev": "yarn run mask:watch & npx prisma generate && npx prisma db push && next dev --hostname 0.0.0.0 --port 23000",
     "build": "yarn mask && npx next telemetry disable && npx prisma generate && cross-env BUILD_MODE=standalone next build",
     "start": "next start",
     "lint": "next lint",
@@ -23,8 +23,8 @@
     "@fortaine/fetch-event-source": "^3.0.6",
     "@hello-pangea/dnd": "^16.5.0",
     "@next-auth/prisma-adapter": "^1.0.7",
+    "@next/third-parties": "14.2.3",
     "@prisma/client": "^5.13.0",
-    "@next/third-parties": "^14.1.0",
     "@svgr/webpack": "^6.5.1",
     "@vercel/analytics": "^0.1.11",
     "@vercel/speed-insights": "^1.0.2",
@@ -79,13 +79,6 @@
     "eslint-config-next": "^14.2.3",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "husky": "^8.0.0",
-    "lint-staged": "^13.2.2",
-    "prettier": "^3.0.2",
-    "tsx": "^4.16.0",
-    "typescript": "5.2.2",
-    "watch": "^1.0.2",
-    "webpack": "^5.88.1",
     "husky": "^9.0.7",
     "lint-staged": "^15.2.0",
     "postcss": "^8.4.33",
@@ -94,7 +87,9 @@
     "prisma": "^5.13.0",
     "tailwindcss": "^3.4.1",
     "tailwindcss-animate": "^1.0.7",
+    "tsx": "^4.16.0",
     "typescript": "^5.3.3",
+    "watch": "^1.0.2",
     "webpack": "^5.90.0"
   },
   "resolutions": {