@modern-js/plugin-express 2.15.0 → 2.16.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @modern-js/plugin-express
 
+## 2.16.0
+
+### Patch Changes
+
+- 4e876ab: chore: package.json include the monorepo-relative directory
+
+  chore: 在 package.json 中声明 monorepo 的子路径
+
+- Updated dependencies [5954330]
+- Updated dependencies [7596520]
+- Updated dependencies [4e876ab]
+  - @modern-js/utils@2.16.0
+  - @modern-js/bff-runtime@2.16.0
+  - @modern-js/bff-core@2.16.0
+  - @modern-js/types@2.16.0
+
 ## 2.15.0
 
 ### Patch Changes

package/dist/cjs/cli/index.js

@@ -1,51 +1,67 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var cli_exports = {};
-__export(cli_exports, {
-  default: () => cli_default
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: () => _default
 });
-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");
-var cli_default = () => ({
+const _path = /* @__PURE__ */ _interop_require_wildcard(require("path"));
+const _utils = require("@modern-js/utils");
+const _bffcore = require("@modern-js/bff-core");
+function _getRequireWildcardCache(nodeInterop) {
+  if (typeof WeakMap !== "function")
+    return null;
+  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
+  return (_getRequireWildcardCache = function(nodeInterop2) {
+    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
+  })(nodeInterop);
+}
+function _interop_require_wildcard(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 _default = () => ({
   name: "@modern-js/plugin-express",
   setup: (api) => {
     let bffExportsUtils;
     const { useAppContext } = api;
-    const runtimeModulePath = path.resolve(__dirname, "../runtime");
+    const runtimeModulePath = _path.resolve(__dirname, "../runtime");
     return {
       config() {
         const appContext = useAppContext();
         const { appDirectory } = appContext;
-        bffExportsUtils = (0, import_utils.createRuntimeExportsUtils)(appContext.internalDirectory, "server");
+        bffExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, "server");
         const serverRuntimePath = bffExportsUtils.getPath();
-        const relativeRuntimePath = (0, import_bff_core.getRelativeRuntimePath)(appDirectory, serverRuntimePath);
+        const relativeRuntimePath = (0, _bffcore.getRelativeRuntimePath)(appDirectory, serverRuntimePath);
         if (process.env.NODE_ENV === "production") {
           return {
             source: {
@@ -76,8 +92,8 @@ var cli_default = () => ({
       },
       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,5 +106,3 @@ var cli_default = () => ({
     };
   }
 });
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/cjs/context.js

@@ -1,30 +1,17 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var context_exports = {};
-__export(context_exports, {
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
   run: () => run,
   useContext: () => useContext
 });
-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
-});
+const _bffcore = require("@modern-js/bff-core");
+const { run, useContext } = (0, _bffcore.createStorage)();

package/dist/cjs/index.js

@@ -1,38 +1,29 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var src_exports = {};
-__export(src_exports, {
-  default: () => src_default
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(src_exports);
-var import_plugin = __toESM(require("./plugin"));
-__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 = {});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: () => _default
+});
+const _plugin = /* @__PURE__ */ _interop_require_default(require("./plugin"));
+_export_star(require("./context"), exports);
+function _export_star(from, to) {
+  Object.keys(from).forEach(function(k) {
+    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+      Object.defineProperty(to, k, {
+        enumerable: true,
+        get: function() {
+          return from[k];
+        }
+      });
+    }
+  });
+  return from;
+}
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+const _default = _plugin.default;

package/dist/cjs/plugin.js

@@ -1,54 +1,75 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var plugin_exports = {};
-__export(plugin_exports, {
-  default: () => plugin_default
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: () => _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 _path = /* @__PURE__ */ _interop_require_wildcard(require("path"));
+const _express = /* @__PURE__ */ _interop_require_default(require("express"));
+const _cookieparser = /* @__PURE__ */ _interop_require_default(require("cookie-parser"));
+const _utils = require("@modern-js/utils");
+const _finalhandler = /* @__PURE__ */ _interop_require_default(require("finalhandler"));
+const _context = require("./context");
+const _registerRoutes = /* @__PURE__ */ _interop_require_default(require("./registerRoutes"));
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+function _getRequireWildcardCache(nodeInterop) {
+  if (typeof WeakMap !== "function")
+    return null;
+  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
+  return (_getRequireWildcardCache = function(nodeInterop2) {
+    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
+  })(nodeInterop);
+}
+function _interop_require_wildcard(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}`));
+  const paths = exts.map((ext) => _path.resolve(apiDir, `app${ext}`));
   for (const filename of paths) {
-    if (await import_utils.fs.pathExists(filename)) {
+    if (await _utils.fs.pathExists(filename)) {
       delete require.cache[filename];
       return [
-        (0, import_utils.compatRequire)(filename),
+        (0, _utils.compatRequire)(filename),
         require(filename)
       ];
     }
@@ -57,136 +78,138 @@ const findAppModule = async (apiDir) => {
 };
 const initMiddlewares = (middleware, app) => {
   middleware.forEach((middlewareItem) => {
-    const middlewareFunc = typeof middlewareItem === "string" ? (0, import_utils.compatRequire)(middlewareItem) : middlewareItem;
+    const middlewareFunc = typeof middlewareItem === "string" ? (0, _utils.compatRequire)(middlewareItem) : middlewareItem;
     app.use(middlewareFunc);
   });
 };
 const useRun = (app) => {
   app.use((req, res, next) => {
-    (0, import_context.run)({
+    (0, _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({
+  app.use((0, _cookieparser.default)());
+  app.use(_express.default.text());
+  app.use(_express.default.urlencoded({
     extended: true
   }));
-  app.use(import_express.default.json());
+  app.use(_express.default.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 = (0, import_express.default)();
-        }
-        initApp(app);
-        if (config) {
-          const { middleware } = config;
-          initMiddlewares(middleware, app);
-        }
-        useRun(app);
-        (0, import_registerRoutes.default)(app, apiHandlerInfos);
-        if (hooks) {
-          const { afterLambdaRegisted } = hooks;
-          if (afterLambdaRegisted) {
-            afterLambdaRegisted(app);
+const _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 = (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);
+              }
+            }
+          } 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`);
           }
-        }
-      } else if (mode === "function") {
-        app = (0, import_express.default)();
-        initApp(app);
-        if (config) {
-          const { middleware } = config;
-          initMiddlewares(middleware, app);
-        }
-        useRun(app);
-        (0, import_registerRoutes.default)(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);
+          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();
+            });
           }
-          next();
-        });
-      }
-      return (req, res) => new Promise((resolve, reject) => {
-        const handler = (err) => {
-          if (err) {
-            return reject(err);
+          return (req, res) => new Promise((resolve, reject) => {
+            const handler = (err) => {
+              if (err) {
+                return reject(err);
+              }
+              return (0, _finalhandler.default)(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();
           }
-          return (0, import_finalhandler.default)(req, res, {})(null);
-        };
-        res.on("finish", (err) => {
-          if (err) {
-            return reject(err);
+          const app = (0, _express.default)();
+          initApp(app);
+          if (config) {
+            const { middleware } = config;
+            debug("web middleware", middleware);
+            initMiddlewares(middleware, app);
           }
-          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 = (0, import_express.default)();
-      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);
-          }
-          if (res.headersSent && res.statusCode !== 200) {
-            (0, import_finalhandler.default)(req, res, {})(null);
-          }
-          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) {
+                (0, _finalhandler.default)(req, res, {})(null);
+              }
+              return resolve();
+            };
+            res.on("finish", (err) => {
+              if (err) {
+                return reject(err);
+              }
+              return resolve();
+            });
+            return app(req, res, handler);
+          });
+        }
+      };
     }
-  })
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+  };
+};