chore: Upgrade Lodash to 4.17.5 (vpulim#1001)

flybondi · Feb 27, 2018 · 7a5550a · 7a5550a
1 parent efca900
commit 7a5550a
Show file tree

Hide file tree

Showing 3 changed files with 420 additions and 659 deletions.
diff --git a/lib/wsdl.js b/lib/wsdl.js
@@ -88,7 +88,7 @@ function trim(text) {
 }
 
 function deepMerge(destination, source) {
-  return _.merge(destination || {}, source, function(a, b) {
+  return _.mergeWith(destination || {}, source, function(a, b) {
       return _.isArray(a) ? a.concat(b) : undefined;
     });
 }
@@ -1183,7 +1183,7 @@ WSDL.prototype._processNextInclude = function(includes, callback) {
     self._includesWsdl.push(wsdl);
 
     if (wsdl.definitions instanceof DefinitionsElement) {
-      _.merge(self.definitions, wsdl.definitions, function(a,b) {
+      _.mergeWith(self.definitions, wsdl.definitions, function(a,b) {
         return (a instanceof SchemaElement) ? a.merge(b) : undefined;
       });
     } else {