From 2b92c57f1ebae0a36878e8359a63a6da4f019356 Mon Sep 17 00:00:00 2001 From: kangfenmao Date: Fri, 24 May 2024 12:43:48 +0800 Subject: [PATCH] style(config): update Prettier and VS Code settings --- .prettierrc.yaml | 4 +++- .vscode/settings.json | 26 ++++++++++++++++++++++++-- .vscode/snippet.code-snippets | 2 +- README.md | 1 + src/renderer/index.html | 3 +-- src/renderer/src/assets/css/base.css | 2 +- 6 files changed, 31 insertions(+), 7 deletions(-) diff --git a/.prettierrc.yaml b/.prettierrc.yaml index 35893b3b..07b4f364 100644 --- a/.prettierrc.yaml +++ b/.prettierrc.yaml @@ -1,4 +1,6 @@ singleQuote: true semi: false -printWidth: 100 +printWidth: 120 trailingComma: none +endOfLine: lf +bracketSameLine: true diff --git a/.vscode/settings.json b/.vscode/settings.json index 4c05394e..4f6177a3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,11 +1,33 @@ { - "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.fixAll.eslint": "explicit" + }, + "search.exclude": { + "**/dist/**": true }, "[javascript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, "[json]": { "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[jsonc]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[css]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[scss]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[markdown]": { + "files.trimTrailingWhitespace": false } } diff --git a/.vscode/snippet.code-snippets b/.vscode/snippet.code-snippets index 59c1d094..06da5b97 100644 --- a/.vscode/snippet.code-snippets +++ b/.vscode/snippet.code-snippets @@ -16,4 +16,4 @@ ], "description": "Function component" } -} \ No newline at end of file +} diff --git a/README.md b/README.md index 29b6a2b5..7eb7294d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # Cherry AI + Cherry AI is a desktop client for multiple cutting-edge LLM models, available on Windows, Mac and Linux. ## Recommended IDE Setup diff --git a/src/renderer/index.html b/src/renderer/index.html index 90d68589..6933cdbe 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -6,8 +6,7 @@ + content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:" /> diff --git a/src/renderer/src/assets/css/base.css b/src/renderer/src/assets/css/base.css index 12f96af3..a2abf0ec 100644 --- a/src/renderer/src/assets/css/base.css +++ b/src/renderer/src/assets/css/base.css @@ -101,4 +101,4 @@ code { display: flex; flex-direction: column; width: 100%; -} \ No newline at end of file +}