@modern-js/plugin-testing 1.2.3-rc.0 → 1.3.3-beta.0

package/CHANGELOG.md

@@ -1,22 +1,57 @@
 # @modern-js/plugin-testing
 
-## 1.2.3-rc.0
+## 1.3.2
 
 ### Patch Changes
 
-- Updated dependencies [4a281912]
-- Updated dependencies [b715c994]
-- Updated dependencies [2da27d3b]
-- Updated dependencies [4a281912]
-- Updated dependencies [b7fb82ec]
-- Updated dependencies [eb026119]
-  - @modern-js/runtime-core@1.1.3-rc.0
-  - @modern-js/testing-plugin-bff@1.1.3-rc.0
-  - @modern-js/babel-compiler@1.1.4-rc.0
-  - @modern-js/utils@1.1.6-rc.0
-  - @modern-js/core@1.2.1-rc.0
-  - @modern-js/webpack@1.1.4-rc.0
-  - @modern-js/testing@1.2.1-rc.0
+- b57ded28: fix testing resolver
+- 1b22634e: fix: plugin testing types
+- Updated dependencies [7dc5aa75]
+  - @modern-js/webpack@1.2.2
+
+## 1.3.1
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+- Updated dependencies [c74597bd]
+  - @modern-js/core@1.3.2
+  - @modern-js/webpack@1.2.1
+  - @modern-js/testing@1.3.1
+  - @modern-js/testing-plugin-bff@1.2.1
+  - @modern-js/runtime-core@1.2.1
+  - @modern-js/babel-compiler@1.2.1
+  - @modern-js/utils@1.2.2
+
+## 1.3.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- c3d46ee4: fix: test config invalid
+- Updated dependencies [2da09c69]
+- Updated dependencies [5597289b]
+- Updated dependencies [fc71e36f]
+- Updated dependencies [4a85378c]
+- Updated dependencies [a2cb9abc]
+- Updated dependencies [e453e421]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+- Updated dependencies [146dcd85]
+- Updated dependencies [1ebc7ee2]
+  - @modern-js/utils@1.2.0
+  - @modern-js/webpack@1.2.0
+  - @modern-js/core@1.3.0
+  - @modern-js/runtime-core@1.2.0
+  - @modern-js/testing@1.3.0
+  - @modern-js/testing-plugin-bff@1.2.0
+  - @modern-js/babel-compiler@1.2.0
 
 ## 1.2.1
 

package/dist/js/modern/cli/plugins/modern.js

@@ -1,8 +1,7 @@
 import path from 'path';
 import { createPlugin } from '@modern-js/testing';
 import { modernjs_config_key } from "../../constant";
