feat: support ESLint 7.x (#139)

Closes #138
testing-library · Sep 20, 2020 · be75630 · be75630
1 parent a934cd7
commit be75630
Show file tree

Hide file tree

Showing 7 changed files with 3,991 additions and 3,988 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ env:
   matrix:
     - ESLINT=5
     - ESLINT=6
+    - ESLINT=7
 
 node_js:
   - 10.12
@@ -22,7 +23,7 @@ jobs:
     - stage: release
       if: branch = master AND type != pull_request AND fork = false
       node_js: 14
-      env: ESLINT=6
+      env: ESLINT=7
       script: npm run build
       deploy:
         provider: script

diff --git a/lib/rules/consistent-data-testid.ts b/lib/rules/consistent-data-testid.ts
@@ -6,8 +6,8 @@ export const RULE_NAME = 'consistent-data-testid';
 export type MessageIds = 'invalidTestId';
 type Options = [
   {
-    testIdPattern: string;
     testIdAttribute?: string | string[];
+    testIdPattern: string;
   }
 ];
 

diff --git a/lib/rules/no-debug.ts b/lib/rules/no-debug.ts
@@ -13,6 +13,10 @@ import {
 } from '../node-utils';
 
 export const RULE_NAME = 'no-debug';
+export type MessageIds = 'noDebug';
+type Options = [
+  { renderFunctions?: string[]; }
+];
 
 function isRenderVariableDeclarator(
   node: TSESTree.VariableDeclarator,
@@ -45,7 +49,7 @@ function hasTestingLibraryImportModule(
   return LIBRARY_MODULES.some(module => module === literal.value);
 }
 
-export default ESLintUtils.RuleCreator(getDocsUrl)({
+export default ESLintUtils.RuleCreator(getDocsUrl)<Options, MessageIds>({
   name: RULE_NAME,
   meta: {
     type: 'problem',

diff --git a/lib/rules/no-render-in-setup.ts b/lib/rules/no-render-in-setup.ts
@@ -12,6 +12,12 @@ import {
 
 export const RULE_NAME = 'no-render-in-setup';
 export type MessageIds = 'noRenderInSetup';
+type Options = [
+  {
+    allowTestingFrameworkSetupHook?: string;
+    renderFunctions?: string[];
+  }
+];
 
 export function findClosestBeforeHook(
   node: TSESTree.Node,
@@ -29,7 +35,7 @@ export function findClosestBeforeHook(
   return findClosestBeforeHook(node.parent, testingFrameworkSetupHooksToFilter);
 }
 
-export default ESLintUtils.RuleCreator(getDocsUrl)({
+export default ESLintUtils.RuleCreator(getDocsUrl)<Options, MessageIds>({
   name: RULE_NAME,
   meta: {
     type: 'problem',

diff --git a/lib/rules/prefer-find-by.ts b/lib/rules/prefer-find-by.ts
@@ -15,9 +15,8 @@ import {
 import { getDocsUrl, SYNC_QUERIES_COMBINATIONS } from '../utils';
 
 export const RULE_NAME = 'prefer-find-by';
-
-type Options = [];
 export type MessageIds = 'preferFindBy';
+type Options = [];
 
 export const WAIT_METHODS = ['waitFor', 'waitForElement', 'wait'];