Skip to content

Commit 9b842a3

Browse files
authored
fix: support @typescript-eslint/eslint-plugin@5 (#942)
1 parent 8befa12 commit 9b842a3

File tree

3 files changed

+41
-38
lines changed

3 files changed

+41
-38
lines changed

.github/workflows/nodejs.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,14 @@ jobs:
6262
test-node:
6363
name:
6464
# prettier-ignore
65-
Test on Node.js v${{ matrix.node-version }} and eslint v${{ matrix.eslint-version }}
65+
Test on Node.js v${{ matrix.node-version }}, eslint v${{ matrix.eslint-version }} and ts-eslint/plugin v${{ matrix.ts-eslint-plugin-version }}
6666
needs: prepare-yarn-cache
6767
strategy:
6868
fail-fast: false
6969
matrix:
7070
node-version: [12.x, 14.x, 16.x]
7171
eslint-version: [6, 7]
72+
ts-eslint-plugin-version: [4, 5]
7273
runs-on: ubuntu-latest
7374

7475
steps:
@@ -78,10 +79,12 @@ jobs:
7879
with:
7980
node-version: ${{ matrix.node-version }}
8081
cache: yarn
81-
- name: install with eslint v${{ matrix.eslint-version }}
82+
- name:
83+
# prettier-ignore
84+
install with eslint v${{ matrix.eslint-version }} and ts-eslint/plugin v${{ matrix.ts-eslint-plugin-version }}
8285
run: |
8386
yarn
84-
yarn add --dev eslint@${{ matrix.eslint-version }}
87+
yarn add --dev eslint@${{ matrix.eslint-version }} @typescript-eslint/eslint-plugin@${{ matrix.ts-eslint-plugin-version }} @typescript-eslint/parser@${{ matrix.ts-eslint-plugin-version }}
8588
- name: run tests
8689
run: yarn test --coverage
8790
env:

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
"@types/jest": "^27.0.0",
9696
"@types/node": "^14.0.0",
9797
"@types/prettier": "^2.0.0",
98-
"@typescript-eslint/eslint-plugin": "^4.0.1",
99-
"@typescript-eslint/parser": "^4.0.1",
98+
"@typescript-eslint/eslint-plugin": "^5.0.0",
99+
"@typescript-eslint/parser": "^5.0.0",
100100
"babel-jest": "^27.0.0",
101101
"babel-plugin-replace-ts-export-assignment": "^0.0.2",
102102
"dedent": "^0.7.0",
@@ -123,7 +123,7 @@
123123
"typescript": "^4.4.0"
124124
},
125125
"peerDependencies": {
126-
"@typescript-eslint/eslint-plugin": "^4.0.0",
126+
"@typescript-eslint/eslint-plugin": "^4.0.0 || ^5.0.0",
127127
"eslint": "^6.0.0 || ^7.0.0"
128128
},
129129
"peerDependenciesMeta": {

yarn.lock

+32-32
Original file line numberDiff line numberDiff line change
@@ -2522,45 +2522,29 @@ __metadata:
25222522
languageName: node
25232523
linkType: hard
25242524

2525-
"@typescript-eslint/eslint-plugin@npm:^4.0.1":
2526-
version: 4.33.0
2527-
resolution: "@typescript-eslint/eslint-plugin@npm:4.33.0"
2525+
"@typescript-eslint/eslint-plugin@npm:^5.0.0":
2526+
version: 5.0.0
2527+
resolution: "@typescript-eslint/eslint-plugin@npm:5.0.0"
25282528
dependencies:
2529-
"@typescript-eslint/experimental-utils": 4.33.0
2530-
"@typescript-eslint/scope-manager": 4.33.0
2529+
"@typescript-eslint/experimental-utils": 5.0.0
2530+
"@typescript-eslint/scope-manager": 5.0.0
25312531
debug: ^4.3.1
25322532
functional-red-black-tree: ^1.0.1
25332533
ignore: ^5.1.8
25342534
regexpp: ^3.1.0
25352535
semver: ^7.3.5
25362536
tsutils: ^3.21.0
25372537
peerDependencies:
2538-
"@typescript-eslint/parser": ^4.0.0
2539-
eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
2538+
"@typescript-eslint/parser": ^5.0.0
2539+
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
25402540
peerDependenciesMeta:
25412541
typescript:
25422542
optional: true
2543-
checksum: d74855d0a5ffe0b2f362ec02fcd9301d39a53fb4155b9bd0cb15a0a31d065143129ebf98df9d86af4b6f74de1d423a4c0d8c0095520844068117453afda5bc4f
2544-
languageName: node
2545-
linkType: hard
2546-
2547-
"@typescript-eslint/experimental-utils@npm:4.33.0, @typescript-eslint/experimental-utils@npm:^4.11.1":
2548-
version: 4.33.0
2549-
resolution: "@typescript-eslint/experimental-utils@npm:4.33.0"
2550-
dependencies:
2551-
"@types/json-schema": ^7.0.7
2552-
"@typescript-eslint/scope-manager": 4.33.0
2553-
"@typescript-eslint/types": 4.33.0
2554-
"@typescript-eslint/typescript-estree": 4.33.0
2555-
eslint-scope: ^5.1.1
2556-
eslint-utils: ^3.0.0
2557-
peerDependencies:
2558-
eslint: "*"
2559-
checksum: f859800ada0884f92db6856f24efcb1d073ac9883ddc2b1aa9339f392215487895bed8447ebce3741e8141bb32e545244abef62b73193ba9a8a0527c523aabae
2543+
checksum: 0b1230b9fc5f74ea7e24fb14ede8e7907710eb1b467dd02cb52ed233f034190ff0aa4fefe8b549f425bdf2301cb9c072cf5e2a970742c664053880a198c9e697
25602544
languageName: node
25612545
linkType: hard
25622546

2563-
"@typescript-eslint/experimental-utils@npm:^5.0.0":
2547+
"@typescript-eslint/experimental-utils@npm:5.0.0, @typescript-eslint/experimental-utils@npm:^5.0.0":
25642548
version: 5.0.0
25652549
resolution: "@typescript-eslint/experimental-utils@npm:5.0.0"
25662550
dependencies:
@@ -2576,20 +2560,36 @@ __metadata:
25762560
languageName: node
25772561
linkType: hard
25782562

2579-
"@typescript-eslint/parser@npm:^4.0.1":
2563+
"@typescript-eslint/experimental-utils@npm:^4.11.1":
25802564
version: 4.33.0
2581-
resolution: "@typescript-eslint/parser@npm:4.33.0"
2565+
resolution: "@typescript-eslint/experimental-utils@npm:4.33.0"
25822566
dependencies:
2567+
"@types/json-schema": ^7.0.7
25832568
"@typescript-eslint/scope-manager": 4.33.0
25842569
"@typescript-eslint/types": 4.33.0
25852570
"@typescript-eslint/typescript-estree": 4.33.0
2571+
eslint-scope: ^5.1.1
2572+
eslint-utils: ^3.0.0
2573+
peerDependencies:
2574+
eslint: "*"
2575+
checksum: f859800ada0884f92db6856f24efcb1d073ac9883ddc2b1aa9339f392215487895bed8447ebce3741e8141bb32e545244abef62b73193ba9a8a0527c523aabae
2576+
languageName: node
2577+
linkType: hard
2578+
2579+
"@typescript-eslint/parser@npm:^5.0.0":
2580+
version: 5.0.0
2581+
resolution: "@typescript-eslint/parser@npm:5.0.0"
2582+
dependencies:
2583+
"@typescript-eslint/scope-manager": 5.0.0
2584+
"@typescript-eslint/types": 5.0.0
2585+
"@typescript-eslint/typescript-estree": 5.0.0
25862586
debug: ^4.3.1
25872587
peerDependencies:
2588-
eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
2588+
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
25892589
peerDependenciesMeta:
25902590
typescript:
25912591
optional: true
2592-
checksum: 102457eae1acd516211098fea081c8a2ed728522bbda7f5a557b6ef23d88970514f9a0f6285d53fca134d3d4d7d17822b5d5e12438d5918df4d1f89cc9e67d57
2592+
checksum: 9c97a60d583e80774e2593b79a9e8baa3b1867dcb2afab250ce8a950fccb44ccc5ecb270dcb071c592652a0eac6f28826ae02e8cbb386788f76eb134972e9c52
25932593
languageName: node
25942594
linkType: hard
25952595

@@ -4469,9 +4469,9 @@ __metadata:
44694469
"@types/jest": ^27.0.0
44704470
"@types/node": ^14.0.0
44714471
"@types/prettier": ^2.0.0
4472-
"@typescript-eslint/eslint-plugin": ^4.0.1
4472+
"@typescript-eslint/eslint-plugin": ^5.0.0
44734473
"@typescript-eslint/experimental-utils": ^5.0.0
4474-
"@typescript-eslint/parser": ^4.0.1
4474+
"@typescript-eslint/parser": ^5.0.0
44754475
babel-jest: ^27.0.0
44764476
babel-plugin-replace-ts-export-assignment: ^0.0.2
44774477
dedent: ^0.7.0
@@ -4497,7 +4497,7 @@ __metadata:
44974497
ts-node: ^10.2.1
44984498
typescript: ^4.4.0
44994499
peerDependencies:
4500-
"@typescript-eslint/eslint-plugin": ^4.0.0
4500+
"@typescript-eslint/eslint-plugin": ^4.0.0 || ^5.0.0
45014501
eslint: ^6.0.0 || ^7.0.0
45024502
peerDependenciesMeta:
45034503
"@typescript-eslint/eslint-plugin":

0 commit comments

Comments
 (0)