FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge pull request #396 from nodegit/update-lodash · nodegit/nodegit@d9c62f4 · GitHub

Repository navigation

Commit d9c62f4

Browse files
committed
Merge pull request #396 from nodegit/update-lodash
Update moar dependencies.
2 parents 6876084 + dfbab95 commit d9c62f4

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎generate/scripts/generateJson.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ module.exports = function generateJson() {
210210
_.merge(enumerable, _.omit(override, ["values"]));
211211

212212
output.push(enumerable);
213-
});
213+
}).value();
214214

215215
output = _.sortBy(output, "typeName");
216216

‎generate/scripts/helpers.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ var Helpers = {
314314
if (fnDef.jsFunctionName == utils.camelCase(collidingName)) {
315315
fnDef.jsFunctionName = utils.camelCase(newName);
316316
}
317-
});
317+
}).value();
318318

319319
_.merge(fnDef, _.omit(fnOverrides, "args", "return"));
320320
},

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"node-pre-gyp"
5555
],
5656
"dependencies": {
57-
"fs-extra": "^0.15.0",
57+
"fs-extra": "^0.16.3",
5858
"node-pre-gyp": "~0.6.1",
5959
"nodegit-promise": "~1.0.0",
6060
"npm": "^2.1.18",
@@ -66,7 +66,7 @@
6666
"istanbul": "~0.3.2",
6767
"js-beautify": "^1.5.4",
6868
"jshint": "^2.6.0",
69-
"lodash": "^2.4.1",
69+
"lodash": "^3.1.0",
7070
"mocha": "~2.1.0",
7171
"nan": "^1.6.2",
7272
"node-gyp": "~1.0.2",

‎test/tests/commit.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ describe("Commit", function() {
132132
}, function(reason) {
133133
return reinitialize(test)
134134
.then(function() {
135-
return Promise.reject();
135+
return Promise.reject(reason);
136136
});
137137
});
138138
});

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL