@modern-js/plugin-express 2.0.0-beta.4 → 2.0.0-beta.6

package/CHANGELOG.md

@@ -1,5 +1,50 @@
 # @modern-js/plugin-express
 
+## 2.0.0-beta.6
+
+### Major Changes
+
+- dda38c9c3e: 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 [7879e8f711]
+- Updated dependencies [6aca875011]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [2344eb26ed]
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [7b7d12cf8f]
+- Updated dependencies [7efeed4]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed5874c6]
+- Updated dependencies [87c1ff86b9]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [102d32e4ba]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06257]
+- Updated dependencies [bbe4c4ab64]
+- Updated dependencies [e4558a0bc4]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/types@2.0.0-beta.6
+  - @modern-js/utils@2.0.0-beta.6
+  - @modern-js/bff-core@2.0.0-beta.6
+  - @modern-js/bff-runtime@2.0.0-beta.6
+
 ## 2.0.0-beta.4
 
 ### Major Changes

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

@@ -11,15 +11,9 @@ var cli_default = () => ({
       config() {
         const appContext = useAppContext();
         const { appDirectory } = appContext;
-        bffExportsUtils = createRuntimeExportsUtils(
-          appContext.internalDirectory,
-          "server"
-        );
+        bffExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "server");
         const serverRuntimePath = bffExportsUtils.getPath();
-        const relativeRuntimePath = getRelativeRuntimePath(
-          appDirectory,
-          serverRuntimePath
-        );
+        const relativeRuntimePath = getRelativeRuntimePath(appDirectory, serverRuntimePath);
         if (process.env.NODE_ENV === "production") {
           return {
             source: {
@@ -40,16 +34,18 @@ var cli_default = () => ({
           };
         }
       },
+      collectServerPlugins({ plugins }) {
+        plugins.push({
+          "@modern-js/plugin-express": "@modern-js/plugin-express/server"
+        });
+        return {
+          plugins
+        };
+      },
       addRuntimeExports(input) {
         const currentFile = bffExportsUtils.getPath();
-        const relativeRuntimeModulePath = path.relative(
-          path.dirname(currentFile),
-          runtimeModulePath
-        );
-        const relativeFramePath = path.relative(
-          path.dirname(currentFile),
-          require.resolve("express")
-        );
+        const relativeRuntimeModulePath = path.relative(path.dirname(currentFile), runtimeModulePath);
+        const relativeFramePath = path.relative(path.dirname(currentFile), require.resolve("express"));
         bffExportsUtils.addExport(`const pluginRuntime = require('${relativeRuntimeModulePath}');
            const express = require('${relativeFramePath}')
            module.exports = {

package/dist/js/modern/plugin.js

@@ -27,12 +27,18 @@ import { run } from "./context";
 import registerRoutes from "./registerRoutes";
 const debug = createDebugger("express");
 const findAppModule = (apiDir) => __async(void 0, null, function* () {
-  const exts = [".ts", ".js"];
+  const exts = [
+    ".ts",
+    ".js"
+  ];
   const paths = exts.map((ext) => path.resolve(apiDir, `app${ext}`));
   for (const filename of paths) {
     if (yield fs.pathExists(filename)) {
       delete require.cache[filename];
-      return [compatRequire(filename), require(filename)];
+      return [
+        compatRequire(filename),
+        require(filename)
+      ];
     }
   }
   return [];
@@ -45,20 +51,29 @@ const initMiddlewares = (middleware, app) => {
 };
 const useRun = (app) => {
   app.use((req, res, next) => {
-    run({ req, res }, next);
+    run({
+      req,
+      res
+    }, next);
   });
 };
 const initApp = (app) => {
   app.use(cookieParser());
   app.use(express.text());
-  app.use(express.urlencoded({ extended: true }));
+  app.use(express.urlencoded({
+    extended: true
+  }));
   app.use(express.json());
   return app;
 };
 var plugin_default = () => ({
   name: "@modern-js/plugin-express",
-  pre: ["@modern-js/plugin-bff"],
-  post: ["@modern-js/plugin-server"],
+  pre: [
+    "@modern-js/plugin-bff"
+  ],
+  post: [
+    "@modern-js/plugin-server"
+  ],
   setup: (api) => ({
     prepareApiServer(_0) {
       return __async(this, arguments, function* ({ pwd, config }) {
@@ -91,8 +106,8 @@ var plugin_default = () => ({
           app = express();
           initApp(app);
           if (config) {
-            const { middleware } = config;
-            initMiddlewares(middleware, app);
+            const { middleware: middleware1 } = config;
+            initMiddlewares(middleware1, app);
           }
           useRun(app);
           registerRoutes(app, apiHandlerInfos);
@@ -130,9 +145,7 @@ var plugin_default = () => ({
         initMiddlewares(middleware, app);
       }
       return (ctx) => new Promise((resolve, reject) => {
-        const {
-          source: { req, res }
-        } = ctx;
+        const { source: { req, res } } = ctx;
         const handler = (err) => {
           if (err) {
             return reject(err);

package/dist/js/modern/utils.js

@@ -35,21 +35,12 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import "reflect-metadata";
-import {
-  httpMethods,
-  isWithMetaHandler,
-  HttpMetadata,
-  ResponseMetaType,
-  ValidationError
-} from "@modern-js/bff-core";
+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
-  );
+  const responseMeta = Reflect.getMetadata(HttpMetadata.Response, handler);
   if (Array.isArray(responseMeta)) {
     for (const meta of responseMeta) {
       const metaType = meta.type;
@@ -95,17 +86,17 @@ const createRouteHandler = (handler) => {
         throw error;
       }
     } else if (isSchemaHandler(handler)) {
-      const result = yield handler(input);
-      if (result.type !== "HandleSuccess") {
-        if (result.type === "InputValidationError") {
+      const result1 = yield handler(input);
+      if (result1.type !== "HandleSuccess") {
+        if (result1.type === "InputValidationError") {
           res.status(400);
         } else {
           res.status(500);
         }
-        return res.json(result.message);
+        return res.json(result1.message);
       } else {
         res.status(200);
-        return res.json(result.value);
+        return res.json(result1.value);
       }
     } else {
       const args = Object.values(input.params).concat(input);
@@ -122,10 +113,7 @@ const createRouteHandler = (handler) => {
       }
     }
   });
-  Object.defineProperties(
-    apiHandler,
-    Object.getOwnPropertyDescriptors(handler)
-  );
+  Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
   return apiHandler;
 };
 const isNormalMethod = (httpMethod) => httpMethods.includes(httpMethod);
@@ -136,11 +124,17 @@ const getInputFromRequest = (request) => __async(void 0, null, function* () {
     headers: request.headers,
     cookies: request.headers.cookie
   };
-  if (typeIs(request, ["application/json"])) {
+  if (typeIs(request, [
+    "application/json"
+  ])) {
     draft.data = request.body;
-  } else if (typeIs(request, ["multipart/form-data"])) {
+  } else if (typeIs(request, [
+    "multipart/form-data"
+  ])) {
     draft.formData = yield resolveFormData(request);
-  } else if (typeIs(request, ["application/x-www-form-urlencoded"])) {
+  } else if (typeIs(request, [
+    "application/x-www-form-urlencoded"
+  ])) {
     draft.formUrlencoded = request.body;
   } else {
     draft.body = request.body;
@@ -148,7 +142,9 @@ const getInputFromRequest = (request) => __async(void 0, null, function* () {
   return draft;
 });
 const resolveFormData = (request) => {
-  const form = formidable({ multiples: true });
+  const form = formidable({
+    multiples: true
+  });
   return new Promise((resolve, reject) => {
     form.parse(request, (err, fields, files) => {
       if (err) {

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

@@ -21,11 +21,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var cli_exports = {};
+__export(cli_exports, {
   default: () => cli_default
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(cli_exports);
 var path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_bff_core = require("@modern-js/bff-core");
@@ -39,15 +39,9 @@ var cli_default = () => ({
       config() {
         const appContext = useAppContext();
         const { appDirectory } = appContext;
-        bffExportsUtils = (0, import_utils.createRuntimeExportsUtils)(
-          appContext.internalDirectory,
-          "server"
-        );
+        bffExportsUtils = (0, import_utils.createRuntimeExportsUtils)(appContext.internalDirectory, "server");
         const serverRuntimePath = bffExportsUtils.getPath();
-        const relativeRuntimePath = (0, import_bff_core.getRelativeRuntimePath)(
-          appDirectory,
-          serverRuntimePath
-        );
+        const relativeRuntimePath = (0, import_bff_core.getRelativeRuntimePath)(appDirectory, serverRuntimePath);
         if (process.env.NODE_ENV === "production") {
           return {
             source: {
@@ -68,16 +62,18 @@ var cli_default = () => ({
           };
         }
       },
+      collectServerPlugins({ plugins }) {
+        plugins.push({
+          "@modern-js/plugin-express": "@modern-js/plugin-express/server"
+        });
+        return {
+          plugins
+        };
+      },
       addRuntimeExports(input) {
         const currentFile = bffExportsUtils.getPath();
-        const relativeRuntimeModulePath = path.relative(
-          path.dirname(currentFile),
-          runtimeModulePath
-        );
-        const relativeFramePath = path.relative(
-          path.dirname(currentFile),
-          require.resolve("express")
-        );
+        const relativeRuntimeModulePath = path.relative(path.dirname(currentFile), runtimeModulePath);
+        const relativeFramePath = path.relative(path.dirname(currentFile), require.resolve("express"));
         bffExportsUtils.addExport(`const pluginRuntime = require('${relativeRuntimeModulePath}');
            const express = require('${relativeFramePath}')
            module.exports = {
@@ -90,3 +86,5 @@ var cli_default = () => ({
     };
   }
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/node/context.js

@@ -15,11 +15,16 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var context_exports = {};
+__export(context_exports, {
   run: () => run,
   useContext: () => useContext
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(context_exports);
 var import_bff_core = require("@modern-js/bff-core");
 const { run, useContext } = (0, import_bff_core.createStorage)();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  run,
+  useContext
+});

package/dist/js/node/index.js

@@ -22,11 +22,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var src_exports = {};
+__export(src_exports, {
   default: () => src_default
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(src_exports);
 var import_plugin = __toESM(require("./plugin"));
-__reExport(stdin_exports, require("./context"), module.exports);
+__reExport(src_exports, require("./context"), module.exports);
 var src_default = import_plugin.default;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/node/plugin.js

@@ -21,18 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  default: () => plugin_default
-});
-module.exports = __toCommonJS(stdin_exports);
-var path = __toESM(require("path"));
-var import_express = __toESM(require("express"));
-var import_cookie_parser = __toESM(require("cookie-parser"));
-var import_utils = require("@modern-js/utils");
-var import_finalhandler = __toESM(require("finalhandler"));
-var import_context = require("./context");
-var import_registerRoutes = __toESM(require("./registerRoutes"));
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -53,14 +41,32 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var plugin_exports = {};
+__export(plugin_exports, {
+  default: () => plugin_default
+});
+module.exports = __toCommonJS(plugin_exports);
+var path = __toESM(require("path"));
+var import_express = __toESM(require("express"));
+var import_cookie_parser = __toESM(require("cookie-parser"));
+var import_utils = require("@modern-js/utils");
+var import_finalhandler = __toESM(require("finalhandler"));
+var import_context = require("./context");
+var import_registerRoutes = __toESM(require("./registerRoutes"));
 const debug = (0, import_utils.createDebugger)("express");
 const findAppModule = (apiDir) => __async(void 0, null, function* () {
-  const exts = [".ts", ".js"];
+  const exts = [
+    ".ts",
+    ".js"
+  ];
   const paths = exts.map((ext) => path.resolve(apiDir, `app${ext}`));
   for (const filename of paths) {
     if (yield import_utils.fs.pathExists(filename)) {
       delete require.cache[filename];
-      return [(0, import_utils.compatRequire)(filename), require(filename)];
+      return [
+        (0, import_utils.compatRequire)(filename),
+        require(filename)
+      ];
     }
   }
   return [];
@@ -73,20 +79,29 @@ const initMiddlewares = (middleware, app) => {
 };
 const useRun = (app) => {
   app.use((req, res, next) => {
-    (0, import_context.run)({ req, res }, next);
+    (0, import_context.run)({
+      req,
+      res
+    }, next);
   });
 };
 const initApp = (app) => {
   app.use((0, import_cookie_parser.default)());
   app.use(import_express.default.text());
-  app.use(import_express.default.urlencoded({ extended: true }));
+  app.use(import_express.default.urlencoded({
+    extended: true
+  }));
   app.use(import_express.default.json());
   return app;
 };
 var plugin_default = () => ({
   name: "@modern-js/plugin-express",
-  pre: ["@modern-js/plugin-bff"],
-  post: ["@modern-js/plugin-server"],
+  pre: [
+    "@modern-js/plugin-bff"
+  ],
+  post: [
+    "@modern-js/plugin-server"
+  ],
   setup: (api) => ({
     prepareApiServer(_0) {
       return __async(this, arguments, function* ({ pwd, config }) {
@@ -119,8 +134,8 @@ var plugin_default = () => ({
           app = (0, import_express.default)();
           initApp(app);
           if (config) {
-            const { middleware } = config;
-            initMiddlewares(middleware, app);
+            const { middleware: middleware1 } = config;
+            initMiddlewares(middleware1, app);
           }
           useRun(app);
           (0, import_registerRoutes.default)(app, apiHandlerInfos);
@@ -158,9 +173,7 @@ var plugin_default = () => ({
         initMiddlewares(middleware, app);
       }
       return (ctx) => new Promise((resolve, reject) => {
-        const {
-          source: { req, res }
-        } = ctx;
+        const { source: { req, res } } = ctx;
         const handler = (err) => {
           if (err) {
             return reject(err);
@@ -181,3 +194,5 @@ var plugin_default = () => ({
     }
   })
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/node/registerRoutes.js

@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var registerRoutes_exports = {};
+__export(registerRoutes_exports, {
   default: () => registerRoutes_default
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(registerRoutes_exports);
 var import_reflect_metadata = require("reflect-metadata");
 var import_utils = require("./utils");
 const registerRoutes = (app, handlerInfos) => {
@@ -35,3 +35,5 @@ const registerRoutes = (app, handlerInfos) => {
   });
 };
 var registerRoutes_default = registerRoutes;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

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

@@ -15,9 +15,13 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var hook_exports = {};
+__export(hook_exports, {
   hook: () => hook
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(hook_exports);
 const hook = (attacher) => attacher;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  hook
+});

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

@@ -16,13 +16,18 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var runtime_exports = {};
+__export(runtime_exports, {
   hook: () => import_hook.hook,
   useContext: () => import_context.useContext
 });
-module.exports = __toCommonJS(stdin_exports);
-__reExport(stdin_exports, require("@modern-js/bff-core"), module.exports);
+module.exports = __toCommonJS(runtime_exports);
+__reExport(runtime_exports, require("@modern-js/bff-core"), module.exports);
 var import_context = require("../context");
 var import_hook = require("./hook");
-__reExport(stdin_exports, require("./operators"), module.exports);
+__reExport(runtime_exports, require("./operators"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  hook,
+  useContext
+});

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

@@ -15,13 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  Middleware: () => Middleware,
-  Pipe: () => Pipe
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_context = require("../context");
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -42,6 +35,13 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var operators_exports = {};
+__export(operators_exports, {
+  Middleware: () => Middleware,
+  Pipe: () => Pipe
+});
+module.exports = __toCommonJS(operators_exports);
+var import_context = require("../context");
 const Pipe = (func) => {
   return {
     name: "pipe",
@@ -85,3 +85,8 @@ const Middleware = (middleware) => {
     }
   };
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Middleware,
+  Pipe
+});

package/dist/js/node/utils.js

@@ -2,8 +2,22 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,33 +35,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  createRouteHandler: () => createRouteHandler,
-  isNormalMethod: () => isNormalMethod
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_reflect_metadata = require("reflect-metadata");
-var import_bff_core = require("@modern-js/bff-core");
-var import_bff_runtime = require("@modern-js/bff-runtime");
-var import_type_is = __toESM(require("type-is"));
-var import_formidable = __toESM(require("formidable"));
-var __defProp2 = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -68,11 +55,19 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var utils_exports = {};
+__export(utils_exports, {
+  createRouteHandler: () => createRouteHandler,
+  isNormalMethod: () => isNormalMethod
+});
+module.exports = __toCommonJS(utils_exports);
+var import_reflect_metadata = require("reflect-metadata");
+var import_bff_core = require("@modern-js/bff-core");
+var import_bff_runtime = require("@modern-js/bff-runtime");
+var import_type_is = __toESM(require("type-is"));
+var import_formidable = __toESM(require("formidable"));
 const handleResponseMeta = (res, handler) => {
-  const responseMeta = Reflect.getMetadata(
-    import_bff_core.HttpMetadata.Response,
-    handler
-  );
+  const responseMeta = Reflect.getMetadata(import_bff_core.HttpMetadata.Response, handler);
   if (Array.isArray(responseMeta)) {
     for (const meta of responseMeta) {
       const metaType = meta.type;
@@ -118,17 +113,17 @@ const createRouteHandler = (handler) => {
         throw error;
       }
     } else if ((0, import_bff_runtime.isSchemaHandler)(handler)) {
-      const result = yield handler(input);
-      if (result.type !== "HandleSuccess") {
-        if (result.type === "InputValidationError") {
+      const result1 = yield handler(input);
+      if (result1.type !== "HandleSuccess") {
+        if (result1.type === "InputValidationError") {
           res.status(400);
         } else {
           res.status(500);
         }
-        return res.json(result.message);
+        return res.json(result1.message);
       } else {
         res.status(200);
-        return res.json(result.value);
+        return res.json(result1.value);
       }
     } else {
       const args = Object.values(input.params).concat(input);
@@ -145,10 +140,7 @@ const createRouteHandler = (handler) => {
       }
     }
   });
-  Object.defineProperties(
-    apiHandler,
-    Object.getOwnPropertyDescriptors(handler)
-  );
+  Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
   return apiHandler;
 };
 const isNormalMethod = (httpMethod) => import_bff_core.httpMethods.includes(httpMethod);
@@ -159,11 +151,17 @@ const getInputFromRequest = (request) => __async(void 0, null, function* () {
     headers: request.headers,
     cookies: request.headers.cookie
   };
-  if ((0, import_type_is.default)(request, ["application/json"])) {
+  if ((0, import_type_is.default)(request, [
+    "application/json"
+  ])) {
     draft.data = request.body;
-  } else if ((0, import_type_is.default)(request, ["multipart/form-data"])) {
+  } else if ((0, import_type_is.default)(request, [
+    "multipart/form-data"
+  ])) {
     draft.formData = yield resolveFormData(request);
-  } else if ((0, import_type_is.default)(request, ["application/x-www-form-urlencoded"])) {
+  } else if ((0, import_type_is.default)(request, [
+    "application/x-www-form-urlencoded"
+  ])) {
     draft.formUrlencoded = request.body;
   } else {
     draft.body = request.body;
@@ -171,7 +169,9 @@ const getInputFromRequest = (request) => __async(void 0, null, function* () {
   return draft;
 });
 const resolveFormData = (request) => {
-  const form = (0, import_formidable.default)({ multiples: true });
+  const form = (0, import_formidable.default)({
+    multiples: true
+  });
   return new Promise((resolve, reject) => {
     form.parse(request, (err, fields, files) => {
       if (err) {
@@ -181,3 +181,8 @@ const resolveFormData = (request) => {
     });
   });
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createRouteHandler,
+  isNormalMethod
+});

package/dist/js/treeshaking/cli/index.js

@@ -35,6 +35,15 @@ var cli_default = function() {
                         };
                     }
                 },
+                collectServerPlugins: function collectServerPlugins(param) {
+                    var plugins = param.plugins;
+                    plugins.push({
+                        "@modern-js/plugin-express": "@modern-js/plugin-express/server"
+                    });
+                    return {
+                        plugins: plugins
+                    };
+                },
                 addRuntimeExports: function addRuntimeExports(input) {
                     var currentFile = bffExportsUtils.getPath();
                     var relativeRuntimeModulePath = path.relative(path.dirname(currentFile), runtimeModulePath);

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

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

package/package.json

@@ -11,25 +11,29 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.6",
   "jsnext:source": "./src/index.ts",
-  "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "types": "./dist/types/cli/index.d.ts",
+  "main": "./dist/js/node/cli/index.js",
+  "module": "./dist/js/treeshaking/cli/index.js",
+  "jsnext:modern": "./dist/js/modern/cli/index.js",
   "exports": {
     "./types": "./types.d.ts",
     ".": {
+      "jsnext:source": "./src/cli/index.ts",
+      "default": "./dist/js/node/cli/index.js"
+    },
+    "./cli": {
+      "jsnext:source": "./src/cli/index.ts",
+      "default": "./dist/js/node/cli/index.js"
+    },
+    "./server": {
       "node": {
         "jsnext:source": "./src/index.ts",
         "import": "./dist/js/modern/index.js",
         "require": "./dist/js/node/index.js"
       },
       "default": "./dist/js/treeshaking/index.js"
-    },
-    "./cli": {
-      "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
     }
   },
   "dependencies": {
@@ -39,10 +43,10 @@
     "formidable": "^1.2.2",
     "reflect-metadata": "^0.1.13",
     "type-is": "^1.6.18",
-    "@modern-js/bff-core": "2.0.0-beta.4",
-    "@modern-js/bff-runtime": "2.0.0-beta.4",
-    "@modern-js/types": "2.0.0-beta.4",
-    "@modern-js/utils": "2.0.0-beta.4"
+    "@modern-js/bff-core": "2.0.0-beta.6",
+    "@modern-js/bff-runtime": "2.0.0-beta.6",
+    "@modern-js/types": "2.0.0-beta.6",
+    "@modern-js/utils": "2.0.0-beta.6"
   },
   "devDependencies": {
     "@types/cookie-parser": "^1.4.2",
@@ -58,10 +62,11 @@
     "supertest": "^6.1.6",
     "typescript": "^4",
     "zod": "^3.17.3",
-    "@modern-js/core": "2.0.0-beta.4",
-    "@modern-js/server-core": "2.0.0-beta.4",
-    "@scripts/build": "2.0.0-beta.4",
-    "@scripts/jest-config": "2.0.0-beta.4"
+    "@modern-js/core": "2.0.0-beta.6",
+    "@modern-js/app-tools": "2.0.0-beta.6",
+    "@modern-js/server-core": "2.0.0-beta.6",
+    "@scripts/build": "2.0.0-beta.6",
+    "@scripts/jest-config": "2.0.0-beta.6"
   },
   "peerDependencies": {
     "express": "^4.17.1"