Merge branch 'main' into diego-ivan/vala-meson

Author: sonnyp

.eslintrc.yaml

@@ -4,11 +4,10 @@ env:
 parser: "@babel/eslint-parser"
 parserOptions:
   sourceType: module
-  ecmaVersion: 2023
   requireConfigFile: false
   babelOptions:
     plugins:
-      - "@babel/plugin-syntax-import-assertions"
+      - "@babel/plugin-syntax-import-attributes"
 extends:
   - eslint:recommended
   - plugin:import/errors

.gitconfig

@@ -0,0 +1,4 @@
+[re.sonny.Commit]
+title-length-hint=72
+body-length-wrap=50
+auto-capitalize-title=true

.gitmodules

@@ -8,6 +8,6 @@
 	path = blueprint-compiler
 	url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
 [submodule "src/langs/typescript/template/gi-types"]
-	path = src/langs/typescript/gi-types
+	path = gi-types
 	url = https://gitlab.gnome.org/BrainBlasted/gi-typescript-definitions.git
 	branch = nightly

Makefile

@@ -4,9 +4,8 @@ SHELL:=/bin/bash -O globstar
 
 setup:
 	flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-	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
+	flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//47 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.vala//24.08 org.freedesktop.Sdk.Extension.llvm18//24.08 org.freedesktop.Sdk.Extension.node20//24.08 #org.freedesktop.Sdk.Extension.typescript//24.08
 # flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
-# 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
 # flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
 # flatpak install --or-update --user --noninteractive gnome-nightly org.gnome.Sdk//master
 	git submodule update --init
@@ -70,14 +69,14 @@ ci: setup build test
 # 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//23.08 org.freedesktop.Sdk.Extension.vala//23.08 org.freedesktop.Sdk.Extension.llvm18//23.08
+# flatpak remove --noninteractive org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.vala//24.08 org.freedesktop.Sdk.Extension.llvm18//24.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
 	flatpak run --env=G_DEBUG=fatal-criticals --command=appstream-util org.flatpak.Builder validate flatpak/files/share/appdata/re.sonny.Workbench.Devel.appdata.xml
-	flatpak run --command="desktop-file-validate" --filesystem=host:ro org.freedesktop.Sdk//23.08 flatpak/files/share/applications/re.sonny.Workbench.Devel.desktop
+	flatpak run --command="desktop-file-validate" --filesystem=host:ro org.freedesktop.Sdk//24.08 flatpak/files/share/applications/re.sonny.Workbench.Devel.desktop
 # appstreamcli validate --override=release-time-missing=info /path/to/your/app.metainfo.xml
 	flatpak run org.flatpak.Builder --run flatpak build-aux/re.sonny.Workbench.Devel.json bash
 

README.md

@@ -14,10 +14,11 @@ Among other things, Workbench comes with
 
 - Live GTK/CSS preview
 - Library of 100+ examples
+<!-- - JavaScript, TypeScript, Rust, Python and Vala support -->
 - JavaScript, Rust, Python and Vala support
 - Declarative user interface syntax
 - Autosave, sessions and projects
-- Code linter and formatter
+- Code diagnostics, completion and formatter
 - Terminal output
 
 ℹ️ Workbench is made possible by Flatpak. Only Flathub Workbench is supported.
@@ -32,8 +33,8 @@ Among other things, Workbench comes with
 | ---------- | --------- | ------ | ---------------- |
 | JavaScript | ✅        | ✅     | 99               |
 | Python     | ✅        | ✅     | 92               |
-| Vala       | ✅        | ✅     | 92               |
-| Rust       | ✅        | ✅     | 45               |
+| Vala       | ✅        | ✅     | 91               |
+| Rust       | ✅        | ✅     | 52               |
 | Blueprint  | ✅        | ✅     |                  |
 | CSS        | ✅        | ✅     |                  |
 

blueprint-compiler

@@ -95,6 +95,14 @@ const demos = [];
     demos.push(demo);
   }
 
+  demos.sort((a, b) => {
+    if (a.name === "Welcome") return -1;
+    if (b.name === "Welcome") return 1;
+    if (a.name === "Platform Tools") return -1;
+    if (b.name === "Platform Tools") return 1;
+    else return a.name.localeCompare(b.name);
+  });
+
   await Gio.File.new_for_path(pkgdatadir)
     .get_child("demos/index.json")
     .replace_contents_async(

build-aux/library.js

@@ -12,7 +12,11 @@
   "modules": [
     {
       "name": "jsonrpc-glib",
-      "config-opts": ["--buildtype=release", "-Denable_tests=false"],
+      "config-opts": [
+        "--libdir=/app/lib",
+        "--buildtype=release",
+        "-Denable_tests=false"
+      ],
       "buildsystem": "meson",
       "sources": [
         {

build-aux/modules/GTKCssLanguageServer.json

@@ -7,15 +7,15 @@
       "type": "file",
       "dest-filename": "biome",
       "only-arches": ["aarch64"],
-      "url": "https://github.com/biomejs/biome/releases/download/cli%2Fv1.8.3/biome-linux-arm64",
-      "sha256": "d134e89f6f4fc29d32c8101efb074969ac263ebdb0303e07039e3735002c6a2d"
+      "url": "https://github.com/biomejs/biome/releases/download/cli%2Fv1.9.2/biome-linux-arm64",
+      "sha256": "b4b88a36487e5b6c7b34fdc5351f4beb57ce7d88497f57fd3474c64413aabf78"
     },
     {
       "type": "file",
       "dest-filename": "biome",
       "only-arches": ["x86_64"],
-      "url": "https://github.com/biomejs/biome/releases/download/cli%2Fv1.8.3/biome-linux-x64",
-      "sha256": "5495f2f69edd94e9f26ed1adb9ed8023d7c143c3cc6f275f90abdded612217e4"
+      "url": "https://github.com/biomejs/biome/releases/download/cli%2Fv1.9.2/biome-linux-x64",
+      "sha256": "e17bb3d15fc192aa767ae7691302f4fd239e80ceaace4c3238857b9da0f43902"
     }
   ]
 }

build-aux/modules/biome.json

@@ -0,0 +1,12 @@
+{
+  "name": "gom",
+  "buildsystem": "meson",
+  "config-opts": ["--libdir=/app/lib", "-Denable-gtk-doc=false"],
+  "sources": [
+    {
+      "type": "archive",
+      "url": "https://download.gnome.org/sources/gom/0.5/gom-0.5.3.tar.xz",
+      "sha256": "069d0909fbdc6b4d27edf7a879366194e3ab508b03548bf5b89ff63546d20177"
+    }
+  ]
+}