diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-13 04:38:20 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-13 04:38:20 +0100 |
| commit | f083013bd741fbb7f0f8d99cf47ced34220fae8f (patch) | |
| tree | 39e586efe528419b36031fcf3a8797a9f1eca926 /templates | |
| parent | 2d5e4dcaff6419f1e168738f46ffc15f165c2977 (diff) | |
| parent | 44753c39e1fd18da91d33e8747843befb8404b0d (diff) | |
Merge remote-tracking branch 'google/release-0_13' into upmerge-from-0.13
Conflicts:
Makefile
build.yaml
package.json
setup.py
src/core/surface/version.c
src/csharp/Grpc.Core/VersionInfo.cs
src/csharp/build_packages.bat
src/python/grpcio/grpc_version.py
src/ruby/lib/grpc/version.rb
tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.c++.internal
tools/doxygen/Doxyfile.core
tools/doxygen/Doxyfile.core.internal
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/package.json.template | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/templates/package.json.template b/templates/package.json.template index d6279b996e..99e8287b35 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" }, + "bundledDependencies": ["node-pre-gyp"], "dependencies": { "lodash": "^3.9.3", "nan": "^2.0.0", - "node-pre-gyp": "^0.6.19", "protobufjs": "^4.0.0" }, "devDependencies": { |