fixed conflicts when merging with main

devsoc-unsw · Dec 11, 2024 · 9bd5bdc · 9bd5bdc
2 parents 41895ea + 833e44e
commit 9bd5bdc
Show file tree

Hide file tree

Showing 59 changed files with 2,620 additions and 4,944 deletions.
diff --git a/backend/package.json b/backend/package.json
@@ -17,29 +17,26 @@
     "connect-redis": "^7.1.1",
     "cors": "^2.8.5",
     "dayjs": "^1.11.13",
-    "express": "^4.21.1",
+    "express": "^4.21.2",
     "express-session": "^1.18.1",
     "form-data": "^4.0.1",
     "mailgun.js": "^10.2.3",
     "prisma": "^5.22.0",
     "redis": "^4.7.0",
     "zod": "^3.23.8",
-    "zod-prisma-types": "^3.1.8"
+    "zod-prisma-types": "^3.2.1"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.2",
     "@types/cors": "^2.8.17",
-    "@types/express": "4",
-    "@types/express-session": "^1.18.0",
-    "@types/node": "^22.7.7",
-    "@types/node-cron": "^3.0.11",
-    "jest-mock-extended": "2.0.4",
+    "@types/express": "^4.17.21",
+    "@types/express-session": "^1.18.1",
+    "@types/node": "^22.10.1",
     "supertest": "^7.0.0",
-    "sync-request-curl": "^3.0.0",
     "ts-node": "^10.9.2",
-    "tsx": "^4.19.1",
-    "typescript": "^5.6.3",
-    "vitest": "^2.1.4",
+    "tsx": "^4.19.2",
+    "typescript": "^5.7.2",
+    "vitest": "^2.1.8",
     "vitest-mock-extended": "^2.0.2"
   }
 }