@modern-js/plugin-bff 2.4.0 → 2.5.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @modern-js/plugin-bff
 
+## 2.5.0
+
+### Patch Changes
+
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- 6fca567: feat: support bff handle complete server, include page render
+  feat: 支持 bff 处理整个服务，包括页面渲染
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
+- Updated dependencies [89ca6cc]
+- Updated dependencies [30614fa]
+- Updated dependencies [1b0ce87]
+- Updated dependencies [11c053b]
+  - @modern-js/bff-core@2.5.0
+  - @modern-js/create-request@2.5.0
+  - @modern-js/server-utils@2.5.0
+  - @modern-js/utils@2.5.0
+
 ## 2.4.0
 
 ### Patch Changes

package/cli.js

@@ -1 +1 @@
-module.exports = require('./dist/js/node/cli');
+module.exports = require('./dist/cjs/cli');

package/dist/{js/node → cjs}/cli.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var cli_exports = {};
 __export(cli_exports, {
   default: () => cli_default
@@ -113,6 +93,16 @@ var cli_default = () => ({
           isSPA: false,
           isSSR: false
         }));
+        if (bff == null ? void 0 : bff.enableHandleWeb) {
+          return {
+            routes: routes.map((route) => {
+              return {
+                ...route,
+                isApi: true
+              };
+            }).concat(apiServerRoutes)
+          };
+        }
         return { routes: routes.concat(apiServerRoutes) };
       },
       collectServerPlugins({ plugins }) {
@@ -121,53 +111,49 @@ var cli_default = () => ({
         });
         return { plugins };
       },
-      beforeBuild() {
-        return __async(this, null, function* () {
-          if ((0, import_utils.isProd)()) {
-            const { internalDirectory } = api.useAppContext();
-            unRegisterResolveRuntimePath = (0, import_helper.registerModernRuntimePath)(internalDirectory);
-          }
-        });
+      async beforeBuild() {
+        if ((0, import_utils.isProd)()) {
+          const { internalDirectory } = api.useAppContext();
+          unRegisterResolveRuntimePath = (0, import_helper.registerModernRuntimePath)(internalDirectory);
+        }
       },
-      afterBuild() {
-        return __async(this, null, function* () {
-          if (unRegisterResolveRuntimePath) {
-            unRegisterResolveRuntimePath();
-          }
-          const { appDirectory, distDirectory } = api.useAppContext();
-          const modernConfig = api.useResolvedConfigContext();
-          const distDir = import_path.default.resolve(distDirectory);
-          const apiDir = import_path.default.resolve(appDirectory, import_utils.API_DIR);
-          const sharedDir = import_path.default.resolve(appDirectory, import_utils.SHARED_DIR);
-          const tsconfigPath = import_path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
-          const sourceDirs = [];
-          if (import_utils.fs.existsSync(apiDir)) {
-            sourceDirs.push(apiDir);
-          }
-          if (import_utils.fs.existsSync(sharedDir)) {
-            sourceDirs.push(sharedDir);
-          }
-          const { server } = modernConfig;
-          const { alias, define, globalVars } = modernConfig.source;
-          const { babel } = modernConfig.tools;
-          if (sourceDirs.length > 0) {
-            yield (0, import_server_utils.compile)(
-              appDirectory,
-              {
-                server,
-                alias,
-                define,
-                globalVars,
-                babelConfig: babel
-              },
-              {
-                sourceDirs,
-                distDir,
-                tsconfigPath
-              }
-            );
-          }
-        });
+      async afterBuild() {
+        if (unRegisterResolveRuntimePath) {
+          unRegisterResolveRuntimePath();
+        }
+        const { appDirectory, distDirectory } = api.useAppContext();
+        const modernConfig = api.useResolvedConfigContext();
+        const distDir = import_path.default.resolve(distDirectory);
+        const apiDir = import_path.default.resolve(appDirectory, import_utils.API_DIR);
+        const sharedDir = import_path.default.resolve(appDirectory, import_utils.SHARED_DIR);
+        const tsconfigPath = import_path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
+        const sourceDirs = [];
+        if (import_utils.fs.existsSync(apiDir)) {
+          sourceDirs.push(apiDir);
+        }
+        if (import_utils.fs.existsSync(sharedDir)) {
+          sourceDirs.push(sharedDir);
+        }
+        const { server } = modernConfig;
+        const { alias, define, globalVars } = modernConfig.source;
+        const { babel } = modernConfig.tools;
+        if (sourceDirs.length > 0) {
+          await (0, import_server_utils.compile)(
+            appDirectory,
+            {
+              server,
+              alias,
+              define,
+              globalVars,
+              babelConfig: babel
+            },
+            {
+              sourceDirs,
+              distDir,
+              tsconfigPath
+            }
+          );
+        }
       }
     };
   }

