Merge branch 'master' into compat-2

Author: evansims

index.d.ts

@@ -73,7 +73,7 @@ declare namespace JwksRsa {
   /** Types from express-jwt@>=7 */
   type GetVerificationKey = (req: Express.Request, token: Jwt | undefined) => Secret | undefined | Promise<Secret | undefined>;
 
-  function expressJwtSecret(options: ExpressJwtOptions): SecretCallbackLong|GetVerificationKey;
+  function expressJwtSecret(options: ExpressJwtOptions): SecretCallbackLong & GetVerificationKey;
 
   function passportJwtSecret(options: ExpressJwtOptions): SecretCallback;