@modern-js/plugin-testing 1.3.0 → 1.3.3

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # @modern-js/plugin-testing
 
+## 1.3.3
+
+### Patch Changes
+
+- 698ad9e8: feat: support test bff for api service
+- 11fda442: fix: add testing runtime base
+- Updated dependencies [75f4eeb8]
+- Updated dependencies [698ad9e8]
+- Updated dependencies [53aca274]
+- Updated dependencies [78279953]
+- Updated dependencies [e116ace5]
+- Updated dependencies [4d72edea]
+  - @modern-js/webpack@1.3.1
+  - @modern-js/testing@1.3.2
+  - @modern-js/testing-plugin-bff@1.2.2
+  - @modern-js/core@1.4.1
+  - @modern-js/utils@1.3.1
+
+## 1.3.2
+
+### Patch Changes
+
+- 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

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

@@ -1,31 +1,5 @@
-import path from 'path';
-import { createPlugin } from '@modern-js/testing';
+import { createPlugin, getModuleNameMapper } from '@modern-js/testing';
 import { modernjs_config_key } from "../../constant";
-export const getModuleNameMapper = config => {
-  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 => 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;
-  }, {});
-};
 export const mergeUserJestConfig = async testUtils => {
   const resolveJestConfig = testUtils.testConfig.jest;
 
@@ -37,26 +11,33 @@ export const mergeUserJestConfig = async testUtils => {
     await resolveJestConfig(testUtils.jestConfig);
   }
 };
-export default ((webpackConfig, userConfig, pwd) => createPlugin(() => ({
-  jestConfig: (utils, next) => {
-    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)`]
-    });
-    mergeUserJestConfig(utils);
-    return next(utils);
-  }
-}), {
+export default ((webpackConfig, userConfig, pwd) => createPlugin(() => {
+  const {
+    resolve: {
+      alias = {}
+    }
+  } = webpackConfig;
+  return {
+    jestConfig: (utils, next) => {
+      utils.mergeJestConfig({
+        globals: {
+          [modernjs_config_key]: userConfig
+        },
+        moduleNameMapper: getModuleNameMapper(alias),
+        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)`]
+      });
+      mergeUserJestConfig(utils);
+      return next(utils);
+    }
+  };
+}, {
   name: '@modern-js/testing-plugin-modern'
 }));

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

