From 173115087acf83834bd932bee8a272752304c34c Mon Sep 17 00:00:00 2001
From: Felix Mosheev <9304194+felixmosh@users.noreply.github.com>
Date: Thu, 26 Dec 2024 12:48:04 +0200
Subject: [PATCH] add express 5 as optional version

---
 packages/express/package.json          |  4 ++--
 packages/express/src/ExpressAdapter.ts |  4 ++--
 yarn.lock                              | 24 ++++++++++++++++++++++--
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/packages/express/package.json b/packages/express/package.json
index e8201d4e3..8095ab46a 100644
--- a/packages/express/package.json
+++ b/packages/express/package.json
@@ -31,11 +31,11 @@
     "@bull-board/api": "6.5.3",
     "@bull-board/ui": "6.5.3",
     "ejs": "^3.1.10",
-    "express": "^4.21.1"
+    "express": "^4.21.1 || ^5.0.0"
   },
   "devDependencies": {
     "@types/ejs": "^3.1.5",
-    "@types/express": "^4.17.21"
+    "@types/express": "^4.17.21 || ^5.0.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/express/src/ExpressAdapter.ts b/packages/express/src/ExpressAdapter.ts
index 55102330a..1709e3cf3 100644
--- a/packages/express/src/ExpressAdapter.ts
+++ b/packages/express/src/ExpressAdapter.ts
@@ -8,7 +8,7 @@ import {
   UIConfig,
 } from '@bull-board/api/dist/typings/app';
 import ejs from 'ejs';
-import express, { Express, NextFunction, Request, Response, Router } from 'express';
+import express, { Express, Request, Response, Router } from 'express';
 import { wrapAsync } from './helpers/wrapAsync';
 
 export class ExpressAdapter implements IServerAdapter {
@@ -74,7 +74,7 @@ export class ExpressAdapter implements IServerAdapter {
       )
     );
 
-    router.use((err: Error, _req: Request, res: Response, next: NextFunction) => {
+    router.use((err: Error, _req: Request, res: Response, next: any) => {
       if (!this.errorHandler) {
         return next();
       }
diff --git a/yarn.lock b/yarn.lock
index 459d9491e..f45662819 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3257,7 +3257,17 @@
     "@types/range-parser" "*"
     "@types/send" "*"
 
-"@types/express@*", "@types/express@^4.17.21":
+"@types/express-serve-static-core@^5.0.0":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.0.2.tgz#812d2871e5eea17fb0bd5214dda7a7b748c0e12a"
+  integrity sha512-vluaspfvWEtE4vcSDlKRNer52DvOGrB2xv6diXy6UKyKW0lqZiWHGNApSyxOv+8DE5Z27IzVvE7hNkxg7EXIcg==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+    "@types/send" "*"
+
+"@types/express@*":
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
   integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
@@ -3267,6 +3277,16 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
+"@types/express@^4.17.21 || ^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-5.0.0.tgz#13a7d1f75295e90d19ed6e74cab3678488eaa96c"
+  integrity sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^5.0.0"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
 "@types/graceful-fs@^4.1.3":
   version "4.1.9"
   resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz#2a06bc0f68a20ab37b3e36aa238be6abdf49e8b4"
@@ -6385,7 +6405,7 @@ expect@^29.7.0:
     jest-message-util "^29.7.0"
     jest-util "^29.7.0"
 
-express@^4.21.1:
+"express@^4.21.1 || ^5.0.0":
   version "4.21.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
   integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==