@modern-js/plugin-testing 1.8.0 → 1.17.0

package/CHANGELOG.md

@@ -1,5 +1,80 @@
 # @modern-js/plugin-testing
 
+## 1.17.0
+
+### Patch Changes
+
+- Updated dependencies [1b9176f]
+- Updated dependencies [77d3a38]
+- Updated dependencies [f1a09c5]
+- Updated dependencies [151329d]
+- Updated dependencies [5af9472]
+- Updated dependencies [6b6a534]
+- Updated dependencies [77d3a38]
+- Updated dependencies [6b43a2b]
+- Updated dependencies [492437f]
+- Updated dependencies [7b8ecf5]
+- Updated dependencies [c3d4a6a]
+- Updated dependencies [a7be124]
+- Updated dependencies [31547b4]
+  - @modern-js/utils@1.17.0
+  - @modern-js/babel-preset-app@1.17.0
+  - @modern-js/webpack@1.17.0
+  - @modern-js/server@1.17.0
+  - @modern-js/runtime@1.17.0
+  - @modern-js/babel-compiler@1.17.0
+  - @modern-js/plugin@1.17.0
+
+## 1.16.0
+
+### Minor Changes
+
+- 1100dd58c: chore: support react 18
+
+  chore: 支持 React 18
+
+### Patch Changes
+
+- Updated dependencies [641592f52]
+- Updated dependencies [3904b30a5]
+- Updated dependencies [1100dd58c]
+- Updated dependencies [a480d6ad0]
+- Updated dependencies [e04e6e76a]
+- Updated dependencies [2808ff5a2]
+- Updated dependencies [81c66e4a4]
+- Updated dependencies [2c305b6f5]
+  - @modern-js/utils@1.16.0
+  - @modern-js/webpack@1.16.0
+  - @modern-js/runtime@1.16.0
+  - @modern-js/server@1.16.0
+  - @modern-js/babel-preset-app@1.16.0
+  - @modern-js/babel-compiler@1.16.0
+  - @modern-js/plugin@1.16.0
+
+## 1.15.0
+
+### Patch Changes
+
+- b1f7000: fix: Adjust createServer logic in bff test plugin
+  fix: 调整 BFF 测试中 create server 的逻辑
+- Updated dependencies [8658a78]
+- Updated dependencies [0df4970]
+- Updated dependencies [335c97c]
+- Updated dependencies [05d4a4f]
+- Updated dependencies [b1f7000]
+- Updated dependencies [ad05af9]
+- Updated dependencies [e8a1e8e]
+- Updated dependencies [5d53d1c]
+- Updated dependencies [37cd159]
+- Updated dependencies [a04a11b]
+  - @modern-js/utils@1.15.0
+  - @modern-js/webpack@1.15.0
+  - @modern-js/runtime@1.15.0
+  - @modern-js/server@1.15.0
+  - @modern-js/babel-preset-app@1.15.0
+  - @modern-js/babel-compiler@1.15.0
+  - @modern-js/plugin@1.15.0
+
 ## 1.8.0
 
 ### Minor Changes

package/dist/js/modern/cli/bff/app.js

@@ -2,21 +2,42 @@ import { AsyncLocalStorage } from 'async_hooks';
 import { Server } from '@modern-js/server';
 const store = new AsyncLocalStorage();
 export const isInHandler = () => Boolean(store.getStore());
+let server = null;
 
 const createApp = async (pwd, config, plugins, routes) => {
-  config.output.path = './';
-  const server = new Server({
-    apiOnly: true,
-    dev: {
-      watch: false
-    },
-    pwd,
-    config,
-    plugins,
-    routes
-  });
-  await server.init();
+  if (!server) {
+    config.output.path = './';
+    server = new Server({
+      apiOnly: true,
+      dev: {
+        watch: false
+      },
+      pwd,
+      config,
+      plugins,
+      routes
+    });
+    await server.init();
+  }
+
+  const app = server.getRequestHandler();
+  return app;
+};
+
+const getApp = () => {
+  if (!server) {
+    throw new Error('please createApp first');
+  }
+
   return server.getRequestHandler();
 };
 
-export { createApp };
+const closeServer = async () => {
+  if (!server) {
+    throw new Error('please createApp first');
+  }
+
+  await server.close();
+};
+
+export { createApp, getApp, closeServer };

