From aa02f90006fe8c922bf7f33a6d31086b99c06cf5 Mon Sep 17 00:00:00 2001 From: Pascal Garber Date: Wed, 16 Oct 2024 12:31:14 +0200 Subject: [PATCH] chore(monorepo): Fixed VSCode prettier extension configuration --- apps/backend/{.prettierrc.json => .prettierrc.mjs} | 2 +- apps/backend/.vscode/settings.json | 6 +++++- apps/frontend/{.prettierrc.json => .prettierrc.mjs} | 2 +- apps/frontend/.vscode/settings.json | 6 +++++- packages/common/.vscode/settings.json | 2 +- packages/core/.prettierrc.mjs | 3 +++ packages/core/.vscode/settings.json | 9 +++++++++ packages/core/package.json | 5 +---- 8 files changed, 26 insertions(+), 9 deletions(-) rename apps/backend/{.prettierrc.json => .prettierrc.mjs} (88%) rename apps/frontend/{.prettierrc.json => .prettierrc.mjs} (84%) create mode 100644 packages/core/.prettierrc.mjs create mode 100644 packages/core/.vscode/settings.json diff --git a/apps/backend/.prettierrc.json b/apps/backend/.prettierrc.mjs similarity index 88% rename from apps/backend/.prettierrc.json rename to apps/backend/.prettierrc.mjs index 00125a0c9..dd964a7d0 100644 --- a/apps/backend/.prettierrc.json +++ b/apps/backend/.prettierrc.mjs @@ -1,4 +1,4 @@ -{ +export default { "trailingComma": "none", "overrides": [ { diff --git a/apps/backend/.vscode/settings.json b/apps/backend/.vscode/settings.json index 0b9c5565f..8afc243fb 100644 --- a/apps/backend/.vscode/settings.json +++ b/apps/backend/.vscode/settings.json @@ -1,5 +1,9 @@ { - "editor.defaultFormatter": "esbenp.prettier-vscode", + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, "editor.formatOnSave": true, + "prettier.configPath": "./.prettierrc.mjs", + "prettier.prettierPath": "./../../node_modules/prettier", "deno.enable": false } diff --git a/apps/frontend/.prettierrc.json b/apps/frontend/.prettierrc.mjs similarity index 84% rename from apps/frontend/.prettierrc.json rename to apps/frontend/.prettierrc.mjs index 4a75807c8..65405ecb4 100644 --- a/apps/frontend/.prettierrc.json +++ b/apps/frontend/.prettierrc.mjs @@ -1,4 +1,4 @@ -{ +export default { "singleQuote": true, "trailingComma": "es5", "plugins": ["prettier-plugin-tailwindcss"] diff --git a/apps/frontend/.vscode/settings.json b/apps/frontend/.vscode/settings.json index 0b9c5565f..8afc243fb 100644 --- a/apps/frontend/.vscode/settings.json +++ b/apps/frontend/.vscode/settings.json @@ -1,5 +1,9 @@ { - "editor.defaultFormatter": "esbenp.prettier-vscode", + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, "editor.formatOnSave": true, + "prettier.configPath": "./.prettierrc.mjs", + "prettier.prettierPath": "./../../node_modules/prettier", "deno.enable": false } diff --git a/packages/common/.vscode/settings.json b/packages/common/.vscode/settings.json index e4667ecea..180f654bc 100644 --- a/packages/common/.vscode/settings.json +++ b/packages/common/.vscode/settings.json @@ -3,7 +3,7 @@ "eslint.enable": false, "deno.enable": true, "deno.lint": true, - "deno.unstable": true, + "deno.unstable": [], "deno.cacheOnSave": true, "deno.disablePaths": [ "./dist", diff --git a/packages/core/.prettierrc.mjs b/packages/core/.prettierrc.mjs new file mode 100644 index 000000000..1f113bc9c --- /dev/null +++ b/packages/core/.prettierrc.mjs @@ -0,0 +1,3 @@ +export default { + trailingComma: "none" +}; diff --git a/packages/core/.vscode/settings.json b/packages/core/.vscode/settings.json new file mode 100644 index 000000000..8afc243fb --- /dev/null +++ b/packages/core/.vscode/settings.json @@ -0,0 +1,9 @@ +{ + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "editor.formatOnSave": true, + "prettier.configPath": "./.prettierrc.mjs", + "prettier.prettierPath": "./../../node_modules/prettier", + "deno.enable": false +} diff --git a/packages/core/package.json b/packages/core/package.json index 22d45e0fe..0eb4b0408 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -74,9 +74,6 @@ "tsconfig": "^7.0.0", "typescript": "^5.4.5" }, - "prettier": { - "trailingComma": "none" - }, "repository": { "type": "git", "url": "git+https://github.com/beabee-communityrm/monorepo.git" @@ -87,4 +84,4 @@ "url": "https://github.com/beabee-communityrm/monorepo/issues" }, "homepage": "https://github.com/beabee-communityrm/monorepo/blob/main/packages/core/README.md" -} +} \ No newline at end of file