From a068d589ae5445144f1b7cd1654baf24e058481b Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Fri, 10 Jul 2020 11:53:20 -0700 Subject: [PATCH] Don't explicitly include protobufjs when loading protos --- packages/grpc-js/package.json | 2 +- packages/grpc-js/src/xds-client.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json index 8831891d..a795afc7 100644 --- a/packages/grpc-js/package.json +++ b/packages/grpc-js/package.json @@ -47,7 +47,7 @@ "clean": "node -e 'require(\"rimraf\")(\"./build\", () => {})'", "compile": "tsc -p .", "format": "clang-format -i -style=\"{Language: JavaScript, BasedOnStyle: Google, ColumnLimit: 80}\" src/*.ts test/*.ts", - "generate-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --json --includeDirs deps/envoy-api/ deps/udpa/ node_modules/protobufjs/ deps/googleapis/ deps/protoc-gen-validate/ -O src/generated/ --grpcLib ../index envoy/service/discovery/v2/ads.proto envoy/api/v2/listener.proto envoy/api/v2/route.proto envoy/api/v2/cluster.proto envoy/api/v2/endpoint.proto", + "generate-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --json --includeDirs deps/envoy-api/ deps/udpa/ deps/googleapis/ deps/protoc-gen-validate/ -O src/generated/ --grpcLib ../index envoy/service/discovery/v2/ads.proto envoy/api/v2/listener.proto envoy/api/v2/route.proto envoy/api/v2/cluster.proto envoy/api/v2/endpoint.proto", "lint": "npm run check", "prepare": "npm run compile", "test": "gulp test", diff --git a/packages/grpc-js/src/xds-client.ts b/packages/grpc-js/src/xds-client.ts index 80d19e0e..9fb5279e 100644 --- a/packages/grpc-js/src/xds-client.ts +++ b/packages/grpc-js/src/xds-client.ts @@ -65,7 +65,6 @@ function loadAdsProtos(): Promise { // Paths are relative to src/build __dirname + '/../../deps/envoy-api/', __dirname + '/../../deps/udpa/', - __dirname + '/../../node_modules/protobufjs/', __dirname + '/../../deps/googleapis/', __dirname + '/../../deps/protoc-gen-validate/', ],