From 5812daa5e1923214be9c4d1220d818b5944924de Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Fri, 29 Jul 2016 10:44:01 -0700 Subject: [PATCH 1/3] Update node protobuf dependency to 3.0.0 where applicable. Also update example dependency to grpc 1.0.0 --- health_check/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/health_check/package.json b/health_check/package.json index 582d5601..bdacb668 100644 --- a/health_check/package.json +++ b/health_check/package.json @@ -15,9 +15,9 @@ } ], "dependencies": { - "grpc": "^0.15.0", + "grpc": "^1.0.0-pre1", "lodash": "^3.9.3", - "google-protobuf": "^3.0.0-alpha.5" + "google-protobuf": "^3.0.0" }, "files": [ "LICENSE", From 792ddf9ea878675092cbc18a1e738115352f77e1 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Tue, 2 Aug 2016 14:38:00 -0700 Subject: [PATCH 2/3] Regenerate packages --- health_check/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/health_check/package.json b/health_check/package.json index 472a80b6..224e4ad6 100644 --- a/health_check/package.json +++ b/health_check/package.json @@ -15,7 +15,7 @@ } ], "dependencies": { - "grpc": "^1.0.0-pre1", + "grpc": "^1.0.0-pre2", "lodash": "^3.9.3", "google-protobuf": "^3.0.0" }, From bceacb5ed33fcc6b7c488b55c6b797fdbbbaa79a Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Tue, 9 Aug 2016 11:35:19 -0700 Subject: [PATCH 3/3] Make Node grpc-tools protoc automatically call the plugin --- tools/bin/protoc.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/bin/protoc.js b/tools/bin/protoc.js index 53fc5dc4..7f835686 100755 --- a/tools/bin/protoc.js +++ b/tools/bin/protoc.js @@ -47,7 +47,11 @@ var exe_ext = process.platform === 'win32' ? '.exe' : ''; var protoc = path.resolve(__dirname, 'protoc' + exe_ext); -var child_process = execFile(protoc, process.argv.slice(2), function(error, stdout, stderr) { +var plugin = path.resolve(__dirname, 'grpc_node_plugin' + exe_ext); + +var args = ['--plugin=protoc-gen-grpc=' + plugin].concat(process.argv.slice(2)); + +var child_process = execFile(protoc, args, function(error, stdout, stderr) { if (error) { throw error; }