f

Author: sonnyp

.github/workflows/CI.yaml

@@ -23,7 +23,7 @@ jobs:
       - name: Install host dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install flatpak mutter flatpak-builder
+          sudo apt-get install flatpak mutter flatpak-builder foundry
 
       # Restore caches
       - name: Restore Flatpak dependencies

Makefile

@@ -67,13 +67,6 @@ ci: setup build test
 # flatpak override --user --share=network --socket=pulseaudio --device=input re.sonny.Workbench.Devel
 	foundry run -- workbench-cli ci $(ROOT)/demos/src/*
 
-# # Note that if you have Sdk extensions installed they will be used
-# # make sure to test without the sdk extensions installed
-# sandbox: setup
-# 	flatpak run org.flatpak.Builder --ccache --user --install --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
-# # flatpak remove --noninteractive org.freedesktop.Sdk.Extension.rust-stable//25.08 org.freedesktop.Sdk.Extension.vala//25.08 org.freedesktop.Sdk.Extension.llvm20//25.08
-# 	flatpak run --command="bash" re.sonny.Workbench.Devel
-
 flatpak:
 	flatpak run org.flatpak.Builder --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
 # This is what Flathub does - consider moving to lint

build-aux/fun

@@ -17,7 +17,7 @@ import format from "./format.js";
 import blueprint from "./blueprint.js";
 import css from "./css.js";
 import javascript from "./javascript.js";
-// import typescript from "./typescript.js";
+import typescript from "./typescript.js";
 import vala from "./vala.js";
 import python from "./python.js";
 import rust from "./rust.js";
@@ -110,7 +110,7 @@ function createLSPClients({ root_uri }) {
       "vala",
       "rust",
       "python",
-      // "typescript",
+      "typescript",
     ].map((id) => {
       const lang = languages.find((language) => language.id === id);
       const lspc = createLSPClient({
@@ -175,19 +175,19 @@ async function ci({ filenames }) {
       });
     }
 
-    // const file_typescript = demo_dir.get_child("main.ts");
-    // if (file_typescript.query_exists(null)) {
-    //   await typescript({
-    //     file: file_typescript,
-    //     lspc: lsp_clients.typescript,
-    //     blueprint_object_ids,
-    //     demo_dir,
-    //     application,
-    //     builder,
-    //     template,
-    //     window,
-    //   });
-    // }
+    const file_typescript = demo_dir.get_child("main.ts");
+    if (file_typescript.query_exists(null)) {
+      await typescript({
+        file: file_typescript,
+        lspc: lsp_clients.typescript,
+        blueprint_object_ids,
+        demo_dir,
+        application,
+        builder,
+        template,
+        window,
+      });
+    }
 
     const file_vala = demo_dir.get_child("main.vala");
     if (file_vala.query_exists(null)) {