@modern-js/plugin-koa 1.21.5 → 2.0.0-beta.1

package/CHANGELOG.md

@@ -1,29 +1,71 @@
 # @modern-js/plugin-koa
 
-## 1.21.5
-
-### Patch Changes
-
-- Updated dependencies [4876aa7]
-  - @modern-js/bff-core@1.21.5
-  - @modern-js/bff-runtime@1.21.5
-  - @modern-js/utils@1.21.5
-
-## 1.21.4
-
-### Patch Changes
-
-- @modern-js/bff-core@1.21.4
-- @modern-js/bff-runtime@1.21.4
-- @modern-js/utils@1.21.4
-
-## 1.21.3
-
-### Patch Changes
-
-- @modern-js/bff-core@1.21.3
-- @modern-js/bff-runtime@1.21.3
-- @modern-js/utils@1.21.3
+## 2.0.0-beta.1
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- 8d24bed25b: fix: compat Hook API in /server namespace
+  fix: 在 @modern-js/runtime/server 命名空间下兼容 Hook API
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- Updated dependencies [2344eb2]
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed587]
+- Updated dependencies [87c1ff8]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [102d32e4ba]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/bff-core@2.0.0-beta.1
+  - @modern-js/utils@2.0.0-beta.1
+  - @modern-js/types@2.0.0-beta.1
+  - @modern-js/bff-runtime@2.0.0-beta.1
+
+## 2.0.0-beta.0
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- 8d24bed25: fix: compat Hook API in /server namespace
+  fix: 在 @modern-js/runtime/server 命名空间下兼容 Hook API
+- 3bbea92b2: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- Updated dependencies [a2509bf]
+- Updated dependencies [edd1cfb1a]
+- Updated dependencies [cc971eabf]
+- Updated dependencies [5b9049f]
+- Updated dependencies [6bda14ed7]
+- Updated dependencies [b8bbe036c]
+- Updated dependencies [d5a31df78]
+- Updated dependencies [dda38c9]
+- Updated dependencies [102d32e4b]
+- Updated dependencies [8b8e1bb57]
+- Updated dependencies [3bbea92b2]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be95]
+- Updated dependencies [14b712d]
+  - @modern-js/bff-core@2.0.0-beta.0
+  - @modern-js/utils@2.0.0-beta.0
+  - @modern-js/types@2.0.0-beta.0
+  - @modern-js/bff-runtime@2.0.0-beta.0
 
 ## 1.21.2
 

package/dist/js/modern/cli/index.js

@@ -18,12 +18,12 @@ export default (() => ({
         bffExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, 'server');
         const serverRuntimePath = bffExportsUtils.getPath();
         const relativeRuntimePath = getRelativeRuntimePath(appDirectory, serverRuntimePath);
-
         if (process.env.NODE_ENV === 'production') {
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': relativeRuntimePath
+                '@modern-js/runtime/server': relativeRuntimePath,
+                '@modern-js/runtime/koa': relativeRuntimePath
               }
             }
           };
@@ -31,13 +31,13 @@ export default (() => ({
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': serverRuntimePath
+                '@modern-js/runtime/server': serverRuntimePath,
+                '@modern-js/runtime/koa': serverRuntimePath
               }
             }
           };
         }
       },
