Skip to content

Commit

Permalink
Update grpc to version 1.10.1 (#694)
Browse files Browse the repository at this point in the history
* Update grpc in firestore

Fixes #515

* Fix tests

Not sure how, but updating grpc made the test start using [email protected], which has some extra properties (dcodeIO/long.js@bc96a70) that broke the deep equals check.

In any case, all dependencies that are referenced should be added to package.json explicitly. I added the relevant tslint rules and also added other missing deps.

* Revert TSLint changes
  • Loading branch information
mmermerkaya authored and Josh Crowther committed Apr 19, 2018
1 parent fcb277a commit 6991857
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 18 deletions.
4 changes: 3 additions & 1 deletion packages/firestore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@firebase/firestore-types": "0.2.2",
"@firebase/logger": "0.1.0",
"@firebase/webchannel-wrapper": "0.2.7",
"grpc": "1.9.1",
"grpc": "1.10.1",
"tslib": "1.9.0"
},
"peerDependencies": {
Expand All @@ -35,6 +35,7 @@
},
"devDependencies": {
"@types/chai": "4.1.2",
"@types/long": "3.0.32",
"@types/mocha": "5.0.0",
"@types/sinon": "4.3.1",
"chai": "4.1.2",
Expand All @@ -47,6 +48,7 @@
"karma-sourcemap-loader": "0.3.7",
"karma-spec-reporter": "0.0.32",
"karma-webpack": "2.0.9",
"long": "3.2.0",
"mkdirp": "0.5.1",
"mocha": "5.0.5",
"npm-run-all": "4.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ describe('Serializer', () => {
];
for (const example of examples) {
const obj = s.toValue(new fieldValue.IntegerValue(example));
// TODO: This test fails with grpc 1.10.1, please fix.
expect(obj).to.deep.equal({ integerValue: '' + example });

const longVal = Long.fromString(example.toString(), false);
Expand Down
23 changes: 7 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
version "4.14.106"
resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.106.tgz#6093e9a02aa567ddecfe9afadca89e53e5dce4dd"

"@types/long@^3.0.32":
"@types/long@3.0.32", "@types/long@^3.0.32":
version "3.0.32"
resolved "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz#f4e5af31e9e9b196d8e5fca8a5e2e20aa3d60b69"

Expand Down Expand Up @@ -4474,16 +4474,7 @@ [email protected]:
version "1.10.3"
resolved "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"

[email protected]:
version "1.9.1"
resolved "https://registry.npmjs.org/grpc/-/grpc-1.9.1.tgz#18d7cfce153ebf952559e62dadbc8bbb85da1eac"
dependencies:
lodash "^4.15.0"
nan "^2.0.0"
node-pre-gyp "^0.6.39"
protobufjs "^5.0.0"

grpc@^1.10.0:
[email protected], grpc@^1.10.0:
version "1.10.1"
resolved "https://registry.npmjs.org/grpc/-/grpc-1.10.1.tgz#90691404aeb769a98784924d08e8fd07c920b2da"
dependencies:
Expand Down Expand Up @@ -6550,14 +6541,14 @@ lolex@^2.2.0, lolex@^2.3.2:
version "2.3.2"
resolved "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz#85f9450425103bf9e7a60668ea25dc43274ca807"

[email protected], long@~3:
version "3.2.0"
resolved "https://registry.npmjs.org/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"

long@^4.0.0:
version "4.0.0"
resolved "https://registry.npmjs.org/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"

long@~3:
version "3.2.0"
resolved "https://registry.npmjs.org/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"

longest@^1.0.1:
version "1.0.1"
resolved "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
Expand Down Expand Up @@ -7037,7 +7028,7 @@ [email protected]:
object-assign "^4.0.1"
thenify-all "^1.0.0"

nan@^2.0.0, nan@^2.10.0, nan@^2.3.0:
nan@^2.10.0, nan@^2.3.0:
version "2.10.0"
resolved "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"

Expand Down

0 comments on commit 6991857

Please sign in to comment.