From 98484e0b488d7a158ca44b009f928fcfd77996a0 Mon Sep 17 00:00:00 2001 From: thomasmichaelwallace Date: Fri, 16 Oct 2020 14:55:15 +0100 Subject: [PATCH 1/4] chore(eslint-plugin): remove support for eslint 5 --- packages/eslint-plugin-tslint/package.json | 2 +- packages/eslint-plugin/package.json | 2 +- packages/eslint-plugin/src/rules/indent.ts | 5 +---- packages/eslint-plugin/src/rules/init-declarations.ts | 7 +------ packages/eslint-plugin/src/rules/keyword-spacing.ts | 7 +------ .../eslint-plugin/src/rules/lines-between-class-members.ts | 5 +---- packages/eslint-plugin/src/rules/no-loop-func.ts | 5 +---- packages/eslint-plugin/src/rules/no-magic-numbers.ts | 5 +---- packages/parser/package.json | 2 +- 9 files changed, 9 insertions(+), 31 deletions(-) diff --git a/packages/eslint-plugin-tslint/package.json b/packages/eslint-plugin-tslint/package.json index 2d51f40326e3..3d2b41da9270 100644 --- a/packages/eslint-plugin-tslint/package.json +++ b/packages/eslint-plugin-tslint/package.json @@ -42,7 +42,7 @@ "lodash": "^4.17.15" }, "peerDependencies": { - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0", + "eslint": "^6.0.0 || ^7.0.0", "tslint": "^5.0.0 || ^6.0.0", "typescript": "*" }, diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index d520fd7c54b1..bf1d163eba03 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -61,7 +61,7 @@ }, "peerDependencies": { "@typescript-eslint/parser": "^4.0.0", - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" + "eslint": "^6.0.0 || ^7.0.0" }, "peerDependenciesMeta": { "typescript": { diff --git a/packages/eslint-plugin/src/rules/indent.ts b/packages/eslint-plugin/src/rules/indent.ts index 9ac6a1593d9c..1c5e4689bfc5 100644 --- a/packages/eslint-plugin/src/rules/indent.ts +++ b/packages/eslint-plugin/src/rules/indent.ts @@ -97,10 +97,7 @@ export default util.createRule({ }, fixable: 'whitespace', schema: baseRule.meta.schema, - messages: baseRule.meta.messages ?? { - wrongIndentation: - 'Expected indentation of {{expected}} but found {{actual}}.', - }, + messages: baseRule.meta.messages, }, defaultOptions: [ // typescript docs and playground use 4 space indent diff --git a/packages/eslint-plugin/src/rules/init-declarations.ts b/packages/eslint-plugin/src/rules/init-declarations.ts index 5706006852b2..b4368527e0cd 100644 --- a/packages/eslint-plugin/src/rules/init-declarations.ts +++ b/packages/eslint-plugin/src/rules/init-declarations.ts @@ -24,12 +24,7 @@ export default createRule({ extendsBaseRule: true, }, schema: baseRule.meta.schema, - messages: baseRule.meta.messages ?? { - initialized: - "Variable '{{idName}}' should be initialized on declaration.", - notInitialized: - "Variable '{{idName}}' should not be initialized on declaration.", - }, + messages: baseRule.meta.messages, }, defaultOptions: ['always'], create(context) { diff --git a/packages/eslint-plugin/src/rules/keyword-spacing.ts b/packages/eslint-plugin/src/rules/keyword-spacing.ts index 2265b2604436..8c4ff1d38ff6 100644 --- a/packages/eslint-plugin/src/rules/keyword-spacing.ts +++ b/packages/eslint-plugin/src/rules/keyword-spacing.ts @@ -17,12 +17,7 @@ export default util.createRule({ }, fixable: 'whitespace', schema: baseRule.meta.schema, - messages: baseRule.meta.messages ?? { - expectedBefore: 'Expected space(s) before "{{value}}".', - expectedAfter: 'Expected space(s) after "{{value}}".', - unexpectedBefore: 'Unexpected space(s) before "{{value}}".', - unexpectedAfter: 'Unexpected space(s) after "{{value}}".', - }, + messages: baseRule.meta.messages, }, defaultOptions: [{}], diff --git a/packages/eslint-plugin/src/rules/lines-between-class-members.ts b/packages/eslint-plugin/src/rules/lines-between-class-members.ts index 21c6b9ed5e51..26b09d528f29 100644 --- a/packages/eslint-plugin/src/rules/lines-between-class-members.ts +++ b/packages/eslint-plugin/src/rules/lines-between-class-members.ts @@ -32,10 +32,7 @@ export default util.createRule({ }, fixable: 'whitespace', schema, - messages: baseRule.meta.messages ?? { - never: 'Unexpected blank line between class members.', - always: 'Expected blank line between class members.', - }, + messages: baseRule.meta.messages, }, defaultOptions: [ 'always', diff --git a/packages/eslint-plugin/src/rules/no-loop-func.ts b/packages/eslint-plugin/src/rules/no-loop-func.ts index 44d0178e8670..1b155ec63ddc 100644 --- a/packages/eslint-plugin/src/rules/no-loop-func.ts +++ b/packages/eslint-plugin/src/rules/no-loop-func.ts @@ -21,10 +21,7 @@ export default util.createRule({ extendsBaseRule: true, }, schema: [], - messages: baseRule?.meta.messages ?? { - unsafeRefs: - 'Function declared in a loop contains unsafe references to variable(s) {{ varNames }}.', - }, + messages: baseRule?.meta.messages, }, defaultOptions: [], create(context) { diff --git a/packages/eslint-plugin/src/rules/no-magic-numbers.ts b/packages/eslint-plugin/src/rules/no-magic-numbers.ts index 0cb41337c1bb..c285b0eb3024 100644 --- a/packages/eslint-plugin/src/rules/no-magic-numbers.ts +++ b/packages/eslint-plugin/src/rules/no-magic-numbers.ts @@ -40,10 +40,7 @@ export default util.createRule({ }, }, ], - messages: baseRule.meta.messages ?? { - useConst: "Number constants declarations must use 'const'.", - noMagic: 'No magic number: {{raw}}.', - }, + messages: baseRule.meta.messages, }, defaultOptions: [ { diff --git a/packages/parser/package.json b/packages/parser/package.json index 97369211c18f..b648f5810f32 100644 --- a/packages/parser/package.json +++ b/packages/parser/package.json @@ -41,7 +41,7 @@ "typecheck": "tsc -p tsconfig.json --noEmit" }, "peerDependencies": { - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" + "eslint": "^6.0.0 || ^7.0.0" }, "dependencies": { "@typescript-eslint/scope-manager": "4.4.1", From 2b1842503949246f4383be3d1428510f733d84eb Mon Sep 17 00:00:00 2001 From: thomas michael wallace Date: Fri, 16 Oct 2020 15:17:08 +0100 Subject: [PATCH 2/4] fix: no-loop-fun baserule exists in eslint 6+ --- packages/eslint-plugin/src/rules/no-loop-func.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/eslint-plugin/src/rules/no-loop-func.ts b/packages/eslint-plugin/src/rules/no-loop-func.ts index 1b155ec63ddc..b99e8563f734 100644 --- a/packages/eslint-plugin/src/rules/no-loop-func.ts +++ b/packages/eslint-plugin/src/rules/no-loop-func.ts @@ -21,7 +21,7 @@ export default util.createRule({ extendsBaseRule: true, }, schema: [], - messages: baseRule?.meta.messages, + messages: baseRule.meta.messages, }, defaultOptions: [], create(context) { From 0b94d9dc8f2eff8357f8db886d2e4acc86c1f1cc Mon Sep 17 00:00:00 2001 From: Brad Zacher Date: Sat, 21 Aug 2021 18:09:01 -0700 Subject: [PATCH 3/4] feat: update for new rules --- packages/eslint-plugin/src/rules/no-invalid-this.ts | 4 +--- packages/eslint-plugin/src/rules/no-unused-expressions.ts | 5 +---- packages/eslint-plugin/src/rules/no-useless-constructor.ts | 4 +--- packages/eslint-plugin/src/rules/quotes.ts | 4 +--- packages/eslint-plugin/src/rules/semi.ts | 5 +---- packages/eslint-plugin/src/rules/space-infix-ops.ts | 4 +++- 6 files changed, 8 insertions(+), 18 deletions(-) diff --git a/packages/eslint-plugin/src/rules/no-invalid-this.ts b/packages/eslint-plugin/src/rules/no-invalid-this.ts index 2d802cdba04d..56407270e732 100644 --- a/packages/eslint-plugin/src/rules/no-invalid-this.ts +++ b/packages/eslint-plugin/src/rules/no-invalid-this.ts @@ -25,9 +25,7 @@ export default createRule({ recommended: false, extendsBaseRule: true, }, - messages: baseRule.meta.messages ?? { - unexpectedThis: "Unexpected 'this'.", - }, + messages: baseRule.meta.messages, hasSuggestions: baseRule.meta.hasSuggestions, schema: baseRule.meta.schema, }, diff --git a/packages/eslint-plugin/src/rules/no-unused-expressions.ts b/packages/eslint-plugin/src/rules/no-unused-expressions.ts index f2f0e2c73b2b..d0eecfa6a4d5 100644 --- a/packages/eslint-plugin/src/rules/no-unused-expressions.ts +++ b/packages/eslint-plugin/src/rules/no-unused-expressions.ts @@ -22,10 +22,7 @@ export default util.createRule({ }, hasSuggestions: baseRule.meta.hasSuggestions, schema: baseRule.meta.schema, - messages: baseRule.meta.messages ?? { - unusedExpression: - 'Expected an assignment or function call and instead saw an expression.', - }, + messages: baseRule.meta.messages, }, defaultOptions: [ { diff --git a/packages/eslint-plugin/src/rules/no-useless-constructor.ts b/packages/eslint-plugin/src/rules/no-useless-constructor.ts index a4532ce72864..7d4f2337b6d5 100644 --- a/packages/eslint-plugin/src/rules/no-useless-constructor.ts +++ b/packages/eslint-plugin/src/rules/no-useless-constructor.ts @@ -57,9 +57,7 @@ export default util.createRule({ }, hasSuggestions: baseRule.meta.hasSuggestions, schema: baseRule.meta.schema, - messages: baseRule.meta.messages ?? { - noUselessConstructor: 'Useless constructor.', - }, + messages: baseRule.meta.messages, }, defaultOptions: [], create(context) { diff --git a/packages/eslint-plugin/src/rules/quotes.ts b/packages/eslint-plugin/src/rules/quotes.ts index e4af60fd0412..bb18912d12db 100644 --- a/packages/eslint-plugin/src/rules/quotes.ts +++ b/packages/eslint-plugin/src/rules/quotes.ts @@ -23,9 +23,7 @@ export default util.createRule({ }, fixable: 'code', hasSuggestions: baseRule.meta.hasSuggestions, - messages: baseRule.meta.messages ?? { - wrongQuotes: 'Strings must use {{description}}.', - }, + messages: baseRule.meta.messages, schema: baseRule.meta.schema, }, defaultOptions: [ diff --git a/packages/eslint-plugin/src/rules/semi.ts b/packages/eslint-plugin/src/rules/semi.ts index 05c4c6b1c3aa..83e7a0c1fd37 100644 --- a/packages/eslint-plugin/src/rules/semi.ts +++ b/packages/eslint-plugin/src/rules/semi.ts @@ -25,10 +25,7 @@ export default util.createRule({ fixable: 'code', hasSuggestions: baseRule.meta.hasSuggestions, schema: baseRule.meta.schema, - messages: baseRule.meta.messages ?? { - missingSemi: 'Missing semicolon.', - extraSemi: 'Extra semicolon.', - }, + messages: baseRule.meta.messages, }, defaultOptions: [ 'always', diff --git a/packages/eslint-plugin/src/rules/space-infix-ops.ts b/packages/eslint-plugin/src/rules/space-infix-ops.ts index 86fb8d93d53f..eb92bd2f112c 100644 --- a/packages/eslint-plugin/src/rules/space-infix-ops.ts +++ b/packages/eslint-plugin/src/rules/space-infix-ops.ts @@ -26,8 +26,10 @@ export default util.createRule({ fixable: baseRule.meta.fixable, hasSuggestions: baseRule.meta.hasSuggestions, schema: baseRule.meta.schema, - messages: baseRule.meta.messages ?? { + messages: { + // @ts-expect-error -- we report on this messageId so we need to ensure it's there in case ESLint changes in future missingSpace: "Operator '{{operator}}' must be spaced.", + ...baseRule.meta.messages, }, }, defaultOptions: [ From 6c2803bc888b80105aebe58945d28b6b5f7a0f01 Mon Sep 17 00:00:00 2001 From: Brad Zacher Date: Sat, 21 Aug 2021 18:16:28 -0700 Subject: [PATCH 4/4] fix: add back and comment on the rules that only got messages in v7 --- packages/eslint-plugin/src/rules/no-invalid-this.ts | 5 ++++- packages/eslint-plugin/src/rules/no-unused-expressions.ts | 6 +++++- packages/eslint-plugin/src/rules/no-useless-constructor.ts | 5 ++++- packages/eslint-plugin/src/rules/quotes.ts | 5 ++++- packages/eslint-plugin/src/rules/semi.ts | 6 +++++- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/packages/eslint-plugin/src/rules/no-invalid-this.ts b/packages/eslint-plugin/src/rules/no-invalid-this.ts index 56407270e732..eb21da3ff8bd 100644 --- a/packages/eslint-plugin/src/rules/no-invalid-this.ts +++ b/packages/eslint-plugin/src/rules/no-invalid-this.ts @@ -25,7 +25,10 @@ export default createRule({ recommended: false, extendsBaseRule: true, }, - messages: baseRule.meta.messages, + // TODO: this rule has only had messages since v7.0 - remove this when we remove support for v6 + messages: baseRule.meta.messages ?? { + unexpectedThis: "Unexpected 'this'.", + }, hasSuggestions: baseRule.meta.hasSuggestions, schema: baseRule.meta.schema, }, diff --git a/packages/eslint-plugin/src/rules/no-unused-expressions.ts b/packages/eslint-plugin/src/rules/no-unused-expressions.ts index d0eecfa6a4d5..527ba14e03ce 100644 --- a/packages/eslint-plugin/src/rules/no-unused-expressions.ts +++ b/packages/eslint-plugin/src/rules/no-unused-expressions.ts @@ -22,7 +22,11 @@ export default util.createRule({ }, hasSuggestions: baseRule.meta.hasSuggestions, schema: baseRule.meta.schema, - messages: baseRule.meta.messages, + // TODO: this rule has only had messages since v7.0 - remove this when we remove support for v6 + messages: baseRule.meta.messages ?? { + unusedExpression: + 'Expected an assignment or function call and instead saw an expression.', + }, }, defaultOptions: [ { diff --git a/packages/eslint-plugin/src/rules/no-useless-constructor.ts b/packages/eslint-plugin/src/rules/no-useless-constructor.ts index 7d4f2337b6d5..d1134bd09db2 100644 --- a/packages/eslint-plugin/src/rules/no-useless-constructor.ts +++ b/packages/eslint-plugin/src/rules/no-useless-constructor.ts @@ -57,7 +57,10 @@ export default util.createRule({ }, hasSuggestions: baseRule.meta.hasSuggestions, schema: baseRule.meta.schema, - messages: baseRule.meta.messages, + // TODO: this rule has only had messages since v7.0 - remove this when we remove support for v6 + messages: baseRule.meta.messages ?? { + noUselessConstructor: 'Useless constructor.', + }, }, defaultOptions: [], create(context) { diff --git a/packages/eslint-plugin/src/rules/quotes.ts b/packages/eslint-plugin/src/rules/quotes.ts index bb18912d12db..699df89da156 100644 --- a/packages/eslint-plugin/src/rules/quotes.ts +++ b/packages/eslint-plugin/src/rules/quotes.ts @@ -23,7 +23,10 @@ export default util.createRule({ }, fixable: 'code', hasSuggestions: baseRule.meta.hasSuggestions, - messages: baseRule.meta.messages, + // TODO: this rule has only had messages since v7.0 - remove this when we remove support for v6 + messages: baseRule.meta.messages ?? { + wrongQuotes: 'Strings must use {{description}}.', + }, schema: baseRule.meta.schema, }, defaultOptions: [ diff --git a/packages/eslint-plugin/src/rules/semi.ts b/packages/eslint-plugin/src/rules/semi.ts index 83e7a0c1fd37..c8829ab83e34 100644 --- a/packages/eslint-plugin/src/rules/semi.ts +++ b/packages/eslint-plugin/src/rules/semi.ts @@ -25,7 +25,11 @@ export default util.createRule({ fixable: 'code', hasSuggestions: baseRule.meta.hasSuggestions, schema: baseRule.meta.schema, - messages: baseRule.meta.messages, + // TODO: this rule has only had messages since v7.0 - remove this when we remove support for v6 + messages: baseRule.meta.messages ?? { + missingSemi: 'Missing semicolon.', + extraSemi: 'Extra semicolon.', + }, }, defaultOptions: [ 'always', pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy