DefinitelyTyped · typescript-bot · Sep 25, 2024 · Sep 14, 2024 · Sep 14, 2024 · Sep 14, 2024
diff --git a/attw.json b/attw.json
@@ -429,6 +429,7 @@
         "express-async-wrap",
         "express-brute-memcached",
         "express-serve-static-core",
+        "express-serve-static-core/v4",
         "express-socket.io-session",
         "express-status-monitor",
         "express-wechat-access",

diff --git a/types/absolute-url/package.json b/types/absolute-url/package.json
@@ -8,7 +8,7 @@
     ],
     "dependencies": {
         "@types/express": "*",
-        "@types/express-serve-static-core": "^4.17.33"
+        "@types/express-serve-static-core": "*"
     },
     "devDependencies": {
         "@types/absolute-url": "workspace:."

diff --git a/types/architect__functions/test/http-tests.ts b/types/architect__functions/test/http-tests.ts
@@ -22,8 +22,12 @@ import express = require("express");
 
 const app = express();
 
-app.get("/", (req, res) => res.send("Hello World!"));
-app.get("/cool", (req, res) => res.send("very cool"));
+app.get("/", (req, res) => {
+    res.send("Hello World!");
+});
+app.get("/cool", (req, res) => {
+    res.send("very cool");
+});
 
 ////////////////////
 // tests for arc.http.helpers: https://github.com/architect/functions/blob/master/src/http/index.js#L21-L26

diff --git a/types/create-test-server/index.d.ts b/types/create-test-server/index.d.ts
@@ -6,7 +6,9 @@ import { Express } from "express";
 import * as http from "http";
 import * as https from "https";
 
-type Server = createTestServer.TestServer & Omit<Express, "listen"> & { get: (url: string, response: string) => void };
+type Server = createTestServer.TestServer & Omit<Express, "listen"> & {
+    get: (url: string, response: string | (() => string)) => void;
+};
 
 /**
  * Returns a Promise which resolves to an (already listening) server.

diff --git a/types/express-brute/index.d.ts b/types/express-brute/index.d.ts
@@ -23,9 +23,9 @@ declare class ExpressBrute {
      * @param {Request}     request     The HTTP request.
      * @param {Response}    response    The HTTP response.
      * @param {Function}    next        The next middleware.
-     * @return {RequestHandler} The Request handler.
+     * @return {void}
      */
-    prevent(request: express.Request, response: express.Response, next: express.NextFunction): express.RequestHandler;
+    prevent: express.RequestHandler;
 
     /**
      * @summary Resets the wait time between requests back to its initial value.

diff --git a/types/express-oauth-server/express-oauth-server-tests.ts b/types/express-oauth-server/express-oauth-server-tests.ts
@@ -56,12 +56,12 @@ let resultingTokenMiddleware: (
     request: express.Request,
     response: express.Response,
     next: express.NextFunction,
-) => Promise<OAuth2Server.Token>;
+) => Promise<void>;
 let resultingAuthorizationCodeMiddleware: (
     request: express.Request,
     response: express.Response,
     next: express.NextFunction,
-) => Promise<OAuth2Server.AuthorizationCode>;
+) => Promise<void>;
 
 oAuthServer = expressOAuthServer.server;
 resultingTokenMiddleware = expressOAuthServer.authenticate();

diff --git a/types/express-oauth-server/index.d.ts b/types/express-oauth-server/index.d.ts
@@ -17,19 +17,19 @@ declare class ExpressOAuthServer {
         request: express.Request,
         response: express.Response,
         next: express.NextFunction,
-    ) => Promise<OAuth2Server.Token>;
+    ) => Promise<void>;
 
     authorize(options?: OAuth2Server.AuthorizeOptions): (
         request: express.Request,
         response: express.Response,
         next: express.NextFunction,
-    ) => Promise<OAuth2Server.AuthorizationCode>;
+    ) => Promise<void>;
 
     token(options?: OAuth2Server.TokenOptions): (
         request: express.Request,
         response: express.Response,
         next: express.NextFunction,
-    ) => Promise<OAuth2Server.Token>;
+    ) => Promise<void>;
 }
 
 export = ExpressOAuthServer;
@@ -3,3 +3,4 @@
 !**/*.d.cts
 !**/*.d.mts
 !**/*.d.*.ts
+/v4/
@@ -323,3 +323,6 @@ app.get("/:readonly", req => {
     // @ts-expect-error
     req.xhr = true;
 });
+
+// Starting with Express 5 RequestHandler can be async
+app.get("/async", Promise.resolve);
@@ -61,7 +61,7 @@ export interface RequestHandler<
         req: Request<P, ResBody, ReqBody, ReqQuery, LocalsObj>,
         res: Response<ResBody, LocalsObj>,
         next: NextFunction,
-    ): void;
+    ): void | Promise<void>;
 }
 
 export type ErrorRequestHandler<
@@ -75,7 +75,7 @@ export type ErrorRequestHandler<
     req: Request<P, ResBody, ReqBody, ReqQuery, LocalsObj>,
     res: Response<ResBody, LocalsObj>,
     next: NextFunction,
-) => void;
+) => void | Promise<void>;
 
 export type PathParams = string | RegExp | Array<string | RegExp>;
 

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@types/express-serve-static-core",
-    "version": "4.19.9999",
+    "version": "5.0.9999",
     "projects": [
         "http://expressjs.com"
     ],

@@ -0,0 +1,7 @@
+{
+    "rules": {
+        "@definitelytyped/no-type-only-packages": "off",
+        "@typescript-eslint/naming-convention": "off",
+        "@typescript-eslint/no-empty-interface": "off"
+    }
+}
@@ -0,0 +1,5 @@
+*
+!**/*.d.ts
+!**/*.d.cts
+!**/*.d.mts
+!**/*.d.*.ts