Merge pull request #32275 from dieseldjango/master

@types/hapi: ServerMethod does not have to return a Promise

types/hapi/index.d.ts

@@ -2704,7 +2704,7 @@ export interface ServerInjectResponse extends Shot.ResponseObject {
  * * * ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
  * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodname-method-options)
  */
-export type ServerMethod = (...args: any[]) => Promise<any>;
+export type ServerMethod = (...args: any[]) => any;
 
 /**
  * The same cache configuration used in server.cache().

types/hapi/test/server/server-method.ts

@@ -6,7 +6,7 @@ const server = new Server({
 });
 server.start();
 
-const add = (a: any, b: any) => {
+const add = (a: any, b: any): number => {
     return a + b;
 };