package/dist/cjs/loader.js

@@ -0,0 +1,66 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var loader_exports = {};
+__export(loader_exports, {
+  default: () => loader_default
+});
+module.exports = __toCommonJS(loader_exports);
+var import_bff_core = require("@modern-js/bff-core");
+var import_utils = require("@modern-js/utils");
+async function loader(source) {
+  this.cacheable();
+  const callback = this.async();
+  const draftOptions = this.getOptions();
+  const { resourcePath } = this;
+  const warning = `The file ${resourcePath} is not allowd to be imported in src directory, only API definition files are allowed.`;
+  if (!draftOptions.existLambda) {
+    import_utils.logger.warn(warning);
+    callback(null, `throw new Error('${warning}')`);
+    return;
+  }
+  const options = {
+    prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
+    apiDir: draftOptions.apiDir,
+    target: draftOptions.target,
+    port: Number(draftOptions.port),
+    source,
+    resourcePath
+  };
+  const { lambdaDir } = draftOptions;
+  if (!resourcePath.startsWith(lambdaDir)) {
+    import_utils.logger.warn(warning);
+    callback(null, `throw new Error('${warning}')`);
+    return;
+  }
+  if (draftOptions.fetcher) {
+    options.fetcher = draftOptions.fetcher;
+  }
+  if (draftOptions.requestCreator) {
+    options.requestCreator = draftOptions.requestCreator;
+  }
+  options.requireResolve = require.resolve;
+  const result = await (0, import_bff_core.generateClient)(options);
+  if (result.isOk) {
+    callback(void 0, result.value);
+  } else {
+    callback(void 0, `throw new Error('${result.value}')`);
+  }
+}
+var loader_default = loader;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/{js/node → cjs}/server.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 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 __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -99,11 +82,12 @@ var server_default = () => ({
         });
         const apiMode = apiRouter.getApiMode();
         const apiHandlerInfos = apiRouter.getApiHandlers();
-        api.setAppContext(__spreadProps(__spreadValues({}, appContext), {
+        api.setAppContext({
+          ...appContext,
           apiRouter,
           apiHandlerInfos,
           apiMode
-        }));
+        });
         return next(props);
       }
     };

package/dist/{js/treeshaking → esm}/cli.js

@@ -35,12 +35,64 @@ function _asyncToGenerator(fn) {
         });
     };
 }
