diff --git a/packages/eslint-plugin-tslint/package.json b/packages/eslint-plugin-tslint/package.json index c7785cf5cab4..d0f29acff4a1 100644 --- a/packages/eslint-plugin-tslint/package.json +++ b/packages/eslint-plugin-tslint/package.json @@ -42,7 +42,7 @@ "lodash": "^4.17.21" }, "peerDependencies": { - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0", + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.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 5ee6a044ab56..e8f80ff7356a 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -63,7 +63,7 @@ }, "peerDependencies": { "@typescript-eslint/parser": "^4.0.0", - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0" + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0-0" }, "peerDependenciesMeta": { "typescript": { diff --git a/packages/eslint-plugin/src/rules/indent.ts b/packages/eslint-plugin/src/rules/indent.ts index 129754543c8f..a87772dd1f66 100644 --- a/packages/eslint-plugin/src/rules/indent.ts +++ b/packages/eslint-plugin/src/rules/indent.ts @@ -100,10 +100,7 @@ export default util.createRule({ fixable: 'whitespace', hasSuggestions: baseRule.meta.hasSuggestions, 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 4557faeb7d77..a75d6e031cd0 100644 --- a/packages/eslint-plugin/src/rules/init-declarations.ts +++ b/packages/eslint-plugin/src/rules/init-declarations.ts @@ -27,12 +27,7 @@ export default createRule({ }, hasSuggestions: baseRule.meta.hasSuggestions, 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 f7bedfc11943..18c1c60bbb95 100644 --- a/packages/eslint-plugin/src/rules/keyword-spacing.ts +++ b/packages/eslint-plugin/src/rules/keyword-spacing.ts @@ -20,12 +20,7 @@ export default util.createRule({ fixable: 'whitespace', hasSuggestions: baseRule.meta.hasSuggestions, 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 ee29c7db72f7..1f7413a38316 100644 --- a/packages/eslint-plugin/src/rules/lines-between-class-members.ts +++ b/packages/eslint-plugin/src/rules/lines-between-class-members.ts @@ -35,10 +35,7 @@ export default util.createRule({ fixable: 'whitespace', hasSuggestions: baseRule.meta.hasSuggestions, 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-invalid-this.ts b/packages/eslint-plugin/src/rules/no-invalid-this.ts index 2d802cdba04d..eb21da3ff8bd 100644 --- a/packages/eslint-plugin/src/rules/no-invalid-this.ts +++ b/packages/eslint-plugin/src/rules/no-invalid-this.ts @@ -25,6 +25,7 @@ export default createRule({ recommended: false, extendsBaseRule: true, }, + // 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'.", }, diff --git a/packages/eslint-plugin/src/rules/no-loop-func.ts b/packages/eslint-plugin/src/rules/no-loop-func.ts index 5560acf0952d..b3e57903dd16 100644 --- a/packages/eslint-plugin/src/rules/no-loop-func.ts +++ b/packages/eslint-plugin/src/rules/no-loop-func.ts @@ -24,10 +24,7 @@ export default util.createRule({ }, hasSuggestions: baseRule.meta.hasSuggestions, 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 20d06f05f563..8171815bb56b 100644 --- a/packages/eslint-plugin/src/rules/no-magic-numbers.ts +++ b/packages/eslint-plugin/src/rules/no-magic-numbers.ts @@ -43,10 +43,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/eslint-plugin/src/rules/no-unused-expressions.ts b/packages/eslint-plugin/src/rules/no-unused-expressions.ts index f2f0e2c73b2b..527ba14e03ce 100644 --- a/packages/eslint-plugin/src/rules/no-unused-expressions.ts +++ b/packages/eslint-plugin/src/rules/no-unused-expressions.ts @@ -22,6 +22,7 @@ export default util.createRule({ }, hasSuggestions: baseRule.meta.hasSuggestions, schema: baseRule.meta.schema, + // 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.', diff --git a/packages/eslint-plugin/src/rules/no-useless-constructor.ts b/packages/eslint-plugin/src/rules/no-useless-constructor.ts index a4532ce72864..d1134bd09db2 100644 --- a/packages/eslint-plugin/src/rules/no-useless-constructor.ts +++ b/packages/eslint-plugin/src/rules/no-useless-constructor.ts @@ -57,6 +57,7 @@ export default util.createRule({ }, hasSuggestions: baseRule.meta.hasSuggestions, schema: baseRule.meta.schema, + // 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.', }, diff --git a/packages/eslint-plugin/src/rules/quotes.ts b/packages/eslint-plugin/src/rules/quotes.ts index e4af60fd0412..699df89da156 100644 --- a/packages/eslint-plugin/src/rules/quotes.ts +++ b/packages/eslint-plugin/src/rules/quotes.ts @@ -23,6 +23,7 @@ export default util.createRule({ }, fixable: 'code', hasSuggestions: baseRule.meta.hasSuggestions, + // 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}}.', }, diff --git a/packages/eslint-plugin/src/rules/semi.ts b/packages/eslint-plugin/src/rules/semi.ts index 05c4c6b1c3aa..c8829ab83e34 100644 --- a/packages/eslint-plugin/src/rules/semi.ts +++ b/packages/eslint-plugin/src/rules/semi.ts @@ -25,6 +25,7 @@ export default util.createRule({ fixable: 'code', hasSuggestions: baseRule.meta.hasSuggestions, schema: baseRule.meta.schema, + // 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.', 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: [ diff --git a/packages/parser/package.json b/packages/parser/package.json index ecdc1a703f0f..93e4a1d5c38e 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 || ^8.0.0-0" + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0-0" }, "dependencies": { "@typescript-eslint/scope-manager": "4.29.2", 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