Merge pull request #1069 from Mygod/express5

chore(deps): bump express
WatWowMap · Nov 13, 2024 · 240b293 · 240b293
2 parents fb7af9f + 185343a
commit 240b293
Show file tree

Hide file tree

Showing 4 changed files with 189 additions and 98 deletions.
diff --git a/package.json b/package.json
@@ -139,7 +139,7 @@
     "discord.js": "14.15.3",
     "dlv": "^1.1.3",
     "dotenv": "^16.3.1",
-    "express": "4.21.0",
+    "express": "5.0.1",
     "express-mysql-session": "3.0.3",
     "express-rate-limit": "7.4.0",
     "express-session": "1.18.0",

diff --git a/server/src/routes/clientRouter.js b/server/src/routes/clientRouter.js
@@ -8,8 +8,10 @@ const CLIENT_ROUTES = [
   '/',
   '/login',
   '/blocked/:info',
-  '/@/:lat/:lon/:zoom?',
-  '/id/:category/:id/:zoom?',
+  '/@/:lat/:lon',
+  '/@/:lat/:lon/:zoom',
+  '/id/:category/:id',
+  '/id/:category/:id/:zoom',
   '/304',
   '/404',
   '/500',

diff --git a/server/src/routes/rootRouter.js b/server/src/routes/rootRouter.js
@@ -102,7 +102,7 @@ rootRouter.post('/api/error/client', async (req, res) => {
   }
 })
 
-rootRouter.get('/area/:area/:zoom?', (req, res) => {
+rootRouter.get(['/area/:area', '/area/:area/:zoom'], (req, res) => {
   const { area, zoom } = req.params
   try {
     const validScanAreas = config.getAreas(req, 'scanAreas')