Skip to content

Commit

Permalink
Merge branch 'master' into release-v2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-fenster committed Mar 26, 2020
2 parents 9878fdf + 2f1b6ae commit 9d0dea8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -42,7 +42,7 @@
"@types/node-fetch": "^2.5.4",
"@types/proxyquire": "^1.3.28",
"@types/pumpify": "^1.4.1",
"@types/rimraf": "^2.0.2",
"@types/rimraf": "^3.0.0",
"@types/semver": "^6.0.0",
"@types/sinon": "^7.0.0",
"@types/through2": "^2.0.33",
Expand Down Expand Up @@ -84,7 +84,7 @@
"stream-events": "^1.0.4",
"through2": "^3.0.0",
"ts-loader": "^6.0.3",
"typescript": "3.6.4",
"typescript": "^3.8.3",
"webpack": "^4.34.0",
"webpack-cli": "^3.3.4"
},
Expand Down Expand Up @@ -117,7 +117,7 @@
},
"homepage": "https://github.com/googleapis/gax-nodejs#readme",
"engines": {
"node": ">=8.10.0"
"node": ">=10"
},
"browser": "build/src/fallback.js"
}
4 changes: 2 additions & 2 deletions src/operationsClient.ts
Expand Up @@ -82,14 +82,14 @@ export class OperationsClient {
operationsProtos: any,
options: OperationsClientOptions
) {
const opts: OperationsClientOptions & ClientStubOptions = Object.assign(
const opts = Object.assign(
{
servicePath: SERVICE_ADDRESS,
port: DEFAULT_SERVICE_PORT,
clientConfig: {},
},
options
);
) as OperationsClientOptions & ClientStubOptions;

const googleApiClient = ['gl-node/' + process.versions.node];
if (opts.libName && opts.libVersion) {
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
@@ -1,7 +1,7 @@
{
"extends": "./node_modules/gts/tsconfig-google.json",
"compilerOptions": {
"lib": ["es2015", "dom"],
"lib": ["es2018", "dom"],
"rootDir": ".",
"outDir": "build",
"noImplicitAny": true,
Expand Down

0 comments on commit 9d0dea8

Please sign in to comment.