@modern-js/plugin-bff 2.58.1 → 2.58.2

package/dist/cjs/cli.js

@@ -36,13 +36,11 @@ var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_server_utils = require("@modern-js/server-utils");
 var import_bff_core = require("@modern-js/bff-core");
-var import_helper = require("./helper");
 const DEFAULT_API_PREFIX = "/api";
 const TS_CONFIG_FILENAME = "tsconfig.json";
 const bffPlugin = () => ({
   name: "@modern-js/plugin-bff",
   setup: (api) => {
-    let unRegisterResolveRuntimePath = null;
     return {
       config() {
         return {
@@ -129,27 +127,18 @@ const bffPlugin = () => ({
           plugins
         };
       },
-      async beforeBuild() {
-        if ((0, import_utils.isProd)()) {
-          const { internalDirectory } = api.useAppContext();
-          unRegisterResolveRuntimePath = (0, import_helper.registerModernRuntimePath)(internalDirectory);
-        }
-      },
       async afterBuild() {
-        if (unRegisterResolveRuntimePath) {
-          unRegisterResolveRuntimePath();
-        }
-        const { appDirectory, distDirectory, apiDirectory, sharedDirectory } = api.useAppContext();
+        const { appDirectory, distDirectory, apiDirectory, sharedDirectory, moduleType } = api.useAppContext();
         const modernConfig = api.useResolvedConfigContext();
         const distDir = import_path.default.resolve(distDirectory);
         const apiDir = apiDirectory || import_path.default.resolve(appDirectory, import_utils.API_DIR);
         const sharedDir = sharedDirectory || 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)) {
+        if (await import_utils.fs.pathExists(apiDir)) {
           sourceDirs.push(apiDir);
         }
-        if (import_utils.fs.existsSync(sharedDir)) {
+        if (await import_utils.fs.pathExists(sharedDir)) {
           sourceDirs.push(sharedDir);
         }
         const { server } = modernConfig;
@@ -163,7 +152,8 @@ const bffPlugin = () => ({
           }, {
             sourceDirs,
             distDir,
-            tsconfigPath
+            tsconfigPath,
+            moduleType
           });
         }
       }

package/dist/cjs/server.js

@@ -63,7 +63,7 @@ var server_default = () => ({
         const root = (0, import_utils.isProd)() ? distDirectory : appDirectory;
         const apiPath = import_path.default.resolve(root || process.cwd(), import_utils.API_DIR);
         apiAppPath = import_path.default.resolve(apiPath, import_constants.API_APP_NAME);
-        const apiMod = (0, import_utils.requireExistModule)(apiAppPath);
+        const apiMod = await (0, import_utils.requireExistModule)(apiAppPath);
         if (apiMod && typeof apiMod === "function") {
           apiMod(transformAPI);
         }
@@ -115,10 +115,10 @@ var server_default = () => ({
           });
         }
       },
-      reset({ event }) {
+      async reset({ event }) {
         storage.reset();
         const appContext = api.useAppContext();
-        const newApiModule = (0, import_utils.requireExistModule)(apiAppPath);
+        const newApiModule = await (0, import_utils.requireExistModule)(apiAppPath);
         if (newApiModule && typeof newApiModule === "function") {
           newApiModule(transformAPI);
         }
@@ -128,7 +128,7 @@ var server_default = () => ({
           apiMiddlewares: middlewares
         });
         if (event.type === "file-change") {
-          const apiHandlerInfos = apiRouter.getApiHandlers();
+          const apiHandlerInfos = await apiRouter.getApiHandlers();
           const appContext2 = api.useAppContext();
           api.setAppContext({
             ...appContext2,
@@ -136,7 +136,7 @@ var server_default = () => ({
           });
         }
       },
-      prepareApiServer(props, next) {
+      async prepareApiServer(props, next) {
         const { pwd, prefix, httpMethodDecider } = props;
         const apiDir = import_path.default.resolve(pwd, import_utils.API_DIR);
         const appContext = api.useAppContext();
@@ -149,7 +149,7 @@ var server_default = () => ({
           httpMethodDecider
         });
         const apiMode = apiRouter.getApiMode();
-        const apiHandlerInfos = apiRouter.getApiHandlers();
+        const apiHandlerInfos = await apiRouter.getApiHandlers();
         api.setAppContext({
           ...appContext,
           apiRouter,

package/dist/esm/cli.js

@@ -4,17 +4,15 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { fs, API_DIR, normalizeOutputPath, SHARED_DIR, isProd } from "@modern-js/utils";
+import { fs, API_DIR, normalizeOutputPath, SHARED_DIR } from "@modern-js/utils";
 import { compile } from "@modern-js/server-utils";
 import { ApiRouter } from "@modern-js/bff-core";
-import { registerModernRuntimePath } from "./helper";
 var DEFAULT_API_PREFIX = "/api";
 var TS_CONFIG_FILENAME = "tsconfig.json";
 var bffPlugin = function() {
   return {
     name: "@modern-js/plugin-bff",
     setup: function(api) {
-      var unRegisterResolveRuntimePath = null;
       return {
         config: function config() {
           return {
@@ -106,40 +104,33 @@ var bffPlugin = function() {
             plugins
           };
         },
-        beforeBuild: function beforeBuild() {
-          return _async_to_generator(function() {
-            var internalDirectory;
-            return _ts_generator(this, function(_state) {
-              if (isProd()) {
-                internalDirectory = api.useAppContext().internalDirectory;
-                unRegisterResolveRuntimePath = registerModernRuntimePath(internalDirectory);
-              }
-              return [
-                2
-              ];
-            });
-          })();
-        },
         afterBuild: function afterBuild() {
           return _async_to_generator(function() {
-            var _api_useAppContext, appDirectory, distDirectory, apiDirectory, sharedDirectory, modernConfig, distDir, apiDir, sharedDir, tsconfigPath, sourceDirs, server, alias, babel;
+            var _api_useAppContext, appDirectory, distDirectory, apiDirectory, sharedDirectory, moduleType, modernConfig, distDir, apiDir, sharedDir, tsconfigPath, sourceDirs, server, alias, babel;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
-                  if (unRegisterResolveRuntimePath) {
-                    unRegisterResolveRuntimePath();
-                  }
-                  _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, distDirectory = _api_useAppContext.distDirectory, apiDirectory = _api_useAppContext.apiDirectory, sharedDirectory = _api_useAppContext.sharedDirectory;
+                  _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, distDirectory = _api_useAppContext.distDirectory, apiDirectory = _api_useAppContext.apiDirectory, sharedDirectory = _api_useAppContext.sharedDirectory, moduleType = _api_useAppContext.moduleType;
                   modernConfig = api.useResolvedConfigContext();
                   distDir = path.resolve(distDirectory);
                   apiDir = apiDirectory || path.resolve(appDirectory, API_DIR);
                   sharedDir = sharedDirectory || path.resolve(appDirectory, SHARED_DIR);
                   tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
                   sourceDirs = [];
-                  if (fs.existsSync(apiDir)) {
+                  return [
+                    4,
+                    fs.pathExists(apiDir)
+                  ];
+                case 1:
+                  if (_state.sent()) {
                     sourceDirs.push(apiDir);
                   }
-                  if (fs.existsSync(sharedDir)) {
+                  return [
+                    4,
+                    fs.pathExists(sharedDir)
+                  ];
+                case 2:
+                  if (_state.sent()) {
                     sourceDirs.push(sharedDir);
                   }
                   server = modernConfig.server;
@@ -148,7 +139,7 @@ var bffPlugin = function() {
                   if (!(sourceDirs.length > 0))
                     return [
                       3,
-                      2
+                      4
                     ];
                   return [
                     4,
@@ -159,13 +150,14 @@ var bffPlugin = function() {
                     }, {
                       sourceDirs,
                       distDir,
-                      tsconfigPath
+                      tsconfigPath,
+                      moduleType
                     })
                   ];
-                case 1:
+                case 3:
                   _state.sent();
-                  _state.label = 2;
-                case 2:
+                  _state.label = 4;
+                case 4:
                   return [
                     2
                   ];

package/dist/esm/server.js

@@ -46,7 +46,12 @@ function server_default() {
                   root = isProd() ? distDirectory : appDirectory;
                   apiPath = path.resolve(root || process.cwd(), API_DIR);
                   apiAppPath = path.resolve(apiPath, API_APP_NAME);
-                  apiMod = requireExistModule(apiAppPath);
+                  return [
+                    4,
+                    requireExistModule(apiAppPath)
+                  ];
+                case 1:
+                  apiMod = _state.sent();
                   if (apiMod && typeof apiMod === "function") {
                     apiMod(transformAPI);
                   }
@@ -63,12 +68,12 @@ function server_default() {
                     4,
                     isWebOnly()
                   ];
-                case 1:
+                case 2:
                   webOnly = _state.sent();
                   if (!webOnly)
                     return [
                       3,
-                      2
+                      3
                     ];
                   handler = function() {
                     var _ref = _async_to_generator(function(c, next) {
@@ -94,9 +99,9 @@ function server_default() {
                   }();
                   return [
                     3,
-                    4
+                    5
                   ];
-                case 2:
+                case 3:
                   runner = api.useHookRunners();
                   renderHandler = enableHandleWeb ? render : null;
                   return [
@@ -112,10 +117,10 @@ function server_default() {
                       }
                     })
                   ];
-                case 3:
-                  handler = _state.sent();
-                  _state.label = 4;
                 case 4:
+                  handler = _state.sent();
+                  _state.label = 5;
+                case 5:
                   if (handler) {
                     globalMiddlewares.push({
                       name: "bind-bff",
@@ -143,44 +148,86 @@ function server_default() {
         },
         reset: function reset(param) {
           var event = param.event;
-          storage.reset();
-          var appContext = api.useAppContext();
-          var newApiModule = requireExistModule(apiAppPath);
-          if (newApiModule && typeof newApiModule === "function") {
-            newApiModule(transformAPI);
-          }
-          var middlewares = storage.middlewares;
-          api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
-            apiMiddlewares: middlewares
-          }));
-          if (event.type === "file-change") {
-            var apiHandlerInfos = apiRouter.getApiHandlers();
-            var appContext1 = api.useAppContext();
-            api.setAppContext(_object_spread_props(_object_spread({}, appContext1), {
-              apiHandlerInfos
-            }));
-          }
+          return _async_to_generator(function() {
+            var appContext, newApiModule, middlewares, apiHandlerInfos, appContext1;
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  storage.reset();
+                  appContext = api.useAppContext();
+                  return [
+                    4,
+                    requireExistModule(apiAppPath)
+                  ];
+                case 1:
+                  newApiModule = _state.sent();
+                  if (newApiModule && typeof newApiModule === "function") {
+                    newApiModule(transformAPI);
+                  }
+                  middlewares = storage.middlewares;
+                  api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
+                    apiMiddlewares: middlewares
+                  }));
+                  if (!(event.type === "file-change"))
+                    return [
+                      3,
+                      3
+                    ];
+                  return [
+                    4,
+                    apiRouter.getApiHandlers()
+                  ];
+                case 2:
+                  apiHandlerInfos = _state.sent();
+                  appContext1 = api.useAppContext();
+                  api.setAppContext(_object_spread_props(_object_spread({}, appContext1), {
+                    apiHandlerInfos
+                  }));
+                  _state.label = 3;
+                case 3:
+                  return [
+                    2
+                  ];
+              }
+            });
+          })();
         },
         prepareApiServer: function prepareApiServer(props, next) {
-          var pwd = props.pwd, prefix = props.prefix, httpMethodDecider = props.httpMethodDecider;
-          var apiDir = path.resolve(pwd, API_DIR);
-          var appContext = api.useAppContext();
-          var apiDirectory = appContext.apiDirectory, lambdaDirectory = appContext.lambdaDirectory;
-          apiRouter = new ApiRouter({
-            appDir: pwd,
-            apiDir: apiDirectory || apiDir,
-            lambdaDir: lambdaDirectory,
-            prefix,
-            httpMethodDecider
-          });
-          var apiMode = apiRouter.getApiMode();
-          var apiHandlerInfos = apiRouter.getApiHandlers();
-          api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
-            apiRouter,
-            apiHandlerInfos,
-            apiMode
-          }));
-          return next(props);
+          return _async_to_generator(function() {
+            var pwd, prefix, httpMethodDecider, apiDir, appContext, apiDirectory, lambdaDirectory, apiMode, apiHandlerInfos;
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  pwd = props.pwd, prefix = props.prefix, httpMethodDecider = props.httpMethodDecider;
+                  apiDir = path.resolve(pwd, API_DIR);
+                  appContext = api.useAppContext();
+                  apiDirectory = appContext.apiDirectory, lambdaDirectory = appContext.lambdaDirectory;
+                  apiRouter = new ApiRouter({
+                    appDir: pwd,
+                    apiDir: apiDirectory || apiDir,
+                    lambdaDir: lambdaDirectory,
+                    prefix,
+                    httpMethodDecider
+                  });
+                  apiMode = apiRouter.getApiMode();
+                  return [
+                    4,
+                    apiRouter.getApiHandlers()
+                  ];
+                case 1:
+                  apiHandlerInfos = _state.sent();
+                  api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
+                    apiRouter,
+                    apiHandlerInfos,
+                    apiMode
+                  }));
+                  return [
+                    2,
+                    next(props)
+                  ];
+              }
+            });
+          })();
         }
       };
     }

package/dist/esm-node/cli.js

@@ -1,14 +1,12 @@
 import path from "path";
-import { fs, API_DIR, normalizeOutputPath, SHARED_DIR, isProd } from "@modern-js/utils";
+import { fs, API_DIR, normalizeOutputPath, SHARED_DIR } from "@modern-js/utils";
 import { compile } from "@modern-js/server-utils";
 import { ApiRouter } from "@modern-js/bff-core";
-import { registerModernRuntimePath } from "./helper";
 const DEFAULT_API_PREFIX = "/api";
 const TS_CONFIG_FILENAME = "tsconfig.json";
 const bffPlugin = () => ({
   name: "@modern-js/plugin-bff",
   setup: (api) => {
-    let unRegisterResolveRuntimePath = null;
     return {
       config() {
         return {
@@ -95,27 +93,18 @@ const bffPlugin = () => ({
           plugins
         };
       },
-      async beforeBuild() {
-        if (isProd()) {
-          const { internalDirectory } = api.useAppContext();
-          unRegisterResolveRuntimePath = registerModernRuntimePath(internalDirectory);
-        }
-      },
       async afterBuild() {
-        if (unRegisterResolveRuntimePath) {
-          unRegisterResolveRuntimePath();
-        }
-        const { appDirectory, distDirectory, apiDirectory, sharedDirectory } = api.useAppContext();
+        const { appDirectory, distDirectory, apiDirectory, sharedDirectory, moduleType } = api.useAppContext();
         const modernConfig = api.useResolvedConfigContext();
         const distDir = path.resolve(distDirectory);
         const apiDir = apiDirectory || path.resolve(appDirectory, API_DIR);
         const sharedDir = sharedDirectory || path.resolve(appDirectory, SHARED_DIR);
         const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
         const sourceDirs = [];
-        if (fs.existsSync(apiDir)) {
+        if (await fs.pathExists(apiDir)) {
           sourceDirs.push(apiDir);
         }
-        if (fs.existsSync(sharedDir)) {
+        if (await fs.pathExists(sharedDir)) {
           sourceDirs.push(sharedDir);
         }
         const { server } = modernConfig;
@@ -129,7 +118,8 @@ const bffPlugin = () => ({
           }, {
             sourceDirs,
             distDir,
-            tsconfigPath
+            tsconfigPath,
+            moduleType
           });
         }
       }

package/dist/esm-node/server.js

@@ -30,7 +30,7 @@ var server_default = () => ({
         const root = isProd() ? distDirectory : appDirectory;
         const apiPath = path.resolve(root || process.cwd(), API_DIR);
         apiAppPath = path.resolve(apiPath, API_APP_NAME);
-        const apiMod = requireExistModule(apiAppPath);
+        const apiMod = await requireExistModule(apiAppPath);
         if (apiMod && typeof apiMod === "function") {
           apiMod(transformAPI);
         }
@@ -82,10 +82,10 @@ var server_default = () => ({
           });
         }
       },
-      reset({ event }) {
+      async reset({ event }) {
         storage.reset();
         const appContext = api.useAppContext();
-        const newApiModule = requireExistModule(apiAppPath);
+        const newApiModule = await requireExistModule(apiAppPath);
         if (newApiModule && typeof newApiModule === "function") {
           newApiModule(transformAPI);
         }
@@ -95,7 +95,7 @@ var server_default = () => ({
           apiMiddlewares: middlewares
         });
         if (event.type === "file-change") {
-          const apiHandlerInfos = apiRouter.getApiHandlers();
+          const apiHandlerInfos = await apiRouter.getApiHandlers();
           const appContext2 = api.useAppContext();
           api.setAppContext({
             ...appContext2,
@@ -103,7 +103,7 @@ var server_default = () => ({
           });
         }
       },
-      prepareApiServer(props, next) {
+      async prepareApiServer(props, next) {
         const { pwd, prefix, httpMethodDecider } = props;
         const apiDir = path.resolve(pwd, API_DIR);
         const appContext = api.useAppContext();
@@ -116,7 +116,7 @@ var server_default = () => ({
           httpMethodDecider
         });
         const apiMode = apiRouter.getApiMode();
-        const apiHandlerInfos = apiRouter.getApiHandlers();
+        const apiHandlerInfos = await apiRouter.getApiHandlers();
         api.setAppContext({
           ...appContext,
           apiRouter,

package/dist/types/server.d.ts

@@ -1,3 +1,3 @@
-import { type ServerPlugin } from '@modern-js/server-core';
+import type { ServerPlugin } from '@modern-js/server-core';
 declare const _default: () => ServerPlugin;
 export default _default;

package/package.json

@@ -15,12 +15,13 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.1",
+  "version": "2.58.2",
   "jsnext:source": "./src/cli.ts",
   "types": "./dist/types/cli.d.ts",
   "main": "./dist/cjs/cli.js",
   "module": "./dist/esm/cli.js",
   "exports": {
+    "./types": "./types.d.ts",
     ".": {
       "types": "./dist/types/cli.d.ts",
       "jsnext:source": "./src/cli.ts",
@@ -58,11 +59,11 @@
   "dependencies": {
     "@babel/core": "^7.24.7",
     "@swc/helpers": "0.5.3",
-    "@modern-js/bff-core": "2.58.1",
-    "@modern-js/create-request": "2.58.1",
-    "@modern-js/server-utils": "2.58.1",
-    "@modern-js/server-core": "2.58.1",
-    "@modern-js/utils": "2.58.1"
+    "@modern-js/bff-core": "2.58.2",
+    "@modern-js/create-request": "2.58.2",
+    "@modern-js/server-core": "2.58.2",
+    "@modern-js/utils": "2.58.2",
+    "@modern-js/server-utils": "2.58.2"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -73,13 +74,13 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.93.0",
-    "@modern-js/app-tools": "2.58.1",
-    "@modern-js/core": "2.58.1",
-    "@modern-js/bff-runtime": "2.58.1",
-    "@modern-js/runtime": "2.58.1",
-    "@modern-js/types": "2.58.1",
-    "@scripts/build": "2.58.1",
-    "@scripts/jest-config": "2.58.1"
+    "@modern-js/bff-runtime": "2.58.2",
+    "@modern-js/app-tools": "2.58.2",
+    "@modern-js/core": "2.58.2",
+    "@modern-js/types": "2.58.2",
+    "@scripts/build": "2.58.2",
+    "@modern-js/runtime": "2.58.2",
+    "@scripts/jest-config": "2.58.2"
   },
   "sideEffects": false,
   "publishConfig": {