Bump to v4.0.1.

This commit is contained in:
John-David Dalton
2016-01-24 18:14:43 -08:00
parent 54e7baecc3
commit 7af5d55f22
65 changed files with 210 additions and 160 deletions

View File

@@ -1,4 +1,3 @@
import baseClone from './baseClone';
import baseMerge from './baseMerge';
import isObject from '../isObject';
@@ -17,9 +16,9 @@ import isObject from '../isObject';
function mergeDefaults(objValue, srcValue, key, object, source, stack) {
if (isObject(objValue) && isObject(srcValue)) {
stack.set(srcValue, objValue);
baseMerge(objValue, srcValue, mergeDefaults, stack);
baseMerge(objValue, srcValue, undefined, mergeDefaults, stack);
}
return objValue === undefined ? baseClone(srcValue) : objValue;
return objValue;
}
export default mergeDefaults;