@garfish/core
Advanced tools
Comparing version 1.14.4-beta-20230504081711.0 to 1.14.4-beta-20230517102049.0
@@ -20,2 +20,14 @@ var __defProp = Object.defineProperty; | ||
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b)); | ||
var __objRest = (source, exclude) => { | ||
var target = {}; | ||
for (var prop in source) | ||
if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0) | ||
target[prop] = source[prop]; | ||
if (source != null && __getOwnPropSymbols) | ||
for (var prop of __getOwnPropSymbols(source)) { | ||
if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop)) | ||
target[prop] = source[prop]; | ||
} | ||
return target; | ||
}; | ||
@@ -58,6 +70,9 @@ // src/garfish.ts | ||
var deepMergeConfig = (globalConfig, localConfig) => { | ||
const props = __spreadValues(__spreadValues({}, globalConfig.props || {}), localConfig.props || {}); | ||
const result = deepMerge(filterUndefinedVal(globalConfig), filterUndefinedVal(localConfig)); | ||
result.props = props; | ||
return result; | ||
const _a = globalConfig, { props: globalProps } = _a, newGlobalConfig = __objRest(_a, ["props"]); | ||
const _b = localConfig, { props: localProps } = _b, newLocalConfig = __objRest(_b, ["props"]); | ||
const props = __spreadValues(__spreadValues({}, globalProps || {}), localProps || {}); | ||
const result = deepMerge(filterUndefinedVal(newGlobalConfig), filterUndefinedVal(newLocalConfig)); | ||
return __spreadProps(__spreadValues({}, result), { | ||
props | ||
}); | ||
}; | ||
@@ -1082,3 +1097,3 @@ var getAppConfig = (globalConfig, localConfig) => { | ||
name: "fix-hmr", | ||
version: "1.14.4-beta-20230504081711.0", | ||
version: "1.14.4-beta-20230517102049.0", | ||
bootstrap() { | ||
@@ -1130,3 +1145,3 @@ if (hasInit) | ||
name, | ||
version: "1.14.4-beta-20230504081711.0" | ||
version: "1.14.4-beta-20230517102049.0" | ||
}, options); | ||
@@ -1297,3 +1312,3 @@ }; | ||
name: "preload", | ||
version: "1.14.4-beta-20230504081711.0", | ||
version: "1.14.4-beta-20230517102049.0", | ||
beforeLoad(appInfo) { | ||
@@ -1544,3 +1559,3 @@ if (Garfish2.options.disablePreloadApp) { | ||
name: "garfish-logger", | ||
version: "1.14.4-beta-20230504081711.0", | ||
version: "1.14.4-beta-20230517102049.0", | ||
beforeLoad(appInfo, ...args) { | ||
@@ -1597,3 +1612,3 @@ coreLog2(`${appInfo.name} beforeLoad`, [appInfo, ...args]); | ||
this.running = false; | ||
this.version = "1.14.4-beta-20230504081711.0"; | ||
this.version = "1.14.4-beta-20230517102049.0"; | ||
this.flag = __GARFISH_FLAG__; | ||
@@ -1600,0 +1615,0 @@ this.loader = new Loader2(); |
{ | ||
"name": "@garfish/core", | ||
"version": "1.14.4-beta-20230504081711.0", | ||
"version": "1.14.4-beta-20230517102049.0", | ||
"description": "core module.", | ||
@@ -32,9 +32,9 @@ "keywords": [ | ||
"@alioth-org/es-module-lexer": "^1.1.0", | ||
"@garfish/hooks": "1.14.4-beta-20230504081711.0", | ||
"@garfish/loader": "1.14.4-beta-20230504081711.0", | ||
"@garfish/utils": "1.14.4-beta-20230504081711.0", | ||
"@garfish/hooks": "1.14.4-beta-20230517102049.0", | ||
"@garfish/loader": "1.14.4-beta-20230517102049.0", | ||
"@garfish/utils": "1.14.4-beta-20230517102049.0", | ||
"eventemitter2": "^6.4.5" | ||
}, | ||
"devDependencies": { | ||
"@garfish/test-suite": "1.14.4-beta-20230504081711.0" | ||
"@garfish/test-suite": "1.14.4-beta-20230517102049.0" | ||
}, | ||
@@ -41,0 +41,0 @@ "publishConfig": { |
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
145998
3803
+ Added@garfish/hooks@1.14.4-beta-20230517102049.0(transitive)
+ Added@garfish/loader@1.14.4-beta-20230517102049.0(transitive)
+ Added@garfish/utils@1.14.4-beta-20230517102049.0(transitive)
- Removed@garfish/hooks@1.14.4-beta-20230504081711.0(transitive)
- Removed@garfish/loader@1.14.4-beta-20230504081711.0(transitive)
- Removed@garfish/utils@1.14.4-beta-20230504081711.0(transitive)