Skip to content

Commit 55a882a

Browse files
committed
Update grpc-web generator and protobuf-javascript
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent 3a295d9 commit 55a882a

File tree

3 files changed

+399
-414
lines changed

3 files changed

+399
-414
lines changed

bazel/external/protobuf_javascript.patch

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
1+
diff --git a/generator/BUILD.bazel b/generator/BUILD.bazel
2+
index ac7756d..a3480c8 100644
3+
--- a/generator/BUILD.bazel
4+
+++ b/generator/BUILD.bazel
5+
@@ -2,7 +2,7 @@ genrule(
6+
name = "generate_version_header",
7+
srcs = ["//:package.json"],
8+
outs = ["version.h"],
9+
- cmd = "node $(location //:generate-version-header.js) $(OUTS)",
10+
+ cmd = "/opt/px_dev/tools/node/bin/node $(location //:generate-version-header.js) $(OUTS)",
11+
tools = ["//:generate-version-header.js"],
12+
)
13+
114
diff --git a/generator/js_generator.cc b/generator/js_generator.cc
2-
index 97b5844..1351a54 100644
15+
index 7ba8bf0..09b1391 100644
316
--- a/generator/js_generator.cc
417
+++ b/generator/js_generator.cc
5-
@@ -3650,6 +3650,9 @@ void Generator::GenerateFile(const GeneratorOptions& options,
18+
@@ -3647,6 +3647,9 @@ void Generator::GenerateFile(const GeneratorOptions& options,
619

720
for (int i = 0; i < file->dependency_count(); i++) {
8-
const std::string& name = file->dependency(i)->name();
21+
const std::string name = std::string(file->dependency(i)->name());
922
+ if (ModuleAlias(name) == "gogoproto_gogo_pb") {
1023
+ continue;
1124
+ }

bazel/repository_locations.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,10 @@ REPOSITORY_LOCATIONS = dict(
269269
],
270270
),
271271
com_google_protobuf_javascript = dict(
272-
sha256 = "35bca1729532b0a77280bf28ab5937438e3dcccd6b31a282d9ae84c896b6f6e3",
273-
strip_prefix = "protobuf-javascript-3.21.2",
272+
sha256 = "123fac2e86109b24e80ccd356aa914e268bf5863ad1354d224d6ceaed6f5c45b",
273+
strip_prefix = "protobuf-javascript-4.0.1",
274274
urls = [
275-
"https://github.com/protocolbuffers/protobuf-javascript/archive/refs/tags/v3.21.2.tar.gz",
275+
"https://github.com/protocolbuffers/protobuf-javascript/archive/refs/tags/v4.0.1.tar.gz",
276276
],
277277
),
278278
com_googlesource_code_re2 = dict(

0 commit comments

Comments
 (0)