From 0a823c28e3805b58b51aa0c451a55a429b73ea07 Mon Sep 17 00:00:00 2001 From: Nacho Vazquez Date: Thu, 7 Sep 2023 19:41:29 -0300 Subject: [PATCH] fix(linter): sync @eslint/js with the eslintVersion instead of the eslintrcVersion --- .../convert-to-flat-config/converters/json-converter.ts | 6 +++--- packages/linter/src/generators/init/init-migration.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/linter/src/generators/convert-to-flat-config/converters/json-converter.ts b/packages/linter/src/generators/convert-to-flat-config/converters/json-converter.ts index 87cdee1e54680..f38040beed595 100644 --- a/packages/linter/src/generators/convert-to-flat-config/converters/json-converter.ts +++ b/packages/linter/src/generators/convert-to-flat-config/converters/json-converter.ts @@ -7,7 +7,7 @@ import { import { join } from 'path'; import { ESLint } from 'eslint'; import * as ts from 'typescript'; -import { eslintrcVersion } from '../../../utils/versions'; +import { eslintVersion, eslintrcVersion } from '../../../utils/versions'; import { createNodeList, generateAst, @@ -255,7 +255,7 @@ function addExtends( tree, {}, { - '@eslint/js': eslintrcVersion, + '@eslint/js': eslintVersion, } ); @@ -279,7 +279,7 @@ function addExtends( tree, {}, { - '@eslint/js': eslintrcVersion, + '@eslint/js': eslintVersion, } ); diff --git a/packages/linter/src/generators/init/init-migration.ts b/packages/linter/src/generators/init/init-migration.ts index ba4495189217c..1e41d3fa5883b 100644 --- a/packages/linter/src/generators/init/init-migration.ts +++ b/packages/linter/src/generators/init/init-migration.ts @@ -15,7 +15,7 @@ import { getGlobalFlatEslintConfiguration, } from './global-eslint-config'; import { useFlatConfig } from '../../utils/flat-config'; -import { eslintrcVersion } from '../../utils/versions'; +import { eslintVersion } from '../../utils/versions'; import { addBlockToFlatConfigExport, addImportToFlatConfig, @@ -35,7 +35,7 @@ export function migrateConfigToMonorepoStyle( tree, {}, { - '@eslint/js': eslintrcVersion, + '@eslint/js': eslintVersion, } ); tree.write(