-
       addRuntimeExports(input) {
         const currentFile = bffExportsUtils.getPath();
         const relativeRuntimeModulePath = path.relative(path.dirname(currentFile), runtimeModulePath);
@@ -51,7 +51,6 @@ export default (() => ({
           `);
         return input;
       }
-
     };
   }
 }));

package/dist/js/modern/plugin.js

@@ -5,11 +5,9 @@ import koaBody from 'koa-body';
 import { fs, compatRequire } from '@modern-js/utils';
 import { run } from "./context";
 import registerRoutes from "./registerRoutes";
-
 const findAppModule = async apiDir => {
   const exts = ['.ts', '.js'];
   const paths = exts.map(ext => path.join(apiDir, `app${ext}`));
-
   for (const filename of paths) {
     if (await fs.pathExists(filename)) {
       // 每次获取 app.ts 的时候，避免使用缓存的 app.ts
@@ -17,20 +15,18 @@ const findAppModule = async apiDir => {
       return compatRequire(filename);
     }
   }
-
   return null;
 };
-
 const initMiddlewares = (middleware, app) => {
   middleware.forEach(middlewareItem => {
     const middlewareFunc = typeof middlewareItem === 'string' ? compatRequire(middlewareItem) : middlewareItem;
     app.use(middlewareFunc);
   });
 };
-
 export default (() => ({
   name: '@modern-js/plugin-koa',
   pre: ['@modern-js/plugin-bff'],
+  post: ['@modern-js/plugin-server'],
   setup: api => ({
     async prepareApiServer({
       pwd,
@@ -42,24 +38,20 @@ export default (() => ({
       const appContext = api.useAppContext();
       const apiHandlerInfos = appContext.apiHandlerInfos;
       const mode = appContext.apiMode;
-
       if (mode === 'framework') {
         app = await findAppModule(apiDir);
-
         if (!(app instanceof Koa)) {
           app = new Koa();
           app.use(koaBody({
             multipart: true
           }));
         }
-
         if (config) {
           const {
             middleware
           } = config;
           initMiddlewares(middleware, app);
         }
-
         app.use(run);
         registerRoutes(router, apiHandlerInfos);
       } else if (mode === 'function') {
@@ -67,60 +59,62 @@ export default (() => ({
         app.use(koaBody({
           multipart: true
         }));
-
         if (config) {
           const {
             middleware
           } = config;
           initMiddlewares(middleware, app);
         }
-
         app.use(run);
         registerRoutes(router, apiHandlerInfos);
       } else {
         throw new Error(`mode must be function or framework`);
       }
-
       app.use(router.routes());
       return (req, res) => {
         return Promise.resolve(app.callback()(req, res));
       };
     },
-
     prepareWebServer({
       config
-    }) {
+    }, next) {
+      var _userConfig$server;
+      const userConfig = api.useConfigContext();
+      if (userConfig !== null && userConfig !== void 0 && (_userConfig$server = userConfig.server) !== null && _userConfig$server !== void 0 && _userConfig$server.disableFrameworkExt) {
+        return next();
+      }
       const app = new Koa();
       app.use(async (ctx, next) => {
         await next();
-
         if (!ctx.body) {
           // restore statusCode
           if (ctx.res.statusCode === 404 && !ctx.response._explicitStatus) {
             ctx.res.statusCode = 200;
           }
-
           ctx.respond = false;
         }
       });
       app.use(koaBody());
-
       if (config) {
         const {
           middleware
         } = config;
         initMiddlewares(middleware, app);
       }
-
-      app.on('error', err => {
-        if (err) {
-          throw err;
-        }
-      });
-      return (req, res) => {
+      return ctx => {
+        const {
+          source: {
+            req,
+            res
+          }
+        } = ctx;
+        app.on('error', err => {
+          if (err) {
+            throw err;
+          }
+        });
         return Promise.resolve(app.callback()(req, res));
       };
     }
-
   })
 }));

package/dist/js/modern/registerRoutes.js

@@ -1,5 +1,4 @@
 import { createRouteHandler } from "./utils";
-
 const registerRoutes = (router, handlerInfos) => {
   handlerInfos.forEach(({
     routePath,
@@ -11,5 +10,4 @@ const registerRoutes = (router, handlerInfos) => {
     router[method](routePath, routeHandler);
   });
 };
-
 export default registerRoutes;

package/dist/js/modern/utils.js

@@ -1,15 +1,12 @@
 import { httpMethods, isWithMetaHandler, ResponseMetaType, HttpMetadata } from '@modern-js/bff-core';
 import { isSchemaHandler } from '@modern-js/bff-runtime';
 import typeIs from 'type-is';
-
 const handleResponseMeta = (ctx, handler) => {
   const responseMeta = Reflect.getMetadata(HttpMetadata.Response, handler);
-
   if (Array.isArray(responseMeta)) {
     for (const meta of responseMeta) {
       const metaType = meta.type;
       const metaValue = meta.value;
-
       switch (metaType) {
         case ResponseMetaType.Headers:
           // eslint-disable-next-line @typescript-eslint/ban-types
@@ -18,40 +15,31 @@ const handleResponseMeta = (ctx, handler) => {
               ctx.append(key, value);
             }
           }
-
           break;
-
         case ResponseMetaType.Redirect:
           if (typeof metaValue === 'string') {
             ctx.redirect(metaValue);
           }
-
           break;
-
         case ResponseMetaType.StatusCode:
           if (typeof metaValue === 'number') {
             ctx.status = metaValue;
           }
-
           break;
-
         default:
           break;
       }
     }
   }
 };
-
 export const createRouteHandler = handler => {
   // eslint-disable-next-line consistent-return
   const apiHandler = async ctx => {
     const input = await getInputFromRequest(ctx);
-
     if (isWithMetaHandler(handler)) {
       try {
         handleResponseMeta(ctx, handler);
         const body = await handler(input);
-
         if (typeof body !== 'undefined') {
           ctx.body = body;
         }
@@ -62,7 +50,6 @@ export const createRouteHandler = handler => {
           } else {
             ctx.status = 500;
           }
-
           return ctx.body = {
             code: error.code,
             message: error.message
@@ -71,14 +58,12 @@ export const createRouteHandler = handler => {
       }
     } else if (isSchemaHandler(handler)) {
       const result = await handler(input);
-
       if (result.type !== 'HandleSuccess') {
         if (result.type === 'InputValidationError') {
           ctx.status = 400;
         } else {
           ctx.status = 500;
         }
-
         ctx.body = result.message;
       } else {
         ctx.body = result.value;
@@ -86,18 +71,15 @@ export const createRouteHandler = handler => {
     } else {
       const args = Object.values(input.params).concat(input);
       const body = await handler(...args);
-
       if (typeof body !== 'undefined') {
         ctx.body = body;
       }
     }
   };
-
   Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
   return apiHandler;
 };
 export const isNormalMethod = httpMethod => httpMethods.includes(httpMethod);
-
 const getInputFromRequest = async ctx => {
   const draft = {
     params: ctx.params,
@@ -105,7 +87,6 @@ const getInputFromRequest = async ctx => {
     headers: ctx.headers,
     cookies: ctx.headers.cookie
   };
-
   if (typeIs.is(ctx.request.type, ['application/json'])) {
     draft.data = ctx.request.body;
   } else if (typeIs.is(ctx.request.type, ['multipart/form-data'])) {
@@ -115,6 +96,5 @@ const getInputFromRequest = async ctx => {
   } else {
     draft.body = ctx.request.body;
   }
-
   return draft;
 };

package/dist/js/node/cli/index.js

@@ -4,17 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _bffCore = require("@modern-js/bff-core");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var _default = () => ({
   name: '@modern-js/plugin-koa',
   setup: api => {
@@ -32,12 +26,12 @@ var _default = () => ({
         bffExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, 'server');
         const serverRuntimePath = bffExportsUtils.getPath();
         const relativeRuntimePath = (0, _bffCore.getRelativeRuntimePath)(appDirectory, serverRuntimePath);
-
         if (process.env.NODE_ENV === 'production') {
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': relativeRuntimePath
+                '@modern-js/runtime/server': relativeRuntimePath,
+                '@modern-js/runtime/koa': relativeRuntimePath
               }
             }
           };
@@ -45,13 +39,13 @@ var _default = () => ({
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': serverRuntimePath
+                '@modern-js/runtime/server': serverRuntimePath,
+                '@modern-js/runtime/koa': serverRuntimePath
               }
             }
           };
         }
       },
-
       addRuntimeExports(input) {
         const currentFile = bffExportsUtils.getPath();
         const relativeRuntimeModulePath = path.relative(path.dirname(currentFile), runtimeModulePath);
@@ -65,9 +59,7 @@ var _default = () => ({
           `);
         return input;
       }
-
     };
   }
 });
