@modern-js/plugin-express 2.15.0 → 2.17.0

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

@@ -1,7 +1,6 @@
 import * as path from "path";
 import { createRuntimeExportsUtils } from "@modern-js/utils";
-import { getRelativeRuntimePath } from "@modern-js/bff-core";
-var cli_default = () => ({
+export default () => ({
   name: "@modern-js/plugin-express",
   setup: (api) => {
     let bffExportsUtils;
@@ -10,29 +9,16 @@ var cli_default = () => ({
     return {
       config() {
         const appContext = useAppContext();
-        const { appDirectory } = appContext;
         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/express": relativeRuntimePath
-              }
-            }
-          };
-        } else {
-          return {
-            source: {
-              alias: {
-                "@modern-js/runtime/server": serverRuntimePath,
-                "@modern-js/runtime/express": serverRuntimePath
-              }
+        const runtimePath = process.env.NODE_ENV === "development" ? require.resolve("@modern-js/plugin-express/runtime") : "@modern-js/plugin-express/runtime";
+        return {
+          source: {
+            alias: {
+              "@modern-js/runtime/server": runtimePath,
+              "@modern-js/runtime/express": runtimePath
             }
-          };
-        }
+          }
+        };
       },
       collectServerPlugins({ plugins }) {
         plugins.push({
@@ -58,6 +44,3 @@ var cli_default = () => ({
     };
   }
 });
-export {
-  cli_default as default
-};

package/dist/esm-node/context.js

@@ -1,6 +1,3 @@
 import { createStorage } from "@modern-js/bff-core";
 const { run, useContext } = createStorage();
-export {
-  run,
-  useContext
-};
+export { run, useContext };

package/dist/esm-node/index.js

@@ -1,6 +1,3 @@
 import plugin from "./plugin";
 export * from "./context";
-var src_default = plugin;
-export {
-  src_default as default
-};
+export default plugin;

package/dist/esm-node/plugin.js

@@ -46,116 +46,117 @@ const initApp = (app) => {
   app.use(express.json());
   return app;
 };
-var plugin_default = () => ({
-  name: "@modern-js/plugin-express",
-  pre: [
-    "@modern-js/plugin-bff"
-  ],
-  post: [
-    "@modern-js/plugin-server"
-  ],
-  setup: (api) => ({
-    async prepareApiServer({ pwd, config, render }) {
-      var _a;
-      let app;
-      const appContext = api.useAppContext();
-      const apiHandlerInfos = appContext.apiHandlerInfos;
-      const apiDirectory = appContext.apiDirectory;
-      const apiDir = apiDirectory || path.join(pwd, "./api");
-      const mode = appContext.apiMode;
-      const userConfig = api.useConfigContext();
-      if (mode === "framework") {
-        const appModule = await findAppModule(apiDir);
-        app = appModule[0];
-        const hooks = appModule[1];
-        if (!app || !app.use) {
-          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);
-          }
-        }
-      } 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`);
-      }
-      if (((_a = userConfig.bff) == null ? void 0 : _a.enableHandleWeb) && render) {
-        app.use(async (req, res, next) => {
-          const html = await render(req, res);
-          if (html) {
-            res.end(html);
-          }
-          next();
-        });
-      }
-      return (req, res) => new Promise((resolve, reject) => {
-        const handler = (err) => {
-          if (err) {
-            return reject(err);
+export default () => {
+  return {
+    name: "@modern-js/plugin-express",
+    pre: [
+      "@modern-js/plugin-bff"
+    ],
+    post: [
+      "@modern-js/plugin-server"
+    ],
+    setup: (api) => {
+      return {
+        async prepareApiServer({ pwd, config, render }) {
+          var _userConfig_bff;
+          let app;
+          const appContext = api.useAppContext();
+          const apiHandlerInfos = appContext.apiHandlerInfos;
+          const apiDirectory = appContext.apiDirectory;
+          const apiDir = apiDirectory || path.join(pwd, "./api");
+          const mode = appContext.apiMode;
+          const userConfig = api.useConfigContext();
+          if (mode === "framework") {
+            const appModule = await findAppModule(apiDir);
+            app = appModule[0];
+            const hooks = appModule[1];
+            if (!app || !app.use) {
+              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);
+              }
+            }
+          } 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 finalhandler(req, res, {})(null);
-        };
-        res.on("finish", (err) => {
-          if (err) {
-            return reject(err);
+          if (((_userConfig_bff = userConfig.bff) === null || _userConfig_bff === void 0 ? void 0 : _userConfig_bff.enableHandleWeb) && render) {
+            app.use(async (req, res, next) => {
+              const html = await render(req, res);
+              if (html) {
+                res.end(html);
+              }
+              next();
+            });
           }
-          return resolve();
-        });
-        return app(req, res, handler);
-      });
-    },
-    prepareWebServer({ config }, next) {
-      var _a;
-      const userConfig = api.useConfigContext();
-      if (!((_a = userConfig == null ? void 0 : userConfig.server) == null ? void 0 : _a.enableFrameworkExt)) {
-        return next();
-      }
-      const app = express();
-      initApp(app);
-      if (config) {
-        const { middleware } = config;
-        debug("web middleware", middleware);
-        initMiddlewares(middleware, app);
-      }
-      return (ctx) => new Promise((resolve, reject) => {
-        const { source: { req, res } } = ctx;
-        const handler = (err) => {
-          if (err) {
-            return reject(err);
+          return (req, res) => new Promise((resolve, reject) => {
+            const handler = (err) => {
+              if (err) {
+                return reject(err);
+              }
+              return finalhandler(req, res, {})(null);
+            };
+            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 ? void 0 : (_userConfig_server = userConfig.server) === null || _userConfig_server === void 0 ? void 0 : _userConfig_server.enableFrameworkExt)) {
+            return next();
           }
-          if (res.headersSent && res.statusCode !== 200) {
-            finalhandler(req, res, {})(null);
+          const app = express();
+          initApp(app);
+          if (config) {
+            const { middleware } = config;
+            debug("web middleware", middleware);
+            initMiddlewares(middleware, app);
           }
-          return resolve();
-        };
-        res.on("finish", (err) => {
-          if (err) {
-            return reject(err);
-          }
-          return resolve();
-        });
-        return app(req, res, handler);
-      });
+          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();
+            };
+            res.on("finish", (err) => {
+              if (err) {
+                return reject(err);
+              }
+              return resolve();
+            });
+            return app(req, res, handler);
+          });
+        }
+      };
     }
-  })
-});
-export {
-  plugin_default as default
+  };
 };

package/dist/esm-node/registerRoutes.js

@@ -12,7 +12,4 @@ const registerRoutes = (app, handlerInfos) => {
     }
   });
 };
-var registerRoutes_default = registerRoutes;
-export {
-  registerRoutes_default as default
-};
+export default registerRoutes;

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

@@ -1,4 +1 @@
-const hook = (attacher) => attacher;
-export {
-  hook
-};
+export const hook = (attacher) => attacher;

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

@@ -1,8 +1,4 @@
 export * from "@modern-js/bff-core";
-import { useContext } from "../context";
-import { hook } from "./hook";
+export { useContext } from "../context";
+export { hook } from "./hook";
 export * from "./operators";
-export {
-  hook,
-  useContext
-};

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

@@ -1,5 +1,5 @@
 import { useContext } from "../context";
-const Pipe = (func) => {
+export const Pipe = (func) => {
   return {
     name: "pipe",
     // eslint-disable-next-line consistent-return
@@ -31,7 +31,7 @@ const Pipe = (func) => {
     }
   };
 };
-const Middleware = (middleware) => {
+export const Middleware = (middleware) => {
   return {
     name: "middleware",
     metadata(helper) {
@@ -41,7 +41,3 @@ const Middleware = (middleware) => {
     }
   };
 };
-export {
-  Middleware,
-  Pipe
-};

package/dist/esm-node/utils.js

@@ -27,9 +27,8 @@ const handleResponseMeta = (res, handler) => {
     }
   }
 };
-const createRouteHandler = (handler) => {
+export const createRouteHandler = (handler) => {
   const apiHandler = async (req, res, next) => {
-    var _a;
     const input = await getInputFromRequest(req);
     if (isWithMetaHandler(handler)) {
       try {
@@ -65,7 +64,8 @@ const createRouteHandler = (handler) => {
       }
     } else if (isInputParamsDeciderHandler(handler)) {
       try {
-        const args = ((_a = input == null ? void 0 : input.data) == null ? void 0 : _a.args) || [];
+        var _input_data;
+        const args = (input === null || input === void 0 ? void 0 : (_input_data = input.data) === null || _input_data === void 0 ? void 0 : _input_data.args) || [];
         const body = await handler(...args);
         if (typeof body !== "undefined") {
           if (typeof body === "object") {
@@ -94,7 +94,7 @@ const createRouteHandler = (handler) => {
   Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
   return apiHandler;
 };
-const isNormalMethod = (httpMethod) => httpMethods.includes(httpMethod);
+export const isNormalMethod = (httpMethod) => httpMethods.includes(httpMethod);
 const getInputFromRequest = async (request) => {
   const draft = {
     params: request.params,
@@ -135,7 +135,3 @@ const resolveFormData = (request) => {
     });
   });
 };
-export {
-  createRouteHandler,
-  isNormalMethod
-};

package/dist/types/runtime/operators.d.ts

@@ -6,6 +6,6 @@ type MaybeAsync<T> = T | Promise<T>;
 type PipeFunction<T> = (value: T, end: EndFunction) => MaybeAsync<void> | MaybeAsync<T>;
 export declare const Pipe: <T>(func: PipeFunction<T>) => Operator;
 export type Pipe = typeof Pipe;
-export declare const Middleware: (middleware: (req: Request, res: Response, next: NextFunction) => void) => Operator;
+export declare const Middleware: (middleware: (req: Request, res: Response, next: NextFunction) => void) => Operator<void>;
 export type Middleware = typeof Middleware;
 export {};

package/package.json

@@ -3,7 +3,11 @@
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/web-infra-dev/modern.js/issues",
-  "repository": "web-infra-dev/modern.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/server/plugin-express"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.15.0",
+  "version": "2.17.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -33,6 +37,9 @@
         "require": "./dist/cjs/index.js"
       },
       "default": "./dist/esm/index.js"
+    },
+    "./runtime": {
+      "default": "./dist/cjs/runtime/index.js"
     }
   },
   "dependencies": {
@@ -42,10 +49,10 @@
     "formidable": "^1.2.2",
     "reflect-metadata": "^0.1.13",
     "type-is": "^1.6.18",
-    "@modern-js/bff-core": "2.15.0",
-    "@modern-js/bff-runtime": "2.15.0",
-    "@modern-js/types": "2.15.0",
-    "@modern-js/utils": "2.15.0"
+    "@modern-js/bff-core": "2.17.0",
+    "@modern-js/bff-runtime": "2.17.0",
+    "@modern-js/types": "2.17.0",
+    "@modern-js/utils": "2.17.0"
   },
   "devDependencies": {
     "@types/cookie-parser": "^1.4.2",
@@ -61,11 +68,11 @@
     "supertest": "^6.1.6",
     "typescript": "^4",
     "zod": "^3.17.3",
-    "@modern-js/core": "2.15.0",
-    "@modern-js/app-tools": "2.15.0",
-    "@modern-js/server-core": "2.15.0",
-    "@scripts/build": "2.15.0",
-    "@scripts/jest-config": "2.15.0"
+    "@modern-js/core": "2.17.0",
+    "@modern-js/app-tools": "2.17.0",
+    "@modern-js/server-core": "2.17.0",
+    "@scripts/build": "2.17.0",
+    "@scripts/jest-config": "2.17.0"
   },
   "peerDependencies": {
     "express": "^4.17.1"