Skip to content

Commit

Permalink
Using the GRPC dependency as exposed from google-gax (#115)
Browse files Browse the repository at this point in the history
* Merge

* Adding --unsafe-perm to work aroun Node 4 issue with GRPC
  • Loading branch information
schmidt-sebastian authored and stephenplusplus committed Jan 24, 2018
1 parent 19c3a15 commit f2cccfe
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ unit_tests: &unit_tests
- checkout
- run:
name: Install modules and dependencies.
command: npm install
# '--unsafe-perm' required as per https://github.com/grpc/grpc/issues/8941
command: npm install --unsafe-perm
- run:
name: Install codecov.
command: npm install codecov
Expand Down
2 changes: 1 addition & 1 deletion conformance/runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const is = require('is');
const through = require('through2');
const googleProtoFiles = require('google-proto-files');
const protobufjs = require('protobufjs');
const grpc = require('grpc');
const grpc = require('google-gax').grpc().grpc;

const Firestore = require('../');
const reference = require('../src/reference')(Firestore);
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
"eslint-plugin-node": "^5.2.1",
"eslint-plugin-prettier": "^2.5.0",
"google-proto-files": "^0.14.1",
"grpc": "^1.8.4",
"ink-docstrap": "git+https://github.com/docstrap/docstrap.git",
"intelli-espower-loader": "^1.0.1",
"jsdoc": "^3.5.5",
Expand Down
2 changes: 1 addition & 1 deletion test/collection.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
'use strict';

const assert = require('power-assert');
const grpc = require('grpc');
const grpc = require('google-gax').grpc().grpc;
const is = require('is');

const Firestore = require('../');
Expand Down
2 changes: 1 addition & 1 deletion test/document.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
const assert = require('power-assert');
const Buffer = require('safe-buffer').Buffer;
const extend = require('extend');
const grpc = require('grpc');
const grpc = require('google-gax').grpc().grpc;
const is = require('is');
const through = require('through2');

Expand Down
2 changes: 1 addition & 1 deletion test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
const assert = require('power-assert');
const duplexify = require('duplexify');
const extend = require('extend');
const grpc = require('grpc');
const grpc = require('google-gax').grpc().grpc;
const GrpcService = require('@google-cloud/common').GrpcService;
const proxyquire = require('proxyquire');
const util = require('@google-cloud/common').util;
Expand Down
2 changes: 1 addition & 1 deletion test/order.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

const assert = require('power-assert');
const Buffer = require('safe-buffer').Buffer;
const grpc = require('grpc');
const grpc = require('google-gax').grpc().grpc;

const Firestore = require('../');
const DocumentReference = require('../src/reference')(Firestore)
Expand Down
2 changes: 1 addition & 1 deletion test/query.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

const assert = require('power-assert');
const extend = require('extend');
const grpc = require('grpc');
const grpc = require('google-gax').grpc().grpc;
const is = require('is');
const through = require('through2');

Expand Down
2 changes: 1 addition & 1 deletion test/transaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
'use strict';

const assert = require('power-assert');
const grpc = require('grpc');
const grpc = require('google-gax').grpc().grpc;
const through = require('through2');

const Firestore = require('../');
Expand Down
2 changes: 1 addition & 1 deletion test/watch.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

const assert = require('power-assert');
const duplexify = require('duplexify');
const grpc = require('grpc');
const grpc = require('google-gax').grpc().grpc;
const is = require('is');
const through = require('through2');

Expand Down
2 changes: 1 addition & 1 deletion test/write-batch.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
'use strict';

const assert = require('power-assert');
const grpc = require('grpc');
const grpc = require('google-gax').grpc().grpc;

const Firestore = require('../');

Expand Down

0 comments on commit f2cccfe

Please sign in to comment.