@@ -8,8 +8,7 @@ const eslintRequire = createRequire(require.resolve('eslint'));
88
99export const espreeParser = eslintRequire . resolve ( 'espree' ) ;
1010
11- export const eslintMajorVersion = semver . major ( eslintVersion ) ;
12- export const usingFlatConfig = eslintMajorVersion >= 9 ;
11+ export const usingFlatConfig = semver . major ( eslintVersion ) >= 9 ;
1312
1413export class FlatCompatRuleTester extends TSESLint . RuleTester {
1514 public constructor ( testerConfig ?: TSESLint . RuleTesterConfig ) {
@@ -25,49 +24,11 @@ export class FlatCompatRuleTester extends TSESLint.RuleTester {
2524 tests : TSESLint . RunTests < TMessageIds , TOptions > ,
2625 ) {
2726 super . run ( ruleName , rule , {
28- valid : FlatCompatRuleTester . _filterCases (
29- tests . valid . map ( t => FlatCompatRuleTester . _flatCompat ( t ) ) ,
30- ) ,
31- invalid : FlatCompatRuleTester . _filterCases (
32- tests . invalid . map ( t => FlatCompatRuleTester . _flatCompat ( t ) ) ,
33- ) ,
27+ valid : tests . valid . map ( t => FlatCompatRuleTester . _flatCompat ( t ) ) ,
28+ invalid : tests . invalid . map ( t => FlatCompatRuleTester . _flatCompat ( t ) ) ,
3429 } ) ;
3530 }
3631
37- /* istanbul ignore next */
38- /**
39- * Filters out test cases that are using ecma version 2022 or higher when running
40- * on ESLint v7
41- * @private
42- */
43- private static _filterCases <
44- T extends
45- | string
46- | TSESLint . ValidTestCase < unknown [ ] >
47- | TSESLint . InvalidTestCase < string , unknown [ ] > ,
48- > ( tests : T [ ] ) : T [ ] {
49- if ( semver . major ( eslintVersion ) > 7 ) {
50- return tests ;
51- }
52-
53- const filtered = tests . filter (
54- t =>
55- typeof t === 'string' ||
56- ! t . parserOptions ?. ecmaVersion ||
57- t . parserOptions . ecmaVersion === 'latest' ||
58- t . parserOptions . ecmaVersion < 2022 ,
59- ) ;
60-
61- // print the number of tests that were filtered
62- if ( filtered . length !== tests . length ) {
63- console . warn (
64- `Filtered ${ tests . length - filtered . length } tests due to unsupported parser options.` ,
65- ) ;
66- }
67-
68- return filtered ;
69- }
70-
7132 /* istanbul ignore next */
7233 private static _flatCompat <
7334 T extends
0 commit comments