@modern-js/plugin-testing 1.1.1 → 1.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/js/modern/cli/plugins/modern.js +3 -1
- package/dist/js/modern/cli/test.js +8 -9
- package/dist/js/modern/runtime-testing/app.js +2 -2
- package/dist/js/modern/runtime-testing/customRender.js +2 -2
- package/dist/js/modern/runtime-testing/index.js +2 -1
- package/dist/js/modern/runtime-testing/reduck.js +2 -2
- package/dist/js/modern/runtime-testing/resolvePlugins.js +2 -2
- package/dist/js/node/cli/plugins/modern.js +3 -1
- package/dist/js/node/cli/test.js +8 -8
- package/dist/js/node/runtime-testing/app.js +2 -2
- package/dist/js/node/runtime-testing/customRender.js +2 -2
- package/dist/js/node/runtime-testing/index.js +10 -1
- package/dist/js/node/runtime-testing/reduck.js +2 -2
- package/dist/js/node/runtime-testing/resolvePlugins.js +2 -2
- package/dist/js/treeshaking/cli/plugins/modern.js +3 -1
- package/dist/js/treeshaking/cli/test.js +10 -9
- package/dist/js/treeshaking/runtime-testing/app.js +3 -3
- package/dist/js/treeshaking/runtime-testing/customRender.js +2 -2
- package/dist/js/treeshaking/runtime-testing/index.js +2 -1
- package/dist/js/treeshaking/runtime-testing/reduck.js +2 -2
- package/dist/js/treeshaking/runtime-testing/resolvePlugins.js +2 -2
- package/dist/types/cli/test.d.ts +7 -5
- package/dist/types/runtime-testing/index.d.ts +2 -1
- package/package.json +48 -13
- package/src/cli/index.ts +1 -4
- package/src/cli/plugins/modern.ts +7 -1
- package/src/cli/test.ts +18 -14
- package/src/runtime-testing/index.ts +1 -1
- package/type.d.ts +11 -0
@@ -41,7 +41,9 @@ export default ((webpackConfig, userConfig, pwd) => createPlugin(() => ({
|
|
41
41
|
utils.setJestConfig({
|
42
42
|
rootDir: pwd || process.cwd(),
|
43
43
|
// todo: diffrent test root for diffrent solutions
|
44
|
-
testMatch: [
|
44
|
+
// testMatch: [`<rootDir>/(src|tests|electron)/**/*.test.[jt]s?(x)`],
|
45
|
+
// testMatch bug on windows, issue: https://github.com/facebook/jest/issues/7914
|
46
|
+
testMatch: [`<rootDir>/src/**/*.test.[jt]s?(x)`, `<rootDir>/tests/**/*.test.[jt]s?(x)`, `<rootDir>/electron/**/*.test.[jt]s?(x)`]
|
45
47
|
});
|
46
48
|
return next(utils);
|
47
49
|
}
|
@@ -2,8 +2,8 @@ import path from 'path';
|
|
2
2
|
import { compiler } from '@modern-js/babel-compiler';
|
3
3
|
import { useAppContext, useResolvedConfigContext } from '@modern-js/core';
|
4
4
|
import { runTest } from '@modern-js/testing';
|
5
|
-
import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
|
6
|
-
|
5
|
+
import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
|
6
|
+
import testingBffPlugin from '@modern-js/testing-plugin-bff';
|
7
7
|
import modernTestPlugin from "./plugins/modern";
|
8
8
|
|
9
9
|
const test = async () => {
|
@@ -15,13 +15,12 @@ const test = async () => {
|
|
15
15
|
const webpackConfigs = getWebpackConfig(WebpackConfigTarget.CLIENT);
|
16
16
|
userConfig.testing = userConfig.testing || {};
|
17
17
|
userConfig.testing.jest = userConfig.testing.jest || userConfig.tools.jest;
|
18
|
-
userConfig.testing.plugins = [...(userConfig.testing.plugins || []), modernTestPlugin(webpackConfigs, userConfig, config.appDirectory)
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
];
|
18
|
+
userConfig.testing.plugins = [...(userConfig.testing.plugins || []), modernTestPlugin(webpackConfigs, userConfig, config.appDirectory), testingBffPlugin({
|
19
|
+
pwd: config.appDirectory,
|
20
|
+
userConfig,
|
21
|
+
plugins: config.plugins.map(p => p.server).filter(Boolean),
|
22
|
+
routes: config.serverRoutes
|
23
|
+
})];
|
25
24
|
const runtimeExportsPath = path.join(config.internalDirectory, '.runtime-exports');
|
26
25
|
await compiler({
|
27
26
|
sourceDir: runtimeExportsPath,
|
@@ -1,6 +1,6 @@
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
1
|
+
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; }
|
2
2
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
4
4
|
|
5
5
|
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; }
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
1
|
+
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; }
|
2
2
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
4
4
|
|
5
5
|
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; }
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
1
|
+
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; }
|
2
2
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
4
4
|
|
5
5
|
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; }
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
1
|
+
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; }
|
2
2
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
4
4
|
|
5
5
|
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; }
|
6
6
|
|
@@ -54,7 +54,9 @@ var _default = (webpackConfig, userConfig, pwd) => (0, _testing.createPlugin)(()
|
|
54
54
|
utils.setJestConfig({
|
55
55
|
rootDir: pwd || process.cwd(),
|
56
56
|
// todo: diffrent test root for diffrent solutions
|
57
|
-
testMatch: [
|
57
|
+
// testMatch: [`<rootDir>/(src|tests|electron)/**/*.test.[jt]s?(x)`],
|
58
|
+
// testMatch bug on windows, issue: https://github.com/facebook/jest/issues/7914
|
59
|
+
testMatch: [`<rootDir>/src/**/*.test.[jt]s?(x)`, `<rootDir>/tests/**/*.test.[jt]s?(x)`, `<rootDir>/electron/**/*.test.[jt]s?(x)`]
|
58
60
|
});
|
59
61
|
return next(utils);
|
60
62
|
}
|
package/dist/js/node/cli/test.js
CHANGED
@@ -15,11 +15,12 @@ var _testing = require("@modern-js/testing");
|
|
15
15
|
|
16
16
|
var _webpack = require("@modern-js/webpack");
|
17
17
|
|
18
|
+
var _testingPluginBff = _interopRequireDefault(require("@modern-js/testing-plugin-bff"));
|
19
|
+
|
18
20
|
var _modern = _interopRequireDefault(require("./plugins/modern"));
|
19
21
|
|
20
22
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
21
23
|
|
22
|
-
// import testingBffPlugin from '@modern-js/testing-plugin-bff';
|
23
24
|
const test = async () => {
|
24
25
|
// eslint-disable-next-line react-hooks/rules-of-hooks
|
25
26
|
const userConfig = (0, _core.useResolvedConfigContext)(); // eslint-disable-next-line react-hooks/rules-of-hooks
|
@@ -29,13 +30,12 @@ const test = async () => {
|
|
29
30
|
const webpackConfigs = (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.CLIENT);
|
30
31
|
userConfig.testing = userConfig.testing || {};
|
31
32
|
userConfig.testing.jest = userConfig.testing.jest || userConfig.tools.jest;
|
32
|
-
userConfig.testing.plugins = [...(userConfig.testing.plugins || []), (0, _modern.default)(webpackConfigs, userConfig, config.appDirectory)
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
];
|
33
|
+
userConfig.testing.plugins = [...(userConfig.testing.plugins || []), (0, _modern.default)(webpackConfigs, userConfig, config.appDirectory), (0, _testingPluginBff.default)({
|
34
|
+
pwd: config.appDirectory,
|
35
|
+
userConfig,
|
36
|
+
plugins: config.plugins.map(p => p.server).filter(Boolean),
|
37
|
+
routes: config.serverRoutes
|
38
|
+
})];
|
39
39
|
|
40
40
|
const runtimeExportsPath = _path.default.join(config.internalDirectory, '.runtime-exports');
|
41
41
|
|
@@ -13,9 +13,9 @@ var _constant = require("../constant");
|
|
13
13
|
|
14
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
15
15
|
|
16
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
16
|
+
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; }
|
17
17
|
|
18
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
18
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
19
19
|
|
20
20
|
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; }
|
21
21
|
|
@@ -13,9 +13,9 @@ var _app = _interopRequireDefault(require("./app"));
|
|
13
13
|
|
14
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
15
15
|
|
16
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
16
|
+
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; }
|
17
17
|
|
18
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
18
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
19
19
|
|
20
20
|
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; }
|
21
21
|
|
@@ -4,7 +4,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
5
5
|
});
|
6
6
|
var _exportNames = {
|
7
|
-
renderApp: true
|
7
|
+
renderApp: true,
|
8
|
+
testBff: true
|
8
9
|
};
|
9
10
|
Object.defineProperty(exports, "renderApp", {
|
10
11
|
enumerable: true,
|
@@ -12,6 +13,12 @@ Object.defineProperty(exports, "renderApp", {
|
|
12
13
|
return _customRender.default;
|
13
14
|
}
|
14
15
|
});
|
16
|
+
Object.defineProperty(exports, "testBff", {
|
17
|
+
enumerable: true,
|
18
|
+
get: function () {
|
19
|
+
return _testingPluginBff.testBff;
|
20
|
+
}
|
21
|
+
});
|
15
22
|
|
16
23
|
var _customRender = _interopRequireDefault(require("./customRender"));
|
17
24
|
|
@@ -43,4 +50,6 @@ Object.keys(_reduck).forEach(function (key) {
|
|
43
50
|
});
|
44
51
|
});
|
45
52
|
|
53
|
+
var _testingPluginBff = require("@modern-js/testing-plugin-bff");
|
54
|
+
|
46
55
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
@@ -17,9 +17,9 @@ var _constant = require("../constant");
|
|
17
17
|
|
18
18
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
19
19
|
|
20
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
20
|
+
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; }
|
21
21
|
|
22
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
22
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
23
23
|
|
24
24
|
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; }
|
25
25
|
|
@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
});
|
6
6
|
exports.default = resolvePlugins;
|
7
7
|
|
8
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
8
|
+
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; }
|
9
9
|
|
10
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
10
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
11
11
|
|
12
12
|
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; }
|
13
13
|
|
@@ -42,7 +42,9 @@ export default (function (webpackConfig, userConfig, pwd) {
|
|
42
42
|
utils.setJestConfig({
|
43
43
|
rootDir: pwd || process.cwd(),
|
44
44
|
// todo: diffrent test root for diffrent solutions
|
45
|
-
testMatch: [
|
45
|
+
// testMatch: [`<rootDir>/(src|tests|electron)/**/*.test.[jt]s?(x)`],
|
46
|
+
// testMatch bug on windows, issue: https://github.com/facebook/jest/issues/7914
|
47
|
+
testMatch: ["<rootDir>/src/**/*.test.[jt]s?(x)", "<rootDir>/tests/**/*.test.[jt]s?(x)", "<rootDir>/electron/**/*.test.[jt]s?(x)"]
|
46
48
|
});
|
47
49
|
return next(utils);
|
48
50
|
}
|
@@ -20,8 +20,8 @@ import path from 'path';
|
|
20
20
|
import { compiler } from '@modern-js/babel-compiler';
|
21
21
|
import { useAppContext, useResolvedConfigContext } from '@modern-js/core';
|
22
22
|
import { runTest } from '@modern-js/testing';
|
23
|
-
import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
|
24
|
-
|
23
|
+
import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
|
24
|
+
import testingBffPlugin from '@modern-js/testing-plugin-bff';
|
25
25
|
import modernTestPlugin from "./plugins/modern";
|
26
26
|
|
27
27
|
var test = /*#__PURE__*/function () {
|
@@ -39,13 +39,14 @@ var test = /*#__PURE__*/function () {
|
|
39
39
|
webpackConfigs = getWebpackConfig(WebpackConfigTarget.CLIENT);
|
40
40
|
userConfig.testing = userConfig.testing || {};
|
41
41
|
userConfig.testing.jest = userConfig.testing.jest || userConfig.tools.jest;
|
42
|
-
userConfig.testing.plugins = [].concat(_toConsumableArray(userConfig.testing.plugins || []), [modernTestPlugin(webpackConfigs, userConfig, config.appDirectory)
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
42
|
+
userConfig.testing.plugins = [].concat(_toConsumableArray(userConfig.testing.plugins || []), [modernTestPlugin(webpackConfigs, userConfig, config.appDirectory), testingBffPlugin({
|
43
|
+
pwd: config.appDirectory,
|
44
|
+
userConfig: userConfig,
|
45
|
+
plugins: config.plugins.map(function (p) {
|
46
|
+
return p.server;
|
47
|
+
}).filter(Boolean),
|
48
|
+
routes: config.serverRoutes
|
49
|
+
})]);
|
49
50
|
runtimeExportsPath = path.join(config.internalDirectory, '.runtime-exports');
|
50
51
|
_context.next = 9;
|
51
52
|
return compiler({
|
@@ -1,6 +1,6 @@
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
1
|
+
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; }
|
2
2
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
4
4
|
|
5
5
|
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; }
|
6
6
|
|
@@ -8,7 +8,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
8
8
|
|
9
9
|
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
|
10
10
|
|
11
|
-
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
|
11
|
+
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
12
12
|
|
13
13
|
import { createApp as _createApp } from '@modern-js/runtime-core';
|
14
14
|
import resolvePlugins from "./resolvePlugins";
|
@@ -1,6 +1,6 @@
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
1
|
+
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; }
|
2
2
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
4
4
|
|
5
5
|
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; }
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
1
|
+
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; }
|
2
2
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
4
4
|
|
5
5
|
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; }
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
1
|
+
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; }
|
2
2
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
4
4
|
|
5
5
|
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; }
|
6
6
|
|
package/dist/types/cli/test.d.ts
CHANGED
@@ -1,8 +1,10 @@
|
|
1
|
-
|
1
|
+
declare const test: () => Promise<void>;
|
2
|
+
export default test;
|
2
3
|
declare module '@modern-js/core' {
|
3
4
|
interface UserConfig {
|
4
|
-
testing
|
5
|
+
testing?: import('@modern-js/testing').TestConfig;
|
5
6
|
}
|
6
|
-
|
7
|
-
|
8
|
-
|
7
|
+
interface ToolsConfig {
|
8
|
+
jest?: import('@modern-js/testing').TestConfig['jest'];
|
9
|
+
}
|
10
|
+
}
|
package/package.json
CHANGED
@@ -11,43 +11,77 @@
|
|
11
11
|
"modern",
|
12
12
|
"modern.js"
|
13
13
|
],
|
14
|
-
"version": "1.1.
|
14
|
+
"version": "1.1.4",
|
15
15
|
"jsnext:source": "./src/index.ts",
|
16
16
|
"types": "./dist/types/index.d.ts",
|
17
17
|
"main": "./dist/js/node/index.js",
|
18
18
|
"module": "./dist/js/treeshaking/index.js",
|
19
19
|
"jsnext:modern": "./dist/js/modern/index.js",
|
20
20
|
"exports": {
|
21
|
+
"./type": "./type.d.ts",
|
22
|
+
".": {
|
23
|
+
"node": {
|
24
|
+
"import": "./dist/js/modern/runtime-testing/index.js",
|
25
|
+
"require": "./dist/js/node/runtime-testing/index.js",
|
26
|
+
"types": "./types/index.d.ts"
|
27
|
+
},
|
28
|
+
"default": "./dist/js/treeshaking/runtime-testing/index.js"
|
29
|
+
},
|
30
|
+
"./runtime": {
|
31
|
+
"node": {
|
32
|
+
"import": "./dist/js/modern/runtime-testing/index.js",
|
33
|
+
"require": "./dist/js/node/runtime-testing/index.js",
|
34
|
+
"types": "./types/index.d.ts"
|
35
|
+
},
|
36
|
+
"default": "./dist/js/treeshaking/runtime/index.js"
|
37
|
+
},
|
21
38
|
"./cli": "./dist/js/node/cli/index.js"
|
22
39
|
},
|
40
|
+
"typesVersions": {
|
41
|
+
"*": {
|
42
|
+
".": [
|
43
|
+
"./dist/types/runtime/index.d.ts"
|
44
|
+
],
|
45
|
+
"cli": [
|
46
|
+
"./dist/types/cli/index.d.ts"
|
47
|
+
],
|
48
|
+
"runtime": [
|
49
|
+
"./dist/types/runtime-testing/index.d.ts"
|
50
|
+
],
|
51
|
+
"type": [
|
52
|
+
"./type.d.ts"
|
53
|
+
]
|
54
|
+
}
|
55
|
+
},
|
23
56
|
"dependencies": {
|
24
57
|
"@babel/preset-env": "^7.15.6",
|
25
58
|
"@babel/runtime": "^7",
|
26
|
-
"@modern-js/babel-compiler": "^1.
|
27
|
-
"@modern-js/testing": "^1.
|
28
|
-
"@modern-js/utils": "^1.
|
29
|
-
"@modern-js/webpack": "^1.
|
59
|
+
"@modern-js/babel-compiler": "^1.0.0",
|
60
|
+
"@modern-js/testing": "^1.0.0",
|
61
|
+
"@modern-js/utils": "^1.0.0",
|
62
|
+
"@modern-js/webpack": "^1.0.0",
|
30
63
|
"@testing-library/jest-dom": "^5.14.1",
|
31
64
|
"@testing-library/react": "^12.0.0",
|
32
|
-
"enhanced-resolve": "^5.8.2"
|
65
|
+
"enhanced-resolve": "^5.8.2",
|
66
|
+
"@modern-js/testing-plugin-bff": "^1.1.1"
|
33
67
|
},
|
34
68
|
"peerDependencies": {
|
35
69
|
"@modern-js-reduck/plugin-auto-actions": "^1.0.0",
|
36
70
|
"@modern-js-reduck/plugin-effects": "^1.0.0",
|
37
71
|
"@modern-js-reduck/plugin-immutable": "^1.0.0",
|
38
72
|
"@modern-js-reduck/store": "^1.0.0",
|
39
|
-
"@modern-js/core": "^1.
|
40
|
-
"@modern-js/runtime-core": "^1.
|
73
|
+
"@modern-js/core": "^1.0.0",
|
74
|
+
"@modern-js/runtime-core": "^1.0.0"
|
41
75
|
},
|
42
76
|
"devDependencies": {
|
43
77
|
"@modern-js-reduck/plugin-auto-actions": "^1.0.0",
|
44
78
|
"@modern-js-reduck/plugin-effects": "^1.0.0",
|
45
79
|
"@modern-js-reduck/plugin-immutable": "^1.0.0",
|
46
80
|
"@modern-js-reduck/store": "^1.0.0",
|
47
|
-
"@modern-js/plugin-testing": "^1.1.
|
48
|
-
"@modern-js/module-tools": "^1.1.
|
49
|
-
"@modern-js/core": "^1.
|
50
|
-
"@modern-js/runtime-core": "^1.
|
81
|
+
"@modern-js/plugin-testing": "^1.1.1",
|
82
|
+
"@modern-js/module-tools": "^1.1.1",
|
83
|
+
"@modern-js/core": "^1.0.0",
|
84
|
+
"@modern-js/runtime-core": "^1.0.0",
|
51
85
|
"@types/jest": "^26",
|
52
86
|
"@types/node": "^14",
|
53
87
|
"@types/react": "^17",
|
@@ -64,5 +98,6 @@
|
|
64
98
|
"new": "modern new",
|
65
99
|
"build": "modern build",
|
66
100
|
"test": "modern test --passWithNoTests"
|
67
|
-
}
|
101
|
+
},
|
102
|
+
"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"
|
68
103
|
}
|
package/src/cli/index.ts
CHANGED
@@ -1,8 +1,5 @@
|
|
1
1
|
import path from 'path';
|
2
|
-
import {
|
3
|
-
createRuntimeExportsUtils,
|
4
|
-
PLUGIN_SCHEMAS,
|
5
|
-
} from '@modern-js/utils';
|
2
|
+
import { createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
|
6
3
|
import { createPlugin, useAppContext } from '@modern-js/core';
|
7
4
|
import test from './test';
|
8
5
|
|
@@ -46,7 +46,13 @@ export default (webpackConfig: any, userConfig: any, pwd: string) =>
|
|
46
46
|
utils.setJestConfig({
|
47
47
|
rootDir: pwd || process.cwd(),
|
48
48
|
// todo: diffrent test root for diffrent solutions
|
49
|
-
testMatch: [
|
49
|
+
// testMatch: [`<rootDir>/(src|tests|electron)/**/*.test.[jt]s?(x)`],
|
50
|
+
// testMatch bug on windows, issue: https://github.com/facebook/jest/issues/7914
|
51
|
+
testMatch: [
|
52
|
+
`<rootDir>/src/**/*.test.[jt]s?(x)`,
|
53
|
+
`<rootDir>/tests/**/*.test.[jt]s?(x)`,
|
54
|
+
`<rootDir>/electron/**/*.test.[jt]s?(x)`,
|
55
|
+
],
|
50
56
|
});
|
51
57
|
|
52
58
|
return next(utils);
|
package/src/cli/test.ts
CHANGED
@@ -1,17 +1,11 @@
|
|
1
1
|
import path from 'path';
|
2
2
|
import { compiler } from '@modern-js/babel-compiler';
|
3
3
|
import { useAppContext, useResolvedConfigContext } from '@modern-js/core';
|
4
|
-
import {
|
4
|
+
import { runTest } from '@modern-js/testing';
|
5
5
|
import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
|
6
|
-
|
6
|
+
import testingBffPlugin from '@modern-js/testing-plugin-bff';
|
7
7
|
import modernTestPlugin from './plugins/modern';
|
8
8
|
|
9
|
-
declare module '@modern-js/core' {
|
10
|
-
interface UserConfig {
|
11
|
-
testing: TestConfig;
|
12
|
-
}
|
13
|
-
}
|
14
|
-
|
15
9
|
const test = async () => {
|
16
10
|
// eslint-disable-next-line react-hooks/rules-of-hooks
|
17
11
|
const userConfig = useResolvedConfigContext();
|
@@ -28,12 +22,12 @@ const test = async () => {
|
|
28
22
|
userConfig.testing.plugins = [
|
29
23
|
...(userConfig.testing.plugins || []),
|
30
24
|
modernTestPlugin(webpackConfigs, userConfig, config.appDirectory),
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
25
|
+
testingBffPlugin({
|
26
|
+
pwd: config.appDirectory,
|
27
|
+
userConfig,
|
28
|
+
plugins: config.plugins.map(p => p.server).filter(Boolean),
|
29
|
+
routes: (config as any).serverRoutes,
|
30
|
+
}),
|
37
31
|
];
|
38
32
|
|
39
33
|
const runtimeExportsPath = path.join(
|
@@ -64,3 +58,13 @@ const test = async () => {
|
|
64
58
|
};
|
65
59
|
|
66
60
|
export default test;
|
61
|
+
|
62
|
+
declare module '@modern-js/core' {
|
63
|
+
interface UserConfig {
|
64
|
+
testing?: import('@modern-js/testing').TestConfig;
|
65
|
+
}
|
66
|
+
|
67
|
+
interface ToolsConfig {
|
68
|
+
jest?: import('@modern-js/testing').TestConfig['jest'];
|
69
|
+
}
|
70
|
+
}
|
package/type.d.ts
CHANGED
@@ -1,4 +1,15 @@
|
|
1
|
+
import '@modern-js/core';
|
1
2
|
declare module '@modern-js/runtime/testing' {
|
2
3
|
export * from '@testing-library/react';
|
3
4
|
export { renderApp, createStore } from '@modern-js/plugin-testing';
|
4
5
|
}
|
6
|
+
|
7
|
+
declare module '@modern-js/core' {
|
8
|
+
interface UserConfig {
|
9
|
+
testing?: import('@modern-js/testing').TestConfig;
|
10
|
+
}
|
11
|
+
|
12
|
+
interface ToolsConfig {
|
13
|
+
jest?: import('@modern-js/testing').TestConfig['jest'];
|
14
|
+
}
|
15
|
+
}
|