From 3b8cf357e4ff8458f27f25f463c887550d0e0e50 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Tue, 9 Apr 2019 16:03:54 -0700 Subject: [PATCH 1/2] Re-add typescript dependency on packages that use it --- packages/grpc-js/package.json | 3 ++- packages/grpc-native-core/deps/grpc | 2 +- packages/proto-loader/package.json | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json index 718ec95ba..539108059 100644 --- a/packages/grpc-js/package.json +++ b/packages/grpc-js/package.json @@ -20,7 +20,8 @@ "@types/node": "^10.5.4", "clang-format": "^1.0.55", "gts": "^0.5.1", - "lodash": "^4.17.4" + "lodash": "^4.17.4", + "typescript": "~3.3.3333" }, "contributors": [ { diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index cb0129702..1b488f836 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit cb012970215b8c5141f4fdfdbe850006bd7994d6 +Subproject commit 1b488f8361234dddf1e48369b5dc482495fb3f9b diff --git a/packages/proto-loader/package.json b/packages/proto-loader/package.json index fb56a89bf..bbf92af50 100644 --- a/packages/proto-loader/package.json +++ b/packages/proto-loader/package.json @@ -46,7 +46,8 @@ "@types/lodash.camelcase": "^4.3.4", "@types/node": "^10.12.5", "clang-format": "^1.2.2", - "gts": "^0.5.3" + "gts": "^0.5.3", + "typescript": "~3.3.3333" }, "engines": { "node": ">=6" From 4d54a9397f00cf2c1639e4f1d86582bbf0ccc2e5 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Wed, 10 Apr 2019 11:03:11 -0700 Subject: [PATCH 2/2] Undo submodue change --- packages/grpc-native-core/deps/grpc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index 1b488f836..cb0129702 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit 1b488f8361234dddf1e48369b5dc482495fb3f9b +Subproject commit cb012970215b8c5141f4fdfdbe850006bd7994d6