Skip to content

Commit a926962

Browse files
authoredApr 19, 2022
build!: drop node 10 from engines list, update typescript to 4.6.3 (#477)
1 parent 627304c commit a926962

File tree

13 files changed

+9
-97
lines changed

13 files changed

+9
-97
lines changed
 

‎.github/sync-repo-settings.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ branchProtectionRules:
99
- "ci/kokoro: System test"
1010
- docs
1111
- lint
12-
- test (10)
1312
- test (12)
1413
- test (14)
14+
- test (16)
1515
- cla/google
1616
- windows
1717
- OwlBot Post Processor

‎.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
node: [10, 12, 14]
12+
node: [12, 14, 16]
1313
steps:
1414
- uses: actions/checkout@v3
1515
- uses: actions/setup-node@v3

‎.kokoro/continuous/node10/common.cfg

-34
This file was deleted.

‎.kokoro/continuous/node10/docs.cfg

-4
This file was deleted.

‎.kokoro/continuous/node10/lint.cfg

-4
This file was deleted.

‎.kokoro/continuous/node10/samples-test.cfg

-7
This file was deleted.

‎.kokoro/continuous/node10/system-test.cfg

-7
This file was deleted.

‎.kokoro/continuous/node10/test.cfg

-9
This file was deleted.

‎.kokoro/continuous/node8/common.cfg

-24
This file was deleted.

‎.kokoro/continuous/node8/test.cfg

Whitespace-only changes.

‎package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"google"
3333
],
3434
"engines": {
35-
"node": ">=10"
35+
"node": ">=12"
3636
},
3737
"author": "Google, LLC",
3838
"license": "Apache-2.0",
@@ -46,7 +46,7 @@
4646
"@types/multiparty": "0.0.33",
4747
"@types/mv": "^2.1.0",
4848
"@types/ncp": "^2.0.1",
49-
"@types/node": "^16.11.3",
49+
"@types/node": "^17.0.23",
5050
"@types/node-fetch": "^2.5.7",
5151
"@types/sinon": "^10.0.0",
5252
"@types/tmp": "0.2.3",
@@ -58,7 +58,7 @@
5858
"execa": "^5.0.0",
5959
"express": "^4.16.4",
6060
"form-data": "^4.0.0",
61-
"gts": "^3.0.0",
61+
"gts": "^3.1.0",
6262
"is-docker": "^2.0.0",
6363
"karma": "^6.0.0",
6464
"karma-chrome-launcher": "^3.0.0",
@@ -80,7 +80,7 @@
8080
"stream-browserify": "^3.0.0",
8181
"tmp": "0.2.1",
8282
"ts-loader": "^8.0.0",
83-
"typescript": "^3.8.3",
83+
"typescript": "^4.6.3",
8484
"uuid": "^8.0.0",
8585
"webpack": "^5.35.0",
8686
"webpack-cli": "^4.0.0"

‎src/gaxios.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export class Gaxios {
165165
} catch (e) {
166166
const err = e as GaxiosError;
167167
err.config = opts;
168-
const {shouldRetry, config} = await getRetryConfig(e);
168+
const {shouldRetry, config} = await getRetryConfig(err);
169169
if (shouldRetry && config) {
170170
err.config.retryConfig!.currentRetryAttempt =
171171
config.retryConfig!.currentRetryAttempt;

‎test/test.retry.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ describe('🛸 retry & exponential backoff', () => {
104104
try {
105105
await req;
106106
throw Error('unreachable');
107-
} catch (err) {
107+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
108+
} catch (err: any) {
108109
assert(err.config);
109110
assert.strictEqual(err.config.retryConfig.currentRetryAttempt, 0);
110111
}

0 commit comments

Comments
 (0)
Please sign in to comment.