typescript-eslint · bradzacher · May 14, 2020 · May 14, 2020 · May 14, 2020 · May 14, 2020
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -19,7 +19,11 @@ module.exports = {
   ],
   parserOptions: {
     sourceType: 'module',
-    project: ['./tsconfig.eslint.json', './packages/*/tsconfig.json'],
+    project: [
+      './tsconfig.eslint.json',
+      './tests/integration/utils/jsconfig.json',
+      './packages/*/tsconfig.json',
+    ],
     tsconfigRootDir: __dirname,
     warnOnUnsupportedTypeScriptVersion: false,
   },

diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
     "all-contributors-cli": "^6.14.2",
     "cspell": "^4.0.61",
     "cz-conventional-changelog": "^3.2.0",
-    "eslint": "^6.7.0",
+    "eslint": "^7.0.0",
     "eslint-plugin-eslint-comments": "^3.1.2",
     "eslint-plugin-eslint-plugin": "^2.2.1",
     "eslint-plugin-import": "^2.20.2",

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
@@ -93,6 +93,7 @@ export default createRule({
             suggest: [
               {
                 messageId: 'suggestedFix',
+                data: banned,
                 fix(fixer): TSESLint.RuleFix | null {
                   if (banned.fixWith == null) {
                     return null;

diff --git a/packages/eslint-plugin-internal/tests/rules/plugin-test-formatting.test.ts b/packages/eslint-plugin-internal/tests/rules/plugin-test-formatting.test.ts
@@ -417,6 +417,27 @@ ruleTester.run({
       ],
     },
   ],
+});
+      `,
+      output: `
+ruleTester.run({
+  valid: [],
+  invalid: [
+    {
+      code: 'const x = 1;',
+      errors: [
+        {
+          messageId: 'foo',
+          suggestions: [
+            {
+              messageId: 'bar',
+              output: 'const x = 1;',
+            },
+          ],
+        },
+      ],
+    },
+  ],
 });
       `,
       errors: [
@@ -459,6 +480,40 @@ ruleTester.run({
       foo\`,
     },
   ],
+});
+      `,
+      output: `
+ruleTester.run({
+  valid: [
+    {
+      code: 'foo',
+    },
+    {
+      code: \`
+foo
+\`,
+    },
+    {
+      code: \`
+      foo
+\`,
+    },
+  ],
+  invalid: [
+    {
+      code: 'foo',
+    },
+    {
+      code: \`
+foo
+\`,
+    },
+    {
+      code: \`
+      foo
+\`,
+    },
+  ],
 });
       `,
       errors: [
@@ -508,6 +563,9 @@ ruleTester.run({
     },
     {
       code: wrap`\`const a = "1";
+${CODE_INDENT}\`.trimRight()`,
+      output: wrap`\`
+const a = "1";
 ${CODE_INDENT}\`.trimRight()`,
       errors: [
         {

diff --git a/packages/eslint-plugin-tslint/package.json b/packages/eslint-plugin-tslint/package.json
@@ -35,7 +35,7 @@
     "lodash": "^4.17.15"
   },
   "peerDependencies": {
-    "eslint": "^5.0.0 || ^6.0.0",
+    "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0",
     "tslint": "^5.0.0 || ^6.0.0",
     "typescript": "*"
   },

diff --git a/packages/eslint-plugin-tslint/tests/index.spec.ts b/packages/eslint-plugin-tslint/tests/index.spec.ts
@@ -13,6 +13,7 @@ const ruleTester = new TSESLint.RuleTester({
      * within @typescript-eslint/parser
      */
     project: './tests/fixture-project/tsconfig.json',
+    warnOnUnsupportedTypeScriptVersion: false,
   },
   parser: require.resolve('@typescript-eslint/parser'),
 });
@@ -71,6 +72,7 @@ ruleTester.run('tslint/config', rule, {
     {
       options: [{ lintFile: './tests/test-project/tslint.json' }],
       code: 'throw "err" // no-string-throw',
+      output: 'throw new Error("err") // no-string-throw',
       filename: './tests/fixture-project/3.ts',
       errors: [
         {

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

diff --git a/packages/eslint-plugin/src/rules/func-call-spacing.ts b/packages/eslint-plugin/src/rules/func-call-spacing.ts
@@ -7,7 +7,10 @@ export type Options = [
     allowNewlines?: boolean;
   }?,
 ];
-export type MessageIds = 'unexpected' | 'missing';
+export type MessageIds =
+  | 'unexpectedWhitespace'
+  | 'unexpectedNewline'
+  | 'missing';
 
 export default util.createRule<Options, MessageIds>({
   name: 'func-call-spacing',
@@ -56,8 +59,9 @@ export default util.createRule<Options, MessageIds>({
     },
 
     messages: {
-      unexpected:
-        'Unexpected space or newline between function name and paren.',
+      unexpectedWhitespace:
+        'Unexpected whitespace between function name and paren.',
+      unexpectedNewline: 'Unexpected newline between function name and paren.',
       missing: 'Missing space between function name and paren.',
     },
   },
@@ -110,7 +114,7 @@ export default util.createRule<Options, MessageIds>({
           return context.report({
             node,
             loc: lastCalleeToken.loc.start,
-            messageId: 'unexpected',
+            messageId: 'unexpectedWhitespace',
             fix(fixer) {
               /*
                * Only autofix if there is no newline
@@ -140,7 +144,7 @@ export default util.createRule<Options, MessageIds>({
           context.report({
             node,
             loc: lastCalleeToken.loc.start,
-            messageId: 'unexpected',
+            messageId: 'unexpectedWhitespace',
           });
         }
       } else {
@@ -157,7 +161,7 @@ export default util.createRule<Options, MessageIds>({
           context.report({
             node,
             loc: lastCalleeToken.loc.start,
-            messageId: 'unexpected',
+            messageId: 'unexpectedNewline',
             fix(fixer) {
               return fixer.replaceTextRange(
                 [lastCalleeToken.range[1], openingParenToken.range[0]],

diff --git a/packages/eslint-plugin/src/rules/no-empty-function.ts b/packages/eslint-plugin/src/rules/no-empty-function.ts
@@ -27,6 +27,8 @@ const schema = util.deepMerge(
             'constructors',
             'private-constructors',
             'protected-constructors',
+            'asyncFunctions',
+            'asyncMethods',
           ],
         },
       },

diff --git a/packages/eslint-plugin/src/rules/no-implied-eval.ts b/packages/eslint-plugin/src/rules/no-implied-eval.ts
@@ -7,6 +7,7 @@ import * as tsutils from 'tsutils';
 import * as util from '../util';
 
 const FUNCTION_CONSTRUCTOR = 'Function';
+const GLOBAL_CANDIDATES = new Set(['global', 'window', 'globalThis']);
 const EVAL_LIKE_METHODS = new Set([
   'setImmediate',
   'setInterval',
@@ -46,7 +47,7 @@ export default util.createRule({
       if (
         node.type === AST_NODE_TYPES.MemberExpression &&
         node.object.type === AST_NODE_TYPES.Identifier &&
-        node.object.name === 'window'
+        GLOBAL_CANDIDATES.has(node.object.name)
       ) {
         if (node.property.type === AST_NODE_TYPES.Identifier) {
           return node.property.name;

diff --git a/packages/eslint-plugin/src/rules/space-before-function-paren.ts b/packages/eslint-plugin/src/rules/space-before-function-paren.ts
@@ -9,11 +9,11 @@ type FuncOption = Option | 'ignore';
 
 export type Options = [
   | Option
-  | Partial<{
-      anonymous: FuncOption;
-      named: FuncOption;
-      asyncArrow: FuncOption;
-    }>,
+  | {
+      anonymous?: FuncOption;
+      named?: FuncOption;
+      asyncArrow?: FuncOption;
+    },
 ];
 export type MessageIds = 'unexpected' | 'missing';
 
@@ -150,7 +150,10 @@ export default util.createRule<Options, MessageIds>({
       if (hasSpacing && functionConfig === 'never') {
         context.report({
           node,
-          loc: leftToken.loc.end,
+          loc: {
+            start: leftToken.loc.end,
+            end: rightToken.loc.start,
+          },
           messageId: 'unexpected',
           fix: fixer =>
             fixer.removeRange([leftToken.range[1], rightToken.range[0]]),
@@ -162,7 +165,7 @@ export default util.createRule<Options, MessageIds>({
       ) {
         context.report({
           node,
-          loc: leftToken.loc.end,
+          loc: rightToken.loc,
           messageId: 'missing',
           fix: fixer => fixer.insertTextAfter(leftToken, ' '),
         });

diff --git a/packages/eslint-plugin/tests/eslint-rules/no-restricted-globals.test.ts b/packages/eslint-plugin/tests/eslint-rules/no-restricted-globals.test.ts
@@ -64,10 +64,11 @@ fdescribe("foo", function() {
       options: ['event'],
       errors: [
         {
-          message: "Unexpected use of 'event'.",
-          // the base rule doesn't use messageId
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        } as any,
+          messageId: 'defaultMessage',
+          data: {
+            name: 'event',
+          },
+        },
       ],
     },
     {
@@ -77,10 +78,11 @@ confirm("TEST");
       options: ['confirm'],
       errors: [
         {
-          message: "Unexpected use of 'confirm'.",
-          // the base rule doesn't use messageId
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        } as any,
+          messageId: 'defaultMessage',
+          data: {
+            name: 'confirm',
+          },
+        },
       ],
     },
     {
@@ -90,10 +92,11 @@ var a = confirm("TEST")?.a;
       options: ['confirm'],
       errors: [
         {
-          message: "Unexpected use of 'confirm'.",
-          // the base rule doesn't use messageId
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        } as any,
+          messageId: 'defaultMessage',
+          data: {
+            name: 'confirm',
+          },
+        },
       ],
     },
   ],

diff --git a/packages/eslint-plugin/tests/rules/array-type.test.ts b/packages/eslint-plugin/tests/rules/array-type.test.ts
@@ -717,6 +717,7 @@ function fooFunction(foo: ArrayClass<string>[]) {
     },
     {
       code: 'let fooVar: Array[];',
+      output: 'let fooVar: any[][];',
       options: [{ default: 'array' }],
       errors: [
         {
@@ -729,6 +730,7 @@ function fooFunction(foo: ArrayClass<string>[]) {
     },
     {
       code: 'let fooVar: Array[];',
+      output: 'let fooVar: any[][];',
       options: [{ default: 'array-simple' }],
       errors: [
         {

diff --git a/packages/eslint-plugin/tests/rules/ban-types.test.ts b/packages/eslint-plugin/tests/rules/ban-types.test.ts
@@ -101,6 +101,7 @@ ruleTester.run('ban-types', rule, {
   invalid: [
     {
       code: 'let a: String;',
+      output: 'let a: string;',
       errors: [
         {
           messageId: 'bannedTypeMessage',