Bump to v4.14.0.

This commit is contained in:
John-David Dalton
2016-07-24 09:52:33 -07:00
parent 295d8cf415
commit a8d3718760
253 changed files with 2469 additions and 1808 deletions

View File

@@ -16,7 +16,10 @@ var baseMerge = require('./_baseMerge'),
*/
function mergeDefaults(objValue, srcValue, key, object, source, stack) {
if (isObject(objValue) && isObject(srcValue)) {
baseMerge(objValue, srcValue, undefined, mergeDefaults, stack.set(srcValue, objValue));
// Recursively merge objects and arrays (susceptible to call stack limits).
stack.set(srcValue, objValue);
baseMerge(objValue, srcValue, undefined, mergeDefaults, stack);
stack['delete'](srcValue);
}
return objValue;
}