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

package/CHANGELOG.md

@@ -1,32 +1,71 @@
 # @modern-js/plugin-express
 
-## 1.21.5
-
-### Patch Changes
-
-- Updated dependencies [4876aa7]
-  - @modern-js/bff-core@1.21.5
-  - @modern-js/bff-runtime@1.21.5
-  - @modern-js/types@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/types@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/types@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/express': relativeRuntimePath
               }
             }
           };
@@ -31,13 +31,13 @@ export default (() => ({
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': serverRuntimePath
+                '@modern-js/runtime/server': serverRuntimePath,
+                '@modern-js/runtime/express': 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

@@ -6,11 +6,9 @@ import finalhandler from 'finalhandler';
 import { run } from "./context";
 import registerRoutes from "./registerRoutes";
 const debug = createDebugger('express');
-
 const findAppModule = async apiDir => {
   const exts = ['.ts', '.js'];
   const paths = exts.map(ext => path.resolve(apiDir, `app${ext}`));
-
   for (const filename of paths) {
     if (await fs.pathExists(filename)) {
       // 每次获取 app.ts 的时候，避免使用缓存的 app.ts
@@ -18,17 +16,14 @@ const findAppModule = async apiDir => {
       return [compatRequire(filename), require(filename)];
     }
   }
-
   return [];
 };
-
 const initMiddlewares = (middleware, app) => {
   middleware.forEach(middlewareItem => {
     const middlewareFunc = typeof middlewareItem === 'string' ? compatRequire(middlewareItem) : middlewareItem;
     app.use(middlewareFunc);
   });
 };
-
 const useRun = app => {
   app.use((req, res, next) => {
     run({
@@ -37,7 +32,6 @@ const useRun = app => {
     }, next);
   });
 };
-
 const initApp = app => {
   app.use(cookieParser());
   app.use(express.text());
@@ -47,10 +41,10 @@ const initApp = app => {
   app.use(express.json());
   return app;
 };
-
 export default (() => ({
   name: '@modern-js/plugin-express',
   pre: ['@modern-js/plugin-bff'],
+  post: ['@modern-js/plugin-server'],
   setup: api => ({
     async prepareApiServer({
       pwd,
@@ -61,34 +55,27 @@ export default (() => ({
       const appContext = api.useAppContext();
       const apiHandlerInfos = appContext.apiHandlerInfos;
       const mode = appContext.apiMode;
-
       if (mode === 'framework') {
         const appModule = await findAppModule(apiDir);
         app = appModule[0];
         const hooks = appModule[1];
-
         if (!app || !app.use) {
           // console.warn('There is not api/app.ts.');
           app = express();
         }
-
         initApp(app);
-
         if (config) {
           const {
             middleware
           } = config;
           initMiddlewares(middleware, app);
         }
-
         useRun(app);
         registerRoutes(app, apiHandlerInfos);
-
         if (hooks) {
           const {
             afterLambdaRegisted
           } = hooks;
-
           if (afterLambdaRegisted) {
             afterLambdaRegisted(app);
           }
@@ -96,47 +83,46 @@ export default (() => ({
       } else if (mode === 'function') {
         app = express();
         initApp(app);
-
         if (config) {
           const {
             middleware
           } = config;
           initMiddlewares(middleware, app);
         }
-
         useRun(app);
         registerRoutes(app, apiHandlerInfos);
       } else {
         throw new Error(`mode must be function or framework`);
       }
-
       return (req, res) => new Promise((resolve, reject) => {
         const handler = err => {
           if (err) {
             return reject(err);
-          } // finalhanlder will trigger 'finish' event
-
-
-          return finalhandler(req, res, {})(null); // return resolve();
+          }
+          // finalhanlder will trigger 'finish' event
+          return finalhandler(req, res, {})(null);
+          // return resolve();
         };
 
         res.on('finish', err => {
           if (err) {
             return reject(err);
           }
-
           return resolve();
         });
         return app(req, res, handler);
       });
     },
-
     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 = express();
       initApp(app);
-
       if (config) {
         const {
           middleware
@@ -144,31 +130,32 @@ export default (() => ({
         debug('web middleware', middleware);
         initMiddlewares(middleware, app);
       }
-
-      return (req, res) => new Promise((resolve, reject) => {
+      return ctx => new Promise((resolve, reject) => {
+        const {
+          source: {
+            req,
+            res
+          }
+        } = ctx;
         const handler = err => {
           if (err) {
             return reject(err);
           }
-
           if (res.headersSent && res.statusCode !== 200) {
             finalhandler(req, res, {})(null);
           }
-
           return resolve();
-        }; // when user call res.send
-
+        };
 
+        // when user call res.send
         res.on('finish', err => {
           if (err) {
             return reject(err);
           }
-
           return resolve();
         });
         return app(req, res, handler);
       });
     }
-
   })
 }));

package/dist/js/modern/registerRoutes.js

@@ -1,6 +1,5 @@
 import 'reflect-metadata';
 import { createRouteHandler } from "./utils";
-
 const registerRoutes = (app, handlerInfos) => {
   handlerInfos.forEach(({
     routePath,
@@ -10,7 +9,6 @@ const registerRoutes = (app, handlerInfos) => {
     const routeHandler = createRouteHandler(handler);
     const method = httpMethod.toLowerCase();
     const routeMiddlwares = Reflect.getMetadata('middleware', handler) || [];
-
     if (routeMiddlwares.length > 0) {
       app[method](routePath, routeMiddlwares, routeHandler);
     } else {
@@ -18,5 +16,4 @@ const registerRoutes = (app, handlerInfos) => {
     }
   });
 };
-
 export default registerRoutes;

package/dist/js/modern/runtime/operators.js

@@ -2,7 +2,6 @@ import { useContext } from "../context";
 export const Pipe = func => {
   return {
     name: 'pipe',
-
     // eslint-disable-next-line consistent-return
     async execute(executeHelper, next) {
       const {
@@ -12,24 +11,18 @@ export const Pipe = func => {
       const {
         res
       } = ctx;
-
       if (typeof func === 'function') {
         let isPiped = true;
-
         const end = value => {
           isPiped = false;
-
           if (typeof value === 'function') {
             value(res);
             return;
-          } // eslint-disable-next-line consistent-return
-
-
+          }
+          // eslint-disable-next-line consistent-return
           return value;
         };
-
         const output = await func(inputs, end);
-
         if (!isPiped) {
           if (output) {
             return executeHelper.result = output;
@@ -38,24 +31,24 @@ export const Pipe = func => {
             return;
           }
         }
-
         executeHelper.inputs = output;
         await next();
       }
     }
-
   };
-}; // eslint-disable-next-line @typescript-eslint/no-redeclare
+};
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
 
 export const Middleware = middleware => {
   return {
     name: 'middleware',
-
     metadata(helper) {
       const middlewares = helper.getMetadata('pipe') || [];
       middlewares.push(middleware);
       helper.setMetadata('middleware', middlewares);
     }
-
   };
-}; // eslint-disable-next-line @typescript-eslint/no-redeclare
+};
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare

package/dist/js/modern/utils.js

@@ -1,104 +1,85 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import 'reflect-metadata';
 import { httpMethods, isWithMetaHandler, HttpMetadata, ResponseMetaType, ValidationError } from '@modern-js/bff-core';
 import { isSchemaHandler } from '@modern-js/bff-runtime';
 import typeIs from 'type-is';
 import formidable from 'formidable';
-
 const handleResponseMeta = (res, 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
           for (const [key, value] of Object.entries(metaValue)) {
             res.append(key, value);
           }
-
           break;
-
         case ResponseMetaType.Redirect:
           res.redirect(metaValue);
           break;
-
         case ResponseMetaType.StatusCode:
           res.status(metaValue);
           break;
-
         default:
           break;
       }
     }
   }
 };
-
 export const createRouteHandler = handler => {
   const apiHandler = async (req, res, next) => {
     const input = await getInputFromRequest(req);
-
     if (isWithMetaHandler(handler)) {
       try {
         handleResponseMeta(res, handler);
-
         if (res.headersSent) {
           return;
         }
-
         const result = await handler(input);
-
         if (result && typeof result === 'object') {
           // eslint-disable-next-line consistent-return
           return res.json(result);
         }
       } catch (error) {
         if (error instanceof ValidationError) {
-          res.status(error.status); // eslint-disable-next-line consistent-return
-
+          res.status(error.status);
+          // eslint-disable-next-line consistent-return
           return res.json({
             message: error.message
           });
         }
-
         throw error;
       }
     } else if (isSchemaHandler(handler)) {
       const result = await handler(input);
-
       if (result.type !== 'HandleSuccess') {
         if (result.type === 'InputValidationError') {
           res.status(400);
         } else {
           res.status(500);
-        } // eslint-disable-next-line consistent-return
-
-
+        }
+        // eslint-disable-next-line consistent-return
         return res.json(result.message);
       } else {
-        res.status(200); // eslint-disable-next-line consistent-return
-
+        res.status(200);
+        // eslint-disable-next-line consistent-return
         return res.json(result.value);
       }
     } else {
       const args = Object.values(input.params).concat(input);
-
       try {
-        const body = await handler(...args); // this should never happen
+        const body = await handler(...args);
 
+        // this should never happen
         if (res.headersSent) {
           // eslint-disable-next-line consistent-return
           return await Promise.resolve();
         }
-
         if (typeof body !== 'undefined') {
           // eslint-disable-next-line consistent-return
           return res.json(body);
@@ -109,12 +90,10 @@ export const createRouteHandler = handler => {
       }
     }
   };
-
   Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
   return apiHandler;
 };
 export const isNormalMethod = httpMethod => httpMethods.includes(httpMethod);
-
 const getInputFromRequest = async request => {
   const draft = {
     params: request.params,
@@ -122,7 +101,6 @@ const getInputFromRequest = async request => {
     headers: request.headers,
     cookies: request.headers.cookie
   };
-
   if (typeIs(request, ['application/json'])) {
     draft.data = request.body;
   } else if (typeIs(request, ['multipart/form-data'])) {
@@ -132,10 +110,8 @@ const getInputFromRequest = async request => {
   } else {
     draft.body = request.body;
   }
-
   return draft;
 };
-
 const resolveFormData = request => {
   const form = formidable({
     multiples: true
@@ -145,7 +121,6 @@ const resolveFormData = request => {
       if (err) {
         reject(err);
       }
-
       resolve(_objectSpread(_objectSpread({}, fields), files));
     });
   });

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-express',
   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/express': relativeRuntimePath
               }
             }
           };
@@ -45,13 +39,13 @@ var _default = () => ({
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': serverRuntimePath
+                '@modern-js/runtime/server': serverRuntimePath,
+                '@modern-js/runtime/express': 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,33 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var _express = _interopRequireDefault(require("express"));
-
 var _cookieParser = _interopRequireDefault(require("cookie-parser"));
-
 var _utils = require("@modern-js/utils");
-
 var _finalhandler = _interopRequireDefault(require("finalhandler"));
-
 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 debug = (0, _utils.createDebugger)('express');
-
 const findAppModule = async apiDir => {
   const exts = ['.ts', '.js'];
   const paths = exts.map(ext => path.resolve(apiDir, `app${ext}`));
-
   for (const filename of paths) {
     if (await _utils.fs.pathExists(filename)) {
       // 每次获取 app.ts 的时候，避免使用缓存的 app.ts
@@ -38,17 +25,14 @@ const findAppModule = async apiDir => {
       return [(0, _utils.compatRequire)(filename), require(filename)];
     }
   }
-
   return [];
 };
-
 const initMiddlewares = (middleware, app) => {
   middleware.forEach(middlewareItem => {
     const middlewareFunc = typeof middlewareItem === 'string' ? (0, _utils.compatRequire)(middlewareItem) : middlewareItem;
     app.use(middlewareFunc);
   });
 };
-
 const useRun = app => {
   app.use((req, res, next) => {
     (0, _context.run)({
@@ -57,7 +41,6 @@ const useRun = app => {
     }, next);
   });
 };
-
 const initApp = app => {
   app.use((0, _cookieParser.default)());
   app.use(_express.default.text());
@@ -67,10 +50,10 @@ const initApp = app => {
   app.use(_express.default.json());
   return app;
 };
-
 var _default = () => ({
   name: '@modern-js/plugin-express',
   pre: ['@modern-js/plugin-bff'],
+  post: ['@modern-js/plugin-server'],
   setup: api => ({
     async prepareApiServer({
       pwd,
@@ -81,34 +64,27 @@ var _default = () => ({
       const appContext = api.useAppContext();
       const apiHandlerInfos = appContext.apiHandlerInfos;
       const mode = appContext.apiMode;
-
       if (mode === 'framework') {
         const appModule = await findAppModule(apiDir);
         app = appModule[0];
         const hooks = appModule[1];
-
         if (!app || !app.use) {
           // console.warn('There is not api/app.ts.');
           app = (0, _express.default)();
         }
-
         initApp(app);
-
         if (config) {
           const {
             middleware
           } = config;
           initMiddlewares(middleware, app);
         }
-
         useRun(app);
         (0, _registerRoutes.default)(app, apiHandlerInfos);
-
         if (hooks) {
           const {
             afterLambdaRegisted
           } = hooks;
-
           if (afterLambdaRegisted) {
             afterLambdaRegisted(app);
           }
@@ -116,47 +92,46 @@ var _default = () => ({
       } else if (mode === 'function') {
         app = (0, _express.default)();
         initApp(app);
-
         if (config) {
           const {
             middleware
           } = config;
           initMiddlewares(middleware, app);
         }
-
         useRun(app);
         (0, _registerRoutes.default)(app, apiHandlerInfos);
       } else {
         throw new Error(`mode must be function or framework`);
       }
-
       return (req, res) => new Promise((resolve, reject) => {
         const handler = err => {
           if (err) {
             return reject(err);
-          } // finalhanlder will trigger 'finish' event
-
-
-          return (0, _finalhandler.default)(req, res, {})(null); // return resolve();
+          }
+          // finalhanlder will trigger 'finish' event
+          return (0, _finalhandler.default)(req, res, {})(null);
+          // return resolve();
         };
 
         res.on('finish', err => {
           if (err) {
             return reject(err);
           }
-
           return resolve();
         });
         return app(req, res, handler);
       });
     },
-
     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 = (0, _express.default)();
       initApp(app);
-
       if (config) {
         const {
           middleware
@@ -164,33 +139,33 @@ var _default = () => ({
         debug('web middleware', middleware);
         initMiddlewares(middleware, app);
       }
-
-      return (req, res) => new Promise((resolve, reject) => {
+      return ctx => new Promise((resolve, reject) => {
+        const {
+          source: {
+            req,
+            res
+          }
+        } = ctx;
         const handler = err => {
           if (err) {
             return reject(err);
           }
-
           if (res.headersSent && res.statusCode !== 200) {
             (0, _finalhandler.default)(req, res, {})(null);
           }
-
           return resolve();
-        }; // when user call res.send
-
+        };
 
+        // when user call res.send
         res.on('finish', err => {
           if (err) {
             return reject(err);
           }
-
           return resolve();
         });
         return app(req, res, handler);
       });
     }
-
   })
 });
-
 exports.default = _default;

package/dist/js/node/registerRoutes.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 require("reflect-metadata");
-
 var _utils = require("./utils");
-
 const registerRoutes = (app, handlerInfos) => {
   handlerInfos.forEach(({
     routePath,
@@ -18,7 +15,6 @@ const registerRoutes = (app, handlerInfos) => {
     const routeHandler = (0, _utils.createRouteHandler)(handler);
     const method = httpMethod.toLowerCase();
     const routeMiddlwares = Reflect.getMetadata('middleware', handler) || [];
-
     if (routeMiddlwares.length > 0) {
       app[method](routePath, routeMiddlwares, routeHandler);
     } else {
@@ -26,6 +22,5 @@ const registerRoutes = (app, handlerInfos) => {
     }
   });
 };
-
 var _default = registerRoutes;
 exports.default = _default;

package/dist/js/node/runtime/hook.js

@@ -4,7 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.hook = void 0;
-
 const hook = attacher => attacher;
-
 exports.hook = hook;

package/dist/js/node/runtime/index.js

@@ -19,9 +19,7 @@ Object.defineProperty(exports, "useContext", {
     return _context.useContext;
   }
 });
-
 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;
@@ -33,13 +31,9 @@ Object.keys(_bffCore).forEach(function (key) {
     }
   });
 });
-
 var _context = require("../context");
-
 var _hook = require("./hook");
-
 var _operators = require("./operators");
-
 Object.keys(_operators).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;

package/dist/js/node/runtime/operators.js

@@ -4,13 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Pipe = exports.Middleware = void 0;
-
 var _context = require("../context");
-
 const Pipe = func => {
   return {
     name: 'pipe',
-
     // eslint-disable-next-line consistent-return
     async execute(executeHelper, next) {
       const {
@@ -20,24 +17,18 @@ const Pipe = func => {
       const {
         res
       } = ctx;
-
       if (typeof func === 'function') {
         let isPiped = true;
-
         const end = value => {
           isPiped = false;
-
           if (typeof value === 'function') {
             value(res);
             return;
-          } // eslint-disable-next-line consistent-return
-
-
+          }
+          // eslint-disable-next-line consistent-return
           return value;
         };
-
         const output = await func(inputs, end);
-
         if (!isPiped) {
           if (output) {
             return executeHelper.result = output;
@@ -46,30 +37,25 @@ const Pipe = func => {
             return;
           }
         }
-
         executeHelper.inputs = output;
         await next();
       }
     }
-
   };
-}; // eslint-disable-next-line @typescript-eslint/no-redeclare
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-redeclare
 exports.Pipe = Pipe;
-
 const Middleware = middleware => {
   return {
     name: 'middleware',
-
     metadata(helper) {
       const middlewares = helper.getMetadata('pipe') || [];
       middlewares.push(middleware);
       helper.setMetadata('middleware', middlewares);
     }
-
   };
-}; // eslint-disable-next-line @typescript-eslint/no-redeclare
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-redeclare
 exports.Middleware = Middleware;

package/dist/js/node/utils.js

@@ -4,114 +4,89 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isNormalMethod = exports.createRouteHandler = void 0;
-
 require("reflect-metadata");
-
 var _bffCore = require("@modern-js/bff-core");
-
 var _bffRuntime = require("@modern-js/bff-runtime");
-
 var _typeIs = _interopRequireDefault(require("type-is"));
-
 var _formidable = _interopRequireDefault(require("formidable"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 const handleResponseMeta = (res, 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
           for (const [key, value] of Object.entries(metaValue)) {
             res.append(key, value);
           }
-
           break;
-
         case _bffCore.ResponseMetaType.Redirect:
           res.redirect(metaValue);
           break;
-
         case _bffCore.ResponseMetaType.StatusCode:
           res.status(metaValue);
           break;
-
         default:
           break;
       }
     }
   }
 };
-
 const createRouteHandler = handler => {
   const apiHandler = async (req, res, next) => {
     const input = await getInputFromRequest(req);
-
     if ((0, _bffCore.isWithMetaHandler)(handler)) {
       try {
         handleResponseMeta(res, handler);
-
         if (res.headersSent) {
           return;
         }
-
         const result = await handler(input);
-
         if (result && typeof result === 'object') {
           // eslint-disable-next-line consistent-return
           return res.json(result);
         }
       } catch (error) {
         if (error instanceof _bffCore.ValidationError) {
-          res.status(error.status); // eslint-disable-next-line consistent-return
-
+          res.status(error.status);
+          // eslint-disable-next-line consistent-return
           return res.json({
             message: error.message
           });
         }
-
         throw error;
       }
     } else if ((0, _bffRuntime.isSchemaHandler)(handler)) {
       const result = await handler(input);
-
       if (result.type !== 'HandleSuccess') {
         if (result.type === 'InputValidationError') {
           res.status(400);
         } else {
           res.status(500);
-        } // eslint-disable-next-line consistent-return
-
-
+        }
+        // eslint-disable-next-line consistent-return
         return res.json(result.message);
       } else {
-        res.status(200); // eslint-disable-next-line consistent-return
-
+        res.status(200);
+        // eslint-disable-next-line consistent-return
         return res.json(result.value);
       }
     } else {
       const args = Object.values(input.params).concat(input);
-
       try {
-        const body = await handler(...args); // this should never happen
+        const body = await handler(...args);
 
+        // this should never happen
         if (res.headersSent) {
           // eslint-disable-next-line consistent-return
           return await Promise.resolve();
         }
-
         if (typeof body !== 'undefined') {
           // eslint-disable-next-line consistent-return
           return res.json(body);
@@ -122,17 +97,12 @@ const createRouteHandler = handler => {
       }
     }
   };
-
   Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
   return apiHandler;
 };
-
 exports.createRouteHandler = createRouteHandler;
-
 const isNormalMethod = httpMethod => _bffCore.httpMethods.includes(httpMethod);
-
 exports.isNormalMethod = isNormalMethod;
-
 const getInputFromRequest = async request => {
   const draft = {
     params: request.params,
@@ -140,7 +110,6 @@ const getInputFromRequest = async request => {
     headers: request.headers,
     cookies: request.headers.cookie
   };
-
   if ((0, _typeIs.default)(request, ['application/json'])) {
     draft.data = request.body;
   } else if ((0, _typeIs.default)(request, ['multipart/form-data'])) {
@@ -150,10 +119,8 @@ const getInputFromRequest = async request => {
   } else {
     draft.body = request.body;
   }
-
   return draft;
 };
-
 const resolveFormData = request => {
   const form = (0, _formidable.default)({
     multiples: true
@@ -163,7 +130,6 @@ const resolveFormData = request => {
       if (err) {
         reject(err);
       }
-
       resolve(_objectSpread(_objectSpread({}, fields), files));
     });
   });

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",
@@ -39,10 +39,10 @@
     "formidable": "^1.2.2",
     "reflect-metadata": "^0.1.13",
     "type-is": "^1.6.18",
-    "@modern-js/bff-core": "1.21.5",
-    "@modern-js/bff-runtime": "1.21.5",
-    "@modern-js/types": "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/types": "2.0.0-beta.1",
+    "@modern-js/utils": "2.0.0-beta.1"
   },
   "devDependencies": {
     "@types/cookie-parser": "^1.4.2",
@@ -58,10 +58,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": {
@@ -75,32 +75,9 @@
     "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"
+    "build": "modern build",
+    "test": "jest --passWithNoTests"
   }
 }

package/types.d.ts

@@ -1,10 +1,40 @@
 /// <reference path="./dist/types/index.d.ts" />
 
+declare module '@modern-js/runtime/express' {
+  import { Request, Response, RequestHandler } from 'express';
+
+  type Context = { req: Request; res: Response };
+
+  export const Pipe: import('./src/runtime').Pipe;
+  export const Middleware: import('./src/runtime').Middleware;
+
+  export function useContext(): Context;
+
+  export type { RequestHandler };
+
+  export * from '@modern-js/bff-core';
+}
+
+// Todo: remove on next version
 declare module '@modern-js/runtime/server' {
   import { Request, Response, RequestHandler } from 'express';
 
+  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 ExpressOptions = {
     addMiddleware: (...input: RequestHandler[]) => void;
+    afterRender: (hook: AfterRenderHook) => void;
+    afterMatch: (hook: AfterMatchHook) => void;
   };
 
   type ExpressAttacher = (options: ExpressOptions) => void;
@@ -18,5 +48,7 @@ declare module '@modern-js/runtime/server' {
 
   export function hook(attacher: ExpressAttacher): ExpressAttacher;
 
+  export type { RequestHandler };
+
   export * from '@modern-js/bff-core';
 }