@modern-js/plugin-bff 2.6.0 → 2.7.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @modern-js/plugin-bff
 
+## 2.7.0
+
+### Minor Changes
+
+- 84bfb439b8: feat: support custom apiDir, lambdaDir and style of writing for bff
+  feat: 支持定制 api 目录，lambda 目录，bff 的写法
+
+### Patch Changes
+
+- 7bb1554194: fix: remove process.env.PORT from the bff generate client code
+  fix: 从 bff 的 generate client code 中移除 process.env.PORT
+- 1eea234fdd: chore: make test files naming consistent
+
+  chore: 统一测试文件命名为小驼峰格式
+
+- Updated dependencies [0f15fc597c]
+- Updated dependencies [dcad887024]
+- Updated dependencies [a4672f7c16]
+- Updated dependencies [7bb1554194]
+- Updated dependencies [7fff9020e1]
+- Updated dependencies [1eea234fdd]
+- Updated dependencies [84bfb439b8]
+  - @modern-js/utils@2.7.0
+  - @modern-js/bff-core@2.7.0
+  - @modern-js/server-utils@2.7.0
+  - @modern-js/create-request@2.7.0
+
 ## 2.6.0
 
 ### Patch Changes

package/dist/cjs/cli.js

@@ -48,30 +48,34 @@ var cli_default = () => ({
       config() {
         return {
           tools: {
-            webpackChain: (chain, { name, CHAIN_ID }) => {
-              const { appDirectory, port } = api.useAppContext();
+            webpackChain: (chain, { CHAIN_ID, isServer }) => {
+              const { port, apiDirectory, lambdaDirectory } = api.useAppContext();
               const modernConfig = api.useResolvedConfigContext();
               const { bff } = modernConfig || {};
               const prefix = (bff == null ? void 0 : bff.prefix) || DEFAULT_API_PREFIX;
-              const rootDir = import_path.default.resolve(appDirectory, import_utils.API_DIR);
-              chain.resolve.alias.set("@api", rootDir);
+              const httpMethodDecider = bff == null ? void 0 : bff.httpMethodDecider;
+              chain.resolve.alias.set("@api", apiDirectory);
               const apiRouter = new import_bff_core.ApiRouter({
-                apiDir: rootDir,
-                prefix
+                apiDir: apiDirectory,
+                lambdaDir: lambdaDirectory,
+                prefix,
+                httpMethodDecider
               });
               const lambdaDir = apiRouter.getLambdaDir();
               const existLambda = apiRouter.isExistLambda();
               const apiRegexp = new RegExp(
-                (0, import_utils.normalizeOutputPath)(`${rootDir}${import_path.default.sep}.*(.[tj]s)$`)
+                (0, import_utils.normalizeOutputPath)(`${apiDirectory}${import_path.default.sep}.*(.[tj]s)$`)
               );
+              const name = isServer ? "server" : "client";
               chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(apiRegexp);
               chain.module.rule(CHAIN_ID.RULE.JS_BFF_API).test(apiRegexp).use("custom-loader").loader(require.resolve("./loader").replace(/\\/g, "/")).options({
                 prefix,
-                apiDir: rootDir,
+                apiDir: apiDirectory,
                 lambdaDir,
                 existLambda,
                 port,
-                target: name
+                target: name,
+                httpMethodDecider
               });
             }
           },
@@ -96,7 +100,6 @@ var cli_default = () => ({
           entryPath: "",
           isSPA: false,
           isSSR: false
-          // FIXME: })) as IAppContext[`serverRoutes`];
         }));
         if (bff == null ? void 0 : bff.enableHandleWeb) {
           return {
@@ -126,11 +129,11 @@ var cli_default = () => ({
         if (unRegisterResolveRuntimePath) {
           unRegisterResolveRuntimePath();
         }
-        const { appDirectory, distDirectory } = api.useAppContext();
+        const { appDirectory, distDirectory, apiDirectory, sharedDirectory } = 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 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)) {

package/dist/cjs/loader.js

@@ -36,10 +36,12 @@ async function loader(source) {
   const options = {
     prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
     apiDir: draftOptions.apiDir,
+    lambdaDir: draftOptions.lambdaDir,
     target: draftOptions.target,
     port: Number(draftOptions.port),
     source,
-    resourcePath
+    resourcePath,
+    httpMethodDecider: draftOptions.httpMethodDecider
   };
   const { lambdaDir } = draftOptions;
   if (!resourcePath.startsWith(lambdaDir)) {

package/dist/cjs/server.js

@@ -77,12 +77,15 @@ var server_default = () => ({
         });
       },
       prepareApiServer(props, next) {
-        const { pwd, prefix } = props;
+        const { pwd, prefix, httpMethodDecider } = props;
         const apiDir = import_path.default.resolve(pwd, import_utils.API_DIR);
         const appContext = api.useAppContext();
+        const { apiDirectory, lambdaDirectory } = appContext;
         const apiRouter = new import_bff_core.ApiRouter({
-          apiDir,
-          prefix
+          apiDir: apiDirectory || apiDir,
+          lambdaDir: lambdaDirectory,
+          prefix,
+          httpMethodDecider
         });
         const apiMode = apiRouter.getApiMode();
         const apiHandlerInfos = apiRouter.getApiHandlers();

package/dist/esm/cli.js

@@ -219,28 +219,32 @@ var cli_default = function() {
                     return {
                         tools: {
                             webpackChain: function(chain, param) {
-                                var name = param.name, CHAIN_ID = param.CHAIN_ID;
-                                var _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, port = _api_useAppContext.port;
+                                var CHAIN_ID = param.CHAIN_ID, isServer = param.isServer;
+                                var _api_useAppContext = api.useAppContext(), port = _api_useAppContext.port, apiDirectory = _api_useAppContext.apiDirectory, lambdaDirectory = _api_useAppContext.lambdaDirectory;
                                 var modernConfig = api.useResolvedConfigContext();
                                 var bff = (modernConfig || {}).bff;
                                 var prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || DEFAULT_API_PREFIX;
-                                var rootDir = path.resolve(appDirectory, API_DIR);
-                                chain.resolve.alias.set("@api", rootDir);
+                                var httpMethodDecider = bff === null || bff === void 0 ? void 0 : bff.httpMethodDecider;
+                                chain.resolve.alias.set("@api", apiDirectory);
                                 var apiRouter = new ApiRouter({
-                                    apiDir: rootDir,
-                                    prefix: prefix
+                                    apiDir: apiDirectory,
+                                    lambdaDir: lambdaDirectory,
+                                    prefix: prefix,
+                                    httpMethodDecider: httpMethodDecider
                                 });
                                 var lambdaDir = apiRouter.getLambdaDir();
                                 var existLambda = apiRouter.isExistLambda();
-                                var apiRegexp = new RegExp(normalizeOutputPath("".concat(rootDir).concat(path.sep, ".*(.[tj]s)$")));
+                                var apiRegexp = new RegExp(normalizeOutputPath("".concat(apiDirectory).concat(path.sep, ".*(.[tj]s)$")));
+                                var name = isServer ? "server" : "client";
                                 chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(apiRegexp);
                                 chain.module.rule(CHAIN_ID.RULE.JS_BFF_API).test(apiRegexp).use("custom-loader").loader(require.resolve("./loader").replace(/\\/g, "/")).options({
                                     prefix: prefix,
-                                    apiDir: rootDir,
+                                    apiDir: apiDirectory,
                                     lambdaDir: lambdaDir,
                                     existLambda: existLambda,
                                     port: port,
-                                    target: name
+                                    target: name,
+                                    httpMethodDecider: httpMethodDecider
                                 });
                             }
                         },
@@ -311,18 +315,18 @@ var cli_default = function() {
                 },
                 afterBuild: function afterBuild() {
                     return _asyncToGenerator(function() {
-                        var _api_useAppContext, appDirectory, distDirectory, modernConfig, distDir, apiDir, sharedDir, tsconfigPath, sourceDirs, server, _modernConfig_source, alias, define, globalVars, babel;
+                        var _api_useAppContext, appDirectory, distDirectory, apiDirectory, sharedDirectory, 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();
                                     }
-                                    _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, distDirectory = _api_useAppContext.distDirectory;
+                                    _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, distDirectory = _api_useAppContext.distDirectory, apiDirectory = _api_useAppContext.apiDirectory, sharedDirectory = _api_useAppContext.sharedDirectory;
                                     modernConfig = api.useResolvedConfigContext();
                                     distDir = path.resolve(distDirectory);
-                                    apiDir = path.resolve(appDirectory, API_DIR);
-                                    sharedDir = path.resolve(appDirectory, SHARED_DIR);
+                                    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)) {

package/dist/esm/loader.js

@@ -148,10 +148,12 @@ function _loader() {
                     options = {
                         prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
                         apiDir: draftOptions.apiDir,
+                        lambdaDir: draftOptions.lambdaDir,
                         target: draftOptions.target,
                         port: Number(draftOptions.port),
                         source: source,
-                        resourcePath: resourcePath
+                        resourcePath: resourcePath,
+                        httpMethodDecider: draftOptions.httpMethodDecider
                     };
                     lambdaDir = draftOptions.lambdaDir;
                     if (!resourcePath.startsWith(lambdaDir)) {

package/dist/esm/server.js

@@ -128,12 +128,15 @@ var server_default = function() {
                     });
                 },
                 prepareApiServer: function prepareApiServer(props, next) {
-                    var pwd = props.pwd, prefix = props.prefix;
+                    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;
                     var apiRouter = new ApiRouter({
-                        apiDir: apiDir,
-                        prefix: prefix
+                        apiDir: apiDirectory || apiDir,
+                        lambdaDir: lambdaDirectory,
+                        prefix: prefix,
+                        httpMethodDecider: httpMethodDecider
                     });
                     var apiMode = apiRouter.getApiMode();
                     var apiHandlerInfos = apiRouter.getApiHandlers();

package/dist/esm-node/cli.js

@@ -23,30 +23,34 @@ var cli_default = () => ({
       config() {
         return {
           tools: {
-            webpackChain: (chain, { name, CHAIN_ID }) => {
-              const { appDirectory, port } = api.useAppContext();
+            webpackChain: (chain, { CHAIN_ID, isServer }) => {
+              const { port, apiDirectory, lambdaDirectory } = api.useAppContext();
               const modernConfig = api.useResolvedConfigContext();
               const { bff } = modernConfig || {};
               const prefix = (bff == null ? void 0 : bff.prefix) || DEFAULT_API_PREFIX;
-              const rootDir = path.resolve(appDirectory, API_DIR);
-              chain.resolve.alias.set("@api", rootDir);
+              const httpMethodDecider = bff == null ? void 0 : bff.httpMethodDecider;
+              chain.resolve.alias.set("@api", apiDirectory);
               const apiRouter = new ApiRouter({
-                apiDir: rootDir,
-                prefix
+                apiDir: apiDirectory,
+                lambdaDir: lambdaDirectory,
+                prefix,
+                httpMethodDecider
               });
               const lambdaDir = apiRouter.getLambdaDir();
               const existLambda = apiRouter.isExistLambda();
               const apiRegexp = new RegExp(
-                normalizeOutputPath(`${rootDir}${path.sep}.*(.[tj]s)$`)
+                normalizeOutputPath(`${apiDirectory}${path.sep}.*(.[tj]s)$`)
               );
+              const name = isServer ? "server" : "client";
               chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(apiRegexp);
               chain.module.rule(CHAIN_ID.RULE.JS_BFF_API).test(apiRegexp).use("custom-loader").loader(require.resolve("./loader").replace(/\\/g, "/")).options({
                 prefix,
-                apiDir: rootDir,
+                apiDir: apiDirectory,
                 lambdaDir,
                 existLambda,
                 port,
-                target: name
+                target: name,
+                httpMethodDecider
               });
             }
           },
@@ -71,7 +75,6 @@ var cli_default = () => ({
           entryPath: "",
           isSPA: false,
           isSSR: false
-          // FIXME: })) as IAppContext[`serverRoutes`];
         }));
         if (bff == null ? void 0 : bff.enableHandleWeb) {
           return {
@@ -101,11 +104,11 @@ var cli_default = () => ({
         if (unRegisterResolveRuntimePath) {
           unRegisterResolveRuntimePath();
         }
-        const { appDirectory, distDirectory } = api.useAppContext();
+        const { appDirectory, distDirectory, apiDirectory, sharedDirectory } = 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 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)) {

package/dist/esm-node/loader.js

@@ -14,10 +14,12 @@ async function loader(source) {
   const options = {
     prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
     apiDir: draftOptions.apiDir,
+    lambdaDir: draftOptions.lambdaDir,
     target: draftOptions.target,
     port: Number(draftOptions.port),
     source,
-    resourcePath
+    resourcePath,
+    httpMethodDecider: draftOptions.httpMethodDecider
   };
   const { lambdaDir } = draftOptions;
   if (!resourcePath.startsWith(lambdaDir)) {

package/dist/esm-node/server.js

@@ -45,12 +45,15 @@ var server_default = () => ({
         });
       },
       prepareApiServer(props, next) {
-        const { pwd, prefix } = props;
+        const { pwd, prefix, httpMethodDecider } = props;
         const apiDir = path.resolve(pwd, API_DIR);
         const appContext = api.useAppContext();
+        const { apiDirectory, lambdaDirectory } = appContext;
         const apiRouter = new ApiRouter({
-          apiDir,
-          prefix
+          apiDir: apiDirectory || apiDir,
+          lambdaDir: lambdaDirectory,
+          prefix,
+          httpMethodDecider
         });
         const apiMode = apiRouter.getApiMode();
         const apiHandlerInfos = apiRouter.getApiHandlers();

package/dist/types/loader.d.ts

@@ -1,3 +1,4 @@
+import type { HttpMethodDecider } from '@modern-js/types';
 import type { LoaderContext } from 'webpack';
 export type APILoaderOptions = {
   prefix: string;
@@ -8,6 +9,7 @@ export type APILoaderOptions = {
   fetcher?: string;
   requestCreator?: string;
   target: string;
+  httpMethodDecider?: HttpMethodDecider;
 };
 declare function loader(this: LoaderContext<APILoaderOptions>, source: string): Promise<void>;
 export default loader;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.6.0",
+  "version": "2.7.0",
   "jsnext:source": "./src/cli.ts",
   "types": "./dist/types/cli.d.ts",
   "main": "./dist/cjs/cli.js",
@@ -50,10 +50,10 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/bff-core": "2.6.0",
-    "@modern-js/create-request": "2.6.0",
-    "@modern-js/server-utils": "2.6.0",
-    "@modern-js/utils": "2.6.0"
+    "@modern-js/bff-core": "2.7.0",
+    "@modern-js/create-request": "2.7.0",
+    "@modern-js/server-utils": "2.7.0",
+    "@modern-js/utils": "2.7.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -65,14 +65,14 @@
     "typescript": "^4",
     "webpack": "^5.75.0",
     "webpack-chain": "^6.5.1",
-    "@modern-js/runtime": "2.6.0",
-    "@modern-js/core": "2.6.0",
-    "@modern-js/bff-runtime": "2.6.0",
-    "@modern-js/server-core": "2.6.0",
-    "@modern-js/types": "2.6.0",
-    "@modern-js/app-tools": "2.6.0",
-    "@scripts/build": "2.6.0",
-    "@scripts/jest-config": "2.6.0"
+    "@modern-js/runtime": "2.7.0",
+    "@modern-js/core": "2.7.0",
+    "@modern-js/bff-runtime": "2.7.0",
+    "@modern-js/server-core": "2.7.0",
+    "@modern-js/types": "2.7.0",
+    "@modern-js/app-tools": "2.7.0",
+    "@scripts/build": "2.7.0",
+    "@scripts/jest-config": "2.7.0"
   },
   "sideEffects": false,
   "publishConfig": {