Skip to content

Commit 530efde

Browse files
committed
Merge branch 'v1-master' of github.com:ShuyunFF2E/cloud-react into feat-imageText-mly
2 parents 381af38 + 3ffad2d commit 530efde

2 files changed

Lines changed: 50 additions & 49 deletions

File tree

.vscode/extensions.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
22
"recommendations": [
3-
"esbenp.prettier-vscode",
43
"dbaeumer.vscode-eslint",
54
"bradlc.vscode-tailwindcss",
65
"ms-vscode.vscode-typescript-next",
76
"formulahendry.auto-rename-tag",
87
"christian-kohler.path-intellisense",
98
"ms-vscode.vscode-json"
109
]
11-
}
10+
}

.vscode/settings.json

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,50 @@
11
{
2-
"editor.formatOnSave": true,
3-
"editor.codeActionsOnSave": {
4-
"source.fixAll.eslint": "explicit",
5-
"source.organizeImports": "never"
6-
},
7-
"editor.defaultFormatter": "esbenp.prettier-vscode",
8-
"[javascript]": {
9-
"editor.defaultFormatter": "esbenp.prettier-vscode"
10-
},
11-
"[javascriptreact]": {
12-
"editor.defaultFormatter": "esbenp.prettier-vscode"
13-
},
14-
"[typescript]": {
15-
"editor.defaultFormatter": "esbenp.prettier-vscode"
16-
},
17-
"[typescriptreact]": {
18-
"editor.defaultFormatter": "esbenp.prettier-vscode"
19-
},
20-
"[json]": {
21-
"editor.defaultFormatter": "esbenp.prettier-vscode"
22-
},
23-
"[css]": {
24-
"editor.defaultFormatter": "esbenp.prettier-vscode"
25-
},
26-
"[less]": {
27-
"editor.defaultFormatter": "esbenp.prettier-vscode"
28-
},
29-
"[html]": {
30-
"editor.defaultFormatter": "esbenp.prettier-vscode"
31-
},
32-
"eslint.validate": [
33-
"javascript",
34-
"javascriptreact",
35-
"typescript",
36-
"typescriptreact"
37-
],
38-
"prettier.requireConfig": false,
39-
"prettier.useEditorConfig": false,
40-
"files.associations": {
41-
"*.jsx": "javascriptreact",
42-
"*.tsx": "typescriptreact"
43-
},
44-
"emmet.includeLanguages": {
45-
"javascript": "javascriptreact",
46-
"typescript": "typescriptreact"
47-
}
48-
}
2+
"editor.formatOnSave": true,
3+
"editor.codeActionsOnSave": {
4+
"source.fixAll.eslint": "explicit",
5+
"source.organizeImports": "never"
6+
},
7+
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
8+
"[javascript]": {
9+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
10+
},
11+
"[javascriptreact]": {
12+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
13+
},
14+
"[typescript]": {
15+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
16+
},
17+
"[typescriptreact]": {
18+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
19+
},
20+
"[json]": {
21+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
22+
},
23+
"[css]": {
24+
"editor.defaultFormatter": "vscode.css-language-features"
25+
},
26+
"[less]": {
27+
"editor.defaultFormatter": "vscode.css-language-features"
28+
},
29+
"[html]": {
30+
"editor.defaultFormatter": "vscode.html-language-features"
31+
},
32+
"eslint.validate": [
33+
"javascript",
34+
"javascriptreact",
35+
"typescript",
36+
"typescriptreact"
37+
],
38+
"eslint.format.enable": true,
39+
"eslint.codeAction.showDocumentation": {
40+
"enable": true
41+
},
42+
"files.associations": {
43+
"*.jsx": "javascriptreact",
44+
"*.tsx": "typescriptreact"
45+
},
46+
"emmet.includeLanguages": {
47+
"javascript": "javascriptreact",
48+
"typescript": "typescriptreact"
49+
}
50+
}

0 commit comments

Comments
 (0)