@modern-js/core 1.14.0 → 1.17.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 +54 -1
- package/dist/bin.js +3 -2
- package/dist/config/mergeConfig.js +2 -2
- package/dist/config/types/index.d.ts +1 -1
- package/package.json +8 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,10 +1,63 @@
|
|
|
1
1
|
# @modern-js/core
|
|
2
2
|
|
|
3
|
+
## 1.17.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 367405a: fix(core): missing BabelConfig type
|
|
8
|
+
|
|
9
|
+
fix(core): 修复未导出 BabelConfig 类型的问题
|
|
10
|
+
|
|
11
|
+
- 9f4e5ce: fix(core): cli -c option not work
|
|
12
|
+
|
|
13
|
+
fix(core): 修复命令行中 -c 选项不生效的问题
|
|
14
|
+
|
|
15
|
+
- 58c53a7: fix: add merge check
|
|
16
|
+
fix: 添加合并属性的检查
|
|
17
|
+
- Updated dependencies [1b9176f]
|
|
18
|
+
- Updated dependencies [77d3a38]
|
|
19
|
+
- Updated dependencies [151329d]
|
|
20
|
+
- Updated dependencies [5af9472]
|
|
21
|
+
- Updated dependencies [6b6a534]
|
|
22
|
+
- Updated dependencies [6b43a2b]
|
|
23
|
+
- Updated dependencies [a7be124]
|
|
24
|
+
- Updated dependencies [31547b4]
|
|
25
|
+
- @modern-js/utils@1.17.0
|
|
26
|
+
- @modern-js/node-bundle-require@1.17.0
|
|
27
|
+
- @modern-js/plugin@1.17.0
|
|
28
|
+
|
|
29
|
+
## 1.16.0
|
|
30
|
+
|
|
31
|
+
### Patch Changes
|
|
32
|
+
|
|
33
|
+
- Updated dependencies [641592f52]
|
|
34
|
+
- Updated dependencies [3904b30a5]
|
|
35
|
+
- Updated dependencies [1100dd58c]
|
|
36
|
+
- Updated dependencies [e04e6e76a]
|
|
37
|
+
- Updated dependencies [81c66e4a4]
|
|
38
|
+
- Updated dependencies [2c305b6f5]
|
|
39
|
+
- @modern-js/utils@1.16.0
|
|
40
|
+
- @modern-js/node-bundle-require@1.16.0
|
|
41
|
+
- @modern-js/plugin@1.16.0
|
|
42
|
+
|
|
43
|
+
## 1.15.0
|
|
44
|
+
|
|
45
|
+
### Patch Changes
|
|
46
|
+
|
|
47
|
+
- Updated dependencies [8658a78]
|
|
48
|
+
- Updated dependencies [05d4a4f]
|
|
49
|
+
- Updated dependencies [ad05af9]
|
|
50
|
+
- Updated dependencies [5d53d1c]
|
|
51
|
+
- Updated dependencies [37cd159]
|
|
52
|
+
- @modern-js/utils@1.15.0
|
|
53
|
+
- @modern-js/node-bundle-require@1.15.0
|
|
54
|
+
- @modern-js/plugin@1.15.0
|
|
55
|
+
|
|
3
56
|
## 1.14.0
|
|
4
57
|
|
|
5
58
|
### Minor Changes
|
|
6
59
|
|
|
7
|
-
- 7b9067f: add babel plugin for
|
|
60
|
+
- 7b9067f: add babel plugin for webpack-builder
|
|
8
61
|
|
|
9
62
|
### Patch Changes
|
|
10
63
|
|
package/dist/bin.js
CHANGED
|
@@ -34,7 +34,8 @@ const SUPPORT_CONFIG_PARAM_COMMANDS = [
|
|
|
34
34
|
'start',
|
|
35
35
|
'inspect',
|
|
36
36
|
];
|
|
37
|
-
|
|
38
|
-
|
|
37
|
+
const customConfigFile = cliParams.config || cliParams.c;
|
|
38
|
+
if (SUPPORT_CONFIG_PARAM_COMMANDS.includes(command) && customConfigFile) {
|
|
39
|
+
runOptions.configFile = customConfigFile;
|
|
39
40
|
}
|
|
40
41
|
_1.cli.run(process.argv.slice(2), runOptions);
|
|
@@ -12,8 +12,8 @@ const utils_1 = require("@modern-js/utils");
|
|
|
12
12
|
const mergeConfig = (configs) => (0, lodash_1.mergeWith)({}, ...configs, (target, source, key) => {
|
|
13
13
|
// Do not use the following merge logic for source.designSystem and tools.tailwind(css)
|
|
14
14
|
if (key === 'designSystem' ||
|
|
15
|
-
key === 'tailwind' ||
|
|
16
|
-
key === 'tailwindcss' ||
|
|
15
|
+
(key === 'tailwind' && typeof source === 'object') ||
|
|
16
|
+
(key === 'tailwindcss' && typeof source === 'object') ||
|
|
17
17
|
key === 'devServer') {
|
|
18
18
|
return (0, lodash_1.mergeWith)({}, target !== null && target !== void 0 ? target : {}, source !== null && source !== void 0 ? source : {});
|
|
19
19
|
}
|
|
@@ -23,7 +23,7 @@ declare type AutoprefixerOptions = autoprefixer.Options;
|
|
|
23
23
|
declare type TerserOptions = BasePluginOptions & {
|
|
24
24
|
terserOptions?: Partial<RawTerserOptions>;
|
|
25
25
|
};
|
|
26
|
-
export type { TestConfig, JestConfig, UnbundleConfig, SassConfig, SassLoaderOptions, LessConfig, LessLoaderOptions, SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions, TransformOptions, AutoprefixerOptions, TerserOptions, };
|
|
26
|
+
export type { TestConfig, JestConfig, BabelConfig, UnbundleConfig, SassConfig, SassLoaderOptions, LessConfig, LessLoaderOptions, SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions, TransformOptions, AutoprefixerOptions, TerserOptions, };
|
|
27
27
|
export interface SourceConfig {
|
|
28
28
|
entries?: Record<string, string | {
|
|
29
29
|
entry: string;
|
package/package.json
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"modern",
|
|
11
11
|
"modern.js"
|
|
12
12
|
],
|
|
13
|
-
"version": "1.
|
|
13
|
+
"version": "1.17.0",
|
|
14
14
|
"jsnext:source": "./src/index.ts",
|
|
15
15
|
"types": "./dist/index.d.ts",
|
|
16
16
|
"main": "./dist/index.js",
|
|
@@ -38,16 +38,16 @@
|
|
|
38
38
|
}
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@modern-js/node-bundle-require": "
|
|
42
|
-
"@modern-js/plugin": "
|
|
43
|
-
"@modern-js/utils": "
|
|
41
|
+
"@modern-js/node-bundle-require": "1.17.0",
|
|
42
|
+
"@modern-js/plugin": "1.17.0",
|
|
43
|
+
"@modern-js/utils": "1.17.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
46
|
"@jest/types": "^27.0.6",
|
|
47
|
-
"@modern-js/babel-preset-app": "1.
|
|
48
|
-
"@modern-js/types": "1.
|
|
49
|
-
"@scripts/build": "
|
|
50
|
-
"@scripts/jest-config": "
|
|
47
|
+
"@modern-js/babel-preset-app": "1.17.0",
|
|
48
|
+
"@modern-js/types": "1.17.0",
|
|
49
|
+
"@scripts/build": "1.17.0",
|
|
50
|
+
"@scripts/jest-config": "1.17.0",
|
|
51
51
|
"@types/babel__code-frame": "^7.0.3",
|
|
52
52
|
"@types/babel__core": "^7.1.16",
|
|
53
53
|
"@types/jest": "^27",
|