Add Workbench CLI (#858)

Author: sonnyp

.github/workflows/CI.yaml

@@ -1,5 +1,7 @@
 name: CI
 
+# See also https://github.com/flatpak/flatpak-github-actions
+
 on:
   pull_request:
     branches: [main]
@@ -10,34 +12,37 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          submodules: "recursive"
+          submodules: recursive
 
       - uses: actions/setup-node@v3
         with:
           node-version: 18
           cache: "npm"
 
-      # See also https://github.com/flatpak/flatpak-github-actions
-      - uses: awalsh128/cache-apt-pkgs-action@latest
-        with:
-          packages: flatpak flatpak-builder
-          version: 1.0
+      - name: Install host dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install flatpak flatpak-builder mutter
 
       # Restore caches
       - name: Restore Flatpak dependencies
         uses: actions/cache/restore@v3
         with:
           path: ~/.local/share/flatpak
           key: ${{ runner.os }}-flatpak-dependencies-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-flatpak-dependencies-
+          restore-keys: |
+            ${{ runner.os }}-flatpak-dependencies-
       - name: Restore .flatpak-builder
         uses: actions/cache/restore@v3
         with:
           path: .flatpak-builder
           key: ${{ runner.os }}-flatpak-builder-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-flatpak-builder-
+          restore-keys: |
+            ${{ runner.os }}-flatpak-builder-
 
+      - run: mutter --wayland --no-x11 --headless --wayland-display=wayland-0 --virtual-monitor 1280x720 > /tmp/mutter.log 2>&1 &
       - run: make ci
+      - run: cat /tmp/mutter.log
 
       # Save caches
       - name: Save Flatpak dependencies

.gitignore

@@ -14,6 +14,7 @@ install
 .venv
 __pycache__
 *.pyc
+*.gresource
 
 # IDEs / editors
 .idea

Makefile

@@ -1,12 +1,19 @@
 SHELL:=/bin/bash -O globstar
-.PHONY: setup lint unit test ci sandbox flatpak
-.DEFAULT_GOAL := ci
+.PHONY: setup build lint unit test ci sandbox flatpak
+.DEFAULT_GOAL := test
 
 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//45 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08 org.freedesktop.Sdk.Extension.llvm16//23.08
 	npm install
-	flatpak-builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean --stop-at=Workbench flatpak build-aux/re.sonny.Workbench.Devel.json
+	make build
+
+build:
+	flatpak-builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
+
+cli:
+	 ./troll/gjspack/bin/gjspack src/cli/main.js --appid=re.sonny.Workbench.cli --prefix=/re/sonny/Workbench --resource-root=src/ --no-executable flatpak/files/share/re.sonny.Workbench.cli/
+	cp src/cli/bin.js flatpak/files/bin/workbench-cli
 
 lint:
 # JavaScript
@@ -17,6 +24,11 @@ lint:
 	./build-aux/fun black --check src/**/*.py
 # Blueprint
 	./build-aux/fun blueprint-compiler format src/**/*.blp
+	./build-aux/fun workbench-cli check blueprint src/**/*.blp
+# Vala
+# ./build-aux/fun workbench-cli check vala src/**/*.vala
+# CSS
+	./build-aux/fun workbench-cli check css src/**/*.css
 # Flatpak manifests
 	flatpak run --user --command=flatpak-builder-lint org.flatpak.Builder manifest --exceptions build-aux/re.sonny.Workbench.json
 	flatpak run --user --command=flatpak-builder-lint org.flatpak.Builder manifest --exceptions build-aux/re.sonny.Workbench.Devel.json
@@ -35,9 +47,10 @@ unit:
 # flatpak run --env=G_DEBUG=fatal-criticals --command=appstream-util org.flatpak.Builder validate data/app.metainfo.xml
 
 test: unit lint
+	./build-aux/fun workbench-cli ci demos/demos/Welcome
 
-ci: setup unit lint
-	flatpak-builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
+ci: setup test
+	./build-aux/fun workbench-cli ci demos/demos/**
 
 # Note that if you have Sdk extensions installed they will be used
 # make sure to test without the sdk extensions installed

build-aux/fun

@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
 
 # fun stands for Flatpak Run
-flatpak-builder --run flatpak build-aux/re.sonny.Workbench.Devel.json "$@"
+flatpak-builder --run $(dirname $0)/../flatpak $(dirname $0)/re.sonny.Workbench.Devel.json "$@"
+# flatpak-builder --env=G_MESSAGES_DEBUG=workbench-cli --run flatpak build-aux/re.sonny.Workbench.Devel.json "$@"

build-aux/modules/biome.json

@@ -7,15 +7,15 @@
       "type": "file",
       "dest-filename": "biome",
       "only-arches": ["aarch64"],
-      "url": "https://github.com/biomejs/biome/releases/download/cli%2Fv1.4.0/biome-linux-arm64",
-      "sha256": "9c944cd932476a5e6264f455ab3979a8ed870a72adffdebc3dbe9ef4e4240926"
+      "url": "https://github.com/biomejs/biome/releases/download/cli%2Fv1.4.1/biome-linux-arm64",
+      "sha256": "8f2712e303877594a9401ce392724f8b8c94d533b6f5902d9cbdd149e4fbd794"
     },
     {
       "type": "file",
       "dest-filename": "biome",
       "only-arches": ["x86_64"],
-      "url": "https://github.com/biomejs/biome/releases/download/cli%2Fv1.4.0/biome-linux-x64",
-      "sha256": "9d14e2a3ebf5350813d7d2b14b8b0b92d3e9cfa384bfbdc6a314b46cf3c8cc6c"
+      "url": "https://github.com/biomejs/biome/releases/download/cli%2Fv1.4.1/biome-linux-x64",
+      "sha256": "2995159aebcb7ddd116b098a1a0a459d1a8681aaa878623fb5390cc0dd0e414a"
     }
   ]
 }

data/app.metainfo.xml

@@ -59,7 +59,7 @@
           <li>Add WebP image format support</li>
           <li>Use Biome instead of prettier for JavaScript formatter</li>
           <li>Use GTKCssLanguageServer instead of prettier for CSS formatter</li>
-          <li>Update Biome to 1.4.0</li>
+          <li>Update Biome to 1.4.1</li>
           <li>Update gst-plugin-gtk4 to 0.11.2</li>
           <li>Update libshumate 1.1.2</li>
           <li>Library: Add "Context Menu" entry</li>

package.json

@@ -24,10 +24,12 @@
     "prepare": "husky install"
   },
   "lint-staged": {
-    "*.{css,json,md,yaml,yml}": "prettier --write",
+    "*.{json,md,yaml,yml}": "prettier --write",
     "*.{js,cjs,mjs}": "eslint --fix",
+    "*.css": "./build-aux/fun workbench-cli format",
     "*.py": "./build-aux/fun black",
     "*.rs": "./build-aux/fun rustfmt --edition 2021",
-    "*.blp": "./build-aux/fun blueprint-compiler format --fix"
+    "*.blp": "./build-aux/fun workbench-cli format",
+    "*.vala": "./build-aux/fun workbench-cli format vala"
   }
 }

src/Previewer/crasher.vala

@@ -1,14 +1,14 @@
 public void main (string[] args) {
     Adw.init ();
 
-    var builder = new Gtk.Builder();
+    var builder = new Gtk.Builder ();
     var output = new Gtk.Window ();
 
     try {
-      builder.add_from_string(args[1], -1);
-      var object = builder.get_object(args[2]) as Gtk.Widget;
-      output.set_child(object);
+        builder.add_from_string (args[1], -1);
+        var object = builder.get_object (args[2]) as Gtk.Widget;
+        output.set_child (object);
     } catch (Error e) {
-      GLib.error(e.message);
+        GLib.error (e.message);
     }
 }