Skip to content

Commit

Permalink
Update google-protobuf and remove workaround
Browse files Browse the repository at this point in the history
In order to comply with the no-unsafe-eval CSP, we worked around issue
protocolbuffers/protobuf#6770 by including a
modified version of google-protobuf under the src/third_party folder.

This CL updates the google-protobuf version to one which fixes this bug,
and removes the workaround.

Change-Id: Ida7943bad452ee930defbc136602a34910a41977
  • Loading branch information
avm99963 committed Jan 21, 2022
1 parent 1e10d19 commit 50435f8
Show file tree
Hide file tree
Showing 17 changed files with 272 additions and 17,913 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ RELEASE_SCRIPT := bash tools/release.bash
grpc_proto_gen:
(cd src/killSwitch && \
protoc -I=. --js_out=import_style=commonjs_strict:. api_proto/*.proto && \
protoc -I. --grpc-web_out=import_style=commonjs,mode=grpcwebtext:. api_proto/*.proto && \
(cd api_proto && \
sed -i -E "s/require\('google-protobuf\//require('..\/..\/third_party\/google-protobuf-commonjs_strict\//" *_pb.js ))
protoc -I. --grpc-web_out=import_style=commonjs,mode=grpcwebtext:. api_proto/*.proto)

node_deps:
npm ci --no-save
Expand Down
324 changes: 245 additions & 79 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@material/menu": "^10.0.0",
"@material/tooltip": "^12.0.0",
"async-mutex": "^0.3.2",
"google-protobuf": "^3.18.0-rc.2",
"google-protobuf": "^3.19.3",
"grpc-web": "^1.2.1",
"idb": "^6.1.2",
"poll-until-promise": "^3.6.1",
Expand Down
Loading

0 comments on commit 50435f8

Please sign in to comment.