upgrade to lodash 4.17.4

vpulim · May 30, 2017 · 10c7990 · 10c7990
1 parent 94a8b54
commit 10c7990
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 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;
     });
 }
@@ -1168,7 +1168,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 {

diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "debug": "~0.7.4",
     "ejs": "~2.5.5",
     "finalhandler": "^0.5.0",
-    "lodash": "^3.10.1",
+    "lodash": "^4.17.4",
     "optional": "^0.1.3",
     "request": ">=2.9.0",
     "sax": ">=0.6",