-
-const getModuleNameMapper = config => {
+export const getModuleNameMapper = config => {
   const {
     resolve: {
       alias = {}
@@ -27,7 +26,17 @@ const getModuleNameMapper = config => {
     return memo;
   }, {});
 };
+export const mergeUserJestConfig = async testUtils => {
+  const resolveJestConfig = testUtils.testConfig.jest;
+
+  if (resolveJestConfig && typeof resolveJestConfig !== 'function') {
+    testUtils.mergeJestConfig(resolveJestConfig);
+  }
 
+  if (typeof resolveJestConfig === 'function') {
+    await resolveJestConfig(testUtils.jestConfig);
+  }
+};
 export default ((webpackConfig, userConfig, pwd) => createPlugin(() => ({
   jestConfig: (utils, next) => {
     utils.mergeJestConfig({
@@ -45,6 +54,7 @@ export default ((webpackConfig, userConfig, pwd) => createPlugin(() => ({
       // testMatch bug on windows, issue: https://github.com/facebook/jest/issues/7914
       testMatch: [`<rootDir>/src/**/*.test.[jt]s?(x)`, `<rootDir>/tests/**/*.test.[jt]s?(x)`, `<rootDir>/electron/**/*.test.[jt]s?(x)`]
     });
+    mergeUserJestConfig(utils);
     return next(utils);
   }
 }), {

package/dist/js/modern/cli/plugins/modern.test.js

@@ -0,0 +1,69 @@
+import { mergeUserJestConfig, getModuleNameMapper } from "./modern";
+describe('modern plugin', () => {
+  test('mergeUserJestConfig support object', () => {
+    const testUtils = {
+      _jestConfig: {
+        a: 1
+      },
+
+      get jestConfig() {
+        return this._jestConfig;
+      },
+
+      testConfig: {
+        jest: {
+          b: 1
+        }
+      },
+
+      mergeJestConfig(config) {
+        Object.assign(this._jestConfig, config);
+      }
+
+    };
+    mergeUserJestConfig(testUtils);
+    expect(testUtils.jestConfig).toEqual({
+      a: 1,
+      b: 1
+    });
+  });
+  test('mergeUserJestConfig support function', () => {
+    const testUtils = {
+      _jestConfig: {
+        a: 1
+      },
+
+      get jestConfig() {
+        return this._jestConfig;
+      },
+
+      testConfig: {
+        jest: jestConfig => {
+          jestConfig.b = 1;
+        }
+      },
+
+      mergeJestConfig(config) {
+        Object.assign(this._jestConfig, config);
+      }
+
+    };
+    mergeUserJestConfig(testUtils);
+    expect(testUtils.jestConfig).toEqual({
+      a: 1,
+      b: 1
+    });
+  }); // TODO: 临时测试代码，待补充
+
+  test('getModuleNameMapper', () => {
+    const mockConfig = {
+      resolve: {
+        alias: {
+          '@modern-js/runtime/core': '/xxx'
+        }
+      }
+    };
+    const alias = getModuleNameMapper(mockConfig);
+    expect(alias).toBeDefined();
+  });
+});

package/dist/js/modern/cli/test.js

@@ -14,6 +14,12 @@ const test = async () => {
 
   const webpackConfigs = getWebpackConfig(WebpackConfigTarget.CLIENT);
   userConfig.testing = userConfig.testing || {};
+  const jest = userConfig.testing.jest || userConfig.tools.jest;
+
+  if (Array.isArray(jest)) {
+    userConfig.testing.jest = jest[0];
+  }
+
   userConfig.testing.jest = userConfig.testing.jest || userConfig.tools.jest;
   userConfig.testing.plugins = [...(userConfig.testing.plugins || []), modernTestPlugin(webpackConfigs, userConfig, config.appDirectory), testingBffPlugin({
     pwd: config.appDirectory,

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

@@ -5,8 +5,8 @@ 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 { createApp } from '@modern-js/runtime-core';
-import resolvePlugins from "./resolvePlugins";
 import { modernjs_config_key } from "../constant";
+import resolvePlugins from "./resolvePlugins";
 
 class ModernRuntime {
   constructor(options) {

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

@@ -0,0 +1,3 @@
+export { default as renderApp } from "./customRender";
+export * from '@testing-library/react';
+export { testBff } from '@modern-js/testing-plugin-bff';

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

@@ -1,4 +1,2 @@
-export { default as renderApp } from "./customRender";
-export * from '@testing-library/react';
-export * from "./reduck";
-export { testBff } from '@modern-js/testing-plugin-bff';
+export * from "./base";
+export * from "./reduck";

package/dist/js/node/cli/plugins/modern.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.mergeUserJestConfig = exports.getModuleNameMapper = exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -41,6 +41,22 @@ const getModuleNameMapper = config => {
   }, {});
 };
 
+exports.getModuleNameMapper = getModuleNameMapper;
+
+const mergeUserJestConfig = async testUtils => {
+  const resolveJestConfig = testUtils.testConfig.jest;
+
+  if (resolveJestConfig && typeof resolveJestConfig !== 'function') {
+    testUtils.mergeJestConfig(resolveJestConfig);
+  }
+
+  if (typeof resolveJestConfig === 'function') {
+    await resolveJestConfig(testUtils.jestConfig);
+  }
+};
+
+exports.mergeUserJestConfig = mergeUserJestConfig;
+
 var _default = (webpackConfig, userConfig, pwd) => (0, _testing.createPlugin)(() => ({
   jestConfig: (utils, next) => {
     utils.mergeJestConfig({
@@ -58,6 +74,7 @@ var _default = (webpackConfig, userConfig, pwd) => (0, _testing.createPlugin)(()
       // testMatch bug on windows, issue: https://github.com/facebook/jest/issues/7914
       testMatch: [`<rootDir>/src/**/*.test.[jt]s?(x)`, `<rootDir>/tests/**/*.test.[jt]s?(x)`, `<rootDir>/electron/**/*.test.[jt]s?(x)`]
     });
+    mergeUserJestConfig(utils);
     return next(utils);
   }
 }), {

package/dist/js/node/cli/plugins/modern.test.js

@@ -0,0 +1,72 @@
+"use strict";
+
+var _modern = require("./modern");
+
+describe('modern plugin', () => {
+  test('mergeUserJestConfig support object', () => {
+    const testUtils = {
+      _jestConfig: {
+        a: 1
+      },
+
+      get jestConfig() {
+        return this._jestConfig;
+      },
+
+      testConfig: {
+        jest: {
+          b: 1
+        }
+      },
+
+      mergeJestConfig(config) {
+        Object.assign(this._jestConfig, config);
+      }
+
+    };
+    (0, _modern.mergeUserJestConfig)(testUtils);
+    expect(testUtils.jestConfig).toEqual({
+      a: 1,
+      b: 1
+    });
+  });
+  test('mergeUserJestConfig support function', () => {
+    const testUtils = {
+      _jestConfig: {
+        a: 1
+      },
+
+      get jestConfig() {
+        return this._jestConfig;
+      },
+
+      testConfig: {
+        jest: jestConfig => {
+          jestConfig.b = 1;
+        }
+      },
+
+      mergeJestConfig(config) {
+        Object.assign(this._jestConfig, config);
+      }
+
+    };
+    (0, _modern.mergeUserJestConfig)(testUtils);
+    expect(testUtils.jestConfig).toEqual({
+      a: 1,
+      b: 1
+    });
+  }); // TODO: 临时测试代码，待补充
+
+  test('getModuleNameMapper', () => {
+    const mockConfig = {
+      resolve: {
+        alias: {
+          '@modern-js/runtime/core': '/xxx'
+        }
+      }
+    };
+    const alias = (0, _modern.getModuleNameMapper)(mockConfig);
+    expect(alias).toBeDefined();
+  });
+});

package/dist/js/node/cli/test.js

@@ -29,6 +29,12 @@ const test = async () => {
 
   const webpackConfigs = (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.CLIENT);
   userConfig.testing = userConfig.testing || {};
+  const jest = userConfig.testing.jest || userConfig.tools.jest;
+
+  if (Array.isArray(jest)) {
+    userConfig.testing.jest = jest[0];
+  }
+
   userConfig.testing.jest = userConfig.testing.jest || userConfig.tools.jest;
   userConfig.testing.plugins = [...(userConfig.testing.plugins || []), (0, _modern.default)(webpackConfigs, userConfig, config.appDirectory), (0, _testingPluginBff.default)({
     pwd: config.appDirectory,

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

@@ -7,10 +7,10 @@ exports.default = void 0;
 
 var _runtimeCore = require("@modern-js/runtime-core");
 
-var _resolvePlugins = _interopRequireDefault(require("./resolvePlugins"));
-
 var _constant = require("../constant");
 
+var _resolvePlugins = _interopRequireDefault(require("./resolvePlugins"));
+
 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; }

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

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  renderApp: true,
+  testBff: true
+};
+Object.defineProperty(exports, "renderApp", {
+  enumerable: true,
+  get: function () {
+    return _customRender.default;
+  }
+});
+Object.defineProperty(exports, "testBff", {
+  enumerable: true,
+  get: function () {
+    return _testingPluginBff.testBff;
+  }
+});
+
+var _customRender = _interopRequireDefault(require("./customRender"));
+
+var _react = require("@testing-library/react");
+
+Object.keys(_react).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _react[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _react[key];
+    }
+  });
+});
+
+var _testingPluginBff = require("@modern-js/testing-plugin-bff");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

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

@@ -3,35 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {
-  renderApp: true,
-  testBff: true
-};
-Object.defineProperty(exports, "renderApp", {
-  enumerable: true,
-  get: function () {
-    return _customRender.default;
-  }
-});
-Object.defineProperty(exports, "testBff", {
-  enumerable: true,
-  get: function () {
-    return _testingPluginBff.testBff;
-  }
-});
-
-var _customRender = _interopRequireDefault(require("./customRender"));
 
-var _react = require("@testing-library/react");
+var _base = require("./base");
 
-Object.keys(_react).forEach(function (key) {
+Object.keys(_base).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _react[key]) return;
+  if (key in exports && exports[key] === _base[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _react[key];
+      return _base[key];
     }
   });
 });
@@ -40,7 +21,6 @@ var _reduck = require("./reduck");
 
 Object.keys(_reduck).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _reduck[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -48,8 +28,4 @@ Object.keys(_reduck).forEach(function (key) {
       return _reduck[key];
     }
   });
-});
-
-var _testingPluginBff = require("@modern-js/testing-plugin-bff");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+});

package/dist/js/treeshaking/cli/plugins/modern.js

@@ -1,10 +1,15 @@
 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 _regeneratorRuntime from "@babel/runtime/regenerator";
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 import path from 'path';
 import { createPlugin } from '@modern-js/testing';
 import { modernjs_config_key } from "../../constant";
-
-var getModuleNameMapper = function getModuleNameMapper(config) {
+export var getModuleNameMapper = function getModuleNameMapper(config) {
   var _config$resolve$alias = config.resolve.alias,
       alias = _config$resolve$alias === void 0 ? {} : _config$resolve$alias;
   return Object.keys(alias).reduce(function (memo, cur) {
@@ -28,7 +33,39 @@ var getModuleNameMapper = function getModuleNameMapper(config) {
     return memo;
   }, {});
 };
+export var mergeUserJestConfig = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(testUtils) {
+    var resolveJestConfig;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            resolveJestConfig = testUtils.testConfig.jest;
+
+            if (resolveJestConfig && typeof resolveJestConfig !== 'function') {
+              testUtils.mergeJestConfig(resolveJestConfig);
+            }
+
+            if (!(typeof resolveJestConfig === 'function')) {
+              _context.next = 5;
+              break;
+            }
+
+            _context.next = 5;
+            return resolveJestConfig(testUtils.jestConfig);
+
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
 
+  return function mergeUserJestConfig(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
 export default (function (webpackConfig, userConfig, pwd) {
   return createPlugin(function () {
     return {
@@ -46,6 +83,7 @@ export default (function (webpackConfig, userConfig, pwd) {
           // testMatch bug on windows, issue: https://github.com/facebook/jest/issues/7914
           testMatch: ["<rootDir>/src/**/*.test.[jt]s?(x)", "<rootDir>/tests/**/*.test.[jt]s?(x)", "<rootDir>/electron/**/*.test.[jt]s?(x)"]
         });
+        mergeUserJestConfig(utils);
         return next(utils);
       }
     };

package/dist/js/treeshaking/cli/plugins/modern.test.js

@@ -0,0 +1,65 @@
+import { mergeUserJestConfig, getModuleNameMapper } from "./modern";
+describe('modern plugin', function () {
+  test('mergeUserJestConfig support object', function () {
+    var testUtils = {
+      _jestConfig: {
+        a: 1
+      },
+
+      get jestConfig() {
+        return this._jestConfig;
+      },
+
+      testConfig: {
+        jest: {
+          b: 1
+        }
+      },
+      mergeJestConfig: function mergeJestConfig(config) {
+        Object.assign(this._jestConfig, config);
+      }
+    };
+    mergeUserJestConfig(testUtils);
+    expect(testUtils.jestConfig).toEqual({
+      a: 1,
+      b: 1
+    });
+  });
+  test('mergeUserJestConfig support function', function () {
+    var testUtils = {
+      _jestConfig: {
+        a: 1
+      },
+
+      get jestConfig() {
+        return this._jestConfig;
+      },
+
+      testConfig: {
+        jest: function jest(jestConfig) {
+          jestConfig.b = 1;
+        }
+      },
+      mergeJestConfig: function mergeJestConfig(config) {
+        Object.assign(this._jestConfig, config);
+      }
+    };
+    mergeUserJestConfig(testUtils);
+    expect(testUtils.jestConfig).toEqual({
+      a: 1,
+      b: 1
+    });
+  }); // TODO: 临时测试代码，待补充
+
+  test('getModuleNameMapper', function () {
+    var mockConfig = {
+      resolve: {
+        alias: {
+          '@modern-js/runtime/core': '/xxx'
+        }
+      }
+    };
+    var alias = getModuleNameMapper(mockConfig);
+    expect(alias).toBeDefined();
+  });
+});

package/dist/js/treeshaking/cli/test.js

@@ -26,7 +26,7 @@ import modernTestPlugin from "./plugins/modern";
 
 var test = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var userConfig, config, webpackConfigs, runtimeExportsPath;
+    var userConfig, config, webpackConfigs, jest, runtimeExportsPath;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -38,6 +38,12 @@ var test = /*#__PURE__*/function () {
 
             webpackConfigs = getWebpackConfig(WebpackConfigTarget.CLIENT);
             userConfig.testing = userConfig.testing || {};
+            jest = userConfig.testing.jest || userConfig.tools.jest;
+
+            if (Array.isArray(jest)) {
+              userConfig.testing.jest = jest[0];
+            }
+
             userConfig.testing.jest = userConfig.testing.jest || userConfig.tools.jest;
             userConfig.testing.plugins = [].concat(_toConsumableArray(userConfig.testing.plugins || []), [modernTestPlugin(webpackConfigs, userConfig, config.appDirectory), testingBffPlugin({
               pwd: config.appDirectory,
@@ -48,7 +54,7 @@ var test = /*#__PURE__*/function () {
               routes: config.serverRoutes
             })]);
             runtimeExportsPath = path.join(config.internalDirectory, '.runtime-exports');
-            _context.next = 9;
+            _context.next = 11;
             return compiler({
               sourceDir: runtimeExportsPath,
               rootDir: runtimeExportsPath,
@@ -60,11 +66,11 @@ var test = /*#__PURE__*/function () {
               }]]
             });
 
-          case 9:
-            _context.next = 11;
+          case 11:
+            _context.next = 13;
             return runTest(userConfig.testing);
 
-          case 11:
+          case 13:
           case "end":
             return _context.stop();
         }

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

@@ -11,8 +11,8 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 import { createApp as _createApp } from '@modern-js/runtime-core';
-import resolvePlugins from "./resolvePlugins";
 import { modernjs_config_key } from "../constant";
+import resolvePlugins from "./resolvePlugins";
 
 var ModernRuntime = /*#__PURE__*/function () {
   function ModernRuntime(options) {

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

@@ -0,0 +1,3 @@
+export { default as renderApp } from "./customRender";
+export * from '@testing-library/react';
+export { testBff } from '@modern-js/testing-plugin-bff';

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

@@ -1,4 +1,2 @@
-export { default as renderApp } from "./customRender";
-export * from '@testing-library/react';
-export * from "./reduck";
-export { testBff } from '@modern-js/testing-plugin-bff';
+export * from "./base";
+export * from "./reduck";

package/dist/types/cli/plugins/modern.d.ts

@@ -1,3 +1,7 @@
-declare const _default: (webpackConfig: any, userConfig: any, pwd: string) => any;
+import type { NormalizedConfig } from '@modern-js/core';
+export declare const getModuleNameMapper: (config: any) => any;
+export declare const mergeUserJestConfig: (testUtils: any) => Promise<void>;
+
+declare const _default: (webpackConfig: any, userConfig: NormalizedConfig, pwd: string) => any;
 
 export default _default;

package/dist/types/cli/plugins/modern.test.d.ts

@@ -0,0 +1 @@
+export {};

package/{src/runtime-testing/index.ts → dist/types/runtime-testing/base.d.ts}

@@ -1,4 +1,3 @@
 export { default as renderApp } from './customRender';
 export * from '@testing-library/react';
-export * from './reduck';
-export { testBff } from '@modern-js/testing-plugin-bff';
+export { testBff } from '@modern-js/testing-plugin-bff';

package/dist/types/runtime-testing/index.d.ts

@@ -1,4 +1,2 @@
-export { default as renderApp } from './customRender';
-export * from '@testing-library/react';
-export * from './reduck';
-export { testBff } from '@modern-js/testing-plugin-bff';
+export * from './base';
+export * from './reduck';

package/jest.config.js

@@ -0,0 +1,8 @@
+const sharedConfig = require('@scripts/jest-config');
+
+/** @type {import('@jest/types').Config.InitialOptions} */
+module.exports = {
+  // eslint-disable-next-line node/no-unsupported-features/es-syntax
+  ...sharedConfig,
+  rootDir: __dirname,
+};

package/package.json

@@ -11,16 +11,20 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.3-rc.0",
+  "version": "1.3.3-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
   "module": "./dist/js/treeshaking/index.js",
   "jsnext:modern": "./dist/js/modern/index.js",
   "exports": {
-    "./type": "./type.d.ts",
+    "./type": {
+      "jsnext:source": "./type.d.ts",
+      "default": "./type.d.ts"
+    },
     ".": {
       "node": {
+        "jsnext:source": "./src/runtime-testing/index.ts",
         "import": "./dist/js/modern/runtime-testing/index.js",
         "require": "./dist/js/node/runtime-testing/index.js",
         "types": "./types/index.d.ts"
@@ -28,19 +32,32 @@
       "default": "./dist/js/treeshaking/runtime-testing/index.js"
     },
     "./runtime": {
+      "jsnext:source": "./src/runtime-testing/index.ts",
       "node": {
         "import": "./dist/js/modern/runtime-testing/index.js",
         "require": "./dist/js/node/runtime-testing/index.js",
         "types": "./types/index.d.ts"
       },
-      "default": "./dist/js/treeshaking/runtime/index.js"
+      "default": "./dist/js/treeshaking/runtime-testing/index.js"
     },
-    "./cli": "./dist/js/node/cli/index.js"
+    "./runtime-base": {
+      "jsnext:source": "./src/runtime-testing/base.ts",
+      "node": {
+        "import": "./dist/js/modern/runtime-testing/base.js",
+        "require": "./dist/js/node/runtime-testing/base.js",
+        "types": "./types/base.d.ts"
+      },
+      "default": "./dist/js/treeshaking/runtime-testing/base.js"
+    },
+    "./cli": {
+      "jsnext:source": "./src/cli/index.ts",
+      "default": "./dist/js/node/cli/index.js"
+    }
   },
   "typesVersions": {
     "*": {
       ".": [
-        "./dist/types/runtime/index.d.ts"
+        "./dist/types/runtime-testing/index.d.ts"
       ],
       "cli": [
         "./dist/types/cli/index.d.ts"
@@ -56,48 +73,52 @@
   "dependencies": {
     "@babel/preset-env": "^7.15.6",
     "@babel/runtime": "^7",
-    "@modern-js/babel-compiler": "^1.1.4-rc.0",
-    "@modern-js/testing": "^1.2.1-rc.0",
-    "@modern-js/utils": "^1.1.6-rc.0",
-    "@modern-js/webpack": "^1.1.4-rc.0",
+    "@modern-js/babel-compiler": "^1.2.1",
+    "@modern-js/testing": "^1.3.1",
+    "@modern-js/utils": "^1.2.2",
+    "@modern-js/webpack": "^1.2.2",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
-    "enhanced-resolve": "^5.8.2",
-    "@modern-js/testing-plugin-bff": "^1.1.3-rc.0"
+    "enhanced-resolve": "^5.8.3",
+    "@modern-js/testing-plugin-bff": "^1.2.1"
   },
   "peerDependencies": {
     "@modern-js-reduck/plugin-auto-actions": "^1.0.0",
     "@modern-js-reduck/plugin-effects": "^1.0.0",
     "@modern-js-reduck/plugin-immutable": "^1.0.0",
     "@modern-js-reduck/store": "^1.0.0",
-    "@modern-js/core": "^1.2.1-rc.0",
-    "@modern-js/runtime-core": "^1.1.3-rc.0"
+    "@modern-js/core": "^1.3.2",
+    "@modern-js/runtime-core": "^1.2.1"
   },
   "devDependencies": {
     "@modern-js-reduck/plugin-auto-actions": "^1.0.0",
     "@modern-js-reduck/plugin-effects": "^1.0.0",
     "@modern-js-reduck/plugin-immutable": "^1.0.0",
     "@modern-js-reduck/store": "^1.0.0",
-    "@modern-js/plugin-testing": "^1.2.2",
-    "@modern-js/module-tools": "^1.1.4",
-    "@modern-js/core": "^1.2.1-rc.0",
-    "@modern-js/runtime-core": "^1.1.3-rc.0",
+    "@scripts/build": "0.0.0",
+    "@modern-js/core": "^1.3.2",
+    "@modern-js/runtime-core": "^1.2.1",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",
     "@types/react-dom": "^17",
-    "typescript": "^4"
+    "react": "^17",
+    "react-dom": "^17",
+    "typescript": "^4",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0"
   },
   "sideEffects": false,
   "modernConfig": {},
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "scripts": {
     "new": "modern new",
     "build": "modern build",
-    "test": "modern test --passWithNoTests"
+    "test": "jest --passWithNoTests"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/tests/.eslintrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  extends: ['@modern-js'],
+  parserOptions: {
+    project: require.resolve('./tsconfig.json'),
+  },
+};

package/tests/index.test.ts

@@ -0,0 +1,7 @@
+import { createStore } from '../src';
+
+describe('plugin-testing', () => {
+  it('default', () => {
+    expect(createStore).toBeDefined();
+  });
+});

package/tests/resolver.test.ts

@@ -0,0 +1,30 @@
+import path from 'path';
+import { fs } from '@modern-js/utils';
+
+const resolver = require('../src/cli/resolver');
+
+describe('plugin-testing', () => {
+  it('resolver', () => {
+    const moduleDir = path.join(
+      __dirname,
+      'node_modules/@modern-js/runtime/module',
+    );
+    fs.ensureDirSync(moduleDir);
+    fs.writeJSONSync(
+      path.join(moduleDir, 'package.json'),
+      {
+        name: '@modern-js/runtime/module',
+        main: './index.js',
+      },
+      'utf-8',
+    );
+    fs.writeFileSync(
+      path.join(moduleDir, 'index.js'),
+      'module.exports = "@modern-js/runtime/module"',
+      'utf-8',
+    );
+    expect(
+      resolver('@modern-js/runtime/module', { basedir: __dirname }),
+    ).toContain('module');
+  });
+});

package/tests/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "@modern-js/tsconfig/base",
+  "compilerOptions": {
+    "declaration": true,
+    "jsx": "preserve",
+    "baseUrl": "./",
+    "outDir": "./out",
+    "emitDeclarationOnly": true,
+    "isolatedModules": true,
+    "paths": {},
+    "types": ["node", "jest"]
+  }
+}

package/tsconfig.json

@@ -4,9 +4,7 @@
     "declaration": false,
     "jsx": "preserve",
     "baseUrl": "./",
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "paths": {}
   },
   "include": ["src"]
 }

package/type.d.ts

@@ -1,7 +1,11 @@
 import '@modern-js/core';
+import "@testing-library/react"
+import "@testing-library/jest-dom"
+import "./dist/types/runtime-testing"
+
 declare module '@modern-js/runtime/testing' {
   export * from '@testing-library/react';
-  export { renderApp, createStore } from '@modern-js/plugin-testing';
+  export { renderApp, createStore } from './dist/types/runtime-testing';
 }
 
 declare module '@modern-js/core' {

package/src/.eslintrc.json

@@ -1,3 +0,0 @@
-{
-  "extends": ["@modern-js"]
-}

package/src/cli/index.ts

@@ -1,48 +0,0 @@
-import path from 'path';
-import { createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
-import { createPlugin, useAppContext } from '@modern-js/core';
-import test from './test';
-
-export default createPlugin(
-  () => {
-    let testingExportsUtils: ReturnType<typeof createRuntimeExportsUtils>;
-
-    return {
-      commands: ({ program }: any) => {
-        program
-          .command('test')
-          .allowUnknownOption()
-          .usage('[options]')
-          .action(async () => {
-            await test();
-          });
-      },
-      validateSchema() {
-        return PLUGIN_SCHEMAS['@modern-js/plugin-testing'];
-      },
-      config() {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const appContext = useAppContext();
-
-        testingExportsUtils = createRuntimeExportsUtils(
-          appContext.internalDirectory,
-          'testing',
-        );
-
-        return {
-          source: {
-            alias: {
-              '@modern-js/runtime/testing': testingExportsUtils.getPath(),
-            },
-          },
-        };
-      },
-      addRuntimeExports() {
-        const testingPath = path.resolve(__dirname, '../');
-
-        testingExportsUtils.addExport(`export * from '${testingPath}'`);
-      },
-    };
-  },
-  { name: '@modern-js/plugin-testing' },
-) as any;

package/src/cli/plugins/modern.ts

@@ -1,64 +0,0 @@
-import path from 'path';
-import { createPlugin } from '@modern-js/testing';
-import { modernjs_config_key } from '@/constant';
-
-const getModuleNameMapper = (config: any) => {
-  const {
-    resolve: { alias = {} },
-  } = config;
-
-  return Object.keys(alias).reduce((memo, cur) => {
-    const aliasValue = Array.isArray(alias[cur]) ? alias[cur] : [alias[cur]];
-
-    const isFile = aliasValue.some((s: string) => s.endsWith('.js'));
-
-    // It's special for if using @modern-js/runtime alias other module @modern-js/runtime/model would not work.
-    if (cur === '@modern-js/runtime$') {
-      memo[`.+${cur}`] = aliasValue[0];
-
-      return memo;
-    }
-
-    if (isFile) {
-      memo[cur] = aliasValue[0];
-    }
-
-    const key = `^${cur}/(.*)$`;
-    const value = path.normalize(`${aliasValue}/$1`);
-    memo[key] = value;
-    return memo;
-  }, {} as any);
-};
-
-export default (webpackConfig: any, userConfig: any, pwd: string) =>
-  createPlugin(
-    () => ({
-      jestConfig: (utils: any, next: any) => {
-        utils.mergeJestConfig({
-          globals: {
-            [modernjs_config_key]: userConfig,
-          },
-          moduleNameMapper: getModuleNameMapper(webpackConfig),
-          testEnvironment: 'jsdom',
-          resolver: require.resolve('../resolver'),
-        });
-
-        utils.setJestConfig({
-          rootDir: pwd || process.cwd(),
-          // todo: diffrent test root for diffrent solutions
-          // testMatch: [`<rootDir>/(src|tests|electron)/**/*.test.[jt]s?(x)`],
-          // testMatch bug on windows, issue: https://github.com/facebook/jest/issues/7914
-          testMatch: [
-            `<rootDir>/src/**/*.test.[jt]s?(x)`,
-            `<rootDir>/tests/**/*.test.[jt]s?(x)`,
-            `<rootDir>/electron/**/*.test.[jt]s?(x)`,
-          ],
-        });
-
-        return next(utils);
-      },
-    }),
-    {
-      name: '@modern-js/testing-plugin-modern',
-    },
-  ) as any;

package/src/cli/resolver.ts

@@ -1,16 +0,0 @@
-import enhanceResolve from 'enhanced-resolve';
-
-const resolver = enhanceResolve.create.sync({
-  conditionNames: ['require', 'node', 'default'],
-  extensions: ['.js', '.json', '.node', '.ts', '.tsx'],
-});
-
-const shouldResolveByEnhance = (url: string) => /^@[^/]+\/[^/]+\/.*/.test(url);
-
-module.exports = function (request: string, options: any) {
-  if (shouldResolveByEnhance(request)) {
-    return resolver(options.basedir, request);
-  }
-
-  return options.defaultResolver(request, options);
-};

package/src/cli/test.ts

@@ -1,70 +0,0 @@
-import path from 'path';
-import { compiler } from '@modern-js/babel-compiler';
-import { useAppContext, useResolvedConfigContext } from '@modern-js/core';
-import { runTest } from '@modern-js/testing';
-import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
-import testingBffPlugin from '@modern-js/testing-plugin-bff';
-import modernTestPlugin from './plugins/modern';
-
-const test = async () => {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const userConfig = useResolvedConfigContext();
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const config = useAppContext();
-
-  // todo: consider lib-tools ...
-  const webpackConfigs = getWebpackConfig(WebpackConfigTarget.CLIENT);
-
-  userConfig.testing = userConfig.testing || {};
-  userConfig.testing.jest =
-    userConfig.testing.jest || (userConfig.tools as any).jest;
-
-  userConfig.testing.plugins = [
-    ...(userConfig.testing.plugins || []),
-    modernTestPlugin(webpackConfigs, userConfig, config.appDirectory),
-    testingBffPlugin({
-      pwd: config.appDirectory,
-      userConfig,
-      plugins: config.plugins.map(p => p.server).filter(Boolean),
-      routes: (config as any).serverRoutes,
-    }),
-  ];
-
-  const runtimeExportsPath = path.join(
-    config.internalDirectory,
-    '.runtime-exports',
-  );
-
-  await compiler(
-    {
-      sourceDir: runtimeExportsPath,
-      rootDir: runtimeExportsPath,
-      distDir: runtimeExportsPath,
-      quiet: true,
-    },
-    {
-      presets: [
-        [
-          require.resolve('@babel/preset-env'),
-          {
-            modules: 'cjs',
-          },
-        ],
-      ],
-    },
-  );
-
-  await runTest(userConfig.testing);
-};
-
-export default test;
-
-declare module '@modern-js/core' {
-  interface UserConfig {
-    testing?: import('@modern-js/testing').TestConfig;
-  }
-
-  interface ToolsConfig {
-    jest?: import('@modern-js/testing').TestConfig['jest'];
-  }
-}

package/src/constant.ts

@@ -1 +0,0 @@
-export const modernjs_config_key = '__modernjs_config__';

package/src/index.ts

@@ -1,4 +0,0 @@
-import '@testing-library/jest-dom/extend-expect';
-import '@testing-library/jest-dom';
-
-export * from './runtime-testing';

package/src/runtime-testing/app.ts

@@ -1,48 +0,0 @@
-import React from 'react';
-import { createApp } from '@modern-js/runtime-core';
-import { UserConfig } from '@modern-js/core';
-import resolvePlugins from './resolvePlugins';
-import { modernjs_config_key } from '@/constant';
-
-interface CreateAppProps {
-  entry?: string;
-  children?: React.ReactElement;
-}
-
-class ModernRuntime {
-  private options: UserConfig;
-
-  constructor(options: UserConfig) {
-    this.options = options;
-  }
-
-  public init(options: UserConfig) {
-    this.options = options;
-  }
-
-  public createApp(props?: CreateAppProps) {
-    const { entry, children } = props || {};
-    let runtimeFeatures = this.options?.runtime;
-
-    if (entry) {
-      runtimeFeatures = {
-        ...(runtimeFeatures || {}),
-        ...this.options.runtimeByEntries?.[entry],
-      };
-    }
-
-    const Component = (): React.ReactElement | null => {
-      if (!children) {
-        return null;
-      }
-
-      return children;
-    };
-
-    return createApp({
-      plugins: resolvePlugins(runtimeFeatures || {}),
-    })(Component);
-  }
-}
-
-export default new ModernRuntime((global as any)[modernjs_config_key] || {});

package/src/runtime-testing/customRender.ts

@@ -1,11 +0,0 @@
-import React from 'react';
-import { render } from '@testing-library/react';
-import app from './app';
-
-const WrapModernProviders = (props: any) =>
-  React.createElement(app.createApp(props));
-
-const customRender = (ui: React.ReactElement, options: any) =>
-  render(ui, { wrapper: WrapModernProviders, ...options });
-
-export default customRender as typeof render;

package/src/runtime-testing/reduck.ts

@@ -1,38 +0,0 @@
-import { createStore as originCreateStore } from '@modern-js-reduck/store';
-import effectsPlugin from '@modern-js-reduck/plugin-effects';
-import autoActionsPlugin from '@modern-js-reduck/plugin-auto-actions';
-import immerPlugin from '@modern-js-reduck/plugin-immutable';
-import { modernjs_config_key } from '@/constant';
-
-export const effects = () => effectsPlugin;
-export const immer = () => immerPlugin;
-export const autoActions = () => autoActionsPlugin;
-
-export const createStore: typeof originCreateStore = props => {
-  const createStatePlugins = () => {
-    const modernConfig = (global as any)[modernjs_config_key];
-    const stateConfig = modernConfig?.runtime?.state;
-    const plugins = [];
-
-    if (stateConfig?.effects !== false) {
-      plugins.push(effects());
-    }
-
-    if (stateConfig?.autoActions !== false) {
-      plugins.push(autoActions());
-    }
-
-    if (stateConfig?.immer !== false) {
-      plugins.push(immer());
-    }
-
-    return (props?.plugins || []).concat(plugins);
-  };
-
-  const config = {
-    ...(props || {}),
-    plugins: createStatePlugins(),
-  };
-
-  return originCreateStore(config);
-};

package/src/runtime-testing/resolvePlugins.ts

@@ -1,23 +0,0 @@
-import { NormalizedConfig } from '@modern-js/core';
-
-const allowedFeatures = ['router', 'state'];
-
-export default function resolvePlugins(features: NormalizedConfig['runtime']) {
-  const plugins: any[] = [];
-
-  if (!features) {
-    return plugins;
-  }
-
-  Object.keys(features).forEach(feature => {
-    if (allowedFeatures.includes(feature)) {
-      const curPluginRes = require(`@modern-js/runtime/plugins`)[feature]({
-        ...features[feature],
-      });
-
-      plugins.push(curPluginRes);
-    }
-  });
-
-  return plugins;
-}