@modern-js/plugin-bff 1.21.5 → 2.0.0-beta.1

package/CHANGELOG.md

@@ -1,35 +1,65 @@
 # @modern-js/plugin-bff
 
-## 1.21.5
+## 2.0.0-beta.1
 
-### Patch Changes
-
-- Updated dependencies [4876aa7]
-  - @modern-js/bff-core@1.21.5
-  - @modern-js/create-request@1.21.5
-  - @modern-js/server-utils@1.21.5
-  - @modern-js/babel-compiler@1.21.5
-  - @modern-js/utils@1.21.5
+### Major Changes
 
-## 1.21.4
+- dda38c9: chore: v2
 
 ### Patch Changes
 
-- @modern-js/bff-core@1.21.4
-- @modern-js/create-request@1.21.4
-- @modern-js/server-utils@1.21.4
-- @modern-js/babel-compiler@1.21.4
-- @modern-js/utils@1.21.4
-
-## 1.21.3
+- 8ff2cf4c71: fix: bff api loader should run before babel loader
+  fix: bff 一体化调用的 loader 应该在 babel loader 前执行
+- Updated dependencies [9b915e0c10]
+- Updated dependencies [2344eb2]
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [a8642da]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/server-utils@2.0.0-beta.1
+  - @modern-js/bff-core@2.0.0-beta.1
+  - @modern-js/utils@2.0.0-beta.1
+  - @modern-js/create-request@2.0.0-beta.1
+  - @modern-js/babel-compiler@2.0.0-beta.1
+
+## 2.0.0-beta.0
+
+### Major Changes
+
+- dda38c9: chore: v2
 
 ### Patch Changes
 
-- @modern-js/bff-core@1.21.3
-- @modern-js/create-request@1.21.3
-- @modern-js/server-utils@1.21.3
-- @modern-js/babel-compiler@1.21.3
-- @modern-js/utils@1.21.3
+- 8ff2cf4: fix: bff api loader should run before babel loader
+  fix: bff 一体化调用的 loader 应该在 babel loader 前执行
+- Updated dependencies [9b915e0c1]
+- Updated dependencies [a2509bf]
+- Updated dependencies [edd1cfb1a]
+- Updated dependencies [cc971eabf]
+- Updated dependencies [5b9049f]
+- Updated dependencies [a8642da]
+- Updated dependencies [b8bbe036c]
+- Updated dependencies [d5a31df78]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be95]
+- Updated dependencies [14b712d]
+  - @modern-js/server-utils@2.0.0-beta.0
+  - @modern-js/bff-core@2.0.0-beta.0
+  - @modern-js/utils@2.0.0-beta.0
+  - @modern-js/create-request@2.0.0-beta.0
+  - @modern-js/babel-compiler@2.0.0-beta.0
 
 ## 1.21.2
 

package/dist/js/modern/cli.js

