@modern-js/plugin-testing 1.3.3 → 1.4.1

package/CHANGELOG.md

@@ -1,5 +1,59 @@
 # @modern-js/plugin-testing
 
+## 1.4.1
+
+### Patch Changes
+
+- bebb39b6: chore: improve devDependencies and peerDependencies
+- 132f7b53: feat: move config declarations to @modern-js/core
+- 8491b6dd: fix: optimise "types" exports from plugin
+- Updated dependencies [bebb39b6]
+- Updated dependencies [4b4e73b7]
+- Updated dependencies [da60172c]
+- Updated dependencies [6cff93dc]
+- Updated dependencies [132f7b53]
+- Updated dependencies [9d4a005b]
+  - @modern-js/webpack@1.5.3
+  - @modern-js/testing@1.4.1
+  - @modern-js/utils@1.3.7
+  - @modern-js/testing-plugin-bff@1.3.0
+
+## 1.4.0
+
+### Minor Changes
+
+- 13684fad: feat: convert testing plugin to new cli plugin
+
+### Patch Changes
+
+- 3a7ce758: feat(plugin-testing): convert to new plugin
+- Updated dependencies [05ce88a0]
+- Updated dependencies [a8df060e]
+- Updated dependencies [c2046f37]
+- Updated dependencies [13684fad]
+- Updated dependencies [a2261fed]
+- Updated dependencies [66cbef42]
+- Updated dependencies [6a7acb81]
+- Updated dependencies [4e2026e4]
+  - @modern-js/core@1.6.0
+  - @modern-js/utils@1.3.6
+  - @modern-js/testing@1.4.0
+  - @modern-js/testing-plugin-bff@1.3.0
+  - @modern-js/runtime-core@1.4.0
+  - @modern-js/webpack@1.5.0
+
+## 1.3.4
+
+### Patch Changes
+
+- 9594df3f: fix: allow other bff plugin in unbundle mode
+- Updated dependencies [deeaa602]
+- Updated dependencies [54786e58]
+- Updated dependencies [3da3bf48]
+  - @modern-js/utils@1.3.2
+  - @modern-js/webpack@1.4.0
+  - @modern-js/core@1.4.3
+
 ## 1.3.3
 
 ### Patch Changes

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

@@ -1,41 +1,95 @@
 import path from 'path';
