From c0f27494a331a9a227bf3ca45a473c4ca9d62125 Mon Sep 17 00:00:00 2001 From: Nazar Hussain Date: Thu, 17 Oct 2024 13:39:06 +0200 Subject: [PATCH 01/11] Add vscode workspace settings --- .gitignore | 2 +- .vscode/settings.json | 21 +++++++++++++++++++++ lodestar.code-workspace | 12 ------------ 3 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 .vscode/settings.json delete mode 100644 lodestar.code-workspace diff --git a/.gitignore b/.gitignore index 073b21cf322a..52d9bc66e5b6 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ validators .tmp .npmrc .vscode/launch.json -.vscode/settings.json +!.vscode/settings.json .vscode/tasks.json # Tests artifacts diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000000..ea399ef35a4f --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,21 @@ +{ + "window.title": "${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}[${activeRepositoryBranchName}]", + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.fixAll.biome": "explicit", + "source.organizeImports.biome": "explicit" + }, + "[javascript]": { + "editor.defaultFormatter": "biomejs.biome" + }, + "[typescript]": { + "editor.defaultFormatter": "biomejs.biome" + }, + "[json]": { + "editor.defaultFormatter": "biomejs.biome" + }, + "[jsonc]": { + "editor.defaultFormatter": "biomejs.biome" + } +} \ No newline at end of file diff --git a/lodestar.code-workspace b/lodestar.code-workspace deleted file mode 100644 index 7030ab8d7270..000000000000 --- a/lodestar.code-workspace +++ /dev/null @@ -1,12 +0,0 @@ -{ - "settings": { - "window.title": "${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}[${activeRepositoryBranchName}]", - "editor.defaultFormatter": "esbenp.prettier-vscode", - "[javascript]": { - "editor.defaultFormatter": "biomejs.biome" - }, - "[typescript]": { - "editor.defaultFormatter": "biomejs.biome" - }, - } -} From 5a8c5867e31659b468d71bbccd906301d0dfa3e3 Mon Sep 17 00:00:00 2001 From: Nazar Hussain Date: Thu, 17 Oct 2024 13:42:18 +0200 Subject: [PATCH 02/11] Update the settings file --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ea399ef35a4f..5bc405debe34 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -18,4 +18,4 @@ "[jsonc]": { "editor.defaultFormatter": "biomejs.biome" } -} \ No newline at end of file +} From 82d36653e12be76458152376777695c4774684cb Mon Sep 17 00:00:00 2001 From: Nazar Hussain Date: Thu, 17 Oct 2024 13:52:38 +0200 Subject: [PATCH 03/11] Add settings for open-in-github --- .vscode/extensions.json | 3 ++- .vscode/settings.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index d2b074c6eea1..b4aba51aae1d 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,6 +1,7 @@ { "recommendations": [ "biomejs.biome", - "esbenp.prettier-vscode" + "esbenp.prettier-vscode", + "sysoev.vscode-open-in-github" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 5bc405debe34..4aa0273c1731 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "window.title": "${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}[${activeRepositoryBranchName}]", "editor.defaultFormatter": "esbenp.prettier-vscode", + "openInGitHub.defaultBranch": "unstable", "editor.formatOnSave": true, "editor.codeActionsOnSave": { "source.fixAll.biome": "explicit", From 27a13445b3a02dc281860186f00b67a4b960afde Mon Sep 17 00:00:00 2001 From: Nazar Hussain Date: Thu, 17 Oct 2024 14:15:12 +0200 Subject: [PATCH 04/11] Update the settings --- .vscode/settings.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 4aa0273c1731..d0a52250d908 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,7 +5,6 @@ "editor.formatOnSave": true, "editor.codeActionsOnSave": { "source.fixAll.biome": "explicit", - "source.organizeImports.biome": "explicit" }, "[javascript]": { "editor.defaultFormatter": "biomejs.biome" From f92bd1326cea7a4cc930498dc91a8b5db5c5bed2 Mon Sep 17 00:00:00 2001 From: Nazar Hussain Date: Thu, 17 Oct 2024 14:17:01 +0200 Subject: [PATCH 05/11] Add comment in the settings --- biome.jsonc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/biome.jsonc b/biome.jsonc index de0689f2d761..212a61d86aa2 100644 --- a/biome.jsonc +++ b/biome.jsonc @@ -18,6 +18,9 @@ "ignore": ["**/lib", "**/.nyc_output", "./packages/*/spec-tests", "**/node_modules", "./packages/*/node_modules/**"] }, "organizeImports": { + // TODO: We will enable this settings as soon mono-repo support is provided in biome. + // Currently it didn't recognize local packages in repo and sort those higher than npm packages + // https://github.com/biomejs/biome/issues/2228 "enabled": false }, "linter": { From 32b8e4d886378321eb84ad1b11c7546e4e9b33fe Mon Sep 17 00:00:00 2001 From: Nazar Hussain Date: Fri, 18 Oct 2024 09:44:51 +0200 Subject: [PATCH 06/11] Update the settings --- .vscode/extensions.json | 3 +-- .vscode/settings.json | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index b4aba51aae1d..d2b074c6eea1 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,6 @@ { "recommendations": [ "biomejs.biome", - "esbenp.prettier-vscode", - "sysoev.vscode-open-in-github" + "esbenp.prettier-vscode" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index d0a52250d908..f83ed88cef76 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "window.title": "${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}[${activeRepositoryBranchName}]", "editor.defaultFormatter": "esbenp.prettier-vscode", + // To make this settings effective install `sysoev.vscode-open-in-github` plugin "openInGitHub.defaultBranch": "unstable", "editor.formatOnSave": true, "editor.codeActionsOnSave": { From fd02f98f363547079f4302ccae7d34ee8d92782b Mon Sep 17 00:00:00 2001 From: Nazar Hussain Date: Fri, 18 Oct 2024 09:54:07 +0200 Subject: [PATCH 07/11] Use tabaqa extension to override settings --- .gitignore | 4 ++-- .vscode/extensions.json | 3 ++- .vscode/settings.json | 22 ---------------------- .vscode/tabaqa.json | 23 +++++++++++++++++++++++ 4 files changed, 27 insertions(+), 25 deletions(-) delete mode 100644 .vscode/settings.json create mode 100644 .vscode/tabaqa.json diff --git a/.gitignore b/.gitignore index 52d9bc66e5b6..0d84db4d4767 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ validators .tmp .npmrc .vscode/launch.json -!.vscode/settings.json +.vscode/settings.json .vscode/tasks.json # Tests artifacts @@ -82,4 +82,4 @@ packages/cli/.git-data.json .last_build_unixsec dictionary.dic -temp/ \ No newline at end of file +temp/ diff --git a/.vscode/extensions.json b/.vscode/extensions.json index d2b074c6eea1..fd7fc672d75d 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,6 +1,7 @@ { "recommendations": [ "biomejs.biome", - "esbenp.prettier-vscode" + "esbenp.prettier-vscode", + "KalimahApps.tabaqa" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index f83ed88cef76..000000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "window.title": "${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}[${activeRepositoryBranchName}]", - "editor.defaultFormatter": "esbenp.prettier-vscode", - // To make this settings effective install `sysoev.vscode-open-in-github` plugin - "openInGitHub.defaultBranch": "unstable", - "editor.formatOnSave": true, - "editor.codeActionsOnSave": { - "source.fixAll.biome": "explicit", - }, - "[javascript]": { - "editor.defaultFormatter": "biomejs.biome" - }, - "[typescript]": { - "editor.defaultFormatter": "biomejs.biome" - }, - "[json]": { - "editor.defaultFormatter": "biomejs.biome" - }, - "[jsonc]": { - "editor.defaultFormatter": "biomejs.biome" - } -} diff --git a/.vscode/tabaqa.json b/.vscode/tabaqa.json new file mode 100644 index 000000000000..1b62aba08ac7 --- /dev/null +++ b/.vscode/tabaqa.json @@ -0,0 +1,23 @@ +{ + "root": true, + "settings": { + "window.title": "${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}[${activeRepositoryBranchName}]", + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.fixAll.biome": "explicit" + }, + "[javascript]": { + "editor.defaultFormatter": "biomejs.biome" + }, + "[typescript]": { + "editor.defaultFormatter": "biomejs.biome" + }, + "[json]": { + "editor.defaultFormatter": "biomejs.biome" + }, + "[jsonc]": { + "editor.defaultFormatter": "biomejs.biome" + } + } +} \ No newline at end of file From f6b45610a73ac26704f0a4bed507d0dcac180e66 Mon Sep 17 00:00:00 2001 From: Nazar Hussain Date: Tue, 22 Oct 2024 09:56:09 +0200 Subject: [PATCH 08/11] Revert "Use tabaqa extension to override settings" This reverts commit fd02f98f363547079f4302ccae7d34ee8d92782b. --- .gitignore | 4 ++-- .vscode/extensions.json | 3 +-- .vscode/settings.json | 22 ++++++++++++++++++++++ .vscode/tabaqa.json | 23 ----------------------- 4 files changed, 25 insertions(+), 27 deletions(-) create mode 100644 .vscode/settings.json delete mode 100644 .vscode/tabaqa.json diff --git a/.gitignore b/.gitignore index 0d84db4d4767..52d9bc66e5b6 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ validators .tmp .npmrc .vscode/launch.json -.vscode/settings.json +!.vscode/settings.json .vscode/tasks.json # Tests artifacts @@ -82,4 +82,4 @@ packages/cli/.git-data.json .last_build_unixsec dictionary.dic -temp/ +temp/ \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json index fd7fc672d75d..d2b074c6eea1 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,6 @@ { "recommendations": [ "biomejs.biome", - "esbenp.prettier-vscode", - "KalimahApps.tabaqa" + "esbenp.prettier-vscode" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000000..f83ed88cef76 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,22 @@ +{ + "window.title": "${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}[${activeRepositoryBranchName}]", + "editor.defaultFormatter": "esbenp.prettier-vscode", + // To make this settings effective install `sysoev.vscode-open-in-github` plugin + "openInGitHub.defaultBranch": "unstable", + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.fixAll.biome": "explicit", + }, + "[javascript]": { + "editor.defaultFormatter": "biomejs.biome" + }, + "[typescript]": { + "editor.defaultFormatter": "biomejs.biome" + }, + "[json]": { + "editor.defaultFormatter": "biomejs.biome" + }, + "[jsonc]": { + "editor.defaultFormatter": "biomejs.biome" + } +} diff --git a/.vscode/tabaqa.json b/.vscode/tabaqa.json deleted file mode 100644 index 1b62aba08ac7..000000000000 --- a/.vscode/tabaqa.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "root": true, - "settings": { - "window.title": "${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}[${activeRepositoryBranchName}]", - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, - "editor.codeActionsOnSave": { - "source.fixAll.biome": "explicit" - }, - "[javascript]": { - "editor.defaultFormatter": "biomejs.biome" - }, - "[typescript]": { - "editor.defaultFormatter": "biomejs.biome" - }, - "[json]": { - "editor.defaultFormatter": "biomejs.biome" - }, - "[jsonc]": { - "editor.defaultFormatter": "biomejs.biome" - } - } -} \ No newline at end of file From 6d2f0be908ead10c9e59c58daf8ff5d18277c9a3 Mon Sep 17 00:00:00 2001 From: Nazar Hussain Date: Tue, 22 Oct 2024 09:57:39 +0200 Subject: [PATCH 09/11] Update the settings file --- .vscode/settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f83ed88cef76..86f499be7a91 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,8 @@ { "window.title": "${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}[${activeRepositoryBranchName}]", "editor.defaultFormatter": "esbenp.prettier-vscode", - // To make this settings effective install `sysoev.vscode-open-in-github` plugin - "openInGitHub.defaultBranch": "unstable", + // If you are using `sysoev.vscode-open-in-github` extension, make sure to enable this setting + // "openInGitHub.defaultBranch": "unstable", "editor.formatOnSave": true, "editor.codeActionsOnSave": { "source.fixAll.biome": "explicit", From da801a4114a9e03cccef955a38ba14eadcc7c1f7 Mon Sep 17 00:00:00 2001 From: Nazar Hussain Date: Tue, 22 Oct 2024 11:29:22 +0200 Subject: [PATCH 10/11] Update settings --- .vscode/settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 86f499be7a91..624bc14fe740 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,8 @@ { "window.title": "${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}[${activeRepositoryBranchName}]", "editor.defaultFormatter": "esbenp.prettier-vscode", - // If you are using `sysoev.vscode-open-in-github` extension, make sure to enable this setting - // "openInGitHub.defaultBranch": "unstable", + // To use this settings please install `sysoev.vscode-open-in-github` extension + "openInGitHub.defaultBranch": "unstable", "editor.formatOnSave": true, "editor.codeActionsOnSave": { "source.fixAll.biome": "explicit", From 207e28c97d99619755cbb1bfe25f7797fca1ccd2 Mon Sep 17 00:00:00 2001 From: Nazar Hussain Date: Tue, 22 Oct 2024 12:12:43 +0200 Subject: [PATCH 11/11] Update .vscode/settings.json Co-authored-by: Nico Flaig --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 624bc14fe740..fbc0552fe61c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,7 @@ { "window.title": "${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}[${activeRepositoryBranchName}]", "editor.defaultFormatter": "esbenp.prettier-vscode", - // To use this settings please install `sysoev.vscode-open-in-github` extension + // For `sysoev.vscode-open-in-github` extension "openInGitHub.defaultBranch": "unstable", "editor.formatOnSave": true, "editor.codeActionsOnSave": {