@@ -1,4 +1,4 @@
-import { mergeUserJestConfig, getModuleNameMapper } from "./modern";
+import { mergeUserJestConfig } from "./modern";
 describe('modern plugin', () => {
   test('mergeUserJestConfig support object', () => {
     const testUtils = {
@@ -53,17 +53,5 @@ describe('modern plugin', () => {
       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/resolver.js

@@ -1,6 +1,6 @@
 import enhanceResolve from 'enhanced-resolve';
 const resolver = enhanceResolve.create.sync({
-  conditionNames: ['jsnext:source', 'require', 'node', 'default'],
+  conditionNames: ['require', 'node', 'default'],
   extensions: ['.js', '.json', '.node', '.ts', '.tsx']
 });
 

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

@@ -4,15 +4,18 @@ 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(); // todo: consider lib-tools ...
-
-  const webpackConfigs = getWebpackConfig(WebpackConfigTarget.CLIENT);
+  const config = useAppContext();
+  const {
+    srcDirectory
+  } = config;
+  const existSrc = await fs.pathExists(srcDirectory);
   userConfig.testing = userConfig.testing || {};
   const jest = userConfig.testing.jest || userConfig.tools.jest;
 
@@ -21,12 +24,25 @@ const test = async () => {
   }
 
   userConfig.testing.jest = userConfig.testing.jest || userConfig.tools.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.serverRoutes
-  })];
+
+  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');
   await compiler({
     sourceDir: runtimeExportsPath,

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,46 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mergeUserJestConfig = exports.getModuleNameMapper = exports.default = void 0;
-
-var _path = _interopRequireDefault(require("path"));
+exports.mergeUserJestConfig = exports.default = void 0;
 
 var _testing = require("@modern-js/testing");
 
 var _constant = require("../../constant");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const getModuleNameMapper = config => {
-  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 => 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.default.normalize(`${aliasValue}/$1`);
-
-    memo[key] = value;
-    return memo;
-  }, {});
-};
-
-exports.getModuleNameMapper = getModuleNameMapper;
-
 const mergeUserJestConfig = async testUtils => {
   const resolveJestConfig = testUtils.testConfig.jest;
 
@@ -57,27 +23,34 @@ const mergeUserJestConfig = async testUtils => {
 
 exports.mergeUserJestConfig = mergeUserJestConfig;
 
-var _default = (webpackConfig, userConfig, pwd) => (0, _testing.createPlugin)(() => ({
-  jestConfig: (utils, next) => {
-    utils.mergeJestConfig({
-      globals: {
-        [_constant.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)`]
-    });
-    mergeUserJestConfig(utils);
-    return next(utils);
-  }
-}), {
+var _default = (webpackConfig, userConfig, pwd) => (0, _testing.createPlugin)(() => {
+  const {
+    resolve: {
+      alias = {}
+    }
+  } = webpackConfig;
+  return {
+    jestConfig: (utils, next) => {
+      utils.mergeJestConfig({
+        globals: {
+          [_constant.modernjs_config_key]: userConfig
+        },
+        moduleNameMapper: (0, _testing.getModuleNameMapper)(alias),
+        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)`]
+      });
+      mergeUserJestConfig(utils);
+      return next(utils);
+    }
+  };
+}, {
   name: '@modern-js/testing-plugin-modern'
 });
 

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

@@ -56,17 +56,5 @@ describe('modern plugin', () => {
       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/resolver.js

@@ -5,7 +5,7 @@ var _enhancedResolve = _interopRequireDefault(require("enhanced-resolve"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const resolver = _enhancedResolve.default.create.sync({
-  conditionNames: ['jsnext:source', 'require', 'node', 'default'],
+  conditionNames: ['require', 'node', 'default'],
   extensions: ['.js', '.json', '.node', '.ts', '.tsx']
 });
 

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

@@ -17,6 +17,8 @@ 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 }; }
@@ -25,9 +27,11 @@ 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)(); // todo: consider lib-tools ...
-
-  const webpackConfigs = (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.CLIENT);
+  const config = (0, _core.useAppContext)();
+  const {
+    srcDirectory
+  } = config;
+  const existSrc = await _utils.fs.pathExists(srcDirectory);
   userConfig.testing = userConfig.testing || {};
   const jest = userConfig.testing.jest || userConfig.tools.jest;
 
@@ -36,12 +40,24 @@ const test = async () => {
   }
 
   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,
-    userConfig,
-    plugins: config.plugins.map(p => p.server).filter(Boolean),
-    routes: config.serverRoutes
-  })];
+
+  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');
 

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

@@ -6,33 +6,8 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 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 { createPlugin, getModuleNameMapper } from '@modern-js/testing';
 import { modernjs_config_key } from "../../constant";
-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) {
-    var aliasValue = Array.isArray(alias[cur]) ? alias[cur] : [alias[cur]];
-    var isFile = aliasValue.some(function (s) {
-      return 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[".+".concat(cur)] = aliasValue[0];
-      return memo;
-    }
-
-    if (isFile) {
-      memo[cur] = aliasValue[0];
-    }
-
-    var key = "^".concat(cur, "/(.*)$");
-    var value = path.normalize("".concat(aliasValue, "/$1"));
-    memo[key] = value;
-    return memo;
-  }, {});
-};
 export var mergeUserJestConfig = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(testUtils) {
     var resolveJestConfig;
@@ -68,11 +43,13 @@ export var mergeUserJestConfig = /*#__PURE__*/function () {
 }();
 export default (function (webpackConfig, userConfig, pwd) {
   return createPlugin(function () {
+    var _webpackConfig$resolv = webpackConfig.resolve.alias,
+        alias = _webpackConfig$resolv === void 0 ? {} : _webpackConfig$resolv;
     return {
       jestConfig: function jestConfig(utils, next) {
         utils.mergeJestConfig({
           globals: _defineProperty({}, modernjs_config_key, userConfig),
-          moduleNameMapper: getModuleNameMapper(webpackConfig),
+          moduleNameMapper: getModuleNameMapper(alias),
           testEnvironment: 'jsdom',
           resolver: require.resolve("../resolver")
         });

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

@@ -1,4 +1,4 @@
-import { mergeUserJestConfig, getModuleNameMapper } from "./modern";
+import { mergeUserJestConfig } from "./modern";
 describe('modern plugin', function () {
   test('mergeUserJestConfig support object', function () {
     var testUtils = {
@@ -49,17 +49,5 @@ describe('modern plugin', function () {
       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/resolver.js

@@ -1,6 +1,6 @@
 import enhanceResolve from 'enhanced-resolve';
 var resolver = enhanceResolve.create.sync({
-  conditionNames: ['jsnext:source', 'require', 'node', 'default'],
+  conditionNames: ['require', 'node', 'default'],
   extensions: ['.js', '.json', '.node', '.ts', '.tsx']
 });