Skip to content

Commit

Permalink
feat: drop support for @typescript-eslint/eslint-plugin v5 (#1530)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: dropped support for `@typescript-eslint/eslint-plugin` v5
  • Loading branch information
G-Rath authored Mar 23, 2024
1 parent 9899ddf commit 150e355
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 73 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
matrix:
node-version: [16.x, 18.x, 19.x, 20.x, 21.x]
eslint-version: [7, 8]
ts-eslint-plugin-version: [5, 6, 7]
ts-eslint-plugin-version: [6, 7]
exclude:
# ts-eslint/plugin@7 doesn't support node@16
- node-version: 16.x
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@
"@types/eslint": "^8.4.6",
"@types/jest": "^29.0.0",
"@types/node": "^14.18.26",
"@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^5.0.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"babel-jest": "^29.0.0",
"babel-plugin-replace-ts-export-assignment": "^0.0.2",
"dedent": "^1.5.0",
Expand Down Expand Up @@ -142,7 +142,7 @@
"typescript": "^5.0.4"
},
"peerDependencies": {
"@typescript-eslint/eslint-plugin": "^5.0.0 || ^6.0.0 || ^7.0.0",
"@typescript-eslint/eslint-plugin": "^6.0.0 || ^7.0.0",
"eslint": "^7.0.0 || ^8.0.0",
"jest": "*"
},
Expand Down
5 changes: 1 addition & 4 deletions src/rules/__tests__/unbound-method.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import path from 'path';
import { version as rawTypeScriptESLintPluginVersion } from '@typescript-eslint/eslint-plugin/package.json';
import { TSESLint } from '@typescript-eslint/utils';
import dedent from 'dedent';
import type { MessageIds, Options } from '../unbound-method';
Expand Down Expand Up @@ -253,9 +252,7 @@ ruleTester.run('unbound-method', requireRule(false), {
"['1', '2', '3'].map(Number.parseInt);",
'[5.2, 7.1, 3.6].map(Math.floor);',
'const x = console.log;',
...(parseInt(rawTypeScriptESLintPluginVersion.split('.')[0], 10) >= 6
? ['const x = Object.defineProperty;']
: []),
'const x = Object.defineProperty;',
...[
'instance.bound();',
'instance.unbound();',
Expand Down
7 changes: 1 addition & 6 deletions src/rules/no-untyped-mock-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@ export default createRule({
create(context) {
return {
CallExpression(node: TSESTree.CallExpression): void {
let { callee, typeArguments } = node;

/* istanbul ignore next */
if (!('typeArguments' in node)) {
typeArguments = (node as TSESTree.CallExpression).typeParameters;
}
const { callee, typeArguments } = node;

if (callee.type !== AST_NODE_TYPES.MemberExpression) {
return;
Expand Down
113 changes: 54 additions & 59 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1661,7 +1661,7 @@ __metadata:
languageName: node
linkType: hard

"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.6.1":
"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
version: 4.10.0
resolution: "@eslint-community/regexpp@npm:4.10.0"
checksum: 2a6e345429ea8382aaaf3a61f865cae16ed44d31ca917910033c02dc00d505d939f10b81e079fa14d43b51499c640138e153b7e40743c4c094d9df97d4e56f7b
Expand Down Expand Up @@ -2939,44 +2939,46 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/eslint-plugin@npm:^5.0.0":
version: 5.62.0
resolution: "@typescript-eslint/eslint-plugin@npm:5.62.0"
"@typescript-eslint/eslint-plugin@npm:^6.0.0":
version: 6.21.0
resolution: "@typescript-eslint/eslint-plugin@npm:6.21.0"
dependencies:
"@eslint-community/regexpp": ^4.4.0
"@typescript-eslint/scope-manager": 5.62.0
"@typescript-eslint/type-utils": 5.62.0
"@typescript-eslint/utils": 5.62.0
"@eslint-community/regexpp": ^4.5.1
"@typescript-eslint/scope-manager": 6.21.0
"@typescript-eslint/type-utils": 6.21.0
"@typescript-eslint/utils": 6.21.0
"@typescript-eslint/visitor-keys": 6.21.0
debug: ^4.3.4
graphemer: ^1.4.0
ignore: ^5.2.0
natural-compare-lite: ^1.4.0
semver: ^7.3.7
tsutils: ^3.21.0
ignore: ^5.2.4
natural-compare: ^1.4.0
semver: ^7.5.4
ts-api-utils: ^1.0.1
peerDependencies:
"@typescript-eslint/parser": ^5.0.0
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
"@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
eslint: ^7.0.0 || ^8.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: fc104b389c768f9fa7d45a48c86d5c1ad522c1d0512943e782a56b1e3096b2cbcc1eea3fcc590647bf0658eef61aac35120a9c6daf979bf629ad2956deb516a1
checksum: 5ef2c502255e643e98051e87eb682c2a257e87afd8ec3b9f6274277615e1c2caf3131b352244cfb1987b8b2c415645eeacb9113fa841fc4c9b2ac46e8aed6efd
languageName: node
linkType: hard

"@typescript-eslint/parser@npm:^5.0.0":
version: 5.62.0
resolution: "@typescript-eslint/parser@npm:5.62.0"
"@typescript-eslint/parser@npm:^6.0.0":
version: 6.21.0
resolution: "@typescript-eslint/parser@npm:6.21.0"
dependencies:
"@typescript-eslint/scope-manager": 5.62.0
"@typescript-eslint/types": 5.62.0
"@typescript-eslint/typescript-estree": 5.62.0
"@typescript-eslint/scope-manager": 6.21.0
"@typescript-eslint/types": 6.21.0
"@typescript-eslint/typescript-estree": 6.21.0
"@typescript-eslint/visitor-keys": 6.21.0
debug: ^4.3.4
peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
eslint: ^7.0.0 || ^8.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: d168f4c7f21a7a63f47002e2d319bcbb6173597af5c60c1cf2de046b46c76b4930a093619e69faf2d30214c29ab27b54dcf1efc7046a6a6bd6f37f59a990e752
checksum: 162fe3a867eeeffda7328bce32dae45b52283c68c8cb23258fb9f44971f761991af61f71b8c9fe1aa389e93dfe6386f8509c1273d870736c507d76dd40647b68
languageName: node
linkType: hard

Expand All @@ -3000,20 +3002,20 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/type-utils@npm:5.62.0":
version: 5.62.0
resolution: "@typescript-eslint/type-utils@npm:5.62.0"
"@typescript-eslint/type-utils@npm:6.21.0":
version: 6.21.0
resolution: "@typescript-eslint/type-utils@npm:6.21.0"
dependencies:
"@typescript-eslint/typescript-estree": 5.62.0
"@typescript-eslint/utils": 5.62.0
"@typescript-eslint/typescript-estree": 6.21.0
"@typescript-eslint/utils": 6.21.0
debug: ^4.3.4
tsutils: ^3.21.0
ts-api-utils: ^1.0.1
peerDependencies:
eslint: "*"
eslint: ^7.0.0 || ^8.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: fc41eece5f315dfda14320be0da78d3a971d650ea41300be7196934b9715f3fe1120a80207551eb71d39568275dbbcf359bde540d1ca1439d8be15e9885d2739
checksum: 77025473f4d80acf1fafcce99c5c283e557686a61861febeba9c9913331f8a41e930bf5cd8b7a54db502a57b6eb8ea6d155cbd4f41349ed00e3d7aeb1f477ddc
languageName: node
linkType: hard

Expand Down Expand Up @@ -3086,7 +3088,24 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:5.62.0, @typescript-eslint/utils@npm:^5.38.1":
"@typescript-eslint/utils@npm:6.21.0, @typescript-eslint/utils@npm:^6.0.0":
version: 6.21.0
resolution: "@typescript-eslint/utils@npm:6.21.0"
dependencies:
"@eslint-community/eslint-utils": ^4.4.0
"@types/json-schema": ^7.0.12
"@types/semver": ^7.5.0
"@typescript-eslint/scope-manager": 6.21.0
"@typescript-eslint/types": 6.21.0
"@typescript-eslint/typescript-estree": 6.21.0
semver: ^7.5.4
peerDependencies:
eslint: ^7.0.0 || ^8.0.0
checksum: b129b3a4aebec8468259f4589985cb59ea808afbfdb9c54f02fad11e17d185e2bf72bb332f7c36ec3c09b31f18fc41368678b076323e6e019d06f74ee93f7bf2
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:^5.38.1":
version: 5.62.0
resolution: "@typescript-eslint/utils@npm:5.62.0"
dependencies:
Expand All @@ -3104,23 +3123,6 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:^6.0.0":
version: 6.21.0
resolution: "@typescript-eslint/utils@npm:6.21.0"
dependencies:
"@eslint-community/eslint-utils": ^4.4.0
"@types/json-schema": ^7.0.12
"@types/semver": ^7.5.0
"@typescript-eslint/scope-manager": 6.21.0
"@typescript-eslint/types": 6.21.0
"@typescript-eslint/typescript-estree": 6.21.0
semver: ^7.5.4
peerDependencies:
eslint: ^7.0.0 || ^8.0.0
checksum: b129b3a4aebec8468259f4589985cb59ea808afbfdb9c54f02fad11e17d185e2bf72bb332f7c36ec3c09b31f18fc41368678b076323e6e019d06f74ee93f7bf2
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:5.62.0":
version: 5.62.0
resolution: "@typescript-eslint/visitor-keys@npm:5.62.0"
Expand Down Expand Up @@ -5209,8 +5211,8 @@ __metadata:
"@types/eslint": ^8.4.6
"@types/jest": ^29.0.0
"@types/node": ^14.18.26
"@typescript-eslint/eslint-plugin": ^5.0.0
"@typescript-eslint/parser": ^5.0.0
"@typescript-eslint/eslint-plugin": ^6.0.0
"@typescript-eslint/parser": ^6.0.0
"@typescript-eslint/utils": ^6.0.0
babel-jest: ^29.0.0
babel-plugin-replace-ts-export-assignment: ^0.0.2
Expand Down Expand Up @@ -5240,7 +5242,7 @@ __metadata:
ts-node: ^10.2.1
typescript: ^5.0.4
peerDependencies:
"@typescript-eslint/eslint-plugin": ^5.0.0 || ^6.0.0 || ^7.0.0
"@typescript-eslint/eslint-plugin": ^6.0.0 || ^7.0.0
eslint: ^7.0.0 || ^8.0.0
jest: "*"
peerDependenciesMeta:
Expand Down Expand Up @@ -8473,13 +8475,6 @@ __metadata:
languageName: node
linkType: hard

"natural-compare-lite@npm:^1.4.0":
version: 1.4.0
resolution: "natural-compare-lite@npm:1.4.0"
checksum: 5222ac3986a2b78dd6069ac62cbb52a7bf8ffc90d972ab76dfe7b01892485d229530ed20d0c62e79a6b363a663b273db3bde195a1358ce9e5f779d4453887225
languageName: node
linkType: hard

"natural-compare@npm:^1.4.0":
version: 1.4.0
resolution: "natural-compare@npm:1.4.0"
Expand Down

0 comments on commit 150e355

Please sign in to comment.