@next-core/brick-kit 2.145.1 → 2.145.2
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 +11 -0
- package/dist/index.bundle.js +4 -3
- package/dist/index.bundle.js.map +1 -1
- package/dist/index.esm.js +4 -3
- package/dist/index.esm.js.map +1 -1
- package/dist/types/core/Kernel.d.ts.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [2.145.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.145.1...@next-core/brick-kit@2.145.2) (2022-09-27)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* should merge userConfig and defaultConfig ([623c30b](https://github.com/easyops-cn/next-core/commit/623c30b32df487bbf8850245f0b44d397d17fc7b))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [2.145.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.145.0...@next-core/brick-kit@2.145.1) (2022-09-26)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @next-core/brick-kit
|
package/dist/index.bundle.js
CHANGED
|
@@ -9207,7 +9207,7 @@
|
|
|
9207
9207
|
|
|
9208
9208
|
var bootstrapResponse = _objectSpread__default["default"]({
|
|
9209
9209
|
templatePackages: []
|
|
9210
|
-
}, data); // Merge `app.defaultConfig` and `app.userConfig` to `app.config`.
|
|
9210
|
+
}, data); // Merge `app.defaultConfig` and `app.userConfig` to `app.config`. Should merge config again in standalone mode when doFulfilStoryboard because static bootstrap.json do not have userConfig.
|
|
9211
9211
|
|
|
9212
9212
|
|
|
9213
9213
|
processBootstrapResponse(bootstrapResponse);
|
|
@@ -9262,8 +9262,9 @@
|
|
|
9262
9262
|
}
|
|
9263
9263
|
|
|
9264
9264
|
if (appRuntimeData) {
|
|
9265
|
-
//
|
|
9266
|
-
storyboard.app.userConfig = _objectSpread__default["default"](_objectSpread__default["default"]({}, storyboard.app.userConfig), appRuntimeData.userConfig);
|
|
9265
|
+
// Merge `app.defaultConfig` and `app.userConfig` to `app.config`.
|
|
9266
|
+
storyboard.app.userConfig = _objectSpread__default["default"](_objectSpread__default["default"]({}, storyboard.app.userConfig), appRuntimeData.userConfig);
|
|
9267
|
+
storyboard.app.config = brickUtils.deepFreeze(_.merge({}, storyboard.app.defaultConfig, storyboard.app.userConfig)); // get inject menus (Actually, appRuntimeData contains both main and inject menus)
|
|
9267
9268
|
|
|
9268
9269
|
storyboard.meta = _objectSpread__default["default"](_objectSpread__default["default"]({}, storyboard.meta), {}, {
|
|
9269
9270
|
injectMenus: appRuntimeData.injectMenus
|