-import { createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
-import { createPlugin, useAppContext } from '@modern-js/core';
+import { fs, PLUGIN_SCHEMAS, createRuntimeExportsUtils } from '@modern-js/utils';
+import { jestConfigHook, getModuleNameMapper } 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 default createPlugin(() => {
-  let testingExportsUtils;
+export const mergeUserJestConfig = testUtils => {
+  const resolveJestConfig = testUtils.testConfig.jest;
+
+  if (resolveJestConfig && typeof resolveJestConfig !== 'function') {
+    testUtils.mergeJestConfig(resolveJestConfig);
+  }
+
+  if (typeof resolveJestConfig === 'function') {
+    resolveJestConfig(testUtils.jestConfig);
+  }
+};
+export default (() => {
+  const BffPlugin = TestingBffPlugin();
   return {
-    commands: ({
-      program
-    }) => {
-      program.command('test').allowUnknownOption().usage('[options]').action(async () => {
-        await test();
-      });
+    name: '@modern-js/plugin-testing',
+    usePlugins: [BffPlugin],
+    post: [BffPlugin.name],
+    registerHook: {
+      jestConfig: jestConfigHook
     },
+    setup: api => {
+      let testingExportsUtils;
+      const appContext = api.useAppContext();
+      const userConfig = api.useResolvedConfigContext();
+      return {
+        commands: ({
+          program
+        }) => {
+          program.command('test').allowUnknownOption().usage('[options]').action(async () => {
+            await test(api);
+          });
+        },
 
-    validateSchema() {
-      return PLUGIN_SCHEMAS['@modern-js/plugin-testing'];
-    },
+        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()
+        config() {
+          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}'`);
+        },
+
+        jestConfig: async (utils, next) => {
+          const existSrc = await fs.pathExists(appContext.srcDirectory);
+
+          if (!existSrc) {
+            return next(utils);
           }
+
+          const webpackConfig = getWebpackConfig(WebpackConfigTarget.CLIENT);
+          const {
+            resolve: {
+              alias = {}
+            }
+          } = webpackConfig;
+          utils.mergeJestConfig({
+            globals: {
+              [MODERNJS_CONFIG_KEY]: userConfig
+            },
+            moduleNameMapper: getModuleNameMapper(alias),
+            testEnvironment: 'jsdom',
+            resolver: require.resolve("./resolver")
+          });
+          utils.setJestConfig({
+            rootDir: appContext.appDirectory || 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)`]
+          });
+          mergeUserJestConfig(utils);
+          return next(utils);
         }
       };
-    },
-
-    addRuntimeExports() {
-      const testingPath = path.resolve(__dirname, '../');
-      testingExportsUtils.addExport(`export * from '${testingPath}'`);
     }
-
   };
-}, {
-  name: '@modern-js/plugin-testing'
 });

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

@@ -1,21 +1,10 @@
 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 { fs } from '@modern-js/utils';
-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();
-  const {
-    srcDirectory
-  } = config;
-  const existSrc = await fs.pathExists(srcDirectory);
+const test = async api => {
+  const userConfig = api.useResolvedConfigContext();
+  const appContext = api.useAppContext();
   userConfig.testing = userConfig.testing || {};
   const jest = userConfig.testing.jest || userConfig.tools.jest;
 
@@ -24,26 +13,7 @@ const test = async () => {
   }
 
   userConfig.testing.jest = userConfig.testing.jest || userConfig.tools.jest;
-
-  if (existSrc) {
-    // todo: consider lib-tools ...
-    const webpackConfigs = getWebpackConfig(WebpackConfigTarget.CLIENT);
-    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.serverRoutes
-    })];
-  } else {
-    userConfig.testing.plugins = [...(userConfig.testing.plugins || []), testingBffPlugin({
-      pwd: config.appDirectory,
-      userConfig,
-      plugins: config.plugins.map(p => p.server).filter(Boolean),
-      routes: config.serverRoutes
-    })];
-  }
-
-  const runtimeExportsPath = path.join(config.internalDirectory, '.runtime-exports');
+  const runtimeExportsPath = path.join(appContext.internalDirectory, '.runtime-exports');
   await compiler({
     sourceDir: runtimeExportsPath,
     rootDir: runtimeExportsPath,
@@ -54,7 +24,7 @@ const test = async () => {
       modules: 'cjs'
     }]]
   });
-  await runTest(userConfig.testing);
+  await runTest(api, userConfig.testing);
 };
 
 export default test;

package/dist/js/modern/constant.js

@@ -1 +1 @@
-export const modernjs_config_key = '__modernjs_config__';
+export const MODERNJS_CONFIG_KEY = '__modernjs_config__';

package/dist/js/modern/runtime-testing/app.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 { createApp } from '@modern-js/runtime-core';
-import { modernjs_config_key } from "../constant";
+import { MODERNJS_CONFIG_KEY } from "../constant";
 import resolvePlugins from "./resolvePlugins";
 
 class ModernRuntime {
@@ -48,4 +48,4 @@ class ModernRuntime {
 
 }
 
-export default new ModernRuntime(global[modernjs_config_key] || {});
+export default new ModernRuntime(global[MODERNJS_CONFIG_KEY] || {});

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

@@ -8,7 +8,7 @@ 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";
+import { MODERNJS_CONFIG_KEY } from "../constant";
 export const effects = () => effectsPlugin;
 export const immer = () => immerPlugin;
 export const autoActions = () => autoActionsPlugin;
@@ -16,7 +16,7 @@ export const createStore = props => {
   const createStatePlugins = () => {
     var _modernConfig$runtime;
 
-    const modernConfig = global[modernjs_config_key];
+    const modernConfig = global[MODERNJS_CONFIG_KEY];
     const stateConfig = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig$runtime = modernConfig.runtime) === null || _modernConfig$runtime === void 0 ? void 0 : _modernConfig$runtime.state;
     const plugins = [];
 

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

@@ -3,55 +3,115 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.mergeUserJestConfig = exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _core = require("@modern-js/core");
+var _testing = require("@modern-js/testing");
+
+var _webpack = require("@modern-js/webpack");
+
+var _testingPluginBff = _interopRequireDefault(require("@modern-js/testing-plugin-bff"));
+
+var _constant = require("../constant");
 
 var _test = _interopRequireDefault(require("./test"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _default = (0, _core.createPlugin)(() => {
-  let testingExportsUtils;
+const mergeUserJestConfig = testUtils => {
+  const resolveJestConfig = testUtils.testConfig.jest;
+
+  if (resolveJestConfig && typeof resolveJestConfig !== 'function') {
+    testUtils.mergeJestConfig(resolveJestConfig);
+  }
+
+  if (typeof resolveJestConfig === 'function') {
+    resolveJestConfig(testUtils.jestConfig);
+  }
+};
+
+exports.mergeUserJestConfig = mergeUserJestConfig;
+
+var _default = () => {
+  const BffPlugin = (0, _testingPluginBff.default)();
   return {
-    commands: ({
-      program
-    }) => {
-      program.command('test').allowUnknownOption().usage('[options]').action(async () => {
-        await (0, _test.default)();
-      });
+    name: '@modern-js/plugin-testing',
+    usePlugins: [BffPlugin],
+    post: [BffPlugin.name],
+    registerHook: {
+      jestConfig: _testing.jestConfigHook
     },
+    setup: api => {
+      let testingExportsUtils;
+      const appContext = api.useAppContext();
+      const userConfig = api.useResolvedConfigContext();
+      return {
+        commands: ({
+          program
+        }) => {
+          program.command('test').allowUnknownOption().usage('[options]').action(async () => {
+            await (0, _test.default)(api);
+          });
+        },
 
-    validateSchema() {
-      return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-testing'];
-    },
+        validateSchema() {
+          return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-testing'];
+        },
 
-    config() {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const appContext = (0, _core.useAppContext)();
-      testingExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, 'testing');
-      return {
-        source: {
-          alias: {
-            '@modern-js/runtime/testing': testingExportsUtils.getPath()
+        config() {
+          testingExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, 'testing');
+          return {
+            source: {
+              alias: {
+                '@modern-js/runtime/testing': testingExportsUtils.getPath()
+              }
+            }
+          };
+        },
+
+        addRuntimeExports() {
+          const testingPath = _path.default.resolve(__dirname, '../');
+
+          testingExportsUtils.addExport(`export * from '${testingPath}'`);
+        },
+
+        jestConfig: async (utils, next) => {
+          const existSrc = await _utils.fs.pathExists(appContext.srcDirectory);
+
+          if (!existSrc) {
+            return next(utils);
           }
+
+          const webpackConfig = (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.CLIENT);
+          const {
+            resolve: {
+              alias = {}
+            }
+          } = webpackConfig;
+          utils.mergeJestConfig({
+            globals: {
+              [_constant.MODERNJS_CONFIG_KEY]: userConfig
+            },
+            moduleNameMapper: (0, _testing.getModuleNameMapper)(alias),
+            testEnvironment: 'jsdom',
+            resolver: require.resolve("./resolver")
+          });
+          utils.setJestConfig({
+            rootDir: appContext.appDirectory || 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)`]
+          });
+          mergeUserJestConfig(utils);
+          return next(utils);
         }
       };
-    },
-
-    addRuntimeExports() {
-      const testingPath = _path.default.resolve(__dirname, '../');
-
-      testingExportsUtils.addExport(`export * from '${testingPath}'`);
     }
-
   };
-}, {
-  name: '@modern-js/plugin-testing'
-});
+};
 
 exports.default = _default;

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

