@modern-js/core 2.15.0 → 2.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 +25 -0
- package/dist/utils/mergeConfig.js +1 -2
- package/package.json +14 -10
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,30 @@
|
|
|
1
1
|
# @modern-js/core
|
|
2
2
|
|
|
3
|
+
## 2.17.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- @modern-js/node-bundle-require@2.17.0
|
|
8
|
+
- @modern-js/plugin@2.17.0
|
|
9
|
+
- @modern-js/utils@2.17.0
|
|
10
|
+
|
|
11
|
+
## 2.16.0
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- 4e876ab: chore: package.json include the monorepo-relative directory
|
|
16
|
+
|
|
17
|
+
chore: 在 package.json 中声明 monorepo 的子路径
|
|
18
|
+
|
|
19
|
+
- 6d5219e: fix: remove ignore logic in mergeConfig for tools.devServer
|
|
20
|
+
fix: 移除 tools.devServer 在 mergeConfig 时候的忽略逻辑
|
|
21
|
+
- Updated dependencies [5954330]
|
|
22
|
+
- Updated dependencies [7596520]
|
|
23
|
+
- Updated dependencies [4e876ab]
|
|
24
|
+
- @modern-js/utils@2.16.0
|
|
25
|
+
- @modern-js/plugin@2.16.0
|
|
26
|
+
- @modern-js/node-bundle-require@2.16.0
|
|
27
|
+
|
|
3
28
|
## 2.15.0
|
|
4
29
|
|
|
5
30
|
### Patch Changes
|
|
@@ -6,8 +6,7 @@ const lodash_1 = require("@modern-js/utils/lodash");
|
|
|
6
6
|
const mergeConfig = (configs) => (0, lodash_1.mergeWith)({}, ...configs, (target, source, key) => {
|
|
7
7
|
// Do not use the following merge logic for source.designSystem and tools.tailwind(css)
|
|
8
8
|
if (key === 'designSystem' ||
|
|
9
|
-
(key === 'tailwindcss' && typeof source === 'object')
|
|
10
|
-
key === 'devServer') {
|
|
9
|
+
(key === 'tailwindcss' && typeof source === 'object')) {
|
|
11
10
|
return (0, lodash_1.mergeWith)({}, target !== null && target !== void 0 ? target : {}, source !== null && source !== void 0 ? source : {});
|
|
12
11
|
}
|
|
13
12
|
if (Array.isArray(target) || Array.isArray(source)) {
|
package/package.json
CHANGED
|
@@ -3,14 +3,18 @@
|
|
|
3
3
|
"description": "A Progressive React Framework for modern web development.",
|
|
4
4
|
"homepage": "https://modernjs.dev",
|
|
5
5
|
"bugs": "https://github.com/web-infra-dev/modern.js/issues",
|
|
6
|
-
"repository":
|
|
6
|
+
"repository": {
|
|
7
|
+
"type": "git",
|
|
8
|
+
"url": "https://github.com/web-infra-dev/modern.js",
|
|
9
|
+
"directory": "packages/cli/core"
|
|
10
|
+
},
|
|
7
11
|
"license": "MIT",
|
|
8
12
|
"keywords": [
|
|
9
13
|
"framework",
|
|
10
14
|
"modern",
|
|
11
15
|
"modern.js"
|
|
12
16
|
],
|
|
13
|
-
"version": "2.
|
|
17
|
+
"version": "2.17.0",
|
|
14
18
|
"jsnext:source": "./src/index.ts",
|
|
15
19
|
"types": "./dist/index.d.ts",
|
|
16
20
|
"main": "./dist/index.js",
|
|
@@ -65,9 +69,9 @@
|
|
|
65
69
|
}
|
|
66
70
|
},
|
|
67
71
|
"dependencies": {
|
|
68
|
-
"@modern-js/node-bundle-require": "2.
|
|
69
|
-
"@modern-js/plugin": "2.
|
|
70
|
-
"@modern-js/utils": "2.
|
|
72
|
+
"@modern-js/node-bundle-require": "2.17.0",
|
|
73
|
+
"@modern-js/plugin": "2.17.0",
|
|
74
|
+
"@modern-js/utils": "2.17.0"
|
|
71
75
|
},
|
|
72
76
|
"devDependencies": {
|
|
73
77
|
"@types/babel__code-frame": "^7.0.3",
|
|
@@ -84,11 +88,11 @@
|
|
|
84
88
|
"terser-webpack-plugin": "^5.1.4",
|
|
85
89
|
"typescript": "^4",
|
|
86
90
|
"webpack": "^5.76.2",
|
|
87
|
-
"@modern-js/builder-shared": "2.
|
|
88
|
-
"@modern-js/babel-preset-app": "2.
|
|
89
|
-
"@modern-js/types": "2.
|
|
90
|
-
"@scripts/
|
|
91
|
-
"@scripts/
|
|
91
|
+
"@modern-js/builder-shared": "2.17.0",
|
|
92
|
+
"@modern-js/babel-preset-app": "2.17.0",
|
|
93
|
+
"@modern-js/types": "2.17.0",
|
|
94
|
+
"@scripts/jest-config": "2.17.0",
|
|
95
|
+
"@scripts/build": "2.17.0"
|
|
92
96
|
},
|
|
93
97
|
"sideEffects": false,
|
|
94
98
|
"publishConfig": {
|