Просмотр исходного кода

Merge pull request #7930 from weseek/support/append-type-to-delegate-to-next

support: Append type to delegateToNext
Yuki Takei 2 лет назад
Родитель
Сommit
0e7981c0a6
1 измененных файлов с 11 добавлено и 9 удалено
  1. 11 9
      apps/app/src/server/routes/next.ts

+ 11 - 9
apps/app/src/server/routes/next.ts

@@ -1,23 +1,25 @@
-import {
-  Request, Response,
-} from 'express';
+import type { IncomingMessage } from 'http';
+
+import type { NextServer, RequestHandler } from 'next/dist/server/next';
 
 
 type Crowi = {
 type Crowi = {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  nextApp: any,
+  nextApp: NextServer,
 }
 }
 
 
-type CrowiReq = Request & {
+type CrowiReq = IncomingMessage & {
   crowi: Crowi,
   crowi: Crowi,
 }
 }
 
 
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-const delegator = (crowi: Crowi) => {
+type NextDelegatorResult = {
+  delegateToNext: RequestHandler,
+};
+
+const delegator = (crowi: Crowi): NextDelegatorResult => {
 
 
   const { nextApp } = crowi;
   const { nextApp } = crowi;
   const handle = nextApp.getRequestHandler();
   const handle = nextApp.getRequestHandler();
 
 
-  const delegateToNext = (req: CrowiReq, res: Response): void => {
+  const delegateToNext: RequestHandler = (req: CrowiReq, res): Promise<void> => {
     req.crowi = crowi;
     req.crowi = crowi;
     return handle(req, res);
     return handle(req, res);
   };
   };