chore: fix middleware typo (#6007)

Co-authored-by: 名字 <邮箱>
umijs · Jan 16, 2021 · 90fc5d0 · 90fc5d0
1 parent db022e8
commit 90fc5d0
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 28 deletions.
diff --git a/docs/plugins/api.md b/docs/plugins/api.md
@@ -213,14 +213,14 @@ api.skipPlugins(['@umijs/plugin-dva']);
 
 通过 `api.registerMethod()` 扩展的方法。
 
-### addBeforeMiddewares
+### addBeforeMiddlewares
 
 添加在 webpack compiler 中间件之前的中间件，返回值格式为 express 中间件。
 
 e.g.
 
 ```ts
-api.addBeforeMiddewares(() => {
+api.addBeforeMiddlewares(() => {
   return (req, res, next) => {
     if (false) {
       res.end('end');
@@ -379,14 +379,14 @@ api.addHTMLHeadScripts(() => {
 });
 ```
 
-### addMiddewares
+### addMiddlewares
 
 添加在 webpack compiler 中间件之后的中间件，返回值格式为 express 中间件。
 
 e.g.
 
 ```ts
-api.addMiddewares(async (ctx: Context, next: any) => {
+api.addMiddlewares(async (ctx: Context, next: any) => {
   // do something before request
   await next();
   // do something after request

diff --git a/docs/plugins/api.zh-CN.md b/docs/plugins/api.zh-CN.md
@@ -214,14 +214,14 @@ api.skipPlugins(['@umijs/plugin-dva']);
 
 通过 `api.registerMethod()` 扩展的方法。
 
-### addBeforeMiddewares
+### addBeforeMiddlewares
 
 添加在 webpack compiler 中间件之前的中间件，返回值格式为 express 中间件。
 
 e.g.
 
 ```ts
-api.addBeforeMiddewares(() => {
+api.addBeforeMiddlewares(() => {
   return (req, res, next) => {
     if (false) {
       res.end('end');
@@ -380,14 +380,14 @@ api.addHTMLHeadScripts(() => {
 });
 ```
 
-### addMiddewares
+### addMiddlewares
 
 添加在 webpack compiler 中间件之后的中间件，返回值格式为 express 中间件。
 
 e.g.
 
 ```ts
-api.addMiddewares(async (ctx: Context, next: any) => {
+api.addMiddlewares(async (ctx: Context, next: any) => {
   // do something before request
   await next();
   // do something after request

diff --git a/packages/preset-built-in/src/plugins/commands/dev/dev.ts b/packages/preset-built-in/src/plugins/commands/dev/dev.ts
@@ -154,18 +154,34 @@ export default (api: IApi) => {
         bundleImplementor,
       });
 
-      const beforeMiddlewares = await api.applyPlugins({
-        key: 'addBeforeMiddewares',
-        type: api.ApplyPluginsType.add,
-        initialValue: [],
-        args: {},
-      });
-      const middlewares = await api.applyPlugins({
-        key: 'addMiddewares',
-        type: api.ApplyPluginsType.add,
-        initialValue: [],
-        args: {},
-      });
+      const beforeMiddlewares = [
+        ...(await api.applyPlugins({
+          key: 'addBeforeMiddewares',
+          type: api.ApplyPluginsType.add,
+          initialValue: [],
+          args: {},
+        })),
+        ...(await api.applyPlugins({
+          key: 'addBeforeMiddlewares',
+          type: api.ApplyPluginsType.add,
+          initialValue: [],
+          args: {},
+        })),
+      ];
+      const middlewares = [
+        ...(await api.applyPlugins({
+          key: 'addMiddewares',
+          type: api.ApplyPluginsType.add,
+          initialValue: [],
+          args: {},
+        })),
+        ...(await api.applyPlugins({
+          key: 'addMiddlewares',
+          type: api.ApplyPluginsType.add,
+          initialValue: [],
+          args: {},
+        })),
+      ];
 
       server = new Server({
         ...opts,

diff --git a/packages/preset-built-in/src/plugins/commands/dev/mock/mock.ts b/packages/preset-built-in/src/plugins/commands/dev/mock/mock.ts
@@ -48,7 +48,7 @@ export default function (api: IApi) {
     ...(userConfig?.mock?.exclude || []),
   ];
 
-  api.addBeforeMiddewares(async () => {
+  api.addBeforeMiddlewares(async () => {
     const checkConflictPaths = async (
       mockRes: IGetMockDataResult,
     ): Promise<void> => {

diff --git a/packages/preset-built-in/src/plugins/features/devScripts.ts b/packages/preset-built-in/src/plugins/features/devScripts.ts
@@ -14,7 +14,7 @@ export default (api: IApi) => {
     },
   });
 
-  api.addBeforeMiddewares(() => {
+  api.addBeforeMiddlewares(() => {
     return (req, res, next) => {
       if (req.path.includes('@@/devScripts.js')) {
         api

diff --git a/packages/preset-built-in/src/plugins/registerMethods.ts b/packages/preset-built-in/src/plugins/registerMethods.ts
@@ -15,9 +15,11 @@ export default function (api: IApi) {
     'onPatchRoutes',
     'onPatchRoutesBefore',
     'onDevCompileDone',
+    'addBeforeMiddlewares',
     'addBeforeMiddewares',
     'addDepInfo',
     'addDevScripts',
+    'addMiddlewares',
     'addMiddewares',
     'addRuntimePlugin',
     'addRuntimePluginKey',

diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts
@@ -247,7 +247,9 @@ export interface IApi extends PluginAPI {
   addEntryCode: IAdd<null, string>;
   addEntryCodeAhead: IAdd<null, string>;
   addTmpGenerateWatcherPaths: IAdd<null, string>;
+  addBeforeMiddlewares: IAdd<{ service: Service }, RequestHandler<any>>;
   addBeforeMiddewares: IAdd<{ service: Service }, RequestHandler<any>>;
+  addMiddlewares: IAdd<{ service: Service }, RequestHandler<any>>;
   addMiddewares: IAdd<{ service: Service }, RequestHandler<any>>;
 }
 

diff --git a/yarn.lock b/yarn.lock
@@ -3524,12 +3524,6 @@
     "@types/connect" "*"
     "@types/node" "*"
 
-"@types/cheerio@0.22.21":
-  version "0.22.21"
-  resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.21.tgz#5e37887de309ba11b2e19a6e14cad7874b31a8a3"
-  dependencies:
-    "@types/node" "*"
-
 "@types/cheerio@0.22.23":
   version "0.22.23"
   resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.23.tgz#74bcfee9c5ee53f619711dca953a89fe5cfa4eb4"