Revert "Revert "Switch from 'grpc' to '@grpc/grpc-js' dependency. (fi…

…rebase#1804)" (firebase#1813)" This reverts commit ae32b2b.
GitLiveApp · Jun 14, 2019 · 5cc7363 · 5cc7363
1 parent fb45cd6
commit 5cc7363
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/packages/firestore/package.json b/packages/firestore/package.json
@@ -32,8 +32,8 @@
     "@firebase/firestore-types": "1.3.0",
     "@firebase/logger": "0.1.15",
     "@firebase/webchannel-wrapper": "0.2.20",
+    "@grpc/grpc-js": "0.4.0",
     "@grpc/proto-loader": "^0.5.0",
-    "grpc": "1.20.3",
     "tslib": "1.9.3"
   },
   "peerDependencies": {

diff --git a/packages/firestore/src/platform_node/grpc_connection.ts b/packages/firestore/src/platform_node/grpc_connection.ts
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-import * as grpc from 'grpc';
+import * as grpc from '@grpc/grpc-js';
 
 import firebase from '@firebase/app';
 const SDK_VERSION = firebase.SDK_VERSION;
 
-const grpcVersion = require('grpc/package.json').version;
+const grpcVersion = require('@grpc/grpc-js/package.json').version;
 
 import { Token } from '../api/credentials';
 import { DatabaseInfo } from '../core/database_info';

diff --git a/packages/firestore/src/platform_node/load_protos.ts b/packages/firestore/src/platform_node/load_protos.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
+import * as grpc from '@grpc/grpc-js';
 import * as protoLoader from '@grpc/proto-loader';
-import * as grpc from 'grpc';
 import * as path from 'path';
 import * as ProtobufJS from 'protobufjs';
 

diff --git a/yarn.lock b/yarn.lock
@@ -893,6 +893,13 @@
     through2 "^2.0.0"
     xdg-basedir "^3.0.0"
 
+"@grpc/grpc-js@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-0.4.0.tgz#b20a6abf1346ce7fd696a042f83d10c94e143881"
+  integrity sha512-UbGDPnstJamJrSiHzCSwSavIX260IfLOZLRJYDqRKJA/jmVZa3hPMWDjhFrcCKDq2MLc/O/nauFED3r4khcZrA==
+  dependencies:
+    semver "^6.0.0"
+
 "@grpc/proto-loader@^0.5.0":
   version "0.5.0"
   resolved "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.0.tgz#6d21930530db6089ed68a90f10a22b76fdc3387d"
@@ -7151,17 +7158,6 @@ grpc@1.20.2:
     node-pre-gyp "^0.13.0"
     protobufjs "^5.0.3"
 
-grpc@1.20.3:
-  version "1.20.3"
-  resolved "https://registry.npmjs.org/grpc/-/grpc-1.20.3.tgz#a74d36718f1e89c4a64f2fb9441199c3c8f78978"
-  integrity sha512-GsEsi0NVj6usS/xor8pF/xDbDiwZQR59aZl5NUZ59Sy2bdPQFZ3UePr5wevZjHboirRCIQCKRI1cCgvSWUe2ag==
-  dependencies:
-    lodash.camelcase "^4.3.0"
-    lodash.clone "^4.5.0"
-    nan "^2.13.2"
-    node-pre-gyp "^0.13.0"
-    protobufjs "^5.0.3"
-
 gtoken@^1.2.1, gtoken@^1.2.3:
   version "1.2.3"
   resolved "https://registry.npmjs.org/gtoken/-/gtoken-1.2.3.tgz#5509571b8afd4322e124cf66cf68115284c476d8"