@@ -13,7 +13,6 @@ export default (() => ({
       validateSchema() {
         return PLUGIN_SCHEMAS['@modern-js/plugin-bff'];
       },
-
       config() {
         return {
           tools: {
@@ -42,7 +41,8 @@ export default (() => ({
               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({
+              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,
                 lambdaDir,
@@ -59,7 +59,6 @@ export default (() => ({
           }
         };
       },
-
       modifyServerRoutes({
         routes
       }) {
@@ -69,26 +68,24 @@ export default (() => ({
         } = modernConfig || {};
         const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || '/api';
         const prefixList = [];
-
         if (Array.isArray(prefix)) {
           prefixList.push(...prefix);
         } else {
           prefixList.push(prefix);
         }
-
         const apiServerRoutes = prefixList.map(pre => ({
           urlPath: pre,
           isApi: true,
           entryPath: '',
           isSPA: false,
-          isSSR: false // FIXME: })) as IAppContext[`serverRoutes`];
-
+          isSSR: false
+          // FIXME: })) as IAppContext[`serverRoutes`];
         }));
+
         return {
           routes: routes.concat(apiServerRoutes)
         };
       },
-
       async beforeBuild() {
         // help esbuild-register resolve @modern-js/server/runtime
         if (isProd()) {
@@ -98,12 +95,10 @@ export default (() => ({
           unRegisterResolveRuntimePath = registerModernRuntimePath(internalDirectory);
         }
       },
-
       async afterBuild() {
         if (unRegisterResolveRuntimePath) {
           unRegisterResolveRuntimePath();
         }
-
         const {
           appDirectory,
           distDirectory
@@ -114,15 +109,12 @@ export default (() => ({
         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;
@@ -134,7 +126,6 @@ export default (() => ({
         const {
           babel
         } = modernConfig.tools;
-
         if (sourceDirs.length > 0) {
           await compile(appDirectory, {
             server,
@@ -149,7 +140,6 @@ export default (() => ({
           });
         }
       }
-
     };
   }
 }));

package/dist/js/modern/helper.js

@@ -2,7 +2,6 @@ import * as path from 'path';
 import { registerPaths } from '@modern-js/bff-core';
 const serverRuntimeAlias = '@modern-js/runtime/server';
 const serverRuntimePath = '.runtime-exports/server';
-
 const registerModernRuntimePath = internalDirectory => {
   const paths = {
     [serverRuntimeAlias]: path.join(internalDirectory, serverRuntimePath)
@@ -10,5 +9,4 @@ const registerModernRuntimePath = internalDirectory => {
   const unRegister = registerPaths(paths);
   return unRegister;
 };
-
 export { registerModernRuntimePath };

package/dist/js/modern/loader.js

@@ -1,25 +1,23 @@
 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
-  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(); // 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();
 
+  // 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,
@@ -31,29 +29,23 @@ async function loader(source) {
   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(undefined, result.value);
   } else {
     callback(undefined, `throw new Error('${result.value}')`);
   }
 }
-
 export default loader;

package/dist/js/modern/server.js

@@ -1,32 +1,23 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 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; }
-
 import path from 'path';
 import { ApiRouter } from '@modern-js/bff-core';
 import { API_DIR, isProd, requireExistModule } from '@modern-js/utils';
 import { API_APP_NAME } from "./constants";
-
 class Storage {
   constructor() {
     _defineProperty(this, "middlewares", []);
   }
-
   reset() {
     this.middlewares = [];
   }
-
 }
-
 const createTransformAPI = storage => ({
   addMiddleware(fn) {
     storage.middlewares.push(fn);
   }
-
 });
-
 export default (() => ({
   name: '@modern-js/plugin-bff',
   setup: api => {
@@ -43,21 +34,17 @@ export default (() => ({
         const apiPath = path.resolve(root || process.cwd(), API_DIR);
         apiAppPath = path.resolve(apiPath, API_APP_NAME);
         const apiMod = requireExistModule(apiAppPath);
-
         if (apiMod && typeof apiMod === 'function') {
           apiMod(transformAPI);
         }
       },
-
       reset() {
         storage.reset();
         const newApiModule = requireExistModule(apiAppPath);
-
         if (newApiModule && typeof newApiModule === 'function') {
           newApiModule(transformAPI);
         }
       },
-
       gather({
         addAPIMiddleware
       }) {
@@ -65,7 +52,6 @@ export default (() => ({
           addAPIMiddleware(mid);
         });
       },
-
       prepareApiServer(props, next) {
         const {
           pwd,
@@ -86,7 +72,6 @@ export default (() => ({
         }));
         return next(props);
       }
-
     };
   }
 }));

package/dist/js/node/cli.js

@@ -4,22 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 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';
-
 var _default = () => ({
   name: '@modern-js/plugin-bff',
   setup: api => {
@@ -28,7 +20,6 @@ var _default = () => ({
       validateSchema() {
         return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-bff'];
       },
-
       config() {
         return {
           tools: {
@@ -48,9 +39,7 @@ var _default = () => ({
                 fetcher
               } = bff || {};
               const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || DEFAULT_API_PREFIX;
-
               const rootDir = _path.default.resolve(appDirectory, _utils.API_DIR);
-
               chain.resolve.alias.set('@api', rootDir);
               const apiRouter = new _bffCore.ApiRouter({
                 apiDir: rootDir,
@@ -59,7 +48,8 @@ var _default = () => ({
               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({
+              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,
                 lambdaDir,
@@ -76,7 +66,6 @@ var _default = () => ({
           }
         };
       },
-
       modifyServerRoutes({
         routes
       }) {
@@ -86,26 +75,24 @@ var _default = () => ({
         } = modernConfig || {};
         const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || '/api';
         const prefixList = [];
-
         if (Array.isArray(prefix)) {
           prefixList.push(...prefix);
         } else {
           prefixList.push(prefix);
         }
-
         const apiServerRoutes = prefixList.map(pre => ({
           urlPath: pre,
           isApi: true,
           entryPath: '',
           isSPA: false,
-          isSSR: false // FIXME: })) as IAppContext[`serverRoutes`];
-
+          isSSR: false
+          // FIXME: })) as IAppContext[`serverRoutes`];
         }));
+
         return {
           routes: routes.concat(apiServerRoutes)
         };
       },
-
       async beforeBuild() {
         // help esbuild-register resolve @modern-js/server/runtime
         if ((0, _utils.isProd)()) {
@@ -115,36 +102,26 @@ var _default = () => ({
           unRegisterResolveRuntimePath = (0, _helper.registerModernRuntimePath)(internalDirectory);
         }
       },
-
       async afterBuild() {
         if (unRegisterResolveRuntimePath) {
           unRegisterResolveRuntimePath();
         }
-
         const {
           appDirectory,
           distDirectory
         } = api.useAppContext();
         const modernConfig = api.useResolvedConfigContext();
-
         const distDir = _path.default.resolve(distDirectory);
-
         const apiDir = _path.default.resolve(appDirectory, _utils.API_DIR);
-
         const sharedDir = _path.default.resolve(appDirectory, _utils.SHARED_DIR);
-
         const tsconfigPath = _path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
-
         const sourceDirs = [];
-
         if (_utils.fs.existsSync(apiDir)) {
           sourceDirs.push(apiDir);
         }
-
         if (_utils.fs.existsSync(sharedDir)) {
           sourceDirs.push(sharedDir);
         }
-
         const {
           server
         } = modernConfig;
@@ -156,7 +133,6 @@ var _default = () => ({
         const {
           babel
         } = modernConfig.tools;
-
         if (sourceDirs.length > 0) {
           await (0, _serverUtils.compile)(appDirectory, {
             server,
@@ -171,9 +147,7 @@ var _default = () => ({
           });
         }
       }
-
     };
   }
 });
-
 exports.default = _default;

package/dist/js/node/helper.js

@@ -4,18 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.registerModernRuntimePath = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var _bffCore = require("@modern-js/bff-core");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const serverRuntimeAlias = '@modern-js/runtime/server';
 const serverRuntimePath = '.runtime-exports/server';
-
 const registerModernRuntimePath = internalDirectory => {
   const paths = {
     [serverRuntimeAlias]: path.join(internalDirectory, serverRuntimePath)
@@ -23,5 +17,4 @@ const registerModernRuntimePath = internalDirectory => {
   const unRegister = (0, _bffCore.registerPaths)(paths);
   return unRegister;
 };
-
 exports.registerModernRuntimePath = registerModernRuntimePath;

package/dist/js/node/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _constants = require("./constants");
-
 Object.keys(_constants).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _constants[key]) return;

package/dist/js/node/loader.js

@@ -4,31 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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(); // 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();
 
+  // 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,
@@ -40,31 +35,24 @@ async function loader(source) {
   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;
   }
-
   if (draftOptions.requestCreator) {
     options.requestCreator = draftOptions.requestCreator;
   }
-
   options.requireResolve = require.resolve;
   const result = await (0, _bffCore.generateClient)(options);
-
   if (result.isOk) {
     callback(undefined, result.value);
   } else {
     callback(undefined, `throw new Error('${result.value}')`);
   }
 }
-
 var _default = loader;
 exports.default = _default;

package/dist/js/node/server.js

@@ -4,41 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _bffCore = require("@modern-js/bff-core");
-
 var _utils = require("@modern-js/utils");
-
 var _constants = require("./constants");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 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; }
-
 class Storage {
   constructor() {
     _defineProperty(this, "middlewares", []);
   }
-
   reset() {
     this.middlewares = [];
   }
-
 }
-
 const createTransformAPI = storage => ({
   addMiddleware(fn) {
     storage.middlewares.push(fn);
   }
-
 });
-
 var _default = () => ({
   name: '@modern-js/plugin-bff',
   setup: api => {
@@ -52,26 +38,20 @@ var _default = () => ({
           distDirectory
         } = api.useAppContext();
         const root = (0, _utils.isProd)() ? distDirectory : appDirectory;
-
         const apiPath = _path.default.resolve(root || process.cwd(), _utils.API_DIR);
-
         apiAppPath = _path.default.resolve(apiPath, _constants.API_APP_NAME);
         const apiMod = (0, _utils.requireExistModule)(apiAppPath);
-
         if (apiMod && typeof apiMod === 'function') {
           apiMod(transformAPI);
         }
       },
-
       reset() {
         storage.reset();
         const newApiModule = (0, _utils.requireExistModule)(apiAppPath);
-
         if (newApiModule && typeof newApiModule === 'function') {
           newApiModule(transformAPI);
         }
       },
-
       gather({
         addAPIMiddleware
       }) {
@@ -79,15 +59,12 @@ var _default = () => ({
           addAPIMiddleware(mid);
         });
       },
-
       prepareApiServer(props, next) {
         const {
           pwd,
           prefix
         } = props;
-
         const apiDir = _path.default.resolve(pwd, _utils.API_DIR);
-
         const appContext = api.useAppContext();
         const apiRouter = new _bffCore.ApiRouter({
           apiDir,
@@ -102,9 +79,7 @@ var _default = () => ({
         }));
         return next(props);
       }
-
     };
   }
 });
-
 exports.default = _default;

package/dist/js/treeshaking/cli.js

@@ -22,20 +22,15 @@ export default (function () {
             tools: {
               webpackChain: function webpackChain(chain, _ref) {
                 var name = _ref.name,
-                    CHAIN_ID = _ref.CHAIN_ID;
-
+                  CHAIN_ID = _ref.CHAIN_ID;
                 var _api$useAppContext = api.useAppContext(),
-                    appDirectory = _api$useAppContext.appDirectory,
-                    port = _api$useAppContext.port;
-
+                  appDirectory = _api$useAppContext.appDirectory,
+                  port = _api$useAppContext.port;
                 var modernConfig = api.useResolvedConfigContext();
-
                 var _ref2 = modernConfig || {},
-                    bff = _ref2.bff;
-
+                  bff = _ref2.bff;
                 var _ref3 = bff || {},
-                    fetcher = _ref3.fetcher;
-
+                  fetcher = _ref3.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);
@@ -46,7 +41,8 @@ export default (function () {
                 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({
+                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,
                   lambdaDir: lambdaDir,
@@ -66,29 +62,26 @@ export default (function () {
         modifyServerRoutes: function modifyServerRoutes(_ref4) {
           var routes = _ref4.routes;
           var modernConfig = api.useResolvedConfigContext();
-
           var _ref5 = modernConfig || {},
-              bff = _ref5.bff;
-
+            bff = _ref5.bff;
           var prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || '/api';
           var prefixList = [];
-
           if (Array.isArray(prefix)) {
             prefixList.push.apply(prefixList, _toConsumableArray(prefix));
           } else {
             prefixList.push(prefix);
           }
-
           var apiServerRoutes = prefixList.map(function (pre) {
             return {
               urlPath: pre,
               isApi: true,
               entryPath: '',
               isSPA: false,
-              isSSR: false // FIXME: })) as IAppContext[`serverRoutes`];
-
+              isSSR: false
+              // FIXME: })) as IAppContext[`serverRoutes`];
             };
           });
+
           return {
             routes: routes.concat(apiServerRoutes)
           };
@@ -96,7 +89,6 @@ export default (function () {
         beforeBuild: function beforeBuild() {
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
             var _api$useAppContext2, internalDirectory;
-
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
@@ -106,7 +98,6 @@ export default (function () {
                       _api$useAppContext2 = api.useAppContext(), internalDirectory = _api$useAppContext2.internalDirectory;
                       unRegisterResolveRuntimePath = registerModernRuntimePath(internalDirectory);
                     }
-
                   case 1:
                   case "end":
                     return _context.stop();
@@ -118,7 +109,6 @@ export default (function () {
         afterBuild: function afterBuild() {
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
             var _api$useAppContext3, appDirectory, distDirectory, modernConfig, distDir, apiDir, sharedDir, tsconfigPath, sourceDirs, server, _modernConfig$source, alias, envVars, globalVars, babel;
-
             return _regeneratorRuntime().wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
@@ -126,7 +116,6 @@ export default (function () {
                     if (unRegisterResolveRuntimePath) {
                       unRegisterResolveRuntimePath();
                     }
-
                     _api$useAppContext3 = api.useAppContext(), appDirectory = _api$useAppContext3.appDirectory, distDirectory = _api$useAppContext3.distDirectory;
                     modernConfig = api.useResolvedConfigContext();
                     distDir = path.resolve(distDirectory);
@@ -134,24 +123,19 @@ export default (function () {
                     sharedDir = path.resolve(appDirectory, SHARED_DIR);
                     tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
                     sourceDirs = [];
-
                     if (fs.existsSync(apiDir)) {
                       sourceDirs.push(apiDir);
                     }
-
                     if (fs.existsSync(sharedDir)) {
                       sourceDirs.push(sharedDir);
                     }
-
                     server = modernConfig.server;
                     _modernConfig$source = modernConfig.source, alias = _modernConfig$source.alias, envVars = _modernConfig$source.envVars, globalVars = _modernConfig$source.globalVars;
                     babel = modernConfig.tools.babel;
-
                     if (!(sourceDirs.length > 0)) {
                       _context2.next = 16;
                       break;
                     }
-
                     _context2.next = 16;
                     return compile(appDirectory, {
                       server: server,
@@ -164,7 +148,6 @@ export default (function () {
                       distDir: distDir,
                       tsconfigPath: tsconfigPath
                     });
-
                   case 16:
                   case "end":
                     return _context2.stop();

package/dist/js/treeshaking/helper.js

@@ -3,12 +3,9 @@ import * as path from 'path';
 import { registerPaths } from '@modern-js/bff-core';
 var serverRuntimeAlias = '@modern-js/runtime/server';
 var serverRuntimePath = '.runtime-exports/server';
-
 var registerModernRuntimePath = function registerModernRuntimePath(internalDirectory) {
   var paths = _defineProperty({}, serverRuntimeAlias, path.join(internalDirectory, serverRuntimePath));
-
   var unRegister = registerPaths(paths);
   return unRegister;
 };
-
 export { registerModernRuntimePath };

package/dist/js/treeshaking/loader.js

@@ -2,11 +2,9 @@ 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);
 }
-
 function _loader() {
   _loader = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(source) {
     var callback, draftOptions, resourcePath, warning, options, lambdaDir, result;
@@ -15,24 +13,19 @@ function _loader() {
         switch (_context.prev = _context.next) {
           case 0:
             // eslint-disable-next-line @babel/no-invalid-this
-            this.cacheable(); // eslint-disable-next-line @babel/no-invalid-this
-
+            this.cacheable();
+            // eslint-disable-next-line @babel/no-invalid-this
             callback = this.async(); // eslint-disable-next-line @babel/no-invalid-this
-
             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,
@@ -43,38 +36,30 @@ function _loader() {
               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;
             }
-
             if (draftOptions.requestCreator) {
               options.requestCreator = draftOptions.requestCreator;
             }
-
             options.requireResolve = require.resolve;
             _context.next = 20;
             return generateClient(options);
-
           case 20:
             result = _context.sent;
-
             if (result.isOk) {
               callback(undefined, result.value);
             } else {
               callback(undefined, "throw new Error('".concat(result.value, "')"));
             }
-
           case 22:
           case "end":
             return _context.stop();
@@ -84,5 +69,4 @@ function _loader() {
   }));
   return _loader.apply(this, arguments);
 }
-
 export default loader;

package/dist/js/treeshaking/server.js

@@ -6,24 +6,19 @@ import path from 'path';
 import { ApiRouter } from '@modern-js/bff-core';
 import { API_DIR, isProd, requireExistModule } from '@modern-js/utils';
 import { API_APP_NAME } from "./constants";
-
 var Storage = /*#__PURE__*/function () {
   function Storage() {
     _classCallCheck(this, Storage);
-
     _defineProperty(this, "middlewares", []);
   }
-
   _createClass(Storage, [{
     key: "reset",
     value: function reset() {
       this.middlewares = [];
     }
   }]);
-
   return Storage;
 }();
-
 var createTransformAPI = function createTransformAPI(storage) {
   return {
     addMiddleware: function addMiddleware(fn) {
@@ -31,7 +26,6 @@ var createTransformAPI = function createTransformAPI(storage) {
     }
   };
 };
-
 export default (function () {
   return {
     name: '@modern-js/plugin-bff',
@@ -42,14 +36,12 @@ export default (function () {
       return {
         prepare: function prepare() {
           var _api$useAppContext = api.useAppContext(),
-              appDirectory = _api$useAppContext.appDirectory,
-              distDirectory = _api$useAppContext.distDirectory;
-
+            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);
           var apiMod = requireExistModule(apiAppPath);
-
           if (apiMod && typeof apiMod === 'function') {
             apiMod(transformAPI);
           }
@@ -57,7 +49,6 @@ export default (function () {
         reset: function reset() {
           storage.reset();
           var newApiModule = requireExistModule(apiAppPath);
-
           if (newApiModule && typeof newApiModule === 'function') {
             newApiModule(transformAPI);
           }
@@ -70,7 +61,7 @@ export default (function () {
         },
         prepareApiServer: function prepareApiServer(props, next) {
           var pwd = props.pwd,
-              prefix = props.prefix;
+            prefix = props.prefix;
           var apiDir = path.resolve(pwd, API_DIR);
           var appContext = api.useAppContext();
           var apiRouter = new ApiRouter({

package/dist/types/cli.d.ts

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

package/dist/types/server.d.ts

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

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.5",
+  "version": "2.0.0-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -55,11 +55,11 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "1.21.5",
-    "@modern-js/bff-core": "1.21.5",
-    "@modern-js/create-request": "1.21.5",
-    "@modern-js/server-utils": "1.21.5",
-    "@modern-js/utils": "1.21.5"
+    "@modern-js/babel-compiler": "2.0.0-beta.1",
+    "@modern-js/bff-core": "2.0.0-beta.1",
+    "@modern-js/create-request": "2.0.0-beta.1",
+    "@modern-js/server-utils": "2.0.0-beta.1",
+    "@modern-js/utils": "2.0.0-beta.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -71,46 +71,23 @@
     "typescript": "^4",
     "webpack": "^5.74.0",
     "webpack-chain": "^6.5.1",
-    "@modern-js/core": "1.21.5",
-    "@modern-js/bff-runtime": "1.21.5",
-    "@modern-js/runtime": "1.21.5",
-    "@modern-js/server-core": "1.21.5",
-    "@modern-js/types": "1.21.5",
-    "@scripts/build": "1.21.5",
-    "@scripts/jest-config": "1.21.5"
+    "@modern-js/core": "2.0.0-beta.1",
+    "@modern-js/bff-runtime": "2.0.0-beta.1",
+    "@modern-js/runtime": "2.0.0-beta.1",
+    "@modern-js/server-core": "2.0.0-beta.1",
+    "@modern-js/types": "2.0.0-beta.1",
+    "@scripts/build": "2.0.0-beta.1",
+    "@scripts/jest-config": "2.0.0-beta.1"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
-    "build": "wireit",
+    "build": "modern build",
     "dev": "modern build --watch",
-    "test": "wireit"
+    "test": "jest --passWithNoTests"
   }
 }