typescript-eslint · JamesHenry · Jul 21, 2019 · Jun 25, 2019 · Jun 25, 2019 · Jun 25, 2019
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -62,8 +62,6 @@ jobs:
           node_version: 10.x
         node_8_x:
           node_version: 8.x
-        node_6_x:
-          node_version: 6.x
     steps:
       - task: NodeTool@0
         inputs:

diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "all-contributors-cli": "^6.0.0",
     "babel-code-frame": "^6.26.0",
     "cz-conventional-changelog": "2.1.0",
-    "eslint": "^5.12.1",
+    "eslint": "^6.0.0",
     "eslint-plugin-eslint-plugin": "^2.0.1",
     "eslint-plugin-jest": "^22.2.2",
     "glob": "7.1.2",

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

diff --git a/packages/eslint-plugin-tslint/tests/index.spec.ts b/packages/eslint-plugin-tslint/tests/index.spec.ts
@@ -1,4 +1,5 @@
 import { TSESLint } from '@typescript-eslint/experimental-utils';
+import * as parser from '@typescript-eslint/parser';
 import { readFileSync } from 'fs';
 import rule, { Options } from '../src/rules/config';
 
@@ -13,7 +14,7 @@ const ruleTester = new TSESLint.RuleTester({
      */
     project: './tests/tsconfig.json',
   },
-  parser: '@typescript-eslint/parser',
+  parser: require.resolve('@typescript-eslint/parser'),
 });
 
 /**
@@ -146,6 +147,7 @@ describe('tslint/error', () => {
   function testOutput(code: string, config: TSESLint.Linter.Config): void {
     const linter = new TSESLint.Linter();
     linter.defineRule('tslint/config', rule);
+    linter.defineParser('@typescript-eslint/parser', parser);
 
     expect(() => linter.verify(code, config)).toThrow(
       `You must provide a value for the "parserOptions.project" property for @typescript-eslint/parser`,
@@ -176,6 +178,7 @@ describe('tslint/error', () => {
     const linter = new TSESLint.Linter();
     jest.spyOn(console, 'warn').mockImplementation();
     linter.defineRule('tslint/config', rule);
+    linter.defineParser('@typescript-eslint/parser', parser);
     expect(() =>
       linter.verify('foo;', {
         parserOptions: {

diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
@@ -54,6 +54,6 @@
   },
   "peerDependencies": {
     "@typescript-eslint/parser": "^1.9.0",
-    "eslint": "^5.0.0"
+    "eslint": "^5.0.0 || ^6.0.0"
   }
 }
diff --git a/packages/eslint-plugin/src/rules/array-type.ts b/packages/eslint-plugin/src/rules/array-type.ts
@@ -72,7 +72,8 @@ function typeNeedsParentheses(node: TSESTree.Node): boolean {
   }
 }
 
-type Options = ['array' | 'generic' | 'array-simple'];
+export type OptionString = 'array' | 'generic' | 'array-simple';
+type Options = [OptionString];
 type MessageIds =
   | 'errorStringGeneric'
   | 'errorStringGenericSimple'

diff --git a/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts b/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
@@ -8,7 +8,6 @@ import {
   AST_TOKEN_TYPES,
   TSESLint,
 } from '@typescript-eslint/experimental-utils';
-import { createGlobalLinebreakMatcher } from 'eslint/lib/util/ast-utils';
 import {
   isOpeningParenToken,
   isClosingParenToken,
@@ -26,6 +25,10 @@ import { OffsetStorage } from './OffsetStorage';
 import { TokenInfo } from './TokenInfo';
 import { createRule, ExcludeKeys, RequireKeys } from '../../util';
 
+function createGlobalLinebreakMatcher() {
+  return /\r\n|[\r\n\u2028\u2029]/gu;
+}
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------

diff --git a/packages/eslint-plugin/tests/RuleTester.ts b/packages/eslint-plugin/tests/RuleTester.ts
@@ -1,8 +1,47 @@
 import { TSESLint, ESLintUtils } from '@typescript-eslint/experimental-utils';
 import * as path from 'path';
 
-// re-export the RuleTester from here to make it easier to do the tests
-const RuleTester = TSESLint.RuleTester;
+const parser = '@typescript-eslint/parser';
+
+type RuleTesterConfig = Omit<TSESLint.RuleTesterConfig, 'parser'> & {
+  parser: typeof parser;
+};
+class RuleTester extends TSESLint.RuleTester {
+  // as of eslint 6 you have to provide an absolute path to the parser
+  // but that's not as clean to type, this saves us trying to manually enforce
+  // that contributors require.resolve everything
+  constructor(options: RuleTesterConfig) {
+    super({
+      ...options,
+      parser: require.resolve(options.parser),
+    });
+  }
+
+  // as of eslint 6 you have to provide an absolute path to the parser
+  // If you don't do that at the test level, the test will fail somewhat cryptically...
+  // This is a lot more explicit
+  run<TMessageIds extends string, TOptions extends Readonly<any[]>>(
+    name: string,
+    rule: TSESLint.RuleModule<TMessageIds, TOptions>,
+    tests: TSESLint.RunTests<TMessageIds, TOptions>,
+  ): void {
+    const errorMessage = `Do not set the parser at the test level unless you want to use a parser other than ${parser}`;
+    tests.valid.forEach(test => {
+      if (typeof test !== 'string') {
+        if (test.parser === parser) {
+          throw new Error(errorMessage);
+        }
+      }
+    });
+    tests.invalid.forEach(test => {
+      if (test.parser === parser) {
+        throw new Error(errorMessage);
+      }
+    });
+
+    super.run(name, rule, tests);
+  }
+}
 
 function getFixturesRootDir() {
   return path.join(process.cwd(), 'tests/fixtures/');