From 636b69494ae1bf33496ac51cf27d37107b49f59a Mon Sep 17 00:00:00 2001 From: Brad Zacher Date: Thu, 9 Jun 2022 22:32:56 -0700 Subject: [PATCH] don't run typescript tests on less than ts-eslint 5.7.0 --- tests/src/rules/consistent-type-specifier-style.js | 4 ++-- tests/src/utils.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/src/rules/consistent-type-specifier-style.js b/tests/src/rules/consistent-type-specifier-style.js index 96037b6cba..dc3d656332 100644 --- a/tests/src/rules/consistent-type-specifier-style.js +++ b/tests/src/rules/consistent-type-specifier-style.js @@ -1,5 +1,5 @@ import { RuleTester } from 'eslint'; -import { test, parsers, tsVersionSatisfies, eslintVersionSatisfies } from '../utils'; +import { test, parsers, tsVersionSatisfies, eslintVersionSatisfies, typescriptEslintParserSatisfies } from '../utils'; const rule = require('rules/consistent-type-specifier-style'); @@ -243,7 +243,7 @@ const FLOW_ONLY = { context('TypeScript', () => { // inline type specifiers weren't supported prior to TS v4.5 - if (!parsers.TS_NEW || !tsVersionSatisfies('>= 4.5')) { + if (!parsers.TS_NEW || !tsVersionSatisfies('>= 4.5') || !typescriptEslintParserSatisfies('>= 5.7.0')) { return; } diff --git a/tests/src/utils.js b/tests/src/utils.js index 3ea4aad33b..a456f33fdb 100644 --- a/tests/src/utils.js +++ b/tests/src/utils.js @@ -2,6 +2,7 @@ import path from 'path'; import eslintPkg from 'eslint/package.json'; import semver from 'semver'; import typescriptPkg from 'typescript/package.json'; +import typescriptEslintParserPkg from '@typescript-eslint/parser'; // warms up the module cache. this import takes a while (>500ms) import 'babel-eslint'; @@ -17,6 +18,10 @@ export function tsVersionSatisfies(specifier) { return semver.satisfies(typescriptPkg.version, specifier); } +export function typescriptEslintParserSatisfies(specifier) { + return semver.satisfies(typescriptEslintParserPkg.version, specifier); +} + export function testFilePath(relativePath) { return path.join(process.cwd(), './tests/files', relativePath); }