-
 exports.default = _default;

package/dist/js/node/context.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useContext = exports.run = void 0;
-
 var _bffCore = require("@modern-js/bff-core");
-
 const {
   run,
   useContext

package/dist/js/node/index.js

@@ -5,11 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {};
 exports.default = void 0;
-
 var _plugin = _interopRequireDefault(require("./plugin"));
-
 var _context = require("./context");
-
 Object.keys(_context).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -21,8 +18,6 @@ Object.keys(_context).forEach(function (key) {
     }
   });
 });
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _default = _plugin.default;
 exports.default = _default;

package/dist/js/node/plugin.js

@@ -4,31 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var _koa = _interopRequireDefault(require("koa"));
-
 var _koaRouter = _interopRequireDefault(require("koa-router"));
-
 var _koaBody = _interopRequireDefault(require("koa-body"));
-
 var _utils = require("@modern-js/utils");
-
 var _context = require("./context");
-
 var _registerRoutes = _interopRequireDefault(require("./registerRoutes"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const findAppModule = async apiDir => {
   const exts = ['.ts', '.js'];
   const paths = exts.map(ext => path.join(apiDir, `app${ext}`));
-
   for (const filename of paths) {
     if (await _utils.fs.pathExists(filename)) {
       // 每次获取 app.ts 的时候，避免使用缓存的 app.ts
@@ -36,20 +24,18 @@ const findAppModule = async apiDir => {
       return (0, _utils.compatRequire)(filename);
     }
   }
-
   return null;
 };
-
 const initMiddlewares = (middleware, app) => {
   middleware.forEach(middlewareItem => {
     const middlewareFunc = typeof middlewareItem === 'string' ? (0, _utils.compatRequire)(middlewareItem) : middlewareItem;
     app.use(middlewareFunc);
   });
 };
-
 var _default = () => ({
   name: '@modern-js/plugin-koa',
   pre: ['@modern-js/plugin-bff'],
+  post: ['@modern-js/plugin-server'],
   setup: api => ({
     async prepareApiServer({
       pwd,
@@ -61,24 +47,20 @@ var _default = () => ({
       const appContext = api.useAppContext();
       const apiHandlerInfos = appContext.apiHandlerInfos;
       const mode = appContext.apiMode;
-
       if (mode === 'framework') {
         app = await findAppModule(apiDir);
-
         if (!(app instanceof _koa.default)) {
           app = new _koa.default();
           app.use((0, _koaBody.default)({
             multipart: true
           }));
         }
-
         if (config) {
           const {
             middleware
           } = config;
           initMiddlewares(middleware, app);
         }
-
         app.use(_context.run);
         (0, _registerRoutes.default)(router, apiHandlerInfos);
       } else if (mode === 'function') {
@@ -86,62 +68,63 @@ var _default = () => ({
         app.use((0, _koaBody.default)({
           multipart: true
         }));
-
         if (config) {
           const {
             middleware
           } = config;
           initMiddlewares(middleware, app);
         }
-
         app.use(_context.run);
         (0, _registerRoutes.default)(router, apiHandlerInfos);
       } else {
         throw new Error(`mode must be function or framework`);
       }
-
       app.use(router.routes());
       return (req, res) => {
         return Promise.resolve(app.callback()(req, res));
       };
     },
-
     prepareWebServer({
       config
-    }) {
+    }, next) {
+      var _userConfig$server;
+      const userConfig = api.useConfigContext();
+      if (userConfig !== null && userConfig !== void 0 && (_userConfig$server = userConfig.server) !== null && _userConfig$server !== void 0 && _userConfig$server.disableFrameworkExt) {
+        return next();
+      }
       const app = new _koa.default();
       app.use(async (ctx, next) => {
         await next();
-
         if (!ctx.body) {
           // restore statusCode
           if (ctx.res.statusCode === 404 && !ctx.response._explicitStatus) {
             ctx.res.statusCode = 200;
           }
-
           ctx.respond = false;
         }
       });
       app.use((0, _koaBody.default)());
-
       if (config) {
         const {
           middleware
         } = config;
         initMiddlewares(middleware, app);
       }
-
-      app.on('error', err => {
-        if (err) {
-          throw err;
-        }
-      });
-      return (req, res) => {
+      return ctx => {
+        const {
+          source: {
+            req,
+            res
+          }
+        } = ctx;
+        app.on('error', err => {
+          if (err) {
+            throw err;
+          }
+        });
         return Promise.resolve(app.callback()(req, res));
       };
     }
-
   })
 });
-
 exports.default = _default;

package/dist/js/node/registerRoutes.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _utils = require("./utils");
-
 const registerRoutes = (router, handlerInfos) => {
   handlerInfos.forEach(({
     routePath,
@@ -18,6 +16,5 @@ const registerRoutes = (router, handlerInfos) => {
     router[method](routePath, routeHandler);
   });
 };
-
 var _default = registerRoutes;
 exports.default = _default;

package/dist/js/node/runtime.js

@@ -14,11 +14,8 @@ Object.defineProperty(exports, "useContext", {
     return _context.useContext;
   }
 });
-
 var _context = require("./context");
-
 var _bffCore = require("@modern-js/bff-core");
-
 Object.keys(_bffCore).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -30,7 +27,5 @@ Object.keys(_bffCore).forEach(function (key) {
     }
   });
 });
-
 const hook = attacher => attacher;
-
 exports.hook = hook;

package/dist/js/node/utils.js

@@ -4,23 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isNormalMethod = exports.createRouteHandler = void 0;
-
 var _bffCore = require("@modern-js/bff-core");
-
 var _bffRuntime = require("@modern-js/bff-runtime");
-
 var _typeIs = _interopRequireDefault(require("type-is"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const handleResponseMeta = (ctx, handler) => {
   const responseMeta = Reflect.getMetadata(_bffCore.HttpMetadata.Response, handler);
-
   if (Array.isArray(responseMeta)) {
     for (const meta of responseMeta) {
       const metaType = meta.type;
       const metaValue = meta.value;
-
       switch (metaType) {
         case _bffCore.ResponseMetaType.Headers:
           // eslint-disable-next-line @typescript-eslint/ban-types
@@ -29,40 +22,31 @@ const handleResponseMeta = (ctx, handler) => {
               ctx.append(key, value);
             }
           }
-
           break;
-
         case _bffCore.ResponseMetaType.Redirect:
           if (typeof metaValue === 'string') {
             ctx.redirect(metaValue);
           }
-
           break;
-
         case _bffCore.ResponseMetaType.StatusCode:
           if (typeof metaValue === 'number') {
             ctx.status = metaValue;
           }
-
           break;
-
         default:
           break;
       }
     }
   }
 };
-
 const createRouteHandler = handler => {
   // eslint-disable-next-line consistent-return
   const apiHandler = async ctx => {
     const input = await getInputFromRequest(ctx);
-
     if ((0, _bffCore.isWithMetaHandler)(handler)) {
       try {
         handleResponseMeta(ctx, handler);
         const body = await handler(input);
-
         if (typeof body !== 'undefined') {
           ctx.body = body;
         }
@@ -73,7 +57,6 @@ const createRouteHandler = handler => {
           } else {
             ctx.status = 500;
           }
-
           return ctx.body = {
             code: error.code,
             message: error.message
@@ -82,14 +65,12 @@ const createRouteHandler = handler => {
       }
     } else if ((0, _bffRuntime.isSchemaHandler)(handler)) {
       const result = await handler(input);
-
       if (result.type !== 'HandleSuccess') {
         if (result.type === 'InputValidationError') {
           ctx.status = 400;
         } else {
           ctx.status = 500;
         }
-
         ctx.body = result.message;
       } else {
         ctx.body = result.value;
@@ -97,23 +78,17 @@ const createRouteHandler = handler => {
     } else {
       const args = Object.values(input.params).concat(input);
       const body = await handler(...args);
-
       if (typeof body !== 'undefined') {
         ctx.body = body;
       }
     }
   };
-
   Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
   return apiHandler;
 };
-
 exports.createRouteHandler = createRouteHandler;
-
 const isNormalMethod = httpMethod => _bffCore.httpMethods.includes(httpMethod);
-
 exports.isNormalMethod = isNormalMethod;
-
 const getInputFromRequest = async ctx => {
   const draft = {
     params: ctx.params,
@@ -121,7 +96,6 @@ const getInputFromRequest = async ctx => {
     headers: ctx.headers,
     cookies: ctx.headers.cookie
   };
-
   if (_typeIs.default.is(ctx.request.type, ['application/json'])) {
     draft.data = ctx.request.body;
   } else if (_typeIs.default.is(ctx.request.type, ['multipart/form-data'])) {
@@ -131,6 +105,5 @@ const getInputFromRequest = async ctx => {
   } else {
     draft.body = ctx.request.body;
   }
-
   return draft;
 };

package/dist/types/cli/index.d.ts

@@ -1,5 +1,3 @@
 import type { CliPlugin } from '@modern-js/core';
-
 declare const _default: () => CliPlugin;
-
 export default _default;

package/dist/types/plugin.d.ts

@@ -1,5 +1,3 @@
 import type { ServerPlugin } from '@modern-js/server-core';
-
 declare const _default: () => ServerPlugin;
-
 export default _default;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.5",
+  "version": "2.0.0-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -37,9 +37,10 @@
     "koa-body": "^4.2.0",
     "koa-router": "^10.0.0",
     "type-is": "^1.6.18",
-    "@modern-js/bff-core": "1.21.5",
-    "@modern-js/bff-runtime": "1.21.5",
-    "@modern-js/utils": "1.21.5"
+    "@modern-js/bff-core": "2.0.0-beta.1",
+    "@modern-js/bff-runtime": "2.0.0-beta.1",
+    "@modern-js/utils": "2.0.0-beta.1",
+    "@modern-js/types": "2.0.0-beta.1"
   },
   "devDependencies": {
     "@types/jest": "^27",
@@ -53,10 +54,10 @@
     "supertest": "^6.1.6",
     "typescript": "^4",
     "zod": "^3.17.3",
-    "@modern-js/core": "1.21.5",
-    "@modern-js/server-core": "1.21.5",
-    "@scripts/build": "1.21.5",
-    "@scripts/jest-config": "1.21.5"
+    "@modern-js/core": "2.0.0-beta.1",
+    "@modern-js/server-core": "2.0.0-beta.1",
+    "@scripts/build": "2.0.0-beta.1",
+    "@scripts/jest-config": "2.0.0-beta.1"
   },
   "modernConfig": {
     "output": {
@@ -70,32 +71,10 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
-    "build": "wireit",
-    "test": "wireit"
+    "dev": "modern build --watch",
+    "build": "modern build",
+    "test": "jest --passWithNoTests"
   }
 }

package/types.d.ts

@@ -1,14 +1,42 @@
 /// <reference path="./dist/types/index.d.ts" />
+declare module '@modern-js/runtime/koa' {
+
+  import { Context, Middleware } from 'koa';
+
+  export type { Middleware as RequestHandler };
+
+  export function useContext(): Context;
+
+  export * from '@modern-js/bff-core';
+}
+
+// Todo: remove on next version
 declare module '@modern-js/runtime/server' {
 
   import { Context, Middleware } from 'koa';
+  import type { AfterMatchContext, AfterRenderContext, NextFunction } from '@modern-js/types';
+
+  export type AfterRenderHook = (
+    context: AfterRenderContext,
+    next: NextFunction,
+  ) => void;
+
+  export type AfterMatchHook = (
+    context: AfterMatchContext,
+    next: NextFunction,
+  ) => void;
+
 
   type KoaOptions = {
     addMiddleware: (...input: Middleware[]) => void;
+    afterRender: (hook: AfterRenderHook) => void;
+    afterMatch: (hook: AfterMatchHook) => void;
   };
 
   type KoaAttacher = (options: KoaOptions) => void;
 
+  export type { Middleware as RequestHandler };
+
   export function useContext(): Context;
 
   export function hook(attacher: KoaAttacher): KoaAttacher;