Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(linter): convert parser options to flat config even is parser is missing #22388

Merged
merged 1 commit into from Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -496,4 +496,70 @@ describe('convert-to-flat-config generator', () => {
expect(tree.exists('eslint.config.js')).toBeTruthy();
expect(tree.exists('libs/test-lib/eslint.config.js')).toBeTruthy();
});

it('should handle parser options even if parser is extended', async () => {
addProjectConfiguration(tree, 'dx-assets-ui', {
root: 'apps/dx-assets-ui',
targets: {},
});
await lintProjectGenerator(tree, {
skipFormat: false,
linter: Linter.EsLint,

project: 'dx-assets-ui',
setParserOptionsProject: false,
});
updateJson(tree, 'apps/dx-assets-ui/.eslintrc.json', () => {
return {
extends: ['../../.eslintrc.json'],
ignorePatterns: ['!**/*', '__fixtures__/**/*'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
parserOptions: {
project: ['apps/dx-assets-ui/tsconfig.*?.json'],
},
rules: {},
},
{
files: ['*.ts', '*.tsx'],
rules: {},
},
{
files: ['*.js', '*.jsx'],
rules: {},
},
],
};
});

await convertToFlatConfigGenerator(tree, options);
expect(tree.exists('apps/dx-assets-ui/eslint.config.js')).toBeTruthy();
expect(tree.exists('eslint.config.js')).toBeTruthy();
expect(tree.read('apps/dx-assets-ui/eslint.config.js', 'utf-8'))
.toMatchInlineSnapshot(`
"const baseConfig = require('../../eslint.config.js');

module.exports = [
...baseConfig,
{
files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
rules: {},
languageSettings: {
parserOptions: { project: ['apps/dx-assets-ui/tsconfig.*?.json'] },
},
},
{
files: ['**/*.ts', '**/*.tsx'],
rules: {},
},
{
files: ['**/*.js', '**/*.jsx'],
rules: {},
},
{ ignores: ['__fixtures__/**/*'] },
];
"
`);
});
});
11 changes: 10 additions & 1 deletion packages/eslint/src/generators/utils/flat-config/ast-utils.ts
Expand Up @@ -760,16 +760,25 @@ export function generateFlatOverride(
!override.plugins &&
!override.parser
) {
if (override.parserOptions) {
const { parserOptions, ...rest } = override;
return generateAst({ ...rest, languageSettings: { parserOptions } });
}
return generateAst(override);
}
const { files, excludedFiles, rules, ...rest } = override;
const { files, excludedFiles, rules, parserOptions, ...rest } = override;

const objectLiteralElements: ts.ObjectLiteralElementLike[] = [
ts.factory.createSpreadAssignment(ts.factory.createIdentifier('config')),
];
addTSObjectProperty(objectLiteralElements, 'files', files);
addTSObjectProperty(objectLiteralElements, 'excludedFiles', excludedFiles);
addTSObjectProperty(objectLiteralElements, 'rules', rules);
if (parserOptions) {
addTSObjectProperty(objectLiteralElements, 'languageSettings', {
parserOptions,
});
}

return ts.factory.createSpreadElement(
ts.factory.createCallExpression(
Expand Down