Skip to content

Commit 10bf84c

Browse files
committed
feat: support ESLint 8.x
BREAKING CHANGE: Requires Node@^12.22.0 || ^14.17.0 || >=16.0.0 BREAKING CHANGE: Requires ESLint@^8.0.0-0
1 parent 1c1c009 commit 10bf84c

File tree

7 files changed

+26
-25
lines changed

7 files changed

+26
-25
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@babel/preset-env",
99
{
1010
"targets": {
11-
"node": 10
11+
"node": 12
1212
}
1313
}
1414
]

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22
node_js:
33
- node
4-
- 10
4+
- 12
55
before_install:
66
- npm config set depth 0
77
notifications:

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
},
1111
"description": "Flowtype linting rules for ESLint.",
1212
"devDependencies": {
13-
"@babel/cli": "^7.15.4",
14-
"@babel/core": "^7.15.5",
15-
"@babel/node": "^7.15.4",
13+
"@babel/cli": "^7.15.7",
14+
"@babel/core": "^7.15.8",
15+
"@babel/eslint-parser": "^7.15.8",
16+
"@babel/node": "^7.15.8",
1617
"@babel/plugin-proposal-object-rest-spread": "^7.15.6",
17-
"@babel/preset-env": "^7.15.6",
18+
"@babel/preset-env": "^7.15.8",
1819
"@babel/register": "^7.15.3",
1920
"ajv": "^8.6.3",
20-
"babel-eslint": "^10.1.0",
2121
"babel-plugin-add-module-exports": "^1.0.4",
2222
"chai": "^4.3.4",
2323
"eclint": "^2.8.1",
24-
"eslint": "^7.32.0",
24+
"eslint": "^8.0.0",
2525
"eslint-config-canonical": "^27.0.1",
2626
"gitdown": "^3.1.4",
2727
"glob": "^7.1.7",
@@ -32,7 +32,7 @@
3232
"semantic-release": "^17.4.7"
3333
},
3434
"engines": {
35-
"node": "^10.12.0 || >=12.0.0"
35+
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
3636
},
3737
"husky": {
3838
"hooks": {
@@ -48,7 +48,7 @@
4848
"main": "./dist/index.js",
4949
"name": "eslint-plugin-flowtype",
5050
"peerDependencies": {
51-
"eslint": "^7.32.0"
51+
"eslint": "^8.0.0"
5252
},
5353
"repository": {
5454
"type": "git",

src/rules/noUnusedExpressions.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// A wrapper around ESLint's core rule no-unused-expressions, additionally ignores type cast
22
// expressions.
3+
import { builtinRules } from 'eslint/use-at-your-own-risk';
34

4-
import coreNOE from 'eslint/lib/rules/no-unused-expressions';
5+
const coreNOE = builtinRules.get('no-unused-expressions');
56

67
const meta = coreNOE.meta;
78

tests/rules/assertions/defineFlowType.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {
2-
RuleTester,
3-
} from 'eslint';
4-
import noUndefRule from 'eslint/lib/rules/no-undef';
1+
import { RuleTester } from 'eslint';
2+
import { builtinRules } from 'eslint/use-at-your-own-risk';
3+
4+
const noUndefRule = builtinRules.get('no-undef');
55

66
const VALID_WITH_DEFINE_FLOW_TYPE = [
77
{
@@ -198,7 +198,7 @@ const ALWAYS_VALID = [
198198
*/
199199
{
200200
const ruleTester = new RuleTester({
201-
parser: require.resolve('babel-eslint'),
201+
parser: require.resolve('@babel/eslint-parser'),
202202
});
203203

204204
ruleTester.run('no-undef must not trigger an error in these cases', noUndefRule, {
@@ -209,7 +209,7 @@ const ALWAYS_VALID = [
209209

210210
{
211211
const ruleTester = new RuleTester({
212-
parser: require.resolve('babel-eslint'),
212+
parser: require.resolve('@babel/eslint-parser'),
213213
});
214214

215215
ruleTester.run('no-undef must trigger an error when define-flow-type is not used in these cases', noUndefRule, {

tests/rules/assertions/useFlowType.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import {
2-
RuleTester,
3-
} from 'eslint';
4-
import noUnusedVarsRule from 'eslint/lib/rules/no-unused-vars';
1+
import { RuleTester } from 'eslint';
2+
import { builtinRules } from 'eslint/use-at-your-own-risk';
53
import useFlowType from '../../../src/rules/useFlowType';
64

5+
const noUnusedVarsRule = builtinRules.get('no-unused-vars');
6+
77
const VALID_WITH_USE_FLOW_TYPE = [
88
{
99
code: 'declare class A {}',
@@ -92,7 +92,7 @@ const ALWAYS_VALID = [
9292
*/
9393
{
9494
const ruleTester = new RuleTester({
95-
parser: require.resolve('babel-eslint'),
95+
parser: require.resolve('@babel/eslint-parser'),
9696
});
9797

9898
ruleTester.run('no-unused-vars must not trigger an error in these cases', noUnusedVarsRule, {
@@ -103,7 +103,7 @@ const ALWAYS_VALID = [
103103

104104
{
105105
const ruleTester = new RuleTester({
106-
parser: require.resolve('babel-eslint'),
106+
parser: require.resolve('@babel/eslint-parser'),
107107
});
108108

109109
ruleTester.run('no-unused-vars must trigger an error in these cases', noUnusedVarsRule, {
@@ -117,7 +117,7 @@ const ALWAYS_VALID = [
117117

118118
{
119119
const ruleTester = new RuleTester({
120-
parser: require.resolve('babel-eslint'),
120+
parser: require.resolve('@babel/eslint-parser'),
121121
rules: {
122122
'use-flow-type': 1,
123123
},

tests/rules/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const reportingRules = [
6060
'valid-syntax',
6161
];
6262

63-
const parser = require.resolve('babel-eslint');
63+
const parser = require.resolve('@babel/eslint-parser');
6464
const ajv = new Ajv({
6565
verbose: true,
6666
});

0 commit comments

Comments
 (0)