Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Remove hack in update.sh, and replace with existing pattern for protobuf dependencies. #1769

Merged
merged 1 commit into from Sep 8, 2022
Merged

fix: Remove hack in update.sh, and replace with existing pattern for protobuf dependencies. #1769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions dev/protos/update.sh
View file
Open in desktop
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