Skip to content

Commit

Permalink
fix: Remove hack in update.sh, and replace with existing pattern for …
Browse files Browse the repository at this point in the history
…protobuf dependencies. (#1769)
  • Loading branch information
tom-andersen authored Sep 8, 2022
1 parent 5eea279 commit 6ba6751
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions dev/protos/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ cp googleapis/google/type/latlng.proto \
"${PROTOS_DIR}/google/type/"

mkdir -p "${PROTOS_DIR}/google/protobuf"
cp protobuf/src/google/protobuf/{any,empty,field_mask,struct,timestamp,wrappers}.proto \
cp protobuf/src/google/protobuf/{any,descriptor,empty,field_mask,struct,timestamp,wrappers}.proto \
"${PROTOS_DIR}/google/protobuf/"

popd
Expand All @@ -80,7 +80,6 @@ popd
PBJS_ARGS=( --proto_path=. \
--js_out=import_style=commonjs,binary:library \
--target=static-module \
--path="$(npm root)/protobufjs" \
--no-create \
--no-encode \
--no-decode \
Expand Down Expand Up @@ -118,22 +117,19 @@ perl -pi -e 's/number\|Long/number\|string/g' firestore_v1beta1_proto_api.js

"${PBJS}" --proto_path=. --target=json -o v1.json \
-r firestore_v1 \
--path="$(npm root)/protobufjs" \
"${PROTOS_DIR}/google/firestore/v1/*.proto" \
"${PROTOS_DIR}/google/protobuf/*.proto" "${PROTOS_DIR}/google/type/*.proto" \
"${PROTOS_DIR}/google/rpc/*.proto" "${PROTOS_DIR}/google/api/*.proto"

"${PBJS}" --proto_path=. --target=json -o v1_admin.json \
-r firestore_admin_v1 \
--path="$(npm root)/protobufjs" \
"${PROTOS_DIR}/google/firestore/admin/v1/*.proto" \
"${PROTOS_DIR}/google/protobuf/*.proto" "${PROTOS_DIR}/google/type/*.proto" \
"${PROTOS_DIR}/google/rpc/*.proto" "${PROTOS_DIR}/google/api/*.proto" \
"${PROTOS_DIR}/google/longrunning/*.proto"

"${PBJS}" --proto_path=. --target=json -o v1beta1.json \
-r firestore_v1beta1 \
--path="$(npm root)/protobufjs" \
"${PROTOS_DIR}/google/firestore/v1beta1/*.proto" \
"${PROTOS_DIR}/google/protobuf/*.proto" "${PROTOS_DIR}/google/type/*.proto" \
"${PROTOS_DIR}/google/rpc/*.proto" "${PROTOS_DIR}/google/api/*.proto"
Expand Down

0 comments on commit 6ba6751

Please sign in to comment.