From 59e17cbf6f7637d0cc07104654e960525093bea9 Mon Sep 17 00:00:00 2001 From: Dmitry Zakharov Date: Sat, 20 Apr 2024 11:09:54 +0300 Subject: [PATCH] fix(linter): rename languageSettings to languageOptions for flat config migration partially closes #22782 --- .../src/generators/convert-to-flat-config/generator.spec.ts | 2 +- packages/eslint/src/generators/utils/flat-config/ast-utils.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/eslint/src/generators/convert-to-flat-config/generator.spec.ts b/packages/eslint/src/generators/convert-to-flat-config/generator.spec.ts index 17d3fa59747d5..10a8d1d027f7a 100644 --- a/packages/eslint/src/generators/convert-to-flat-config/generator.spec.ts +++ b/packages/eslint/src/generators/convert-to-flat-config/generator.spec.ts @@ -547,7 +547,7 @@ describe('convert-to-flat-config generator', () => { { files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'], rules: {}, - languageSettings: { + languageOptions: { parserOptions: { project: ['apps/dx-assets-ui/tsconfig.*?.json'] }, }, }, diff --git a/packages/eslint/src/generators/utils/flat-config/ast-utils.ts b/packages/eslint/src/generators/utils/flat-config/ast-utils.ts index 4e779e29a140e..3ecd1ca651615 100644 --- a/packages/eslint/src/generators/utils/flat-config/ast-utils.ts +++ b/packages/eslint/src/generators/utils/flat-config/ast-utils.ts @@ -762,7 +762,7 @@ export function generateFlatOverride( ) { if (override.parserOptions) { const { parserOptions, ...rest } = override; - return generateAst({ ...rest, languageSettings: { parserOptions } }); + return generateAst({ ...rest, languageOptions: { parserOptions } }); } return generateAst(override); } @@ -775,7 +775,7 @@ export function generateFlatOverride( addTSObjectProperty(objectLiteralElements, 'excludedFiles', excludedFiles); addTSObjectProperty(objectLiteralElements, 'rules', rules); if (parserOptions) { - addTSObjectProperty(objectLiteralElements, 'languageSettings', { + addTSObjectProperty(objectLiteralElements, 'languageOptions', { parserOptions, }); }