Skip to content

Commit 6cb2eaf

Browse files
Caneryycursoragent
andcommitted
fix(auth): merge main and use bcryptjs for login route CI build
Replace native bcrypt with bcryptjs to fix Next.js build failure on /api/auth/login page data collection. Re-apply login security changes after merging upstream main per maintainer request. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent b201ed6 commit 6cb2eaf

4 files changed

Lines changed: 19 additions & 231 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"migrate": "npx tsx src/lib/db/migrate.ts"
4040
},
4141
"dependencies": {
42-
"bcrypt": "^5.1.1",
42+
"bcryptjs": "^2.4.3",
4343
"@apollo/client": "^3.8.0",
4444
"@dnd-kit/core": "^6.3.1",
4545
"@dnd-kit/sortable": "^8.0.0",
@@ -109,7 +109,7 @@
109109
"@testing-library/jest-dom": "^6.9.1",
110110
"@testing-library/react": "^16.3.0",
111111
"@testing-library/user-event": "^14.6.1",
112-
"@types/bcrypt": "^5.0.2",
112+
"@types/bcryptjs": "^2.4.6",
113113
"@types/chai": "^5.2.3",
114114
"@types/d3-array": "^3.2.2",
115115
"@types/d3-color": "^3.1.3",

0 commit comments

Comments
 (0)