feat: support ESLint v8 (#3737)

typescript-eslint · Oct 11, 2021 · 4ca62ae · 4ca62ae
1 parent 165a507
commit 4ca62ae
Show file tree

Hide file tree

Showing 72 changed files with 508 additions and 160 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -47,6 +47,7 @@
     "bigint",
     "bivariant",
     "blockless",
+    "camelcase",
     "codebases",
     "Codecov",
     "contravariant",

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -86,7 +86,7 @@ module.exports = {
     '@typescript-eslint/internal/prefer-ast-types-enum': 'error',
 
     //
-    // eslint base
+    // eslint-base
     //
 
     curly: ['error', 'all'],

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,6 +47,10 @@ jobs:
           yarn --ignore-engines --frozen-lockfile --ignore-scripts
           yarn check-clean-workspace-after-install
 
+      - name: Patch Dependencies
+        run: |
+          yarn patch-package
+
       - name: Build
         run: |
           yarn build
@@ -89,6 +93,10 @@ jobs:
           yarn --ignore-engines --frozen-lockfile --ignore-scripts
           yarn check-clean-workspace-after-install
 
+      - name: Patch Dependencies
+        run: |
+          yarn patch-package
+
       - name: Build
         run: |
           yarn build
@@ -167,6 +175,10 @@ jobs:
           yarn --ignore-engines --frozen-lockfile --ignore-scripts
           yarn check-clean-workspace-after-install
 
+      - name: Patch Dependencies
+        run: |
+          yarn patch-package
+
       - name: Build
         run: |
           yarn build
@@ -210,6 +222,10 @@ jobs:
           yarn --ignore-engines --frozen-lockfile --ignore-scripts
           yarn check-clean-workspace-after-install
 
+      - name: Patch Dependencies
+        run: |
+          yarn patch-package
+
       - name: Build
         run: |
           yarn build
@@ -252,6 +268,10 @@ jobs:
           yarn --ignore-engines --frozen-lockfile --ignore-scripts
           yarn check-clean-workspace-after-install
 
+      - name: Patch Dependencies
+        run: |
+          yarn patch-package
+
       - name: Build
         run: |
           yarn build
@@ -334,6 +354,10 @@ jobs:
           yarn --ignore-engines --frozen-lockfile --ignore-scripts
           yarn check-clean-workspace-after-install
 
+      - name: Patch Dependencies
+        run: |
+          yarn patch-package
+
       - name: Build
         run: |
           yarn build

diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "lint-markdown-fix": "yarn lint-markdown --fix",
     "lint-markdown": "markdownlint \"**/*.md\" --config=.markdownlint.json --ignore-path=.markdownlintignore",
     "lint": "eslint . --ext .js,.ts",
-    "postinstall": "yarn husky install && yarn build",
+    "postinstall": "patch-package && yarn husky install && yarn build",
     "pre-commit": "yarn lint-staged",
     "pre-push": "yarn check-format",
     "test": "nx run-many --target=test --all --parallel",
@@ -100,7 +100,8 @@
     "cspell": "^5.5.2",
     "cz-conventional-changelog": "^3.3.0",
     "downlevel-dts": "^0.7.0",
-    "eslint": "^7.27.0",
+    "enhanced-resolve": "^5.8.2",
+    "eslint": "^8.0.0-0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-eslint-plugin": "^3.0.3",
     "eslint-plugin-import": "^2.23.4",
@@ -115,6 +116,7 @@
     "make-dir": "^3.1.0",
     "markdownlint-cli": "^0.28.1",
     "node-fetch": "^3.0.0",
+    "patch-package": "^6.4.7",
     "prettier": "2.3.2",
     "pretty-format": "^27.0.2",
     "rimraf": "^3.0.2",

diff --git a/packages/eslint-plugin-internal/jest.config.js b/packages/eslint-plugin-internal/jest.config.js
@@ -3,6 +3,7 @@
 // @ts-check
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
+  resolver: '<rootDir>/../../tests/jest-resolver.js',
   globals: {
     'ts-jest': {
       isolatedModules: true,

diff --git a/packages/eslint-plugin-internal/src/rules/no-poorly-typed-ts-props.ts b/packages/eslint-plugin-internal/src/rules/no-poorly-typed-ts-props.ts
@@ -44,6 +44,7 @@ export default createRule({
       requiresTypeChecking: true,
     },
     fixable: 'code',
+    hasSuggestions: true,
     schema: [],
     messages: {
       doNotUse: 'Do not use {{type}}.{{property}} because it is poorly typed.',

diff --git a/packages/eslint-plugin-tslint/jest.config.js b/packages/eslint-plugin-tslint/jest.config.js
@@ -3,6 +3,7 @@
 // @ts-check
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
+  resolver: '<rootDir>/../../tests/jest-resolver.js',
   globals: {
     'ts-jest': {
       isolatedModules: true,

diff --git 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",
+    "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0",
     "tslint": "^5.0.0 || ^6.0.0",
     "typescript": "*"
   },

diff --git a/packages/eslint-plugin/jest.config.js b/packages/eslint-plugin/jest.config.js
@@ -3,6 +3,7 @@
 // @ts-check
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
+  resolver: '<rootDir>/../../tests/jest-resolver.js',
   globals: {
     'ts-jest': {
       isolatedModules: true,

diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
@@ -64,7 +64,7 @@
   },
   "peerDependencies": {
     "@typescript-eslint/parser": "^4.0.0",
-    "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+    "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
   },
   "peerDependenciesMeta": {
     "typescript": {

diff --git a/packages/eslint-plugin/src/rules/brace-style.ts b/packages/eslint-plugin/src/rules/brace-style.ts
@@ -1,12 +1,14 @@
 import { TSESTree } from '@typescript-eslint/experimental-utils';
-import baseRule from 'eslint/lib/rules/brace-style';
+import { getESLintCoreRule } from '../util/getESLintCoreRule';
 import {
   InferOptionsTypeFromRule,
   InferMessageIdsTypeFromRule,
   createRule,
   isTokenOnSameLine,
 } from '../util';
 
+const baseRule = getESLintCoreRule('brace-style');
+
 export type Options = InferOptionsTypeFromRule<typeof baseRule>;
 export type MessageIds = InferMessageIdsTypeFromRule<typeof baseRule>;
 
@@ -22,6 +24,7 @@ export default createRule<Options, MessageIds>({
     },
     messages: baseRule.meta.messages,
     fixable: baseRule.meta.fixable,
+    hasSuggestions: baseRule.meta.hasSuggestions,
     schema: baseRule.meta.schema,
   },
   defaultOptions: ['1tbs'],

diff --git a/packages/eslint-plugin/src/rules/comma-dangle.ts b/packages/eslint-plugin/src/rules/comma-dangle.ts
@@ -1,10 +1,12 @@
 import * as util from '../util';
-import baseRule from 'eslint/lib/rules/comma-dangle';
+import { getESLintCoreRule } from '../util/getESLintCoreRule';
 import {
   TSESTree,
   AST_NODE_TYPES,
 } from '@typescript-eslint/experimental-utils';
 
+const baseRule = getESLintCoreRule('comma-dangle');
+
 export type Options = util.InferOptionsTypeFromRule<typeof baseRule>;
 export type MessageIds = util.InferMessageIdsTypeFromRule<typeof baseRule>;
 
@@ -83,6 +85,7 @@ export default util.createRule<Options, MessageIds>({
       additionalProperties: false,
     },
     fixable: 'code',
+    hasSuggestions: baseRule.meta.hasSuggestions,
     messages: baseRule.meta.messages,
   },
   defaultOptions: ['never'],

diff --git a/packages/eslint-plugin/src/rules/dot-notation.ts b/packages/eslint-plugin/src/rules/dot-notation.ts
@@ -1,14 +1,16 @@
 import { TSESTree } from '@typescript-eslint/experimental-utils';
 import * as ts from 'typescript';
 import * as tsutils from 'tsutils';
-import baseRule from 'eslint/lib/rules/dot-notation';
+import { getESLintCoreRule } from '../util/getESLintCoreRule';
 import {
   createRule,
   getParserServices,
   InferMessageIdsTypeFromRule,
   InferOptionsTypeFromRule,
 } from '../util';
 
+const baseRule = getESLintCoreRule('dot-notation');
+
 export type Options = InferOptionsTypeFromRule<typeof baseRule>;
 export type MessageIds = InferMessageIdsTypeFromRule<typeof baseRule>;
 
@@ -52,6 +54,7 @@ export default createRule<Options, MessageIds>({
       },
     ],
     fixable: baseRule.meta.fixable,
+    hasSuggestions: baseRule.meta.hasSuggestions,
     messages: baseRule.meta.messages,
   },
   defaultOptions: [

diff --git a/packages/eslint-plugin/src/rules/indent.ts b/packages/eslint-plugin/src/rules/indent.ts
@@ -9,9 +9,11 @@ import {
   TSESTree,
   AST_NODE_TYPES,
 } from '@typescript-eslint/experimental-utils';
-import baseRule from 'eslint/lib/rules/indent';
+import { getESLintCoreRule } from '../util/getESLintCoreRule';
 import * as util from '../util';
 
+const baseRule = getESLintCoreRule('indent');
+
 type Options = util.InferOptionsTypeFromRule<typeof baseRule>;
 type MessageIds = util.InferMessageIdsTypeFromRule<typeof baseRule>;
 
@@ -96,6 +98,7 @@ export default util.createRule<Options, MessageIds>({
       extendsBaseRule: true,
     },
     fixable: 'whitespace',
+    hasSuggestions: baseRule.meta.hasSuggestions,
     schema: baseRule.meta.schema,
     messages: baseRule.meta.messages ?? {
       wrongIndentation:

diff --git a/packages/eslint-plugin/src/rules/init-declarations.ts b/packages/eslint-plugin/src/rules/init-declarations.ts
@@ -2,13 +2,15 @@ import {
   TSESTree,
   AST_NODE_TYPES,
 } from '@typescript-eslint/experimental-utils';
-import baseRule from 'eslint/lib/rules/init-declarations';
+import { getESLintCoreRule } from '../util/getESLintCoreRule';
 import {
   InferOptionsTypeFromRule,
   InferMessageIdsTypeFromRule,
   createRule,
 } from '../util';
 
+const baseRule = getESLintCoreRule('init-declarations');
+
 export type Options = InferOptionsTypeFromRule<typeof baseRule>;
 export type MessageIds = InferMessageIdsTypeFromRule<typeof baseRule>;
 
@@ -23,6 +25,7 @@ export default createRule<Options, MessageIds>({
       recommended: false,
       extendsBaseRule: true,
     },
+    hasSuggestions: baseRule.meta.hasSuggestions,
     schema: baseRule.meta.schema,
     messages: baseRule.meta.messages ?? {
       initialized:

diff --git a/packages/eslint-plugin/src/rules/keyword-spacing.ts b/packages/eslint-plugin/src/rules/keyword-spacing.ts
@@ -1,7 +1,9 @@
 import { AST_TOKEN_TYPES } from '@typescript-eslint/experimental-utils';
-import baseRule from 'eslint/lib/rules/keyword-spacing';
+import { getESLintCoreRule } from '../util/getESLintCoreRule';
 import * as util from '../util';
 
+const baseRule = getESLintCoreRule('keyword-spacing');
+
 export type Options = util.InferOptionsTypeFromRule<typeof baseRule>;
 export type MessageIds = util.InferMessageIdsTypeFromRule<typeof baseRule>;
 
@@ -16,6 +18,7 @@ export default util.createRule<Options, MessageIds>({
       extendsBaseRule: true,
     },
     fixable: 'whitespace',
+    hasSuggestions: baseRule.meta.hasSuggestions,
     schema: baseRule.meta.schema,
     messages: baseRule.meta.messages ?? {
       expectedBefore: 'Expected space(s) before "{{value}}".',

diff --git a/packages/eslint-plugin/src/rules/lines-between-class-members.ts b/packages/eslint-plugin/src/rules/lines-between-class-members.ts
@@ -2,9 +2,11 @@ import {
   AST_NODE_TYPES,
   TSESTree,
 } from '@typescript-eslint/experimental-utils';
-import baseRule from 'eslint/lib/rules/lines-between-class-members';
+import { getESLintCoreRule } from '../util/getESLintCoreRule';
 import * as util from '../util';
 
+const baseRule = getESLintCoreRule('lines-between-class-members');
+
 type Options = util.InferOptionsTypeFromRule<typeof baseRule>;
 type MessageIds = util.InferMessageIdsTypeFromRule<typeof baseRule>;
 
@@ -31,6 +33,7 @@ export default util.createRule<Options, MessageIds>({
       extendsBaseRule: true,
     },
     fixable: 'whitespace',
+    hasSuggestions: baseRule.meta.hasSuggestions,
     schema,
     messages: baseRule.meta.messages ?? {
       never: 'Unexpected blank line between class members.',

diff --git a/packages/eslint-plugin/src/rules/no-confusing-non-null-assertion.ts b/packages/eslint-plugin/src/rules/no-confusing-non-null-assertion.ts
@@ -17,6 +17,7 @@ export default util.createRule({
       recommended: false,
     },
     fixable: 'code',
+    hasSuggestions: true,
     messages: {
       confusingEqual:
         'Confusing combinations of non-null assertion and equal test like "a! == b", which looks very similar to not equal "a !== b".',

diff --git a/packages/eslint-plugin/src/rules/no-confusing-void-expression.ts b/packages/eslint-plugin/src/rules/no-confusing-void-expression.ts
@@ -71,6 +71,7 @@ export default util.createRule<Options, MessageId>({
     ],
     type: 'problem',
     fixable: 'code',
+    hasSuggestions: true,
   },
   defaultOptions: [{}],