@modern-js/plugin-bff 1.15.0 → 1.16.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @modern-js/plugin-bff
 
+## 1.16.0
+
+### Minor Changes
+
+- 020b9bd52: feat: support frame mode without lambda directories
+  feat: 支持无 lambda 目录的框架模式
+
+### Patch Changes
+
+- Updated dependencies [641592f52]
+- Updated dependencies [3904b30a5]
+- Updated dependencies [1100dd58c]
+- Updated dependencies [e04e6e76a]
+- Updated dependencies [81c66e4a4]
+- Updated dependencies [2c305b6f5]
+- Updated dependencies [020b9bd52]
+  - @modern-js/utils@1.16.0
+  - @modern-js/create-request@1.16.0
+  - @modern-js/server-utils@1.16.0
+  - @modern-js/bff-core@1.16.0
+  - @modern-js/babel-compiler@1.16.0
+
 ## 1.15.0
 
 ### Patch Changes

package/dist/js/modern/cli.js

@@ -2,6 +2,7 @@ import path from 'path';
 import { compiler } from '@modern-js/babel-compiler';
 import { fs, API_DIR, PLUGIN_SCHEMAS, normalizeOutputPath, SHARED_DIR, isProd } from '@modern-js/utils';
 import { resolveBabelConfig } 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';