@@ -9,29 +9,13 @@ var _path = _interopRequireDefault(require("path"));
 
 var _babelCompiler = require("@modern-js/babel-compiler");
 
-var _core = require("@modern-js/core");
-
 var _testing = require("@modern-js/testing");
 
-var _webpack = require("@modern-js/webpack");
-
-var _testingPluginBff = _interopRequireDefault(require("@modern-js/testing-plugin-bff"));
-
-var _utils = require("@modern-js/utils");
-
-var _modern = _interopRequireDefault(require("./plugins/modern"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const test = async () => {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const userConfig = (0, _core.useResolvedConfigContext)(); // eslint-disable-next-line react-hooks/rules-of-hooks
-
-  const config = (0, _core.useAppContext)();
-  const {
-    srcDirectory
-  } = config;
-  const existSrc = await _utils.fs.pathExists(srcDirectory);
+const test = async api => {
+  const userConfig = api.useResolvedConfigContext();
+  const appContext = api.useAppContext();
   userConfig.testing = userConfig.testing || {};
   const jest = userConfig.testing.jest || userConfig.tools.jest;
 
@@ -41,25 +25,7 @@ const test = async () => {
 
   userConfig.testing.jest = userConfig.testing.jest || userConfig.tools.jest;
 
-  if (existSrc) {
-    // todo: consider lib-tools ...
-    const webpackConfigs = (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.CLIENT);
-    userConfig.testing.plugins = [...(userConfig.testing.plugins || []), (0, _modern.default)(webpackConfigs, userConfig, config.appDirectory), (0, _testingPluginBff.default)({
-      pwd: config.appDirectory,
-      userConfig,
-      plugins: config.plugins.map(p => p.server).filter(Boolean),
-      routes: config.serverRoutes
-    })];
-  } else {
-    userConfig.testing.plugins = [...(userConfig.testing.plugins || []), (0, _testingPluginBff.default)({
-      pwd: config.appDirectory,
-      userConfig,
-      plugins: config.plugins.map(p => p.server).filter(Boolean),
-      routes: config.serverRoutes
-    })];
-  }
-
-  const runtimeExportsPath = _path.default.join(config.internalDirectory, '.runtime-exports');
+  const runtimeExportsPath = _path.default.join(appContext.internalDirectory, '.runtime-exports');
 
   await (0, _babelCompiler.compiler)({
     sourceDir: runtimeExportsPath,
@@ -71,7 +37,7 @@ const test = async () => {
       modules: 'cjs'
     }]]
   });
-  await (0, _testing.runTest)(userConfig.testing);
+  await (0, _testing.runTest)(api, userConfig.testing);
 };
 
 var _default = test;

package/dist/js/node/constant.js

@@ -3,6 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.modernjs_config_key = void 0;
-const modernjs_config_key = '__modernjs_config__';
-exports.modernjs_config_key = modernjs_config_key;
+exports.MODERNJS_CONFIG_KEY = void 0;
+const MODERNJS_CONFIG_KEY = '__modernjs_config__';
+exports.MODERNJS_CONFIG_KEY = MODERNJS_CONFIG_KEY;

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

@@ -59,6 +59,6 @@ class ModernRuntime {
 
 }
 
-var _default = new ModernRuntime(global[_constant.modernjs_config_key] || {});
+var _default = new ModernRuntime(global[_constant.MODERNJS_CONFIG_KEY] || {});
 
 exports.default = _default;

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

@@ -39,7 +39,7 @@ const createStore = props => {
   const createStatePlugins = () => {
     var _modernConfig$runtime;
 
-    const modernConfig = global[_constant.modernjs_config_key];
+    const modernConfig = global[_constant.MODERNJS_CONFIG_KEY];
     const stateConfig = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig$runtime = modernConfig.runtime) === null || _modernConfig$runtime === void 0 ? void 0 : _modernConfig$runtime.state;
     const plugins = [];