electron-builder-util
Advanced tools
Comparing version 19.2.5 to 19.3.0
@@ -14,3 +14,3 @@ "use strict"; | ||
} | ||
function assignKey(to, from, key) { | ||
function assignKey(target, from, key) { | ||
const value = from[key]; | ||
@@ -21,7 +21,11 @@ // https://github.com/electron-userland/electron-builder/pull/562 | ||
} | ||
const prevValue = to[key]; | ||
if (prevValue == null || value === null || !isObject(prevValue) || !isObject(value)) { | ||
to[key] = value; | ||
const prevValue = target[key]; | ||
if (prevValue === null) { | ||
// if explicitly set to null, it means that we want to not use default or inherited value | ||
return; | ||
} | ||
if (prevValue == null || value == null || !isObject(prevValue) || !isObject(value)) { | ||
target[key] = value; | ||
} else { | ||
to[key] = assign(prevValue, value); | ||
target[key] = assign(prevValue, value); | ||
} | ||
@@ -28,0 +32,0 @@ } |
@@ -155,3 +155,3 @@ declare module "electron-builder-util/out/log" { | ||
export function deepAssign(target: any, ...objects: Array<any>): any | ||
export function deepAssign<T>(target: T, ...objects: Array<any>): T | ||
} | ||
@@ -158,0 +158,0 @@ |
{ | ||
"name": "electron-builder-util", | ||
"version": "19.2.5", | ||
"version": "19.3.0", | ||
"main": "out/util.js", | ||
@@ -5,0 +5,0 @@ "author": "Vladimir Krivosheev", |
Sorry, the diff of this file is not supported yet
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
117076
1233