@@ -75,10 +76,18 @@ export default (() => ({
               const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || DEFAULT_API_PREFIX;
               const rootDir = path.resolve(appDirectory, API_DIR);
               chain.resolve.alias.set('@api', rootDir);
-              const apiRegexp = new RegExp(normalizeOutputPath(`${appDirectory}${path.sep}api${path.sep}.*(.[tj]s)$`));
+              const apiRouter = new ApiRouter({
+                apiDir: rootDir,
+                prefix
+              });
+              const lambdaDir = apiRouter.getLambdaDir();
+              const existLambda = apiRouter.isExistLambda();
+              const apiRegexp = new RegExp(normalizeOutputPath(`${rootDir}${path.sep}.*(.[tj]s)$`));
               chain.module.rule(CHAIN_ID.RULE.LOADERS).oneOf(CHAIN_ID.ONE_OF.BFF_CLIENT).before(CHAIN_ID.ONE_OF.FALLBACK).test(apiRegexp).use('custom-loader').loader(require.resolve("./loader").replace(/\\/g, '/')).options({
                 prefix,
                 apiDir: rootDir,
+                lambdaDir,
+                existLambda,
                 port,
                 fetcher,
                 target: name,

package/dist/js/modern/loader.js

@@ -1,4 +1,5 @@
 import { generateClient } from '@modern-js/bff-core';
+import { logger } from '@modern-js/utils';
 
 async function loader(source) {
   // eslint-disable-next-line @babel/no-invalid-this
@@ -6,16 +7,36 @@ async function loader(source) {
 
   const callback = this.async(); // eslint-disable-next-line @babel/no-invalid-this
 
-  const draftOptions = this.getOptions();
+  const draftOptions = this.getOptions(); // eslint-disable-next-line @babel/no-invalid-this
+
+  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,
-    // eslint-disable-next-line @babel/no-invalid-this
-    resourcePath: this.resourcePath
+    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;

package/dist/js/node/cli.js

@@ -13,6 +13,8 @@ var _utils = require("@modern-js/utils");
 
 var _serverUtils = require("@modern-js/server-utils");
 
+var _bffCore = require("@modern-js/bff-core");
+
 var _helper = require("./helper");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -93,10 +95,18 @@ var _default = () => ({
               const rootDir = _path.default.resolve(appDirectory, _utils.API_DIR);
 
               chain.resolve.alias.set('@api', rootDir);
-              const apiRegexp = new RegExp((0, _utils.normalizeOutputPath)(`${appDirectory}${_path.default.sep}api${_path.default.sep}.*(.[tj]s)$`));
+              const apiRouter = new _bffCore.ApiRouter({
+                apiDir: rootDir,
+                prefix
+              });
+              const lambdaDir = apiRouter.getLambdaDir();
+              const existLambda = apiRouter.isExistLambda();
+              const apiRegexp = new RegExp((0, _utils.normalizeOutputPath)(`${rootDir}${_path.default.sep}.*(.[tj]s)$`));
               chain.module.rule(CHAIN_ID.RULE.LOADERS).oneOf(CHAIN_ID.ONE_OF.BFF_CLIENT).before(CHAIN_ID.ONE_OF.FALLBACK).test(apiRegexp).use('custom-loader').loader(require.resolve("./loader").replace(/\\/g, '/')).options({
                 prefix,
                 apiDir: rootDir,
+                lambdaDir,
+                existLambda,
                 port,
                 fetcher,
                 target: name,

package/dist/js/node/loader.js

@@ -7,22 +7,46 @@ exports.default = void 0;
 
 var _bffCore = require("@modern-js/bff-core");
 
+var _utils = require("@modern-js/utils");
+
 async function loader(source) {
   // eslint-disable-next-line @babel/no-invalid-this
   this.cacheable(); // eslint-disable-next-line @babel/no-invalid-this
 
   const callback = this.async(); // eslint-disable-next-line @babel/no-invalid-this
 
-  const draftOptions = this.getOptions();
+  const draftOptions = this.getOptions(); // eslint-disable-next-line @babel/no-invalid-this
+
+  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) {
+    _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,
-    // eslint-disable-next-line @babel/no-invalid-this
-    resourcePath: this.resourcePath
+    resourcePath
   };
+  const {
+    lambdaDir
+  } = draftOptions;
+
+  if (!resourcePath.startsWith(lambdaDir)) {
+    _utils.logger.warn(warning);
+
+    callback(null, `throw new Error('${warning}')`);
+    return;
+  }
 
   if (draftOptions.fetcher) {
     options.fetcher = draftOptions.fetcher;

package/dist/js/treeshaking/cli.js

@@ -5,6 +5,7 @@ import path from 'path';
 import { compiler } from '@modern-js/babel-compiler';
 import { fs, API_DIR, PLUGIN_SCHEMAS, normalizeOutputPath, SHARED_DIR, isProd } from '@modern-js/utils';
 import { resolveBabelConfig } 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';
@@ -123,10 +124,18 @@ export default (function () {
                 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 apiRegexp = new RegExp(normalizeOutputPath("".concat(appDirectory).concat(path.sep, "api").concat(path.sep, ".*(.[tj]s)$")));
+                var apiRouter = new ApiRouter({
+                  apiDir: rootDir,
+                  prefix: prefix
+                });
+                var lambdaDir = apiRouter.getLambdaDir();
+                var existLambda = apiRouter.isExistLambda();
+                var apiRegexp = new RegExp(normalizeOutputPath("".concat(rootDir).concat(path.sep, ".*(.[tj]s)$")));
                 chain.module.rule(CHAIN_ID.RULE.LOADERS).oneOf(CHAIN_ID.ONE_OF.BFF_CLIENT).before(CHAIN_ID.ONE_OF.FALLBACK).test(apiRegexp).use('custom-loader').loader(require.resolve("./loader").replace(/\\/g, '/')).options({
                   prefix: prefix,
                   apiDir: rootDir,
+                  lambdaDir: lambdaDir,
+                  existLambda: existLambda,
                   port: port,
                   fetcher: fetcher,
                   target: name,

package/dist/js/treeshaking/loader.js

@@ -1,6 +1,7 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { generateClient } from '@modern-js/bff-core';
+import { logger } from '@modern-js/utils';
 
 function loader(_x) {
   return _loader.apply(this, arguments);
@@ -8,7 +9,7 @@ function loader(_x) {
 
 function _loader() {
   _loader = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(source) {
-    var callback, draftOptions, options, result;
+    var callback, draftOptions, resourcePath, warning, options, lambdaDir, result;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -18,17 +19,41 @@ function _loader() {
 
             callback = this.async(); // eslint-disable-next-line @babel/no-invalid-this
 
-            draftOptions = this.getOptions();
+            draftOptions = this.getOptions(); // eslint-disable-next-line @babel/no-invalid-this
+
+            resourcePath = this.resourcePath;
+            warning = "The file ".concat(resourcePath, " is not allowd to be imported in src directory, only API definition files are allowed.");
+
+            if (draftOptions.existLambda) {
+              _context.next = 9;
+              break;
+            }
+
+            logger.warn(warning);
+            callback(null, "throw new Error('".concat(warning, "')"));
+            return _context.abrupt("return");
+
+          case 9:
             options = {
               prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
               apiDir: draftOptions.apiDir,
               target: draftOptions.target,
               port: Number(draftOptions.port),
               source: source,
-              // eslint-disable-next-line @babel/no-invalid-this
-              resourcePath: this.resourcePath
+              resourcePath: resourcePath
             };
+            lambdaDir = draftOptions.lambdaDir;
+
+            if (resourcePath.startsWith(lambdaDir)) {
+              _context.next = 15;
+              break;
+            }
 
+            logger.warn(warning);
+            callback(null, "throw new Error('".concat(warning, "')"));
+            return _context.abrupt("return");
+
+          case 15:
             if (draftOptions.fetcher) {
               options.fetcher = draftOptions.fetcher;
             }
@@ -38,10 +63,10 @@ function _loader() {
             }
 
             options.requireResolve = require.resolve;
-            _context.next = 9;
+            _context.next = 20;
             return generateClient(options);
 
-          case 9:
+          case 20:
             result = _context.sent;
 
             if (result.isOk) {
@@ -50,7 +75,7 @@ function _loader() {
               callback(undefined, "throw new Error('".concat(result.value, "')"));
             }
 
-          case 11:
+          case 22:
           case "end":
             return _context.stop();
         }

package/dist/types/loader.d.ts

@@ -2,6 +2,8 @@ import type { LoaderContext } from 'webpack';
 export declare type APILoaderOptions = {
   prefix: string;
   apiDir: string;
+  lambdaDir: string;
+  existLambda: boolean;
   port: number;
   fetcher?: string;
   requestCreator?: string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.15.0",
+  "version": "1.16.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -55,18 +55,18 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "1.15.0",
-    "@modern-js/bff-core": "1.15.0",
-    "@modern-js/create-request": "1.15.0",
-    "@modern-js/server-utils": "1.15.0",
-    "@modern-js/utils": "1.15.0"
+    "@modern-js/babel-compiler": "1.16.0",
+    "@modern-js/bff-core": "1.16.0",
+    "@modern-js/create-request": "1.16.0",
+    "@modern-js/server-utils": "1.16.0",
+    "@modern-js/utils": "1.16.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.15.0",
-    "@modern-js/bff-runtime": "1.15.0",
-    "@modern-js/runtime": "1.15.0",
-    "@modern-js/server-core": "1.15.0",
-    "@modern-js/types": "1.15.0",
+    "@modern-js/core": "1.16.0",
+    "@modern-js/bff-runtime": "1.16.0",
+    "@modern-js/runtime": "1.16.0",
+    "@modern-js/server-core": "1.16.0",
+    "@modern-js/types": "1.16.0",
     "@scripts/build": "1.15.0",
     "@scripts/jest-config": "1.15.0",
     "@types/babel__core": "^7.1.15",