Skip to content

Commit 47962ce

Browse files
Merge branch 'develop' into feat/block-styles
2 parents ddc8a2b + ec22856 commit 47962ce

File tree

2 files changed

+26
-6
lines changed

2 files changed

+26
-6
lines changed

.prettierignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Ignore JavaScript files to prevent conflicts with ESLint
2+
*.js
3+
*.jsx
4+
*.ts
5+
*.tsx
6+
7+
# Ignore build files
8+
dist/
9+
build/
10+
node_modules/
11+
12+
# Ignore other files that shouldn't be formatted
13+
*.min.js
14+
*.min.css

.vscode/settings.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
{
22
"editor.codeActionsOnSave": {
3-
"source.fixAll.eslint": true,
4-
"source.fixAll.stylelint": true
3+
"source.fixAll.eslint": "explicit",
4+
"source.fixAll.stylelint": "explicit"
55
},
66
"editor.formatOnSave": false,
7-
"eslint.validate": [
8-
"javascript"
9-
],
7+
"editor.defaultFormatter": null,
8+
"[javascript]": {
9+
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
10+
"editor.formatOnSave": false
11+
},
12+
"[javascriptreact]": {
13+
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
14+
"editor.formatOnSave": false
15+
},
1016
"stylelint.validate": [
1117
"css",
1218
"scss"
1319
]
14-
}
20+
}

0 commit comments

Comments
 (0)