@modern-js/plugin-testing 1.7.1-beta.0 → 1.7.1-beta.1

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

@@ -38,12 +38,9 @@ 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; // 服务端统一使用 ts-jest
-
-  const transform = {
-    '\\.[jt]sx?$': require.resolve('ts-jest')
-  };
+  } = jestConfig;
   const apiOnly = await isApiOnly(pwd);
 
   const mergedModuleNameMapper = _objectSpread(_objectSpread({}, moduleNameMapper), aliasMapper);

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

@@ -48,7 +48,6 @@ export default (mockApiInfosByFile => {
   const files = Object.keys(mockApiInfosByFile);
   files.forEach(mockedFile => {
     jest.mock(mockedFile, () => {
-      // eslint-disable-next-line @typescript-eslint/no-require-imports
       const supertest = require('supertest');
 
       return mockApiInfosByFile[mockedFile].reduce((res, info) => {

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

@@ -4,7 +4,6 @@ import { bff_info_key } from "./constant";
 import mockAPI from "./mockAPI";
 import { createApp, closeServer } from "./app";
 let uped = false;
-const BEFORE_ALL_TIMEOUT = 30000;
 
 const setup = () => {
   var _bff_info$modernUserC, _bff_info$modernUserC2;
@@ -34,7 +33,7 @@ const setup = () => {
     if (!app) {
       app = await createApp(bff_info.appDir, bff_info.modernUserConfig, bff_info.plugins, bff_info.routes);
     }
-  }, BEFORE_ALL_TIMEOUT);
+  });
   afterAll(async () => {
     await closeServer();
   });

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/index.js

@@ -52,12 +52,9 @@ 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; // 服务端统一使用 ts-jest
-
-  const transform = {
-    '\\.[jt]sx?$': require.resolve('ts-jest')
-  };
+  } = jestConfig;
   const apiOnly = await (0, _utils.isApiOnly)(pwd);
 
   const mergedModuleNameMapper = _objectSpread(_objectSpread({}, moduleNameMapper), aliasMapper);

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

@@ -61,7 +61,6 @@ var _default = mockApiInfosByFile => {
   const files = Object.keys(mockApiInfosByFile);
   files.forEach(mockedFile => {
     jest.mock(mockedFile, () => {
-      // eslint-disable-next-line @typescript-eslint/no-require-imports
       const supertest = require('supertest');
 
       return mockApiInfosByFile[mockedFile].reduce((res, info) => {

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

@@ -13,7 +13,6 @@ var _app = require("./app");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 let uped = false;
-const BEFORE_ALL_TIMEOUT = 30000;
 
 const setup = () => {
   var _bff_info$modernUserC, _bff_info$modernUserC2;
@@ -43,7 +42,7 @@ const setup = () => {
     if (!app) {
       app = await (0, _app.createApp)(bff_info.appDir, bff_info.modernUserConfig, bff_info.plugins, bff_info.routes);
     }
-  }, BEFORE_ALL_TIMEOUT);
+  });
   afterAll(async () => {
     await (0, _app.closeServer)();
   });

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/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, moduleNameMapper, transform, apiOnly, mergedModuleNameMapper, resolver, configFields, commonConfig;
+    var pwd, userConfig, plugins, routes, utils, bffConfig, jestConfig, alias, aliasMapper, transform, moduleNameMapper, apiOnly, mergedModuleNameMapper, resolver, configFields, commonConfig;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -32,15 +32,11 @@ 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);
-            moduleNameMapper = jestConfig.moduleNameMapper; // 服务端统一使用 ts-jest
-
-            transform = {
-              '\\.[jt]sx?$': require.resolve('ts-jest')
-            };
-            _context.next = 9;
+            transform = jestConfig.transform, moduleNameMapper = jestConfig.moduleNameMapper;
+            _context.next = 8;
             return isApiOnly(pwd);
 
-          case 9:
+          case 8:
             apiOnly = _context.sent;
             mergedModuleNameMapper = _objectSpread(_objectSpread({}, moduleNameMapper), aliasMapper);
             resolver = jestConfig.resolver || DEFAULT_RESOLVER_PATH; // 这三个配置不能设置在 projects 中，需要设置在外层(https://github.com/facebook/jest/issues/9696)
@@ -78,7 +74,7 @@ export var setJestConfigForBFF = /*#__PURE__*/function () {
 
             utils.setJestConfig(commonConfig);
 
-          case 16:
+          case 15:
           case "end":
             return _context.stop();
         }

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

@@ -46,7 +46,6 @@ export default (function (mockApiInfosByFile) {
   var files = Object.keys(mockApiInfosByFile);
   files.forEach(function (mockedFile) {
     jest.mock(mockedFile, function () {
-      // eslint-disable-next-line @typescript-eslint/no-require-imports
       var supertest = require('supertest');
 
       return mockApiInfosByFile[mockedFile].reduce(function (res, info) {

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

@@ -6,7 +6,6 @@ import { bff_info_key } from "./constant";
 import mockAPI from "./mockAPI";
 import { createApp, closeServer } from "./app";
 var uped = false;
-var BEFORE_ALL_TIMEOUT = 30000;
 
 var setup = function setup() {
   var _bff_info$modernUserC, _bff_info$modernUserC2;
@@ -54,7 +53,7 @@ var setup = function setup() {
         }
       }
     }, _callee);
-  })), BEFORE_ALL_TIMEOUT);
+  })));
   afterAll( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {

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/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.7.1-beta.0",
+  "version": "1.7.1-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -129,7 +129,7 @@
   "devDependencies": {
     "@modern-js/core": "1.13.3",
     "@modern-js/runtime": "1.4.4",
-    "@modern-js/bff-core": "1.2.1",
+    "@modern-js/bff-core": "1.2.2-beta.1",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/jest": "^27",