@modern-js/plugin-testing 1.5.1 → 1.5.2

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

@@ -1,20 +1,16 @@
 import path from 'path';
 import { PLUGIN_SCHEMAS, createRuntimeExportsUtils, isApiOnly } from '@modern-js/utils';
-import { jestConfigHook, getModuleNameMapper, DEFAULT_RESOLVER_PATH } from '@modern-js/testing';
+import { testingHooks, getModuleNameMapper, DEFAULT_RESOLVER_PATH } from '@modern-js/testing';
 import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
 import TestingBffPlugin from '@modern-js/testing-plugin-bff';
 import { MODERNJS_CONFIG_KEY } from "../constant";
 import test from "./test";
 export const mergeUserJestConfig = testUtils => {
-  const resolveJestConfig = testUtils.testConfig.jest;
+  const resolveJestConfig = testUtils.testConfig.jest; // resolveJestConfig 如果是函数类型，在所有测试插件 jestConfig 都执行后，再执行生成最终配置
 
   if (resolveJestConfig && typeof resolveJestConfig !== 'function') {
     testUtils.mergeJestConfig(resolveJestConfig);
   }
-
-  if (typeof resolveJestConfig === 'function') {
-    resolveJestConfig(testUtils.jestConfig);
-  }
 };
 export default (() => {
   const BffPlugin = TestingBffPlugin();
@@ -22,16 +18,14 @@ export default (() => {
     name: '@modern-js/plugin-testing',
     usePlugins: [BffPlugin],
     post: [BffPlugin.name],
-    registerHook: {
-      jestConfig: jestConfigHook
-    },
+    registerHook: testingHooks,
     setup: api => {
       let testingExportsUtils;
       return {
         commands: ({
           program
         }) => {
-          program.command('test').allowUnknownOption().usage('[options]').action(async () => {
+          program.command('test').allowUnknownOption().usage('<regexForTestFiles> --[options]').action(async () => {
             await test(api);
           });
         },
@@ -78,9 +72,7 @@ export default (() => {
             },
             moduleNameMapper: getModuleNameMapper(alias),
             testEnvironment: 'jsdom',
-            resolver: DEFAULT_RESOLVER_PATH
-          });
-          utils.setJestConfig({
+            resolver: DEFAULT_RESOLVER_PATH,
             rootDir: appContext.appDirectory || process.cwd(),
             // todo: diffrent test root for diffrent solutions
             // testMatch: [`<rootDir>/(src|tests|electron)/**/*.test.[jt]s?(x)`],

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

@@ -22,15 +22,11 @@ var _test = _interopRequireDefault(require("./test"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const mergeUserJestConfig = testUtils => {
-  const resolveJestConfig = testUtils.testConfig.jest;
+  const resolveJestConfig = testUtils.testConfig.jest; // resolveJestConfig 如果是函数类型，在所有测试插件 jestConfig 都执行后，再执行生成最终配置
 
   if (resolveJestConfig && typeof resolveJestConfig !== 'function') {
     testUtils.mergeJestConfig(resolveJestConfig);
   }
-
-  if (typeof resolveJestConfig === 'function') {
-    resolveJestConfig(testUtils.jestConfig);
-  }
 };
 
 exports.mergeUserJestConfig = mergeUserJestConfig;
@@ -41,16 +37,14 @@ var _default = () => {
     name: '@modern-js/plugin-testing',
     usePlugins: [BffPlugin],
     post: [BffPlugin.name],
-    registerHook: {
-      jestConfig: _testing.jestConfigHook
-    },
+    registerHook: _testing.testingHooks,
     setup: api => {
       let testingExportsUtils;
       return {
         commands: ({
           program
         }) => {
-          program.command('test').allowUnknownOption().usage('[options]').action(async () => {
+          program.command('test').allowUnknownOption().usage('<regexForTestFiles> --[options]').action(async () => {
             await (0, _test.default)(api);
           });
         },
@@ -98,9 +92,7 @@ var _default = () => {
             },
             moduleNameMapper: (0, _testing.getModuleNameMapper)(alias),
             testEnvironment: 'jsdom',
-            resolver: _testing.DEFAULT_RESOLVER_PATH
-          });
-          utils.setJestConfig({
+            resolver: _testing.DEFAULT_RESOLVER_PATH,
             rootDir: appContext.appDirectory || process.cwd(),
             // todo: diffrent test root for diffrent solutions
             // testMatch: [`<rootDir>/(src|tests|electron)/**/*.test.[jt]s?(x)`],

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

@@ -8,21 +8,17 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 import path from 'path';
 import { PLUGIN_SCHEMAS, createRuntimeExportsUtils, isApiOnly } from '@modern-js/utils';
-import { jestConfigHook, getModuleNameMapper, DEFAULT_RESOLVER_PATH } from '@modern-js/testing';
+import { testingHooks, getModuleNameMapper, DEFAULT_RESOLVER_PATH } from '@modern-js/testing';
 import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
 import TestingBffPlugin from '@modern-js/testing-plugin-bff';
 import { MODERNJS_CONFIG_KEY } from "../constant";
 import test from "./test";
 export var mergeUserJestConfig = function mergeUserJestConfig(testUtils) {
-  var resolveJestConfig = testUtils.testConfig.jest;
+  var resolveJestConfig = testUtils.testConfig.jest; // resolveJestConfig 如果是函数类型，在所有测试插件 jestConfig 都执行后，再执行生成最终配置
 
   if (resolveJestConfig && typeof resolveJestConfig !== 'function') {
     testUtils.mergeJestConfig(resolveJestConfig);
   }
-
-  if (typeof resolveJestConfig === 'function') {
-    resolveJestConfig(testUtils.jestConfig);
-  }
 };
 export default (function () {
   var BffPlugin = TestingBffPlugin();
@@ -30,15 +26,13 @@ export default (function () {
     name: '@modern-js/plugin-testing',
     usePlugins: [BffPlugin],
     post: [BffPlugin.name],
-    registerHook: {
-      jestConfig: jestConfigHook
-    },
+    registerHook: testingHooks,
     setup: function setup(api) {
       var testingExportsUtils;
       return {
         commands: function commands(_ref) {
           var program = _ref.program;
-          program.command('test').allowUnknownOption().usage('[options]').action( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+          program.command('test').allowUnknownOption().usage('<regexForTestFiles> --[options]').action( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
             return _regeneratorRuntime.wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
@@ -102,9 +96,7 @@ export default (function () {
                       globals: _defineProperty({}, MODERNJS_CONFIG_KEY, userConfig),
                       moduleNameMapper: getModuleNameMapper(alias),
                       testEnvironment: 'jsdom',
-                      resolver: DEFAULT_RESOLVER_PATH
-                    });
-                    utils.setJestConfig({
+                      resolver: DEFAULT_RESOLVER_PATH,
                       rootDir: appContext.appDirectory || process.cwd(),
                       // todo: diffrent test root for diffrent solutions
                       // testMatch: [`<rootDir>/(src|tests|electron)/**/*.test.[jt]s?(x)`],
@@ -114,7 +106,7 @@ export default (function () {
                     mergeUserJestConfig(utils);
                     return _context2.abrupt("return", next(utils));
 
-                  case 13:
+                  case 12:
                   case "end":
                     return _context2.stop();
                 }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.5.1",
+  "version": "1.5.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -113,13 +113,13 @@
   "modernConfig": {},
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "scripts": {
     "new": "modern new",
     "dev": "modern build --watch",
     "build": "modern build",
     "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"
+  }
 }