Skip to content

Commit d78925d

Browse files
authored
fix: handle extensions.json comments in vscode-web and code-server (#398)
1 parent 22b2ad5 commit d78925d

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

code-server/README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Automatically install [code-server](https://github.com/coder/code-server) in a w
1515
module "code-server" {
1616
count = data.coder_workspace.me.start_count
1717
source = "registry.coder.com/modules/code-server/coder"
18-
version = "1.0.26"
18+
version = "1.0.29"
1919
agent_id = coder_agent.example.id
2020
}
2121
```
@@ -30,7 +30,7 @@ module "code-server" {
3030
module "code-server" {
3131
count = data.coder_workspace.me.start_count
3232
source = "registry.coder.com/modules/code-server/coder"
33-
version = "1.0.26"
33+
version = "1.0.29"
3434
agent_id = coder_agent.example.id
3535
install_version = "4.8.3"
3636
}
@@ -44,7 +44,7 @@ Install the Dracula theme from [OpenVSX](https://open-vsx.org/):
4444
module "code-server" {
4545
count = data.coder_workspace.me.start_count
4646
source = "registry.coder.com/modules/code-server/coder"
47-
version = "1.0.26"
47+
version = "1.0.29"
4848
agent_id = coder_agent.example.id
4949
extensions = [
5050
"dracula-theme.theme-dracula"
@@ -62,7 +62,7 @@ Configure VS Code's [settings.json](https://code.visualstudio.com/docs/getstarte
6262
module "code-server" {
6363
count = data.coder_workspace.me.start_count
6464
source = "registry.coder.com/modules/code-server/coder"
65-
version = "1.0.26"
65+
version = "1.0.29"
6666
agent_id = coder_agent.example.id
6767
extensions = ["dracula-theme.theme-dracula"]
6868
settings = {
@@ -79,7 +79,7 @@ Just run code-server in the background, don't fetch it from GitHub:
7979
module "code-server" {
8080
count = data.coder_workspace.me.start_count
8181
source = "registry.coder.com/modules/code-server/coder"
82-
version = "1.0.26"
82+
version = "1.0.29"
8383
agent_id = coder_agent.example.id
8484
extensions = ["dracula-theme.theme-dracula", "ms-azuretools.vscode-docker"]
8585
}
@@ -95,7 +95,7 @@ Run an existing copy of code-server if found, otherwise download from GitHub:
9595
module "code-server" {
9696
count = data.coder_workspace.me.start_count
9797
source = "registry.coder.com/modules/code-server/coder"
98-
version = "1.0.26"
98+
version = "1.0.29"
9999
agent_id = coder_agent.example.id
100100
use_cached = true
101101
extensions = ["dracula-theme.theme-dracula", "ms-azuretools.vscode-docker"]
@@ -108,7 +108,7 @@ Just run code-server in the background, don't fetch it from GitHub:
108108
module "code-server" {
109109
count = data.coder_workspace.me.start_count
110110
source = "registry.coder.com/modules/code-server/coder"
111-
version = "1.0.26"
111+
version = "1.0.29"
112112
agent_id = coder_agent.example.id
113113
offline = true
114114
}

code-server/run.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ if [ "${AUTO_INSTALL_EXTENSIONS}" = true ]; then
104104

105105
if [ -f "$WORKSPACE_DIR/.vscode/extensions.json" ]; then
106106
printf "🧩 Installing extensions from %s/.vscode/extensions.json...\n" "$WORKSPACE_DIR"
107-
extensions=$(jq -r '.recommendations[]' "$WORKSPACE_DIR"/.vscode/extensions.json)
107+
# Use sed to remove single-line comments before parsing with jq
108+
extensions=$(sed 's|//.*||g' "$WORKSPACE_DIR"/.vscode/extensions.json | jq -r '.recommendations[]')
108109
for extension in $extensions; do
109110
if extension_installed "$extension"; then
110111
continue

vscode-web/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Automatically install [Visual Studio Code Server](https://code.visualstudio.com/
1515
module "vscode-web" {
1616
count = data.coder_workspace.me.start_count
1717
source = "registry.coder.com/modules/vscode-web/coder"
18-
version = "1.0.26"
18+
version = "1.0.29"
1919
agent_id = coder_agent.example.id
2020
accept_license = true
2121
}
@@ -31,7 +31,7 @@ module "vscode-web" {
3131
module "vscode-web" {
3232
count = data.coder_workspace.me.start_count
3333
source = "registry.coder.com/modules/vscode-web/coder"
34-
version = "1.0.26"
34+
version = "1.0.29"
3535
agent_id = coder_agent.example.id
3636
install_prefix = "/home/coder/.vscode-web"
3737
folder = "/home/coder"
@@ -45,7 +45,7 @@ module "vscode-web" {
4545
module "vscode-web" {
4646
count = data.coder_workspace.me.start_count
4747
source = "registry.coder.com/modules/vscode-web/coder"
48-
version = "1.0.26"
48+
version = "1.0.29"
4949
agent_id = coder_agent.example.id
5050
extensions = ["github.copilot", "ms-python.python", "ms-toolsai.jupyter"]
5151
accept_license = true
@@ -60,7 +60,7 @@ Configure VS Code's [settings.json](https://code.visualstudio.com/docs/getstarte
6060
module "vscode-web" {
6161
count = data.coder_workspace.me.start_count
6262
source = "registry.coder.com/modules/vscode-web/coder"
63-
version = "1.0.26"
63+
version = "1.0.29"
6464
agent_id = coder_agent.example.id
6565
extensions = ["dracula-theme.theme-dracula"]
6666
settings = {

vscode-web/run.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ if [ "${AUTO_INSTALL_EXTENSIONS}" = true ]; then
9292

9393
if [ -f "$WORKSPACE_DIR/.vscode/extensions.json" ]; then
9494
printf "🧩 Installing extensions from %s/.vscode/extensions.json...\n" "$WORKSPACE_DIR"
95-
extensions=$(jq -r '.recommendations[]' "$WORKSPACE_DIR"/.vscode/extensions.json)
95+
# Use sed to remove single-line comments before parsing with jq
96+
extensions=$(sed 's|//.*||g' "$WORKSPACE_DIR"/.vscode/extensions.json | jq -r '.recommendations[]')
9697
for extension in $extensions; do
9798
$VSCODE_WEB "$EXTENSION_ARG" --install-extension "$extension" --force
9899
done

0 commit comments

Comments
 (0)