chore: upgrade to express 5 (#4611)

cloud-gov · Nov 15, 2024 · f0670ec · f0670ec
1 parent deedf28
commit f0670ec
Show file tree

Hide file tree

Showing 7 changed files with 231 additions and 27 deletions.
diff --git a/api/middlewares/parse-form.js b/api/middlewares/parse-form.js
@@ -1,7 +1,6 @@
 const { urlencoded } = require('express');
 
 const parseForm = urlencoded({
-  extended: false,
   limit: '1kb',
 });
 

diff --git a/api/routers/build-log.js b/api/routers/build-log.js
@@ -3,7 +3,7 @@ const BuildLogController = require('../controllers/build-log');
 const { sessionAuth } = require('../middlewares');
 
 router.get(
-  '/build/:build_id/log(/offset/:offset)?',
+  '/build/:build_id/log{/offset/:offset}',
   sessionAuth,
   BuildLogController.find,
 );

diff --git a/api/routers/build-task.js b/api/routers/build-task.js
@@ -17,6 +17,6 @@ router.post(
 router.put('/tasks/:build_task_id/:token', BuildTaskController.update);
 router.get('/tasks/types', sessionAuth, BuildTaskTypeController.list);
 router.get('/tasks/default-rules', sessionAuth, BuildTaskTypeController.getDefaultRules);
-router.get('/tasks/:task_id/report/:sub_page?', sessionAuth, BuildTaskController.report);
+router.get('/tasks/:task_id/report/{:sub_page}', sessionAuth, BuildTaskController.report);
 
 module.exports = router;
diff --git a/api/routers/main.js b/api/routers/main.js
@@ -7,12 +7,12 @@ router.get('/', MainController.home);
 router.get('/system-use', MainController.systemUse);
 
 // add csrf middleware to app route so that we can use request.csrfToken()
-router.get('/organizations(/*)?', csrfProtection, MainController.app);
-router.get('/sites(/*)?', csrfProtection, MainController.app);
+router.get('/organizations{/*splat}', csrfProtection, MainController.app);
+router.get('/sites{/*splat}', csrfProtection, MainController.app);
 router.get('/settings', csrfProtection, MainController.app);
 
 router.get('/robots.txt', MainController.robots);
 
-router.options('(/*)?', (_req, res) => res.notFound());
+router.options('{/*splat}', (_req, res) => res.notFound());
 
 module.exports = router;
diff --git a/api/routers/report.js b/api/routers/report.js
@@ -4,6 +4,6 @@ const MainController = require('../controllers/main');
 const { csrfProtection } = require('../middlewares');
 
 // add csrf middleware to app route so that we can use request.csrfToken()
-router.get('/report(/*)?', csrfProtection, MainController.report);
+router.get('/report{*splat}', csrfProtection, MainController.report);
 
 module.exports = router;
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "db-migrate-pg": "^1.5.2",
     "deep-extend": "^0.6",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "express": "^4.19.2",
+    "express": "^5.0.1",
     "express-rate-limit": "^5.2.3",
     "express-session": "^1.18.0",
     "express-slow-down": "^1.4.0",