@modern-js/module-tools 1.1.0 → 1.1.1-jupiter.0
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/CHANGELOG.md +22 -75
- package/dist/js/modern/cli/new.js +2 -2
- package/dist/js/modern/commands/dev.js +12 -5
- package/dist/js/modern/features/build/build-platform.js +21 -18
- package/dist/js/modern/features/build/index.js +18 -8
- package/dist/js/modern/tasks/build-source-code.js +2 -2
- package/dist/js/modern/tasks/generator-dts.js +2 -2
- package/dist/js/modern/utils/babel.js +2 -2
- package/dist/js/node/cli/new.js +2 -2
- package/dist/js/node/commands/dev.js +13 -6
- package/dist/js/node/features/build/build-platform.js +21 -18
- package/dist/js/node/features/build/index.js +18 -7
- package/dist/js/node/tasks/build-source-code.js +2 -2
- package/dist/js/node/tasks/generator-dts.js +2 -2
- package/dist/js/node/utils/babel.js +2 -2
- package/dist/types/index.d.ts +3 -0
- package/package.json +17 -17
- package/src/commands/dev.ts +5 -3
- package/src/features/build/build-platform.ts +27 -20
- package/src/features/build/index.ts +17 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,85 +1,32 @@
|
|
|
1
1
|
# @modern-js/module-tools
|
|
2
2
|
|
|
3
|
-
## 1.1.
|
|
4
|
-
|
|
5
|
-
### Minor Changes
|
|
6
|
-
|
|
7
|
-
- 96119db2: Relese v1.1.0
|
|
8
|
-
|
|
9
|
-
1. 全面支持 Windows 平台
|
|
10
|
-
|
|
11
|
-
ISSUE:
|
|
12
|
-
|
|
13
|
-
- [182](https://github.com/modern-js-dev/modern.js/issues/182)
|
|
14
|
-
- [236](https://github.com/modern-js-dev/modern.js/issues/236)
|
|
15
|
-
|
|
16
|
-
PR
|
|
17
|
-
|
|
18
|
-
- [219](https://github.com/modern-js-dev/modern.js/pull/219)
|
|
19
|
-
- [247](https://github.com/modern-js-dev/modern.js/pull/247)
|
|
20
|
-
- [249](https://github.com/modern-js-dev/modern.js/pull/249)
|
|
21
|
-
- [253](https://github.com/modern-js-dev/modern.js/pull/253)
|
|
22
|
-
- [268](https://github.com/modern-js-dev/modern.js/pull/268)
|
|
23
|
-
- [270](https://github.com/modern-js-dev/modern.js/pull/270)
|
|
24
|
-
- [273](https://github.com/modern-js-dev/modern.js/pull/273)
|
|
25
|
-
- [276](https://github.com/modern-js-dev/modern.js/pull/276)
|
|
26
|
-
|
|
27
|
-
2. 修复 Unbundled 模式启用问题
|
|
28
|
-
|
|
29
|
-
ISSUE
|
|
30
|
-
|
|
31
|
-
- [186](https://github.com/modern-js-dev/modern.js/issues/186)
|
|
32
|
-
- [224](https://github.com/modern-js-dev/modern.js/issues/224)
|
|
33
|
-
- [225](https://github.com/modern-js-dev/modern.js/issues/225)
|
|
34
|
-
- [238](https://github.com/modern-js-dev/modern.js/issues/238)
|
|
35
|
-
|
|
36
|
-
PR
|
|
37
|
-
|
|
38
|
-
- [226](https://github.com/modern-js-dev/modern.js/pull/226)
|
|
39
|
-
- [264](https://github.com/modern-js-dev/modern.js/pull/264)
|
|
40
|
-
- [codesmith-12](https://github.com/modern-js-dev/codesmith/pull/12)
|
|
41
|
-
|
|
42
|
-
3. 修复模块工程方案 .npmignore 文件初始化未生成
|
|
43
|
-
|
|
44
|
-
ISSUE
|
|
3
|
+
## 1.1.1
|
|
45
4
|
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
PR
|
|
49
|
-
|
|
50
|
-
- [209](https://github.com/modern-js-dev/modern.js/pull/209)
|
|
51
|
-
|
|
52
|
-
4. 修复 Storybook 使用时浏览器打开页面报错
|
|
53
|
-
|
|
54
|
-
ISSUE
|
|
55
|
-
|
|
56
|
-
- [228](https://github.com/modern-js-dev/modern.js/issues/228)
|
|
57
|
-
|
|
58
|
-
PR
|
|
59
|
-
|
|
60
|
-
- [254](https://github.com/modern-js-dev/modern.js/pull/254)
|
|
61
|
-
|
|
62
|
-
5. 修复 BFF 一体化开发不支持 unbundle 模式
|
|
63
|
-
|
|
64
|
-
ISSUE
|
|
65
|
-
|
|
66
|
-
- [235](https://github.com/modern-js-dev/modern.js/issues/235)
|
|
67
|
-
- [257](https://github.com/modern-js-dev/modern.js/issues/257)
|
|
68
|
-
|
|
69
|
-
PR
|
|
70
|
-
|
|
71
|
-
- [269](https://github.com/modern-js-dev/modern.js/pull/269)
|
|
72
|
-
- [271](https://github.com/modern-js-dev/modern.js/pull/271)
|
|
73
|
-
|
|
74
|
-
6. 修复 Node17 dev 命令报错问题
|
|
5
|
+
### Patch Changes
|
|
75
6
|
|
|
76
|
-
|
|
7
|
+
- 0fa83663: support more .env files
|
|
8
|
+
- Updated dependencies [6f7fe574]
|
|
9
|
+
- Updated dependencies [0fa83663]
|
|
10
|
+
- Updated dependencies [f594fbc8]
|
|
11
|
+
- @modern-js/core@1.1.2
|
|
12
|
+
- @modern-js/babel-preset-module@1.1.1
|
|
13
|
+
- @modern-js/css-config@1.1.1
|
|
14
|
+
- @modern-js/i18n-cli-language-detector@1.1.1
|
|
15
|
+
- @modern-js/plugin-analyze@1.1.1
|
|
16
|
+
- @modern-js/plugin-changeset@1.1.1
|
|
17
|
+
- @modern-js/plugin-fast-refresh@1.1.1
|
|
18
|
+
- @modern-js/plugin-i18n@1.1.1
|
|
19
|
+
- @modern-js/new-action@1.1.2
|
|
20
|
+
- @modern-js/babel-compiler@1.1.2
|
|
21
|
+
- @modern-js/style-compiler@1.1.1
|
|
22
|
+
- @modern-js/module-tools-hooks@1.1.1
|
|
23
|
+
- @modern-js/utils@1.1.2
|
|
77
24
|
|
|
78
|
-
|
|
25
|
+
## 1.1.0
|
|
79
26
|
|
|
80
|
-
|
|
27
|
+
### Minor Changes
|
|
81
28
|
|
|
82
|
-
|
|
29
|
+
- 96119db2: Relese v1.1.0
|
|
83
30
|
|
|
84
31
|
### Patch Changes
|
|
85
32
|
|
|
@@ -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
|
|
|
@@ -20,10 +20,17 @@ export const dev = async option => {
|
|
|
20
20
|
modernConfig,
|
|
21
21
|
tsconfigPath
|
|
22
22
|
});
|
|
23
|
-
const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
|
|
23
|
+
const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
|
|
24
24
|
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
25
|
+
if (process.env.RUN_PLATFORM) {
|
|
26
|
+
await devFeature.showMenu({
|
|
27
|
+
isTsProject,
|
|
28
|
+
appDirectory
|
|
29
|
+
});
|
|
30
|
+
} else {
|
|
31
|
+
await devFeature.devStorybook({
|
|
32
|
+
isTsProject,
|
|
33
|
+
appDirectory
|
|
34
|
+
});
|
|
35
|
+
}
|
|
29
36
|
};
|
|
@@ -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
|
|
|
@@ -45,26 +45,29 @@ export const buildPlatform = async option => {
|
|
|
45
45
|
await pMap(taskMapper, async ({
|
|
46
46
|
taskPath,
|
|
47
47
|
params,
|
|
48
|
-
logger
|
|
48
|
+
logger: _
|
|
49
49
|
}) => {
|
|
50
50
|
const childProcess = execa.node(taskPath, params, {
|
|
51
|
-
stdio: '
|
|
51
|
+
stdio: 'inherit',
|
|
52
52
|
all: true
|
|
53
|
-
});
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
53
|
+
}); // lm.addStdout(logger, childProcess.stdout, {
|
|
54
|
+
// event: { data: true, error: true },
|
|
55
|
+
// });
|
|
56
|
+
// lm.addStderr(logger, childProcess.stderr);
|
|
57
|
+
|
|
58
|
+
try {
|
|
59
|
+
await childProcess;
|
|
60
|
+
} catch (_unused) {
|
|
61
|
+
// eslint-disable-next-line no-process-exit
|
|
62
|
+
process.exit(1);
|
|
63
|
+
} // lm.disappearCompiling();
|
|
62
64
|
// console.info(lg.colors.title(title));
|
|
63
65
|
// console.info(a.all);
|
|
64
|
-
});
|
|
65
|
-
lm.disappearCompiling();
|
|
66
66
|
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
}
|
|
67
|
+
}, {
|
|
68
|
+
concurrency: 1
|
|
69
|
+
}); // lm.disappearCompiling();
|
|
70
|
+
// for (const key of Object.keys(loggerMap)) {
|
|
71
|
+
// console.info(loggerMap[key].value);
|
|
72
|
+
// }
|
|
70
73
|
};
|
|
@@ -1,17 +1,15 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import { Import, fs } from '@modern-js/utils';
|
|
3
3
|
const buildFeature = Import.lazy('./build', require);
|
|
4
|
-
const buildWatchFeature = Import.lazy('./build-watch', require);
|
|
5
|
-
|
|
6
|
-
// require,
|
|
7
|
-
// );
|
|
8
|
-
|
|
4
|
+
const buildWatchFeature = Import.lazy('./build-watch', require);
|
|
5
|
+
const bp = Import.lazy('./build-platform', require);
|
|
9
6
|
export const build = async (config, modernConfig) => {
|
|
10
7
|
const {
|
|
11
8
|
appDirectory,
|
|
12
9
|
enableWatchMode,
|
|
13
10
|
platform,
|
|
14
|
-
clear = true
|
|
11
|
+
clear = true,
|
|
12
|
+
isTsProject
|
|
15
13
|
} = config;
|
|
16
14
|
const {
|
|
17
15
|
output: {
|
|
@@ -20,12 +18,24 @@ export const build = async (config, modernConfig) => {
|
|
|
20
18
|
} = modernConfig; // TODO: maybe need watch mode in build platform
|
|
21
19
|
|
|
22
20
|
if (typeof platform === 'boolean' && platform) {
|
|
23
|
-
|
|
21
|
+
if (process.env.RUN_PLATFORM) {
|
|
22
|
+
await bp.buildPlatform({
|
|
23
|
+
platform: 'all',
|
|
24
|
+
isTsProject
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
|
|
24
28
|
return;
|
|
25
29
|
}
|
|
26
30
|
|
|
27
31
|
if (typeof platform === 'string') {
|
|
28
|
-
|
|
32
|
+
if (process.env.RUN_PLATFORM) {
|
|
33
|
+
await bp.buildPlatform({
|
|
34
|
+
platform,
|
|
35
|
+
isTsProject
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
|
|
29
39
|
return;
|
|
30
40
|
}
|
|
31
41
|
|
|
@@ -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/js/node/cli/new.js
CHANGED
|
@@ -7,9 +7,9 @@ exports.newCli = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _utils = require("@modern-js/utils");
|
|
9
9
|
|
|
10
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
10
|
+
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; }
|
|
11
11
|
|
|
12
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
12
|
+
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; }
|
|
13
13
|
|
|
14
14
|
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; }
|
|
15
15
|
|
|
@@ -38,12 +38,19 @@ const dev = async option => {
|
|
|
38
38
|
modernConfig,
|
|
39
39
|
tsconfigPath
|
|
40
40
|
});
|
|
41
|
-
const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
41
|
+
const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
|
|
42
|
+
|
|
43
|
+
if (process.env.RUN_PLATFORM) {
|
|
44
|
+
await devFeature.showMenu({
|
|
45
|
+
isTsProject,
|
|
46
|
+
appDirectory
|
|
47
|
+
});
|
|
48
|
+
} else {
|
|
49
|
+
await devFeature.devStorybook({
|
|
50
|
+
isTsProject,
|
|
51
|
+
appDirectory
|
|
52
|
+
});
|
|
53
|
+
}
|
|
47
54
|
};
|
|
48
55
|
|
|
49
56
|
exports.dev = dev;
|
|
@@ -7,9 +7,9 @@ exports.buildPlatform = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _utils = require("@modern-js/utils");
|
|
9
9
|
|
|
10
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
10
|
+
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; }
|
|
11
11
|
|
|
12
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
12
|
+
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; }
|
|
13
13
|
|
|
14
14
|
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; }
|
|
15
15
|
|
|
@@ -57,28 +57,31 @@ const buildPlatform = async option => {
|
|
|
57
57
|
await pMap(taskMapper, async ({
|
|
58
58
|
taskPath,
|
|
59
59
|
params,
|
|
60
|
-
logger
|
|
60
|
+
logger: _
|
|
61
61
|
}) => {
|
|
62
62
|
const childProcess = execa.node(taskPath, params, {
|
|
63
|
-
stdio: '
|
|
63
|
+
stdio: 'inherit',
|
|
64
64
|
all: true
|
|
65
|
-
});
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
65
|
+
}); // lm.addStdout(logger, childProcess.stdout, {
|
|
66
|
+
// event: { data: true, error: true },
|
|
67
|
+
// });
|
|
68
|
+
// lm.addStderr(logger, childProcess.stderr);
|
|
69
|
+
|
|
70
|
+
try {
|
|
71
|
+
await childProcess;
|
|
72
|
+
} catch (_unused) {
|
|
73
|
+
// eslint-disable-next-line no-process-exit
|
|
74
|
+
process.exit(1);
|
|
75
|
+
} // lm.disappearCompiling();
|
|
74
76
|
// console.info(lg.colors.title(title));
|
|
75
77
|
// console.info(a.all);
|
|
76
|
-
});
|
|
77
|
-
lm.disappearCompiling();
|
|
78
78
|
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
}
|
|
79
|
+
}, {
|
|
80
|
+
concurrency: 1
|
|
81
|
+
}); // lm.disappearCompiling();
|
|
82
|
+
// for (const key of Object.keys(loggerMap)) {
|
|
83
|
+
// console.info(loggerMap[key].value);
|
|
84
|
+
// }
|
|
82
85
|
};
|
|
83
86
|
|
|
84
87
|
exports.buildPlatform = buildPlatform;
|
|
@@ -13,18 +13,17 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
13
13
|
|
|
14
14
|
const buildFeature = _utils.Import.lazy('./build', require);
|
|
15
15
|
|
|
16
|
-
const buildWatchFeature = _utils.Import.lazy('./build-watch', require);
|
|
17
|
-
// './build-platform',
|
|
18
|
-
// require,
|
|
19
|
-
// );
|
|
16
|
+
const buildWatchFeature = _utils.Import.lazy('./build-watch', require);
|
|
20
17
|
|
|
18
|
+
const bp = _utils.Import.lazy('./build-platform', require);
|
|
21
19
|
|
|
22
20
|
const build = async (config, modernConfig) => {
|
|
23
21
|
const {
|
|
24
22
|
appDirectory,
|
|
25
23
|
enableWatchMode,
|
|
26
24
|
platform,
|
|
27
|
-
clear = true
|
|
25
|
+
clear = true,
|
|
26
|
+
isTsProject
|
|
28
27
|
} = config;
|
|
29
28
|
const {
|
|
30
29
|
output: {
|
|
@@ -33,12 +32,24 @@ const build = async (config, modernConfig) => {
|
|
|
33
32
|
} = modernConfig; // TODO: maybe need watch mode in build platform
|
|
34
33
|
|
|
35
34
|
if (typeof platform === 'boolean' && platform) {
|
|
36
|
-
|
|
35
|
+
if (process.env.RUN_PLATFORM) {
|
|
36
|
+
await bp.buildPlatform({
|
|
37
|
+
platform: 'all',
|
|
38
|
+
isTsProject
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
|
|
37
42
|
return;
|
|
38
43
|
}
|
|
39
44
|
|
|
40
45
|
if (typeof platform === 'string') {
|
|
41
|
-
|
|
46
|
+
if (process.env.RUN_PLATFORM) {
|
|
47
|
+
await bp.buildPlatform({
|
|
48
|
+
platform,
|
|
49
|
+
isTsProject
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
|
|
42
53
|
return;
|
|
43
54
|
}
|
|
44
55
|
|
|
@@ -7,9 +7,9 @@ exports.initEnv = exports.getWillCompilerCode = exports.buildSourceCode = export
|
|
|
7
7
|
|
|
8
8
|
var _utils = require("@modern-js/utils");
|
|
9
9
|
|
|
10
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
10
|
+
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; }
|
|
11
11
|
|
|
12
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
12
|
+
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; }
|
|
13
13
|
|
|
14
14
|
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; }
|
|
15
15
|
|
|
@@ -10,9 +10,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
10
10
|
|
|
11
11
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
12
12
|
|
|
13
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
13
|
+
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; }
|
|
14
14
|
|
|
15
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
15
|
+
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; }
|
|
16
16
|
|
|
17
17
|
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; }
|
|
18
18
|
|
|
@@ -9,9 +9,9 @@ var _babelPresetModule = require("@modern-js/babel-preset-module");
|
|
|
9
9
|
|
|
10
10
|
var _utils = require("@modern-js/utils");
|
|
11
11
|
|
|
12
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
12
|
+
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; }
|
|
13
13
|
|
|
14
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
14
|
+
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; }
|
|
15
15
|
|
|
16
16
|
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; }
|
|
17
17
|
|
package/dist/types/index.d.ts
CHANGED
|
@@ -2,6 +2,9 @@ export declare const defineConfig: (config: import("@modern-js/core/config").Con
|
|
|
2
2
|
|
|
3
3
|
declare const _default: import("@modern-js/core").AsyncPlugin<Partial<import("@modern-js/core").Progresses2Threads<{
|
|
4
4
|
config: import("@modern-js/core").ParallelWorkflow<void, unknown>;
|
|
5
|
+
resolvedConfig: import("@modern-js/core").AsyncWaterfall<{
|
|
6
|
+
resolved: import("@modern-js/core").NormalizedConfig;
|
|
7
|
+
}>;
|
|
5
8
|
validateSchema: import("@modern-js/core").ParallelWorkflow<void, unknown>;
|
|
6
9
|
prepare: import("@modern-js/core").AsyncWorkflow<void, void>;
|
|
7
10
|
commands: import("@modern-js/core").AsyncWorkflow<{
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"modern",
|
|
12
12
|
"modern.js"
|
|
13
13
|
],
|
|
14
|
-
"version": "1.1.0",
|
|
14
|
+
"version": "1.1.1-jupiter.0",
|
|
15
15
|
"bin": {
|
|
16
16
|
"modern": "./bin/modern.js"
|
|
17
17
|
},
|
|
@@ -44,19 +44,19 @@
|
|
|
44
44
|
"@babel/runtime": "^7",
|
|
45
45
|
"@babel/traverse": "^7.15.0",
|
|
46
46
|
"@babel/types": "^7.15.0",
|
|
47
|
-
"@modern-js/babel-compiler": "^1.1.
|
|
48
|
-
"@modern-js/babel-preset-module": "^1.1.
|
|
49
|
-
"@modern-js/core": "^1.1.
|
|
50
|
-
"@modern-js/css-config": "^1.1.
|
|
51
|
-
"@modern-js/i18n-cli-language-detector": "^1.1.
|
|
52
|
-
"@modern-js/module-tools-hooks": "^1.1.
|
|
53
|
-
"@modern-js/new-action": "^1.1.
|
|
54
|
-
"@modern-js/plugin-analyze": "^1.1.
|
|
55
|
-
"@modern-js/plugin-changeset": "^1.1.
|
|
56
|
-
"@modern-js/plugin-fast-refresh": "^1.1.
|
|
57
|
-
"@modern-js/plugin-i18n": "^1.1.
|
|
58
|
-
"@modern-js/style-compiler": "^1.1.
|
|
59
|
-
"@modern-js/utils": "^1.1.
|
|
47
|
+
"@modern-js/babel-compiler": "^1.1.2",
|
|
48
|
+
"@modern-js/babel-preset-module": "^1.1.1",
|
|
49
|
+
"@modern-js/core": "^1.1.2",
|
|
50
|
+
"@modern-js/css-config": "^1.1.1",
|
|
51
|
+
"@modern-js/i18n-cli-language-detector": "^1.1.1",
|
|
52
|
+
"@modern-js/module-tools-hooks": "^1.1.1",
|
|
53
|
+
"@modern-js/new-action": "^1.1.2",
|
|
54
|
+
"@modern-js/plugin-analyze": "^1.1.1",
|
|
55
|
+
"@modern-js/plugin-changeset": "^1.1.1",
|
|
56
|
+
"@modern-js/plugin-fast-refresh": "^1.1.1",
|
|
57
|
+
"@modern-js/plugin-i18n": "^1.1.1",
|
|
58
|
+
"@modern-js/style-compiler": "^1.1.1",
|
|
59
|
+
"@modern-js/utils": "^1.1.2",
|
|
60
60
|
"chalk": "^4.1.2",
|
|
61
61
|
"chokidar": "^3.5.2",
|
|
62
62
|
"dotenv": "^10.0.0",
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
},
|
|
76
76
|
"devDependencies": {
|
|
77
77
|
"@babel/preset-typescript": "^7.15.0",
|
|
78
|
-
"@modern-js/babel-chain": "^1.1.
|
|
78
|
+
"@modern-js/babel-chain": "^1.1.1",
|
|
79
79
|
"@types/babel__core": "^7.1.15",
|
|
80
80
|
"@types/babel__generator": "^7.6.3",
|
|
81
81
|
"@types/babel__traverse": "^7.14.2",
|
|
@@ -88,8 +88,8 @@
|
|
|
88
88
|
"@types/signale": "^1.4.2",
|
|
89
89
|
"commander": "^8.1.0",
|
|
90
90
|
"typescript": "^4",
|
|
91
|
-
"@modern-js/plugin-testing": "^1.
|
|
92
|
-
"@modern-js/module-tools": "^1.
|
|
91
|
+
"@modern-js/plugin-testing": "^1.1.1",
|
|
92
|
+
"@modern-js/module-tools": "^1.1.1"
|
|
93
93
|
},
|
|
94
94
|
"sideEffects": false,
|
|
95
95
|
"modernConfig": {
|
package/src/commands/dev.ts
CHANGED
|
@@ -35,7 +35,9 @@ export const dev = async (option: IDevOption) => {
|
|
|
35
35
|
valid.valideBeforeTask({ modernConfig, tsconfigPath });
|
|
36
36
|
|
|
37
37
|
const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
if (process.env.RUN_PLATFORM) {
|
|
39
|
+
await devFeature.showMenu({ isTsProject, appDirectory });
|
|
40
|
+
} else {
|
|
41
|
+
await devFeature.devStorybook({ isTsProject, appDirectory });
|
|
42
|
+
}
|
|
41
43
|
};
|
|
@@ -44,33 +44,40 @@ export const buildPlatform = async (option: IBuildPlatformOption) => {
|
|
|
44
44
|
...params,
|
|
45
45
|
};
|
|
46
46
|
});
|
|
47
|
-
|
|
48
47
|
if (taskMapper.length <= 0) {
|
|
49
48
|
console.info(chalk.yellow(`'${platform}' is undefined task`));
|
|
50
49
|
return;
|
|
51
50
|
}
|
|
52
51
|
|
|
53
52
|
lm.showCompiling();
|
|
54
|
-
await pMap(
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
event: { data: true, error: true },
|
|
62
|
-
});
|
|
53
|
+
await pMap(
|
|
54
|
+
taskMapper,
|
|
55
|
+
async ({ taskPath, params, logger: _ }: any) => {
|
|
56
|
+
const childProcess = execa.node(taskPath, params, {
|
|
57
|
+
stdio: 'inherit',
|
|
58
|
+
all: true,
|
|
59
|
+
});
|
|
63
60
|
|
|
64
|
-
|
|
61
|
+
// lm.addStdout(logger, childProcess.stdout, {
|
|
62
|
+
// event: { data: true, error: true },
|
|
63
|
+
// });
|
|
65
64
|
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
65
|
+
// lm.addStderr(logger, childProcess.stderr);
|
|
66
|
+
try {
|
|
67
|
+
await childProcess;
|
|
68
|
+
} catch {
|
|
69
|
+
// eslint-disable-next-line no-process-exit
|
|
70
|
+
process.exit(1);
|
|
71
|
+
}
|
|
72
|
+
// lm.disappearCompiling();
|
|
73
|
+
// console.info(lg.colors.title(title));
|
|
74
|
+
// console.info(a.all);
|
|
75
|
+
},
|
|
76
|
+
{ concurrency: 1 },
|
|
77
|
+
);
|
|
71
78
|
|
|
72
|
-
lm.disappearCompiling();
|
|
73
|
-
for (const key of Object.keys(loggerMap)) {
|
|
74
|
-
|
|
75
|
-
}
|
|
79
|
+
// lm.disappearCompiling();
|
|
80
|
+
// for (const key of Object.keys(loggerMap)) {
|
|
81
|
+
// console.info(loggerMap[key].value);
|
|
82
|
+
// }
|
|
76
83
|
};
|
|
@@ -8,27 +8,37 @@ const buildWatchFeature: typeof import('./build-watch') = Import.lazy(
|
|
|
8
8
|
'./build-watch',
|
|
9
9
|
require,
|
|
10
10
|
);
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
11
|
+
const bp: typeof import('./build-platform') = Import.lazy(
|
|
12
|
+
'./build-platform',
|
|
13
|
+
require,
|
|
14
|
+
);
|
|
15
15
|
|
|
16
16
|
export const build = async (
|
|
17
17
|
config: IBuildConfig,
|
|
18
18
|
modernConfig: NormalizedConfig,
|
|
19
19
|
) => {
|
|
20
|
-
const {
|
|
20
|
+
const {
|
|
21
|
+
appDirectory,
|
|
22
|
+
enableWatchMode,
|
|
23
|
+
platform,
|
|
24
|
+
clear = true,
|
|
25
|
+
isTsProject,
|
|
26
|
+
} = config;
|
|
21
27
|
const {
|
|
22
28
|
output: { path: outputPath = 'dist' },
|
|
23
29
|
} = modernConfig;
|
|
24
30
|
// TODO: maybe need watch mode in build platform
|
|
25
31
|
if (typeof platform === 'boolean' && platform) {
|
|
26
|
-
|
|
32
|
+
if (process.env.RUN_PLATFORM) {
|
|
33
|
+
await bp.buildPlatform({ platform: 'all', isTsProject });
|
|
34
|
+
}
|
|
27
35
|
return;
|
|
28
36
|
}
|
|
29
37
|
|
|
30
38
|
if (typeof platform === 'string') {
|
|
31
|
-
|
|
39
|
+
if (process.env.RUN_PLATFORM) {
|
|
40
|
+
await bp.buildPlatform({ platform, isTsProject });
|
|
41
|
+
}
|
|
32
42
|
return;
|
|
33
43
|
}
|
|
34
44
|
|