diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-11 14:06:49 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-11 14:06:49 -0800 |
| commit | 05632298196e612bbdcc3d0c035df39ca086ef26 (patch) | |
| tree | 6b333699fe5ab756e2a4c391158c8887537332c4 | |
| parent | 6e8a93966977b1e92de7358461e6a5f65160ebdd (diff) | |
| parent | ab604b6d76e84c87eb196b6db9d2b12018485a7b (diff) | |
Merge pull request #5206 from murgatroid99/node_bundle_node-pre-gyp
Bundle node-pre-gyp with the node package
| -rw-r--r-- | package.json | 5 | ||||
| -rw-r--r-- | templates/package.json.template | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/package.json b/package.json index fe364d37a4..df976fd3a5 100644 --- a/package.json +++ b/package.json @@ -23,13 +23,12 @@ "test": "./node_modules/.bin/mocha src/node/test && npm run-script lint", "gen_docs": "./node_modules/.bin/jsdoc -c src/node/jsdoc_conf.json", "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha src/node/test", - "preinstall": "npm install node-pre-gyp", - "install": "./node_modules/.bin/node-pre-gyp install --fallback-to-build" + "install": "node-pre-gyp install --fallback-to-build" }, + "bundledDependencies": ["node-pre-gyp"], "dependencies": { "lodash": "^3.9.3", "nan": "^2.0.0", - "node-pre-gyp": "^0.6.19", "protobufjs": "^4.0.0" }, "devDependencies": { diff --git a/templates/package.json.template b/templates/package.json.template index d6279b996e..ba2a078bb2 100644 --- a/templates/package.json.template +++ b/templates/package.json.template @@ -25,13 +25,12 @@ "test": "./node_modules/.bin/mocha src/node/test && npm run-script lint", "gen_docs": "./node_modules/.bin/jsdoc -c src/node/jsdoc_conf.json", "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha src/node/test", - "preinstall": "npm install node-pre-gyp", - "install": "./node_modules/.bin/node-pre-gyp install --fallback-to-build" + "install": "node-pre-gyp install --fallback-to-build" }, + "bundledDependencies": ["node-pre-gyp"], "dependencies": { "lodash": "^3.9.3", "nan": "^2.0.0", - "node-pre-gyp": "^0.6.19", "protobufjs": "^4.0.0" }, "devDependencies": { |