From bbff7403fbf46f9ad92240ac213df8d30ef31b64 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 20 Sep 2018 02:56:13 +0200 Subject: update packages --- node_modules/lodash/_baseMerge.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'node_modules/lodash/_baseMerge.js') diff --git a/node_modules/lodash/_baseMerge.js b/node_modules/lodash/_baseMerge.js index f4cb8c698..c5868f04c 100644 --- a/node_modules/lodash/_baseMerge.js +++ b/node_modules/lodash/_baseMerge.js @@ -3,7 +3,8 @@ var Stack = require('./_Stack'), baseFor = require('./_baseFor'), baseMergeDeep = require('./_baseMergeDeep'), isObject = require('./isObject'), - keysIn = require('./keysIn'); + keysIn = require('./keysIn'), + safeGet = require('./_safeGet'); /** * The base implementation of `_.merge` without support for multiple sources. @@ -27,7 +28,7 @@ function baseMerge(object, source, srcIndex, customizer, stack) { } else { var newValue = customizer - ? customizer(object[key], srcValue, (key + ''), object, source, stack) + ? customizer(safeGet(object, key), srcValue, (key + ''), object, source, stack) : undefined; if (newValue === undefined) { -- cgit v1.2.3