Skip to content

Commit 8237a53

Browse files
committed
Upgrade grpc-web to 2.0.2. Remove vendored copy with bazel repo
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent 9b80f0a commit 8237a53

File tree

10 files changed

+423
-2035
lines changed

10 files changed

+423
-2035
lines changed

bazel/external/grpc-web_protobuf_v30_support.patch

Lines changed: 409 additions & 0 deletions
Large diffs are not rendered by default.

bazel/grpc_web.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ pl_grpc_web_library = rule(
189189
cfg = "host",
190190
),
191191
"_protoc_gen_grpc_web": attr.label(
192-
default = Label("//third_party/protoc-gen-grpc-web:protoc-gen-grpc-web"),
192+
default = Label("@com_github_grpc_grpcweb//javascript/net/grpc/web/generator:protoc-gen-grpc-web"),
193193
executable = True,
194194
cfg = "host",
195195
),

bazel/repositories.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,8 @@ def _pl_deps():
259259
_bazel_repo("com_github_bazelbuild_buildtools")
260260
_bazel_repo("com_github_fmeum_rules_meta")
261261
_bazel_repo("com_google_protobuf_javascript", patches = ["//bazel/external:protobuf_javascript.patch"], patch_args = ["-p1"])
262+
# TODO(ddelnano): Remove patch once grpc-web upgrades to protobuf v30+.
263+
_bazel_repo("com_github_grpc_grpcweb", patches = ["//bazel/external:grpc-web_protobuf_v30_support.patch"], patch_args = ["-p1"])
262264

263265
_com_llvm_lib()
264266
_cc_deps()

bazel/repository_locations.bzl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ REPOSITORY_LOCATIONS = dict(
110110
strip_prefix = "grpc-1.74.1",
111111
urls = ["https://github.com/grpc/grpc/archive/refs/tags/v1.74.1.tar.gz"],
112112
),
113+
com_github_grpc_grpcweb = dict(
114+
sha256 = "0f0c8c0c1104306d67dad678be7c14efe52a698795a58b2b72ab67a8bb100c15",
115+
strip_prefix = "grpc-web-2.0.2",
116+
urls = ["https://github.com/grpc/grpc-web/archive/refs/tags/2.0.2.tar.gz"],
117+
),
113118
# August 19, 2020.
114119
com_github_google_sentencepiece = dict(
115120
sha256 = "1c0bd83e03f71a10fc934b7ce996e327488b838587f03159fd392c77c7701389",

src/ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"date-fns": "^2.29.3",
104104
"google-protobuf": "4.0.1",
105105
"graphql": "^15.5.0",
106-
"grpc-web": "^1.0.7",
106+
"grpc-web": "2.0.2",
107107
"history": "^4.10.1",
108108
"jose": "^4.9.3",
109109
"launchdarkly-react-client-sdk": "^2.20.0",

src/ui/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2813,7 +2813,7 @@ __metadata:
28132813
google-protobuf: 4.0.1
28142814
graphql: ^15.5.0
28152815
graphql-schema-typescript: ^1.5.2
2816-
grpc-web: ^1.0.7
2816+
grpc-web: 2.0.2
28172817
history: ^4.10.1
28182818
html-webpack-plugin: ^5.5.0
28192819
jest: ^27.3.1
@@ -8658,10 +8658,10 @@ __metadata:
86588658
languageName: node
86598659
linkType: hard
86608660

8661-
"grpc-web@npm:^1.0.7":
8662-
version: 1.2.1
8663-
resolution: "grpc-web@npm:1.2.1"
8664-
checksum: 3860a3761793ccff10db513126957acf2794bcdb0fb82fc20fc4ffbc16e25b9742500d966acc88fbb258bf1d88ef7a4014189287bffbc79177560d7d83eadec1
8661+
"grpc-web@npm:2.0.2":
8662+
version: 2.0.2
8663+
resolution: "grpc-web@npm:2.0.2"
8664+
checksum: 3f587ca5d8da51ca126f2014259981ee4b2d18051449db8a03a2df572fa94c5304b0f5ac4d6ed371aa76d278e6cfe428e05b0c703e23aa0dfabfec2ce5ec5dbd
86658665
languageName: node
86668666
linkType: hard
86678667

third_party/protoc-gen-grpc-web/BUILD.bazel

Lines changed: 0 additions & 27 deletions
This file was deleted.

third_party/protoc-gen-grpc-web/LICENSE

Lines changed: 0 additions & 205 deletions
This file was deleted.

third_party/protoc-gen-grpc-web/README.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)