Skip to content

Updated most dependencies to latest versions #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnhaley81 merged 2 commits into from
Feb 10, 2015
Merged

Updated most dependencies to latest versions #394

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7b1db5
Updated some dependencies
Feb 10, 2015
f032b61
Removed an artifact from the rebase
Feb 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Updated some dependencies
  • Loading branch information
John Haley committed Feb 10, 2015
commit c7b1db5d52c39e1df34633df867784ee78f0b7d7
1 change: 1 addition & 0 deletions generate/templates/partials/callback_helpers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_asyncAfter(

{{ cbFunction.return.type }} resultStatus;

{}
{% each cbFunction|returnsInfo true false as _return %}
if (result.IsEmpty() || result->IsNativeError()) {
baton->result = {{ cbFunction.return.error }};
Expand Down
15 changes: 5 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,24 @@
"node-pre-gyp"
],
"dependencies": {
"fs-extra": "~0.15.0",
"fs-extra": "^0.15.0",
"node-pre-gyp": "~0.6.1",
"nodegit-promise": "~1.0.0",
"npm": "^2.1.18",
"promisify-node": "~0.1.2",
"which-native-nodish": "^1.0.3"
},
"devDependencies": {
"mocha": "~2.1.0",
"combyne": "~0.6.2",
"istanbul": "~0.3.2",
"js-beautify": "^1.5.4",
"jshint": "~2.5.6",
"jshint": "^2.6.0",
"lodash": "^2.4.1",
"nan": "~1.5.0",
"mocha": "~2.1.0",
"nan": "^1.6.2",
"node-gyp": "~1.0.2",
"nw-gyp": "^0.12.4",
"request": "~2.51.0",
"request": "^2.53.0",
"tar": "~1.0.1"
},
"binary": {
Expand All @@ -85,19 +85,14 @@
"mocha": "mocha test/runner test/tests",
"mochaDebug": "mocha --debug-brk test/runner test/tests",
"test": "npm run lint && npm run cov",

"generateJson": "node generate/scripts/generateJson",
"generateNativeCode": "node generate/scripts/generateNativeCode",
"generateMissingTests": "node generate/scripts/generateMissingTests",


"prepublish": "node lifecycleScripts/prepareForBuild.js",
"publish": "node-pre-gyp package && node-pre-gyp publish",

"install": "node lifecycleScripts/install",
"installDebug": "BUILD_DEBUG=true npm install",
"postinstall": "node lifecycleScripts/clean",

"recompile": "node-gyp configure build",
"rebuild": "node generate && node-gyp configure build",
"recompileDebug": "node-gyp configure --debug build",
Expand Down