+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;
+}
 function _iterableToArray(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
 function _nonIterableSpread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _objectSpreadProps(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
 function _toConsumableArray(arr) {
     return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
 }
@@ -168,7 +220,7 @@ var cli_default = function() {
                         tools: {
                             webpackChain: function(chain, param) {
                                 var name = param.name, CHAIN_ID = param.CHAIN_ID;
-                                var ref = api.useAppContext(), appDirectory = ref.appDirectory, port = ref.port;
+                                var _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, port = _api_useAppContext.port;
                                 var modernConfig = api.useResolvedConfigContext();
                                 var bff = (modernConfig || {}).bff;
                                 var prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || DEFAULT_API_PREFIX;
@@ -221,6 +273,15 @@ var cli_default = function() {
                             isSSR: false
                         };
                     });
+                    if (bff === null || bff === void 0 ? void 0 : bff.enableHandleWeb) {
+                        return {
+                            routes: routes.map(function(route) {
+                                return _objectSpreadProps(_objectSpread({}, route), {
+                                    isApi: true
+                                });
+                            }).concat(apiServerRoutes)
+                        };
+                    }
                     return {
                         routes: routes.concat(apiServerRoutes)
                     };
@@ -250,14 +311,14 @@ var cli_default = function() {
                 },
                 afterBuild: function afterBuild() {
                     return _asyncToGenerator(function() {
-                        var ref, appDirectory, distDirectory, modernConfig, distDir, apiDir, sharedDir, tsconfigPath, sourceDirs, server, _source, alias, define, globalVars, babel;
+                        var _api_useAppContext, appDirectory, distDirectory, modernConfig, distDir, apiDir, sharedDir, tsconfigPath, sourceDirs, server, _modernConfig_source, alias, define, globalVars, babel;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
                                     if (unRegisterResolveRuntimePath) {
                                         unRegisterResolveRuntimePath();
                                     }
-                                    ref = api.useAppContext(), appDirectory = ref.appDirectory, distDirectory = ref.distDirectory;
+                                    _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, distDirectory = _api_useAppContext.distDirectory;
                                     modernConfig = api.useResolvedConfigContext();
                                     distDir = path.resolve(distDirectory);
                                     apiDir = path.resolve(appDirectory, API_DIR);
@@ -271,7 +332,7 @@ var cli_default = function() {
                                         sourceDirs.push(sharedDir);
                                     }
                                     server = modernConfig.server;
-                                    _source = modernConfig.source, alias = _source.alias, define = _source.define, globalVars = _source.globalVars;
+                                    _modernConfig_source = modernConfig.source, alias = _modernConfig_source.alias, define = _modernConfig_source.define, globalVars = _modernConfig_source.globalVars;
                                     babel = modernConfig.tools.babel;
                                     if (!(sourceDirs.length > 0)) return [
                                         3,

package/dist/{js/treeshaking → esm}/server.js

@@ -105,7 +105,7 @@ var server_default = function() {
             var apiAppPath = "";
             return {
                 prepare: function prepare() {
-                    var ref = api.useAppContext(), appDirectory = ref.appDirectory, distDirectory = ref.distDirectory;
+                    var _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, distDirectory = _api_useAppContext.distDirectory;
                     var root = isProd() ? distDirectory : appDirectory;
                     var apiPath = path.resolve(root || process.cwd(), API_DIR);
                     apiAppPath = path.resolve(apiPath, API_APP_NAME);

package/dist/{js/modern → esm-node}/cli.js

@@ -1,23 +1,3 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import path from "path";
 import {
   fs,
@@ -92,6 +72,16 @@ var cli_default = () => ({
           isSPA: false,
           isSSR: false
         }));
+        if (bff == null ? void 0 : bff.enableHandleWeb) {
+          return {
+            routes: routes.map((route) => {
+              return {
+                ...route,
+                isApi: true
+              };
+            }).concat(apiServerRoutes)
+          };
+        }
         return { routes: routes.concat(apiServerRoutes) };
       },
       collectServerPlugins({ plugins }) {
@@ -100,53 +90,49 @@ var cli_default = () => ({
         });
         return { plugins };
       },
-      beforeBuild() {
-        return __async(this, null, function* () {
-          if (isProd()) {
-            const { internalDirectory } = api.useAppContext();
-            unRegisterResolveRuntimePath = registerModernRuntimePath(internalDirectory);
-          }
-        });
+      async beforeBuild() {
+        if (isProd()) {
+          const { internalDirectory } = api.useAppContext();
+          unRegisterResolveRuntimePath = registerModernRuntimePath(internalDirectory);
+        }
       },
-      afterBuild() {
-        return __async(this, null, function* () {
-          if (unRegisterResolveRuntimePath) {
-            unRegisterResolveRuntimePath();
-          }
-          const { appDirectory, distDirectory } = api.useAppContext();
-          const modernConfig = api.useResolvedConfigContext();
-          const distDir = path.resolve(distDirectory);
-          const apiDir = path.resolve(appDirectory, API_DIR);
-          const sharedDir = path.resolve(appDirectory, SHARED_DIR);
-          const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-          const sourceDirs = [];
-          if (fs.existsSync(apiDir)) {
-            sourceDirs.push(apiDir);
-          }
-          if (fs.existsSync(sharedDir)) {
-            sourceDirs.push(sharedDir);
-          }
-          const { server } = modernConfig;
-          const { alias, define, globalVars } = modernConfig.source;
-          const { babel } = modernConfig.tools;
-          if (sourceDirs.length > 0) {
-            yield compile(
-              appDirectory,
-              {
-                server,
-                alias,
-                define,
-                globalVars,
-                babelConfig: babel
-              },
-              {
-                sourceDirs,
-                distDir,
-                tsconfigPath
-              }
-            );
-          }
-        });
+      async afterBuild() {
+        if (unRegisterResolveRuntimePath) {
+          unRegisterResolveRuntimePath();
+        }
+        const { appDirectory, distDirectory } = api.useAppContext();
+        const modernConfig = api.useResolvedConfigContext();
+        const distDir = path.resolve(distDirectory);
+        const apiDir = path.resolve(appDirectory, API_DIR);
+        const sharedDir = path.resolve(appDirectory, SHARED_DIR);
+        const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+        const sourceDirs = [];
+        if (fs.existsSync(apiDir)) {
+          sourceDirs.push(apiDir);
+        }
+        if (fs.existsSync(sharedDir)) {
+          sourceDirs.push(sharedDir);
+        }
+        const { server } = modernConfig;
+        const { alias, define, globalVars } = modernConfig.source;
+        const { babel } = modernConfig.tools;
+        if (sourceDirs.length > 0) {
+          await compile(
+            appDirectory,
+            {
+              server,
+              alias,
+              define,
+              globalVars,
+              babelConfig: babel
+            },
+            {
+              sourceDirs,
+              distDir,
+              tsconfigPath
+            }
+          );
+        }
       }
     };
   }

package/dist/esm-node/loader.js

@@ -0,0 +1,45 @@
+import { generateClient } from "@modern-js/bff-core";
+import { logger } from "@modern-js/utils";
+async function loader(source) {
+  this.cacheable();
+  const callback = this.async();
+  const draftOptions = this.getOptions();
+  const { resourcePath } = this;
+  const warning = `The file ${resourcePath} is not allowd to be imported in src directory, only API definition files are allowed.`;
+  if (!draftOptions.existLambda) {
+    logger.warn(warning);
+    callback(null, `throw new Error('${warning}')`);
+    return;
+  }
+  const options = {
+    prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
+    apiDir: draftOptions.apiDir,
+    target: draftOptions.target,
+    port: Number(draftOptions.port),
+    source,
+    resourcePath
+  };
+  const { lambdaDir } = draftOptions;
+  if (!resourcePath.startsWith(lambdaDir)) {
+    logger.warn(warning);
+    callback(null, `throw new Error('${warning}')`);
+    return;
+  }
+  if (draftOptions.fetcher) {
+    options.fetcher = draftOptions.fetcher;
+  }
+  if (draftOptions.requestCreator) {
+    options.requestCreator = draftOptions.requestCreator;
+  }
+  options.requireResolve = require.resolve;
+  const result = await generateClient(options);
+  if (result.isOk) {
+    callback(void 0, result.value);
+  } else {
+    callback(void 0, `throw new Error('${result.value}')`);
+  }
+}
+var loader_default = loader;
+export {
+  loader_default as default
+};

package/dist/{js/modern → esm-node}/server.js

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-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 __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import path from "path";
 import { ApiRouter } from "@modern-js/bff-core";
 import { API_DIR, isProd, requireExistModule } from "@modern-js/utils";
@@ -73,11 +54,12 @@ var server_default = () => ({
         });
         const apiMode = apiRouter.getApiMode();
         const apiHandlerInfos = apiRouter.getApiHandlers();
-        api.setAppContext(__spreadProps(__spreadValues({}, appContext), {
+        api.setAppContext({
+          ...appContext,
           apiRouter,
           apiHandlerInfos,
           apiMode
-        }));
+        });
         return next(props);
       }
     };

package/package.json

@@ -11,28 +11,27 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.0",
+  "version": "2.5.0",
   "jsnext:source": "./src/cli.ts",
   "types": "./dist/types/cli.d.ts",
-  "main": "./dist/js/node/cli.js",
-  "module": "./dist/js/treeshaking/cli.js",
-  "jsnext:modern": "./dist/js/modern/cli.js",
+  "main": "./dist/cjs/cli.js",
+  "module": "./dist/esm/cli.js",
   "exports": {
     ".": {
       "jsnext:source": "./src/cli.ts",
-      "default": "./dist/js/node/cli.js"
+      "default": "./dist/cjs/cli.js"
     },
     "./cli": {
       "jsnext:source": "./src/cli.ts",
-      "default": "./dist/js/node/cli.js"
+      "default": "./dist/cjs/cli.js"
     },
     "./server": {
       "jsnext:source": "./src/server.ts",
-      "default": "./dist/js/node/server.js"
+      "default": "./dist/cjs/server.js"
     },
     "./loader": {
       "jsnext:source": "./src/loader.ts",
-      "default": "./dist/js/node/loader.js"
+      "default": "./dist/cjs/loader.js"
     }
   },
   "typesVersions": {
@@ -51,10 +50,10 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/bff-core": "2.4.0",
-    "@modern-js/create-request": "2.4.0",
-    "@modern-js/server-utils": "2.4.0",
-    "@modern-js/utils": "2.4.0"
+    "@modern-js/bff-core": "2.5.0",
+    "@modern-js/create-request": "2.5.0",
+    "@modern-js/server-utils": "2.5.0",
+    "@modern-js/utils": "2.5.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -66,14 +65,14 @@
     "typescript": "^4",
     "webpack": "^5.75.0",
     "webpack-chain": "^6.5.1",
-    "@modern-js/core": "2.4.0",
-    "@modern-js/bff-runtime": "2.4.0",
-    "@modern-js/server-core": "2.4.0",
-    "@modern-js/runtime": "2.4.0",
-    "@modern-js/types": "2.4.0",
-    "@modern-js/app-tools": "2.4.0",
-    "@scripts/build": "2.4.0",
-    "@scripts/jest-config": "2.4.0"
+    "@modern-js/runtime": "2.5.0",
+    "@modern-js/core": "2.5.0",
+    "@modern-js/bff-runtime": "2.5.0",
+    "@modern-js/server-core": "2.5.0",
+    "@modern-js/types": "2.5.0",
+    "@modern-js/app-tools": "2.5.0",
+    "@scripts/build": "2.5.0",
+    "@scripts/jest-config": "2.5.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/server.js

@@ -1 +1 @@
-module.exports = require('./dist/js/node/server');
+module.exports = require('./dist/cjs/server');

package/dist/js/modern/loader.js

@@ -1,67 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import { generateClient } from "@modern-js/bff-core";
-import { logger } from "@modern-js/utils";
-function loader(source) {
-  return __async(this, null, function* () {
-    this.cacheable();
-    const callback = this.async();
-    const draftOptions = this.getOptions();
-    const { resourcePath } = this;
-    const warning = `The file ${resourcePath} is not allowd to be imported in src directory, only API definition files are allowed.`;
-    if (!draftOptions.existLambda) {
-      logger.warn(warning);
-      callback(null, `throw new Error('${warning}')`);
-      return;
-    }
-    const options = {
-      prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
-      apiDir: draftOptions.apiDir,
-      target: draftOptions.target,
-      port: Number(draftOptions.port),
-      source,
-      resourcePath
-    };
-    const { lambdaDir } = draftOptions;
-    if (!resourcePath.startsWith(lambdaDir)) {
-      logger.warn(warning);
-      callback(null, `throw new Error('${warning}')`);
-      return;
-    }
-    if (draftOptions.fetcher) {
-      options.fetcher = draftOptions.fetcher;
-    }
-    if (draftOptions.requestCreator) {
-      options.requestCreator = draftOptions.requestCreator;
-    }
-    options.requireResolve = require.resolve;
-    const result = yield generateClient(options);
-    if (result.isOk) {
-      callback(void 0, result.value);
-    } else {
-      callback(void 0, `throw new Error('${result.value}')`);
-    }
-  });
-}
-var loader_default = loader;
-export {
-  loader_default as default
-};

package/dist/js/node/loader.js

@@ -1,88 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-var loader_exports = {};
-__export(loader_exports, {
-  default: () => loader_default
-});
-module.exports = __toCommonJS(loader_exports);
-var import_bff_core = require("@modern-js/bff-core");
-var import_utils = require("@modern-js/utils");
-function loader(source) {
-  return __async(this, null, function* () {
-    this.cacheable();
-    const callback = this.async();
-    const draftOptions = this.getOptions();
-    const { resourcePath } = this;
-    const warning = `The file ${resourcePath} is not allowd to be imported in src directory, only API definition files are allowed.`;
-    if (!draftOptions.existLambda) {
-      import_utils.logger.warn(warning);
-      callback(null, `throw new Error('${warning}')`);
-      return;
-    }
-    const options = {
-      prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
-      apiDir: draftOptions.apiDir,
-      target: draftOptions.target,
-      port: Number(draftOptions.port),
-      source,
-      resourcePath
-    };
-    const { lambdaDir } = draftOptions;
-    if (!resourcePath.startsWith(lambdaDir)) {
-      import_utils.logger.warn(warning);
-      callback(null, `throw new Error('${warning}')`);
-      return;
-    }
-    if (draftOptions.fetcher) {
-      options.fetcher = draftOptions.fetcher;
-    }
-    if (draftOptions.requestCreator) {
-      options.requestCreator = draftOptions.requestCreator;
-    }
-    options.requireResolve = require.resolve;
-    const result = yield (0, import_bff_core.generateClient)(options);
-    if (result.isOk) {
-      callback(void 0, result.value);
-    } else {
-      callback(void 0, `throw new Error('${result.value}')`);
-    }
-  });
-}
-var loader_default = loader;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});