@modern-js/plugin-bff 1.15.1-beta.0 → 1.17.0

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @modern-js/plugin-bff
 
+## 1.17.0
+
+### Patch Changes
+
+- Updated dependencies [1b9176f]
+- Updated dependencies [77d3a38]
+- Updated dependencies [151329d]
+- Updated dependencies [5af9472]
+- Updated dependencies [6b6a534]
+- Updated dependencies [6b43a2b]
+- Updated dependencies [a7be124]
+- Updated dependencies [31547b4]
+  - @modern-js/utils@1.17.0
+  - @modern-js/bff-core@1.17.0
+  - @modern-js/create-request@1.17.0
+  - @modern-js/server-utils@1.17.0
+  - @modern-js/babel-compiler@1.17.0
+
+## 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

@@ -1,48 +1,50 @@
 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 { compile } from '@modern-js/server-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';
-const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs']; // const compile = async (
-//   appDirectory: string,
-//   modernConfig: NormalizedConfig,
-//   compileOptions: CompileOptions,
-// ) => {
-//   const { patterns } = compileOptions;
-//   const results = await Promise.all(
-//     patterns.map(async pattern => {
-//       const { from, to, tsconfigPath } = pattern;
-//       const babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
-//         tsconfigPath: tsconfigPath ? tsconfigPath : '',
-//         syntax: 'es6+',
-//         type: 'commonjs',
-//       });
-//       if (await fs.pathExists(from)) {
-//         const basename = path.basename(from);
-//         const targetDir = path.join(to, basename);
-//         await fs.copy(from, targetDir, {
-//           filter: src =>
-//             !['.ts', '.js'].includes(path.extname(src)) && src !== tsconfigPath,
-//         });
-//       }
-//       return compiler(
-//         {
-//           rootDir: appDirectory,
-//           distDir: to,
-//           sourceDir: from,
-//           extensions: FILE_EXTENSIONS,
-//         },
-//         babelConfig,
-//       );
-//     }),
-//   );
-//   results.forEach(result => {
-//     if (result.code === 1) {
-//       throw new Error(result.message);
-//     }
-//   });
-// };
+const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs']; // TODO: 封装服务端编译函数
+
+const compile = async (appDirectory, modernConfig, compileOptions) => {
+  const {
+    patterns
+  } = compileOptions;
+  const results = await Promise.all(patterns.map(async pattern => {
+    const {
+      from,
+      to,
+      tsconfigPath
+    } = pattern;
+    const babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
+      tsconfigPath: tsconfigPath ? tsconfigPath : '',
+      syntax: 'es6+',
+      type: 'commonjs'
+    });
+
+    if (await fs.pathExists(from)) {
+      const basename = path.basename(from);
+      const targetDir = path.join(to, basename);
+      await fs.copy(from, targetDir, {
+        filter: src => !['.ts', '.js'].includes(path.extname(src)) && src !== tsconfigPath
+      });
+    }
+
+    return compiler({
+      rootDir: appDirectory,
+      distDir: to,
+      sourceDir: from,
+      extensions: FILE_EXTENSIONS
+    }, babelConfig);
+  }));
+  results.forEach(result => {
+    if (result.code === 1) {
+      throw new Error(result.message);
+    }
+  });
+};
 
 export default (() => ({
   name: '@modern-js/plugin-bff',
@@ -74,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

@@ -7,55 +7,61 @@ exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
+var _babelCompiler = require("@modern-js/babel-compiler");
+
 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 }; }
 
 const DEFAULT_API_PREFIX = '/api';
 const TS_CONFIG_FILENAME = 'tsconfig.json';
-const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs']; // const compile = async (
-//   appDirectory: string,
-//   modernConfig: NormalizedConfig,
-//   compileOptions: CompileOptions,
-// ) => {
-//   const { patterns } = compileOptions;
-//   const results = await Promise.all(
-//     patterns.map(async pattern => {
-//       const { from, to, tsconfigPath } = pattern;
-//       const babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
-//         tsconfigPath: tsconfigPath ? tsconfigPath : '',
-//         syntax: 'es6+',
-//         type: 'commonjs',
-//       });
-//       if (await fs.pathExists(from)) {
-//         const basename = path.basename(from);
-//         const targetDir = path.join(to, basename);
-//         await fs.copy(from, targetDir, {
-//           filter: src =>
-//             !['.ts', '.js'].includes(path.extname(src)) && src !== tsconfigPath,
-//         });
-//       }
-//       return compiler(
-//         {
-//           rootDir: appDirectory,
-//           distDir: to,
-//           sourceDir: from,
-//           extensions: FILE_EXTENSIONS,
-//         },
-//         babelConfig,
-//       );
-//     }),
-//   );
-//   results.forEach(result => {
-//     if (result.code === 1) {
-//       throw new Error(result.message);
-//     }
-//   });
-// };
+const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs']; // TODO: 封装服务端编译函数
+
+const compile = async (appDirectory, modernConfig, compileOptions) => {
+  const {
+    patterns
+  } = compileOptions;
+  const results = await Promise.all(patterns.map(async pattern => {
+    const {
+      from,
+      to,
+      tsconfigPath
+    } = pattern;
+    const babelConfig = (0, _serverUtils.resolveBabelConfig)(appDirectory, modernConfig, {
+      tsconfigPath: tsconfigPath ? tsconfigPath : '',
+      syntax: 'es6+',
+      type: 'commonjs'
+    });
+
+    if (await _utils.fs.pathExists(from)) {
+      const basename = _path.default.basename(from);
+
+      const targetDir = _path.default.join(to, basename);
+
+      await _utils.fs.copy(from, targetDir, {
+        filter: src => !['.ts', '.js'].includes(_path.default.extname(src)) && src !== tsconfigPath
+      });
+    }
+
+    return (0, _babelCompiler.compiler)({
+      rootDir: appDirectory,
+      distDir: to,
+      sourceDir: from,
+      extensions: FILE_EXTENSIONS
+    }, babelConfig);
+  }));
+  results.forEach(result => {
+    if (result.code === 1) {
+      throw new Error(result.message);
+    }
+  });
+};
 
 var _default = () => ({
   name: '@modern-js/plugin-bff',
@@ -89,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,
@@ -183,7 +197,7 @@ var _default = () => ({
         }
 
         if (patterns.length > 0) {
-          await (0, _serverUtils.compile)(appDirectory, modernConfig, {
+          await compile(appDirectory, modernConfig, {
             patterns
           });
         }

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

@@ -1,51 +1,97 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 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 { compile } from '@modern-js/server-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';
-var FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs']; // const compile = async (
-//   appDirectory: string,
-//   modernConfig: NormalizedConfig,
-//   compileOptions: CompileOptions,
-// ) => {
-//   const { patterns } = compileOptions;
-//   const results = await Promise.all(
-//     patterns.map(async pattern => {
-//       const { from, to, tsconfigPath } = pattern;
-//       const babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
-//         tsconfigPath: tsconfigPath ? tsconfigPath : '',
-//         syntax: 'es6+',
-//         type: 'commonjs',
-//       });
-//       if (await fs.pathExists(from)) {
-//         const basename = path.basename(from);
-//         const targetDir = path.join(to, basename);
-//         await fs.copy(from, targetDir, {
-//           filter: src =>
-//             !['.ts', '.js'].includes(path.extname(src)) && src !== tsconfigPath,
-//         });
-//       }
-//       return compiler(
-//         {
-//           rootDir: appDirectory,
-//           distDir: to,
-//           sourceDir: from,
-//           extensions: FILE_EXTENSIONS,
-//         },
-//         babelConfig,
-//       );
-//     }),
-//   );
-//   results.forEach(result => {
-//     if (result.code === 1) {
-//       throw new Error(result.message);
-//     }
-//   });
-// };
+var FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs']; // TODO: 封装服务端编译函数
+
+var compile = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(appDirectory, modernConfig, compileOptions) {
+    var patterns, results;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            patterns = compileOptions.patterns;
+            _context2.next = 3;
+            return Promise.all(patterns.map( /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(pattern) {
+                var from, to, tsconfigPath, babelConfig, basename, targetDir;
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        from = pattern.from, to = pattern.to, tsconfigPath = pattern.tsconfigPath;
+                        babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
+                          tsconfigPath: tsconfigPath ? tsconfigPath : '',
+                          syntax: 'es6+',
+                          type: 'commonjs'
+                        });
+                        _context.next = 4;
+                        return fs.pathExists(from);
+
+                      case 4:
+                        if (!_context.sent) {
+                          _context.next = 9;
+                          break;
+                        }
+
+                        basename = path.basename(from);
+                        targetDir = path.join(to, basename);
+                        _context.next = 9;
+                        return fs.copy(from, targetDir, {
+                          filter: function filter(src) {
+                            return !['.ts', '.js'].includes(path.extname(src)) && src !== tsconfigPath;
+                          }
+                        });
+
+                      case 9:
+                        return _context.abrupt("return", compiler({
+                          rootDir: appDirectory,
+                          distDir: to,
+                          sourceDir: from,
+                          extensions: FILE_EXTENSIONS
+                        }, babelConfig));
+
+                      case 10:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee);
+              }));
+
+              return function (_x4) {
+                return _ref2.apply(this, arguments);
+              };
+            }()));
+
+          case 3:
+            results = _context2.sent;
+            results.forEach(function (result) {
+              if (result.code === 1) {
+                throw new Error(result.message);
+              }
+            });
+
+          case 5:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+
+  return function compile(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
+  };
+}();
 
 export default (function () {
   return {
@@ -59,9 +105,9 @@ export default (function () {
         config: function config() {
           return {
             tools: {
-              webpackChain: function webpackChain(chain, _ref) {
-                var name = _ref.name,
-                    CHAIN_ID = _ref.CHAIN_ID;
+              webpackChain: function webpackChain(chain, _ref3) {
+                var name = _ref3.name,
+                    CHAIN_ID = _ref3.CHAIN_ID;
 
                 var _api$useAppContext = api.useAppContext(),
                     appDirectory = _api$useAppContext.appDirectory,
@@ -69,19 +115,27 @@ export default (function () {
 
                 var modernConfig = api.useResolvedConfigContext();
 
-                var _ref2 = modernConfig || {},
-                    bff = _ref2.bff;
+                var _ref4 = modernConfig || {},
+                    bff = _ref4.bff;
 
-                var _ref3 = bff || {},
-                    fetcher = _ref3.fetcher;
+                var _ref5 = bff || {},
+                    fetcher = _ref5.fetcher;
 
                 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,
@@ -94,12 +148,12 @@ export default (function () {
             }
           };
         },
-        modifyServerRoutes: function modifyServerRoutes(_ref4) {
-          var routes = _ref4.routes;
+        modifyServerRoutes: function modifyServerRoutes(_ref6) {
+          var routes = _ref6.routes;
           var modernConfig = api.useResolvedConfigContext();
 
-          var _ref5 = modernConfig || {},
-              bff = _ref5.bff;
+          var _ref7 = modernConfig || {},
+              bff = _ref7.bff;
 
           var prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || '/api';
           var prefixList = [];
@@ -125,12 +179,12 @@ export default (function () {
           };
         },
         beforeBuild: function beforeBuild() {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
             var _api$useAppContext2, internalDirectory;
 
-            return _regeneratorRuntime().wrap(function _callee$(_context) {
+            return _regeneratorRuntime().wrap(function _callee3$(_context3) {
               while (1) {
-                switch (_context.prev = _context.next) {
+                switch (_context3.prev = _context3.next) {
                   case 0:
                     // help esbuild-register resolve @modern-js/server/runtime
                     if (isProd()) {
@@ -140,19 +194,19 @@ export default (function () {
 
                   case 1:
                   case "end":
-                    return _context.stop();
+                    return _context3.stop();
                 }
               }
-            }, _callee);
+            }, _callee3);
           }))();
         },
         afterBuild: function afterBuild() {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
             var _api$useAppContext3, appDirectory, distDirectory, modernConfig, distDir, apiDir, sharedDir, tsconfigPath, patterns;
 
-            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            return _regeneratorRuntime().wrap(function _callee4$(_context4) {
               while (1) {
-                switch (_context2.prev = _context2.next) {
+                switch (_context4.prev = _context4.next) {
                   case 0:
                     if (unRegisterResolveRuntimePath) {
                       unRegisterResolveRuntimePath();
@@ -183,21 +237,21 @@ export default (function () {
                     }
 
                     if (!(patterns.length > 0)) {
-                      _context2.next = 13;
+                      _context4.next = 13;
                       break;
                     }
 
-                    _context2.next = 13;
+                    _context4.next = 13;
                     return compile(appDirectory, modernConfig, {
                       patterns: patterns
                     });
 
                   case 13:
                   case "end":
-                    return _context2.stop();
+                    return _context4.stop();
                 }
               }
-            }, _callee2);
+            }, _callee4);
           }))();
         }
       };

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.1-beta.0",
+  "version": "1.17.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -55,20 +55,20 @@
   "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.1-beta.0",
-    "@modern-js/utils": "1.15.0"
+    "@modern-js/babel-compiler": "1.17.0",
+    "@modern-js/bff-core": "1.17.0",
+    "@modern-js/create-request": "1.17.0",
+    "@modern-js/server-utils": "1.17.0",
+    "@modern-js/utils": "1.17.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",
-    "@scripts/build": "1.15.0",
-    "@scripts/jest-config": "1.15.0",
+    "@modern-js/core": "1.17.0",
+    "@modern-js/bff-runtime": "1.17.0",
+    "@modern-js/runtime": "1.17.0",
+    "@modern-js/server-core": "1.17.0",
+    "@modern-js/types": "1.17.0",
+    "@scripts/build": "1.17.0",
+    "@scripts/jest-config": "1.17.0",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^27",
     "@types/node": "^14",
@@ -82,8 +82,7 @@
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "wireit": {
     "build": {