package/dist/js/modern/cli/bff/index.js

@@ -21,9 +21,14 @@ export const setJestConfigForBFF = async ({
   const bffConfig = {
     rootDir: path.join(pwd, './api'),
     setupFilesAfterEnv: [require.resolve("./setup")],
-    testEnvironment: require.resolve("./env"),
+    testEnvironment: 'node',
     testMatch: [`**/api/**/*.test.[jt]s`],
     globals: {
+      'ts-jest': {
+        diagnostics: {
+          warnOnly: true
+        }
+      },
       [bff_info_key]: {
         appDir: pwd,
         modernUserConfig: userConfig,
@@ -38,9 +43,12 @@ export const setJestConfigForBFF = async ({
   const alias = (userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$source = userConfig.source) === null || _userConfig$source === void 0 ? void 0 : _userConfig$source.alias) || {};
   const aliasMapper = getModuleNameMapper(alias);
   const {
-    transform,
     moduleNameMapper
-  } = jestConfig;
+  } = jestConfig; // 服务端统一使用 ts-jest
+
+  const transform = {
+    '\\.[jt]sx?$': require.resolve('ts-jest')
+  };
   const apiOnly = await isApiOnly(pwd);
 
   const mergedModuleNameMapper = _objectSpread(_objectSpread({}, moduleNameMapper), aliasMapper);

package/dist/js/modern/cli/bff/mockAPI.js

@@ -5,7 +5,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 * as ptr from 'path-to-regexp';
-import * as mock_appModule from "./app"; // eslint-disable-next-line @typescript-eslint/naming-convention
+import * as mockAppModule from "./app"; // eslint-disable-next-line @typescript-eslint/naming-convention
 
 const mock_replaceUrlWithParams = (url, paramValues, payload) => {
   const keys = [];
@@ -44,16 +44,16 @@ const mock_getParamsAndPayload = args => {
   }
 };
 
-export default ((mock_apiInfosByFile, mock_app) => {
-  const files = Object.keys(mock_apiInfosByFile);
+export default (mockApiInfosByFile => {
+  const files = Object.keys(mockApiInfosByFile);
   files.forEach(mockedFile => {
     jest.mock(mockedFile, () => {
       const supertest = require('supertest');
 
-      return mock_apiInfosByFile[mockedFile].reduce((res, info) => {
+      return mockApiInfosByFile[mockedFile].reduce((res, info) => {
         const module = {
           [info.name]: (...args) => {
-            if (mock_appModule.isInHandler()) {
+            if (mockAppModule.isInHandler()) {
               return info.handler(...args);
             }
 
@@ -62,7 +62,8 @@ export default ((mock_apiInfosByFile, mock_app) => {
               returnHttp
             } = module[info.name];
             const url = mock_replaceUrlWithParams(info.routePath, params, payload.params);
-            let test = supertest(mock_app)[info.httpMethod.toLowerCase()](url);
+            const app = mockAppModule.getApp();
+            let test = supertest(app)[info.httpMethod.toLowerCase()](url);
 
             if (payload.query) {
               test = test.query(payload.query);

package/dist/js/modern/cli/bff/setup.js

@@ -2,6 +2,7 @@ import path from 'path';
 import { ApiRouter } from '@modern-js/bff-core';
 import { bff_info_key } from "./constant";
 import mockAPI from "./mockAPI";
+import { createApp, closeServer } from "./app";
 let uped = false;
 
 const setup = () => {
@@ -27,7 +28,16 @@ const setup = () => {
     res[apiInfo.filename].push(apiInfo);
     return res;
   }, {});
-  mockAPI(apiInfosByFile, global.app);
+  let app = null;
+  beforeAll(async () => {
+    if (!app) {
+      app = await createApp(bff_info.appDir, bff_info.modernUserConfig, bff_info.plugins, bff_info.routes);
+    }
+  });
+  afterAll(async () => {
+    await closeServer();
+  });
+  mockAPI(apiInfosByFile);
 };
 
 setup();

package/dist/js/modern/runtime-testing/request.js

@@ -1,11 +1,13 @@
 /* eslint-disable eslint-comments/disable-enable-pair */
 import supertest from 'supertest';
+import { getApp } from "../cli/bff/app";
 
 function request(...args) {
   const [fn, ...extraArgs] = args;
+  const app = getApp();
 
   if (!fn) {
-    return supertest(global.app);
+    return supertest(app);
   }
 
   fn.returnHttp = true;

package/dist/js/node/cli/bff/app.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isInHandler = exports.createApp = void 0;
+exports.isInHandler = exports.getApp = exports.createApp = exports.closeServer = void 0;
 
 var _async_hooks = require("async_hooks");
 
@@ -14,21 +14,46 @@ const store = new _async_hooks.AsyncLocalStorage();
 const isInHandler = () => Boolean(store.getStore());
 
 exports.isInHandler = isInHandler;
+let server = null;
 
 const createApp = async (pwd, config, plugins, routes) => {
-  config.output.path = './';
-  const server = new _server.Server({
-    apiOnly: true,
-    dev: {
-      watch: false
-    },
-    pwd,
-    config,
-    plugins,
-    routes
-  });
-  await server.init();
+  if (!server) {
+    config.output.path = './';
+    server = new _server.Server({
+      apiOnly: true,
+      dev: {
+        watch: false
+      },
+      pwd,
+      config,
+      plugins,
+      routes
+    });
+    await server.init();
+  }
+
+  const app = server.getRequestHandler();
+  return app;
+};
+
+exports.createApp = createApp;
+
+const getApp = () => {
+  if (!server) {
+    throw new Error('please createApp first');
+  }
+
   return server.getRequestHandler();
 };
 
-exports.createApp = createApp;
+exports.getApp = getApp;
+
+const closeServer = async () => {
+  if (!server) {
+    throw new Error('please createApp first');
+  }
+
+  await server.close();
+};
+
+exports.closeServer = closeServer;

package/dist/js/node/cli/bff/index.js

@@ -35,9 +35,14 @@ const setJestConfigForBFF = async ({
   const bffConfig = {
     rootDir: _path.default.join(pwd, './api'),
     setupFilesAfterEnv: [require.resolve("./setup")],
-    testEnvironment: require.resolve("./env"),
+    testEnvironment: 'node',
     testMatch: [`**/api/**/*.test.[jt]s`],
     globals: {
+      'ts-jest': {
+        diagnostics: {
+          warnOnly: true
+        }
+      },
       [_constant.bff_info_key]: {
         appDir: pwd,
         modernUserConfig: userConfig,
@@ -52,9 +57,12 @@ const setJestConfigForBFF = async ({
   const alias = (userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$source = userConfig.source) === null || _userConfig$source === void 0 ? void 0 : _userConfig$source.alias) || {};
   const aliasMapper = (0, _base.getModuleNameMapper)(alias);
   const {
-    transform,
     moduleNameMapper
-  } = jestConfig;
+  } = jestConfig; // 服务端统一使用 ts-jest
+
+  const transform = {
+    '\\.[jt]sx?$': require.resolve('ts-jest')
+  };
   const apiOnly = await (0, _utils.isApiOnly)(pwd);
 
   const mergedModuleNameMapper = _objectSpread(_objectSpread({}, moduleNameMapper), aliasMapper);

package/dist/js/node/cli/bff/mockAPI.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var ptr = _interopRequireWildcard(require("path-to-regexp"));
 
-var mock_appModule = _interopRequireWildcard(require("./app"));
+var mockAppModule = _interopRequireWildcard(require("./app"));
 
 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); }
 
@@ -57,16 +57,16 @@ const mock_getParamsAndPayload = args => {
   }
 };
 
-var _default = (mock_apiInfosByFile, mock_app) => {
-  const files = Object.keys(mock_apiInfosByFile);
+var _default = mockApiInfosByFile => {
+  const files = Object.keys(mockApiInfosByFile);
   files.forEach(mockedFile => {
     jest.mock(mockedFile, () => {
       const supertest = require('supertest');
 
-      return mock_apiInfosByFile[mockedFile].reduce((res, info) => {
+      return mockApiInfosByFile[mockedFile].reduce((res, info) => {
         const module = {
           [info.name]: (...args) => {
-            if (mock_appModule.isInHandler()) {
+            if (mockAppModule.isInHandler()) {
               return info.handler(...args);
             }
 
@@ -75,7 +75,8 @@ var _default = (mock_apiInfosByFile, mock_app) => {
               returnHttp
             } = module[info.name];
             const url = mock_replaceUrlWithParams(info.routePath, params, payload.params);
-            let test = supertest(mock_app)[info.httpMethod.toLowerCase()](url);
+            const app = mockAppModule.getApp();
+            let test = supertest(app)[info.httpMethod.toLowerCase()](url);
 
             if (payload.query) {
               test = test.query(payload.query);

package/dist/js/node/cli/bff/setup.js

@@ -8,6 +8,8 @@ var _constant = require("./constant");
 
 var _mockAPI = _interopRequireDefault(require("./mockAPI"));
 
+var _app = require("./app");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 let uped = false;
@@ -35,7 +37,16 @@ const setup = () => {
     res[apiInfo.filename].push(apiInfo);
     return res;
   }, {});
-  (0, _mockAPI.default)(apiInfosByFile, global.app);
+  let app = null;
+  beforeAll(async () => {
+    if (!app) {
+      app = await (0, _app.createApp)(bff_info.appDir, bff_info.modernUserConfig, bff_info.plugins, bff_info.routes);
+    }
+  });
+  afterAll(async () => {
+    await (0, _app.closeServer)();
+  });
+  (0, _mockAPI.default)(apiInfosByFile);
 };
 
 setup();

package/dist/js/node/runtime-testing/request.js

@@ -7,14 +7,17 @@ exports.request = request;
 
 var _supertest = _interopRequireDefault(require("supertest"));
 
+var _app = require("../cli/bff/app");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /* eslint-disable eslint-comments/disable-enable-pair */
 function request(...args) {
   const [fn, ...extraArgs] = args;
+  const app = (0, _app.getApp)();
 
   if (!fn) {
-    return (0, _supertest.default)(global.app);
+    return (0, _supertest.default)(app);
   }
 
   fn.returnHttp = true;

package/dist/js/treeshaking/cli/bff/app.js

@@ -6,14 +6,20 @@ var store = new AsyncLocalStorage();
 export var isInHandler = function isInHandler() {
   return Boolean(store.getStore());
 };
+var server = null;
 
 var createApp = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(pwd, config, plugins, routes) {
-    var server;
+    var app;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
+            if (server) {
+              _context.next = 5;
+              break;
+            }
+
             config.output.path = './';
             server = new Server({
               apiOnly: true,
@@ -25,13 +31,14 @@ var createApp = /*#__PURE__*/function () {
               plugins: plugins,
               routes: routes
             });
-            _context.next = 4;
+            _context.next = 5;
             return server.init();
 
-          case 4:
-            return _context.abrupt("return", server.getRequestHandler());
-
           case 5:
+            app = server.getRequestHandler();
+            return _context.abrupt("return", app);
+
+          case 7:
           case "end":
             return _context.stop();
         }
@@ -44,4 +51,42 @@ var createApp = /*#__PURE__*/function () {
   };
 }();
 
-export { createApp };
+var getApp = function getApp() {
+  if (!server) {
+    throw new Error('please createApp first');
+  }
+
+  return server.getRequestHandler();
+};
+
+var closeServer = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            if (server) {
+              _context2.next = 2;
+              break;
+            }
+
+            throw new Error('please createApp first');
+
+          case 2:
+            _context2.next = 4;
+            return server.close();
+
+          case 4:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+
+  return function closeServer() {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+export { createApp, getApp, closeServer };

package/dist/js/treeshaking/cli/bff/index.js

@@ -11,7 +11,7 @@ export var setJestConfigForBFF = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     var _userConfig$source;
 
-    var pwd, userConfig, plugins, routes, utils, bffConfig, jestConfig, alias, aliasMapper, transform, moduleNameMapper, apiOnly, mergedModuleNameMapper, resolver, configFields, commonConfig;
+    var pwd, userConfig, plugins, routes, utils, bffConfig, jestConfig, alias, aliasMapper, moduleNameMapper, transform, apiOnly, mergedModuleNameMapper, resolver, configFields, commonConfig;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -20,9 +20,15 @@ export var setJestConfigForBFF = /*#__PURE__*/function () {
             bffConfig = {
               rootDir: path.join(pwd, './api'),
               setupFilesAfterEnv: [require.resolve("./setup")],
-              testEnvironment: require.resolve("./env"),
+              testEnvironment: 'node',
               testMatch: ["**/api/**/*.test.[jt]s"],
-              globals: _defineProperty({}, bff_info_key, {
+              globals: _defineProperty({
+                'ts-jest': {
+                  diagnostics: {
+                    warnOnly: true
+                  }
+                }
+              }, bff_info_key, {
                 appDir: pwd,
                 modernUserConfig: userConfig,
                 plugins: plugins,
@@ -32,11 +38,15 @@ export var setJestConfigForBFF = /*#__PURE__*/function () {
             jestConfig = utils.jestConfig;
             alias = (userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$source = userConfig.source) === null || _userConfig$source === void 0 ? void 0 : _userConfig$source.alias) || {};
             aliasMapper = getModuleNameMapper(alias);
-            transform = jestConfig.transform, moduleNameMapper = jestConfig.moduleNameMapper;
-            _context.next = 8;
+            moduleNameMapper = jestConfig.moduleNameMapper; // 服务端统一使用 ts-jest
+
+            transform = {
+              '\\.[jt]sx?$': require.resolve('ts-jest')
+            };
+            _context.next = 9;
             return isApiOnly(pwd);
 
-          case 8:
+          case 9:
             apiOnly = _context.sent;
             mergedModuleNameMapper = _objectSpread(_objectSpread({}, moduleNameMapper), aliasMapper);
             resolver = jestConfig.resolver || DEFAULT_RESOLVER_PATH; // 这三个配置不能设置在 projects 中，需要设置在外层(https://github.com/facebook/jest/issues/9696)
@@ -74,7 +84,7 @@ export var setJestConfigForBFF = /*#__PURE__*/function () {
 
             utils.setJestConfig(commonConfig);
 
-          case 15:
+          case 16:
           case "end":
             return _context.stop();
         }

package/dist/js/treeshaking/cli/bff/mockAPI.js

@@ -3,7 +3,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import * as ptr from 'path-to-regexp';
-import * as mock_appModule from "./app"; // eslint-disable-next-line @typescript-eslint/naming-convention
+import * as mockAppModule from "./app"; // eslint-disable-next-line @typescript-eslint/naming-convention
 
 var mock_replaceUrlWithParams = function mock_replaceUrlWithParams(url, paramValues, payload) {
   var keys = [];
@@ -42,19 +42,19 @@ var mock_getParamsAndPayload = function mock_getParamsAndPayload(args) {
   }
 };
 
-export default (function (mock_apiInfosByFile, mock_app) {
-  var files = Object.keys(mock_apiInfosByFile);
+export default (function (mockApiInfosByFile) {
+  var files = Object.keys(mockApiInfosByFile);
   files.forEach(function (mockedFile) {
     jest.mock(mockedFile, function () {
       var supertest = require('supertest');
 
-      return mock_apiInfosByFile[mockedFile].reduce(function (res, info) {
+      return mockApiInfosByFile[mockedFile].reduce(function (res, info) {
         var module = _defineProperty({}, info.name, function () {
           for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
             args[_key] = arguments[_key];
           }
 
-          if (mock_appModule.isInHandler()) {
+          if (mockAppModule.isInHandler()) {
             return info.handler.apply(info, args);
           }
 
@@ -66,7 +66,8 @@ export default (function (mock_apiInfosByFile, mock_app) {
           var _ref = module[info.name],
               returnHttp = _ref.returnHttp;
           var url = mock_replaceUrlWithParams(info.routePath, params, payload.params);
-          var test = supertest(mock_app)[info.httpMethod.toLowerCase()](url);
+          var app = mockAppModule.getApp();
+          var test = supertest(app)[info.httpMethod.toLowerCase()](url);
 
           if (payload.query) {
             test = test.query(payload.query);

package/dist/js/treeshaking/cli/bff/setup.js

@@ -1,7 +1,10 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import path from 'path';
 import { ApiRouter } from '@modern-js/bff-core';
 import { bff_info_key } from "./constant";
 import mockAPI from "./mockAPI";
+import { createApp, closeServer } from "./app";
 var uped = false;
 
 var setup = function setup() {
@@ -27,7 +30,46 @@ var setup = function setup() {
     res[apiInfo.filename].push(apiInfo);
     return res;
   }, {});
-  mockAPI(apiInfosByFile, global.app);
+  var app = null;
+  beforeAll( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (app) {
+              _context.next = 4;
+              break;
+            }
+
+            _context.next = 3;
+            return createApp(bff_info.appDir, bff_info.modernUserConfig, bff_info.plugins, bff_info.routes);
+
+          case 3:
+            app = _context.sent;
+
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  })));
+  afterAll( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return closeServer();
+
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  })));
+  mockAPI(apiInfosByFile);
 };
 
 setup();

package/dist/js/treeshaking/runtime-testing/request.js

@@ -2,6 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 
 /* eslint-disable eslint-comments/disable-enable-pair */
 import supertest from 'supertest';
+import { getApp } from "../cli/bff/app";
 
 function request() {
   for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -10,9 +11,10 @@ function request() {
 
   var fn = args[0],
       extraArgs = args.slice(1);
+  var app = getApp();
 
   if (!fn) {
-    return supertest(global.app);
+    return supertest(app);
   }
 
   fn.returnHttp = true;

package/dist/types/cli/bff/app.d.ts

@@ -3,4 +3,6 @@
 /// <reference types="node/http" />
 export declare const isInHandler: () => boolean;
 declare const createApp: (pwd: string, config: any, plugins: any[], routes: any[]) => Promise<(req: import("http").IncomingMessage, res: import("http").ServerResponse, next?: (() => void) | undefined) => void>;
-export { createApp };
+declare const getApp: () => (req: import("http").IncomingMessage, res: import("http").ServerResponse, next?: (() => void) | undefined) => void;
+declare const closeServer: () => Promise<void>;
+export { createApp, getApp, closeServer };

package/dist/types/cli/bff/mockAPI.d.ts

@@ -1,3 +1,3 @@
-declare const _default: (mock_apiInfosByFile: Record<string, any[]>, mock_app: any) => void;
+declare const _default: (mockApiInfosByFile: Record<string, any[]>) => void;
 
 export default _default;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.8.0",
+  "version": "1.17.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -99,12 +99,12 @@
     "@modern-js-reduck/plugin-effects": "^1.0.2",
     "@modern-js-reduck/plugin-immutable": "^1.0.1",
     "@modern-js-reduck/store": "^1.0.3",
-    "@modern-js/babel-compiler": "^1.2.6",
-    "@modern-js/utils": "^1.9.0",
-    "@modern-js/webpack": "^1.12.4",
-    "@modern-js/babel-preset-app": "^1.6.0",
-    "@modern-js/plugin": "^1.4.1",
-    "@modern-js/server": "^1.6.0",
+    "@modern-js/babel-compiler": "1.17.0",
+    "@modern-js/utils": "1.17.0",
+    "@modern-js/webpack": "1.17.0",
+    "@modern-js/babel-preset-app": "1.17.0",
+    "@modern-js/plugin": "1.17.0",
+    "@modern-js/server": "1.17.0",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@types/testing-library__jest-dom": "^5.14.3",
@@ -119,7 +119,9 @@
     "yargs": "^17.0.1"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^1.5.0"
+    "react": ">=17",
+    "react-dom": ">=17",
+    "@modern-js/runtime": "^1.17.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -127,21 +129,19 @@
     }
   },
   "devDependencies": {
-    "@modern-js/core": "1.14.0",
-    "@modern-js/runtime": "1.5.0",
-    "@modern-js/bff-core": "1.2.2",
-    "@scripts/build": "0.0.0",
-    "@scripts/jest-config": "0.0.0",
+    "react": "^17",
+    "react-dom": "^17",
+    "@modern-js/core": "1.17.0",
+    "@modern-js/runtime": "1.17.0",
+    "@modern-js/bff-core": "1.17.0",
+    "@scripts/build": "1.17.0",
+    "@scripts/jest-config": "1.17.0",
     "@types/jest": "^27",
     "@types/supertest": "^2.0.11",
     "@types/node": "^14",
-    "@types/react": "^17",
-    "@types/react-dom": "^17",
     "@types/yargs": "^17.0.2",
     "@jest/types": "^27.0.6",
     "jest": "^27",
-    "react": "^17",
-    "react-dom": "^17",
     "typescript": "^4"
   },
   "sideEffects": false,

package/dist/js/modern/cli/bff/env.js

@@ -1,28 +0,0 @@
-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 NodeEnvironment from 'jest-environment-node';
-import { createApp } from "./app";
-import { bff_info_key } from "./constant";
-export default class extends NodeEnvironment {
-  constructor(...args) {
-    super(...args);
-
-    _defineProperty(this, "app", void 0);
-  }
-
-  async setup() {
-    const bff_info = this.global[bff_info_key];
-    const {
-      plugins
-    } = bff_info; // eslint-disable-next-line no-multi-assign
-
-    this.global.app = this.app = await createApp(bff_info.appDir, bff_info.modernUserConfig, plugins, bff_info.routes);
-  }
-
-  async teardown() {
-    var _this$app, _this$app$server;
-
-    await ((_this$app = this.app) === null || _this$app === void 0 ? void 0 : (_this$app$server = _this$app.server) === null || _this$app$server === void 0 ? void 0 : _this$app$server.close());
-  }
-
-}

package/dist/js/node/cli/bff/env.js

@@ -1,42 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _jestEnvironmentNode = _interopRequireDefault(require("jest-environment-node"));
-
-var _app = require("./app");
-
-var _constant = require("./constant");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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 _default extends _jestEnvironmentNode.default {
-  constructor(...args) {
-    super(...args);
-
-    _defineProperty(this, "app", void 0);
-  }
-
-  async setup() {
-    const bff_info = this.global[_constant.bff_info_key];
-    const {
-      plugins
-    } = bff_info; // eslint-disable-next-line no-multi-assign
-
-    this.global.app = this.app = await (0, _app.createApp)(bff_info.appDir, bff_info.modernUserConfig, plugins, bff_info.routes);
-  }
-
-  async teardown() {
-    var _this$app, _this$app$server;
-
-    await ((_this$app = this.app) === null || _this$app === void 0 ? void 0 : (_this$app$server = _this$app.server) === null || _this$app$server === void 0 ? void 0 : _this$app$server.close());
-  }
-
-}
-
-exports.default = _default;

package/dist/js/treeshaking/cli/bff/env.js

@@ -1,98 +0,0 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _createSuper from "@babel/runtime/helpers/esm/createSuper";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import NodeEnvironment from 'jest-environment-node';
-import { createApp } from "./app";
-import { bff_info_key } from "./constant";
-
-var _default = /*#__PURE__*/function (_NodeEnvironment) {
-  _inherits(_default, _NodeEnvironment);
-
-  var _super = _createSuper(_default);
-
-  function _default() {
-    var _this;
-
-    _classCallCheck(this, _default);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _defineProperty(_assertThisInitialized(_this), "app", void 0);
-
-    return _this;
-  }
-
-  _createClass(_default, [{
-    key: "setup",
-    value: function () {
-      var _setup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var bff_info, plugins;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                bff_info = this.global[bff_info_key];
-                plugins = bff_info.plugins; // eslint-disable-next-line no-multi-assign
-
-                _context.next = 4;
-                return createApp(bff_info.appDir, bff_info.modernUserConfig, plugins, bff_info.routes);
-
-              case 4:
-                this.global.app = this.app = _context.sent;
-
-              case 5:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function setup() {
-        return _setup.apply(this, arguments);
-      }
-
-      return setup;
-    }()
-  }, {
-    key: "teardown",
-    value: function () {
-      var _teardown = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _this$app, _this$app$server;
-
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return (_this$app = this.app) === null || _this$app === void 0 ? void 0 : (_this$app$server = _this$app.server) === null || _this$app$server === void 0 ? void 0 : _this$app$server.close();
-
-              case 2:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function teardown() {
-        return _teardown.apply(this, arguments);
-      }
-
-      return teardown;
-    }()
-  }]);
-
-  return _default;
-}(NodeEnvironment);
-
-export { _default as default };

package/dist/types/cli/bff/env.d.ts

@@ -1,6 +0,0 @@
-import NodeEnvironment from 'jest-environment-node';
-export default class extends NodeEnvironment {
-  app: any;
-  setup(): Promise<void>;
-  teardown(): Promise<void>;
-}