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.

Sign up for GitHub

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

Jump to bottom

fix(linter): move eslint-config-prettier to the end for proper override #28503

Merged
merged 9 commits into from
Nov 19, 2024
Merged

fix(linter): move eslint-config-prettier to the end for proper override #28503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3e08eff
fix(eslint): move eslint-config-prettier to the end for proper override
demonicattack Oct 17, 2024
7c12eb6
fix(eslint): formating
demonicattack Oct 17, 2024
c195b0f
fix(core): correct formatting issue
demonicattack Oct 17, 2024
bb3a363
fix(core): add missing override rule
demonicattack Oct 17, 2024
c4ca0ac
Merge branch 'master' into patch-1
demonicattack Oct 18, 2024
e6c259a
Merge branch 'master' into patch-1
demonicattack Oct 18, 2024
5fa587d
Update packages/eslint-plugin/src/flat-configs/javascript.ts
demonicattack Nov 17, 2024
cd5c290
cleanup(linter): reword source code comment
leosvelperez Nov 18, 2024
303548d
Merge branch 'master' into patch-1
leosvelperez Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions packages/eslint-plugin/src/flat-configs/javascript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export default tseslint.config(
files: ['**/*.js', '**/*.jsx'],
extends: [eslint.configs.recommended, ...tseslint.configs.recommended],
},
...(isPrettierAvailable ? [require('eslint-config-prettier')] : []),
{
languageOptions: {
parser: tseslint.parser,
Expand Down Expand Up @@ -80,5 +79,9 @@ export default tseslint.config(
*/
'@typescript-eslint/no-require-imports': 'off',
},
}
},
/**
* We include it last so it overrides the conflicting rules from the configuration blocks above.
*/
...(isPrettierAvailable ? [require('eslint-config-prettier')] : [])
);
7 changes: 5 additions & 2 deletions packages/eslint-plugin/src/flat-configs/typescript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export default tseslint.config(
files: ['**/*.ts', '**/*.tsx'],
extends: [eslint.configs.recommended, ...tseslint.configs.recommended],
},
...(isPrettierAvailable ? [require('eslint-config-prettier')] : []),
{
plugins: { '@typescript-eslint': tseslint.plugin },
languageOptions: {
Expand Down Expand Up @@ -64,5 +63,9 @@ export default tseslint.config(
*/
'@typescript-eslint/no-require-imports': 'off',
},
}
},
/**
* We include it last so it overrides the conflicting rules from the configuration blocks above.
*/
...(isPrettierAvailable ? [require('eslint-config-prettier')] : [])
);