Skip to content

Commit

Permalink
chore(generator): uses eslint-config-prettier rather than eslint-plug…
Browse files Browse the repository at this point in the history
…in-prettier as recommended by prettier

See #10626
  • Loading branch information
murdos committed Aug 22, 2024
1 parent 9fe81ea commit 8e1087c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
3 changes: 1 addition & 2 deletions .lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export default {
'src/{main,test}/webapp/**/*.{ts,vue}': ['eslint --fix'],
'{,src/*/resources/**/}*.{js,cjs,ts,tsx,vue}': ['prettier --write'],
'*.{js,cjs,ts,tsx,vue}': ['eslint --fix', 'prettier --write'],
'src/main/style/**/*.{css,scss}': ['stylelint --fix', 'prettier --write'],
'src/main/glyph/**/*.{css,scss}': ['prettier --write'],
'*.pug': ['eslint --fix', 'prettier --write'],
Expand Down
3 changes: 1 addition & 2 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import globals from 'globals';
import prettier from 'eslint-plugin-prettier/recommended';
import prettier from 'eslint-config-prettier';
import typescript from 'typescript-eslint';
import js from '@eslint/js';
import vue from 'eslint-plugin-vue';
Expand Down Expand Up @@ -37,7 +37,6 @@ export default typescript.config(
'vue/multi-word-component-names': 'off',
'vue/no-reserved-component-names': 'off',
'@typescript-eslint/no-empty-object-type': 'off',
'prettier/prettier': ['error', { singleQuote: true }],
},
},
prettier,
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
"@vue/test-utils": "2.4.6",
"cypress": "13.13.3",
"eslint": "9.9.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "3.5.0",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-pug": "1.2.5",
"eslint-plugin-vue": "9.27.0",
"fontello-cli": "0.6.2",
Expand Down

0 comments on commit 8e1087c

Please sign in to comment.