Permalink
Browse files

Bugfix: Inherit error of lodash merge / mergeWidth split.

  • Loading branch information...
1 parent 3e8e6dc commit e8908f9e2e7c3a9b2553e94afc9f5eb25fa271a2 @rottmann rottmann committed Feb 17, 2016
Showing with 7 additions and 5 deletions.
  1. +5 −3 lib/workers/api_use.js
  2. +2 −2 package.json
@@ -142,11 +142,13 @@ function postProcess(parsedFiles, filenames, preProcess, packageInfos, source, t
* @todo Bad Hack - watch for something better
*/
function _recursiveMerge(block, matchedData) {
- _.merge(block, matchedData, function(a, b) {
- if(a instanceof Array)
+ _.mergeWith(block, matchedData, function(a, b) {
+ if(a instanceof Array) {
return a.concat(b);
- if(_.isObject(a))
+ }
+ if(_.isObject(a)) {
_recursiveMerge(a, b);
+ }
return a;
});
}
View
@@ -1,6 +1,6 @@
{
"name": "apidoc-core",
- "version": "0.6.0",
+ "version": "0.6.1",
"description": "Core parser library to generate apidoc result following the apidoc-spec",
"author": "Peter Rottmann <rottmann@inveris.de>",
"license": {
@@ -33,7 +33,7 @@
"node": ">= 0.10.0"
},
"dependencies": {
- "lodash": "~4.3.0",
+ "lodash": "~4.5.0",
"semver": "~5.1.0",
"wrench": "~1.5.8"
},

0 comments on commit e8908f9

Please sign in to comment.