Skip to content

Commit bf5e999

Browse files
authored
Use the node18 SDK Extension instead of 20 (#971)
That's what typescript requires
1 parent 2c0a46a commit bf5e999

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ SHELL:=/bin/bash -O globstar
44

55
setup:
66
flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
7-
flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//46 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08 org.freedesktop.Sdk.Extension.llvm18//23.08 org.freedesktop.Sdk.Extension.node20//23.08 org.freedesktop.Sdk.Extension.typescript//23.08
7+
flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//46 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08 org.freedesktop.Sdk.Extension.llvm18//23.08 org.freedesktop.Sdk.Extension.node18//23.08 org.freedesktop.Sdk.Extension.typescript//23.08
88
# flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
9-
# flatpak install --or-update --user --noninteractive flathub-beta org.freedesktop.Sdk.Extension.rust-stable//24.08beta org.freedesktop.Sdk.Extension.vala//24.08beta org.freedesktop.Sdk.Extension.llvm18//24.08beta org.freedesktop.Sdk.Extension.node20//24.08beta org.freedesktop.Sdk.Extension.typescript//24.08beta
9+
# flatpak install --or-update --user --noninteractive flathub-beta org.freedesktop.Sdk.Extension.rust-stable//24.08beta org.freedesktop.Sdk.Extension.vala//24.08beta org.freedesktop.Sdk.Extension.llvm18//24.08beta org.freedesktop.Sdk.Extension.node18//24.08beta org.freedesktop.Sdk.Extension.typescript//24.08beta
1010
# flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
1111
# flatpak install --or-update --user --noninteractive gnome-nightly org.gnome.Sdk//master
1212
git submodule update --init

build-aux/re.sonny.Workbench.Devel.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"org.freedesktop.Sdk.Extension.vala",
99
"org.freedesktop.Sdk.Extension.rust-stable",
1010
"org.freedesktop.Sdk.Extension.llvm18",
11-
"org.freedesktop.Sdk.Extension.node20",
11+
"org.freedesktop.Sdk.Extension.node18",
1212
"org.freedesktop.Sdk.Extension.typescript"
1313
],
1414
"build-options": {
15-
"append-path": "/usr/lib/sdk/vala/bin:/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/node20/bin:/usr/lib/sdk/typescript/bin",
15+
"append-path": "/usr/lib/sdk/vala/bin:/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/node18/bin:/usr/lib/sdk/typescript/bin",
1616
"append-ld-library-path": "/usr/lib/sdk/vala/lib"
1717
},
1818
"command": "workbench",

build-aux/re.sonny.Workbench.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"org.freedesktop.Sdk.Extension.vala",
99
"org.freedesktop.Sdk.Extension.rust-stable",
1010
"org.freedesktop.Sdk.Extension.llvm18",
11-
"org.freedesktop.Sdk.Extension.node20",
11+
"org.freedesktop.Sdk.Extension.node18",
1212
"org.freedesktop.Sdk.Extension.typescript"
1313
],
1414
"build-options": {
15-
"append-path": "/usr/lib/sdk/vala/bin:/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/node20/bin:/usr/lib/sdk/typescript/bin",
15+
"append-path": "/usr/lib/sdk/vala/bin:/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/node18/bin:/usr/lib/sdk/typescript/bin",
1616
"append-ld-library-path": "/usr/lib/sdk/vala/lib"
1717
},
1818
"command": "workbench",

src/Extensions/Extensions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@ export function isTypeScriptEnabled() {
7777
}
7878

7979
const llvm = "llvm18";
80-
const node = "node20";
80+
const node = "node18";
8181
const runtime = getFlatpakInfo().get_string("Application", "runtime");
8282
const freedesktop_version = runtime.endsWith("master") ? "24.08beta" : "23.08";

src/workbench

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export PKG_CONFIG_PATH=/app/lib/pkgconfig/:$PKG_CONFIG_PATH
88
source /usr/lib/sdk/rust-stable/enable.sh 2> /dev/null
99
source /usr/lib/sdk/vala/enable.sh 2> /dev/null
1010
source /usr/lib/sdk/llvm18/enable.sh 2> /dev/null
11-
source /usr/lib/sdk/node20/enable.sh 2> /dev/null
11+
source /usr/lib/sdk/node18/enable.sh 2> /dev/null
1212

1313
## enabling the typescript extension
1414
export PATH=$PATH:/usr/lib/sdk/typescript/bin

0 commit comments

Comments
 (0)