Merge branch 'master' into feature/handle-mongodb-unavailable

Author: fehmer

.github/workflows/monkey-ci.yml

@@ -2,7 +2,7 @@ name: Monkey CI
 
 env:
   PNPM_VERSION: "9.6.0"
-  NODE_VERSION: "20.19.4"
+  NODE_VERSION: "24.10.0"
   RECAPTCHA_SITE_KEY: "6Lc-V8McAAAAAJ7s6LGNe7MBZnRiwbsbiWts87aj"
 
 permissions:

.github/workflows/pretty-check.yml

@@ -2,7 +2,7 @@ name: Prettier Check
 
 env:
   PNPM_VERSION: "9.6.0"
-  NODE_VERSION: "20.19.4"
+  NODE_VERSION: "24.10.0"
 
 on:
   pull_request:

.github/workflows/pretty-fix.yml

@@ -2,7 +2,7 @@ name: Prettier Fix
 
 env:
   PNPM_VERSION: "9.6.0"
-  NODE_VERSION: "20.19.4"
+  NODE_VERSION: "24.10.0"
 
 permissions:
   contents: write

.gitignore

@@ -90,6 +90,7 @@ dist/
 frontend/public/
 backend/globalConfig.json
 backend/server.version
+backend/src/server.version
 vite-build/
 
 #cloudflare y

.nvmrc

@@ -1 +1 @@
-20.19.4
+24.10.0

backend/docker/compose.yml

@@ -23,7 +23,7 @@ services:
     container_name: monkeytype-api-server
     build:
       dockerfile_inline: |
-        FROM node:20.19.4
+        FROM node:24.10.0
         RUN npm i -g [email protected]
         RUN mkdir /pnpm-store && chown -R 1000:1000 /pnpm-store
     user: "node"    ##this works as long as your local user has uid=1000

backend/package.json

@@ -21,12 +21,13 @@
     "gen-docs": "tsx scripts/openapi.ts dist/static/api/openapi.json && redocly build-docs -o dist/static/api/internal.html internal@v2 && redocly bundle -o dist/static/api/public.json public-filter && redocly build-docs -o dist/static/api/public.html public@v2"
   },
   "engines": {
-    "node": "20.19.4"
+    "node": "24.10.0"
   },
   "dependencies": {
     "@date-fns/utc": "1.2.0",
     "@monkeytype/contracts": "workspace:*",
     "@monkeytype/funbox": "workspace:*",
+    "@monkeytype/schemas": "workspace:*",
     "@monkeytype/util": "workspace:*",
     "@ts-rest/core": "3.52.1",
     "@ts-rest/express": "3.52.1",
@@ -49,7 +50,7 @@
     "mjml": "4.15.0",
     "mongodb": "6.3.0",
     "mustache": "4.2.0",
-    "nodemailer": "6.9.14",
+    "nodemailer": "7.0.7",
     "object-hash": "3.0.0",
     "prom-client": "15.1.3",
     "rate-limiter-flexible": "5.0.3",
@@ -64,7 +65,6 @@
   "devDependencies": {
     "@monkeytype/eslint-config": "workspace:*",
     "@monkeytype/oxlint-config": "workspace:*",
-    "@monkeytype/schemas": "workspace:*",
     "@monkeytype/typescript-config": "workspace:*",
     "@redocly/cli": "2.0.5",
     "@types/bcrypt": "5.0.2",
@@ -80,7 +80,7 @@
     "@types/object-hash": "3.0.6",
     "@types/readline-sync": "1.4.8",
     "@types/string-similarity": "4.0.2",
-    "@types/supertest": "2.0.12",
+    "@types/supertest": "6.0.3",
     "@types/swagger-stats": "0.95.11",
     "@types/ua-parser-js": "0.7.36",
     "@types/uuid": "10.0.0",
@@ -91,7 +91,7 @@
     "openapi3-ts": "2.0.2",
     "oxlint": "1.15.0",
     "readline-sync": "1.4.10",
-    "supertest": "6.2.3",
+    "supertest": "7.1.4",
     "testcontainers": "11.4.0",
     "tsx": "4.16.2",
     "typescript": "5.5.4",

docker/backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.19.4-alpine3.19 AS builder
+FROM node:24.10.0-alpine3.22 AS builder
 
 WORKDIR /app
 
@@ -18,7 +18,7 @@ RUN pnpm deploy --filter backend --prod /prod/backend
 #---------------------------------
 
 ## target image
-FROM node:20.19.4-alpine3.19
+FROM node:24.10.0-alpine3.22
 
 ## get server_version from build-arg, default to UNKNOWN
 ARG server_version=UNKNOWN

docker/frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.19.4-alpine3.19 AS builder
+FROM node:24.10.0-alpine3.22 AS builder
 WORKDIR /app
 
 #ENV

docker/frontend/updateConfig.sh

@@ -1,12 +1,12 @@
 #!/bin/sh
 cd  /usr/share/nginx/html
 echo "replace firebase config appid: ${FIREBASE_APPID}"
-sed -i "s/###FIREBASE_APIKEY###/${FIREBASE_APIKEY}/g" js/firebase.*.js
-sed -i "s/###FIREBASE_AUTHDOMAIN###/${FIREBASE_AUTHDOMAIN}/g" js/firebase.*.js
-sed -i "s/###FIREBASE_PROJECTID###/${FIREBASE_PROJECTID}/g" js/firebase.*.js
-sed -i "s/###FIREBASE_STORAGEBUCKET###/${FIREBASE_STORAGEBUCKET}/g" js/firebase.*.js
-sed -i "s/###FIREBASE_MESSAGINGSENDERID###/${FIREBASE_MESSAGINGSENDERID}/g" js/firebase.*.js
-sed -i "s/###FIREBASE_APPID###/${FIREBASE_APPID}/g" js/firebase.*.js
+sed -i "s/###FIREBASE_APIKEY###/${FIREBASE_APIKEY}/g" js/firebase-config-live.*.js
+sed -i "s/###FIREBASE_AUTHDOMAIN###/${FIREBASE_AUTHDOMAIN}/g" js/firebase-config-live.*.js
+sed -i "s/###FIREBASE_PROJECTID###/${FIREBASE_PROJECTID}/g" js/firebase-config-live.*.js
+sed -i "s/###FIREBASE_STORAGEBUCKET###/${FIREBASE_STORAGEBUCKET}/g" js/firebase-config-live.*.js
+sed -i "s/###FIREBASE_MESSAGINGSENDERID###/${FIREBASE_MESSAGINGSENDERID}/g" js/firebase-config-live.*.js
+sed -i "s/###FIREBASE_APPID###/${FIREBASE_APPID}/g" js/firebase-config-live.*.js
 
 
 echo "use backend url ${MONKEYTYPE_BACKENDURL}"