Skip to content

Commit e4f44f3

Browse files
authored
Update ESLint to v7 (#577)
1 parent 83bbabc commit e4f44f3

37 files changed

+57
-101
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"ava": "^3.8.1",
5454
"babel-eslint": "^10.1.0",
5555
"chalk": "^4.0.0",
56-
"eslint": "^6.8.0",
56+
"eslint": "^7.0.0",
5757
"eslint-ava-rule-tester": "^4.0.0",
5858
"eslint-plugin-eslint-plugin": "^2.2.1",
5959
"execa": "^4.0.0",
@@ -66,7 +66,7 @@
6666
"xo": "^0.30.0"
6767
},
6868
"peerDependencies": {
69-
"eslint": ">=6.8.0"
69+
"eslint": ">=7.0.0"
7070
},
7171
"ava": {
7272
"babel": true,

test/better-regex.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const ruleTester = avaRuleTester(test, {
1010

1111
const createError = (original, optimized) => [
1212
{
13-
ruleId: 'better-regex',
1413
message: `${original} can be optimized to ${optimized}`
1514
}
1615
];

test/consistent-function-scoping.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@ const typescriptRuleTester = avaRuleTester(test, {
1717
parser: require.resolve('@typescript-eslint/parser')
1818
});
1919

20-
const ruleId = 'consistent-function-scoping';
2120
const MESSAGE_ID_NAMED = 'named';
2221
const MESSAGE_ID_ANONYMOUS = 'anonymous';
2322

2423
const createError = ({name, arrow}) => ({
25-
ruleId,
2624
messageId: name ? MESSAGE_ID_NAMED : MESSAGE_ID_ANONYMOUS,
2725
data: {
2826
functionType: arrow ? 'arrow function' : 'function',

test/custom-error-definition.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ const typescriptRuleTester = avaRuleTester(test, {
1818
parser: require.resolve('@typescript-eslint/parser')
1919
});
2020

21-
const invalidClassNameError = {ruleId: 'custom-error-definition', message: 'Invalid class name, use `FooError`.'};
22-
const constructorError = {ruleId: 'custom-error-definition', message: 'Add a constructor to your error.'};
23-
const noSuperCallError = {ruleId: 'custom-error-definition', message: 'Missing call to `super()` in constructor.'};
24-
const invalidNameError = name => ({ruleId: 'custom-error-definition', message: `The \`name\` property should be set to \`${name}\`.`});
25-
const passMessageToSuperError = {ruleId: 'custom-error-definition', message: 'Pass the error message to `super()` instead of setting `this.message`.'};
21+
const invalidClassNameError = {message: 'Invalid class name, use `FooError`.'};
22+
const constructorError = {message: 'Add a constructor to your error.'};
23+
const noSuperCallError = {message: 'Missing call to `super()` in constructor.'};
24+
const invalidNameError = name => ({message: `The \`name\` property should be set to \`${name}\`.`});
25+
const passMessageToSuperError = {message: 'Pass the error message to `super()` instead of setting `this.message`.'};
2626
const invalidExportError = {
27-
ruleId: 'custom-error-definition',
2827
messageId: 'invalidExport'
2928
};
3029

test/error-message.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ const ruleTester = avaRuleTester(test, {
1010
});
1111

1212
const emptyStringError = {
13-
ruleId: 'error-message',
1413
message: 'Error message should not be an empty string.'
1514
};
1615

1716
const noMessageError = {
18-
ruleId: 'error-message',
1917
message: 'Pass a message to the error constructor.'
2018
};
2119

test/escape-case.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ const ruleTester = avaRuleTester(test, {
1111

1212
const errors = [
1313
{
14-
ruleId: 'escape-case',
1514
message: 'Use uppercase characters for the value of the escape sequence.'
1615
}
1716
];

test/expiring-todo-comments.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,57 +9,46 @@ const ruleTester = avaRuleTester(test, {
99
});
1010

1111
const expiredTodoError = (expirationDate, message) => ({
12-
ruleId: 'expiring-todo-comments',
1312
message: `There is a TODO that is past due date: ${expirationDate}. ${message}`
1413
});
1514

1615
const avoidMultipleDatesError = (expirationDates, message) => ({
17-
ruleId: 'expiring-todo-comments',
1816
message: `Avoid using multiple expiration dates in TODO: ${expirationDates}. ${message}`
1917
});
2018

2119
const havePackageError = (package_, message) => ({
22-
ruleId: 'expiring-todo-comments',
2320
message: `There is a TODO that is deprecated since you installed: ${package_}. ${message}`
2421
});
2522

2623
const dontHavePackageError = (package_, message) => ({
27-
ruleId: 'expiring-todo-comments',
2824
message: `There is a TODO that is deprecated since you uninstalled: ${package_}. ${message}`
2925
});
3026

3127
const versionMatchesError = (comparison, message) => ({
32-
ruleId: 'expiring-todo-comments',
3328
message: `There is a TODO match for package version: ${comparison}. ${message}`
3429
});
3530

3631
const engineMatchesError = (comparison, message) => ({
37-
ruleId: 'expiring-todo-comments',
3832
message: `There is a TODO match for Node.js version: ${comparison}. ${message}`
3933
});
4034

4135
const reachedPackageVersionError = (version, message) => ({
42-
ruleId: 'expiring-todo-comments',
4336
message: `There is a TODO that is past due package version: ${version}. ${message}`
4437
});
4538

4639
const avoidMultiplePackageVersionsError = (versions, message) => ({
47-
ruleId: 'expiring-todo-comments',
4840
message: `Avoid using multiple package versions in TODO: ${versions}. ${message}`
4941
});
5042

5143
const removeWhitespacesError = (argument, message) => ({
52-
ruleId: 'expiring-todo-comments',
5344
message: `Avoid using whitespaces on TODO argument. On '${argument}' use '${argument.replace(/ /g, '')}'. ${message}`
5445
});
5546

5647
const missingAtSymbolError = (bad, good, message) => ({
57-
ruleId: 'expiring-todo-comments',
5848
message: `Missing '@' on TODO argument. On '${bad}' use '${good}'. ${message}`
5949
});
6050

6151
const noWarningCommentError = () => ({
62-
ruleId: 'expiring-todo-comments',
6352
message: 'Unexpected \'todo\' comment.'
6453
});
6554

test/explicit-length-check.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const ruleTester = avaRuleTester(test, {
1010

1111
const error = message => {
1212
return {
13-
ruleId: 'explicit-length-check',
1413
message
1514
};
1615
};

test/filename-case.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ function testCaseWithOptions(filename, errorMessage, options = []) {
3131
options,
3232
errors: errorMessage && [
3333
{
34-
ruleId: 'filename-case',
3534
message: errorMessage
3635
}
3736
]

test/import-index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ const ruleTester = avaRuleTester(test, {
1212
});
1313

1414
const error = {
15-
ruleId: 'import-index',
1615
message: 'Do not reference the index file directly.'
1716
};
1817

0 commit comments

Comments
 (0)