Add make stable and make devel commands

workbenchdev · Jul 3, 2024 · bdf7bed · bdf7bed
1 parent 78dbbfb
commit bdf7bed
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ We provide a couple of tools to make the development process pleasant.
 # sudo dnf install flatpak flatpak-builder nodejs make gcc gcc-c++
 
 cd Workbench
-make setup
+make
 ```
 
 Before submitting a PR, we recommend running tests locally with

diff --git a/Makefile b/Makefile
@@ -1,19 +1,27 @@
 SHELL:=/bin/bash -O globstar
 .PHONY: setup build lint unit test ci sandbox flatpak
-.DEFAULT_GOAL := test
+.DEFAULT_GOAL := setup
 
 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.llvm16//23.08 org.freedesktop.Sdk.Extension.node18//23.08 org.freedesktop.Sdk.Extension.typescript//23.08
-# flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
+	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.node18//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
-	npm install
-	make build
+	git submodule update --init
+	npm install --no-fund
+	@echo " ✅ You can use make stable or make devel to build Workbench"
 
-build:
+stable:
+	flatpak-builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.json
+
+devel:
 	flatpak-builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
 
+build: devel
+
 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

diff --git a/src/Library/Library.js b/src/Library/Library.js
@@ -58,9 +58,9 @@ export default function Library({ application }) {
     const search_term = search_entry.get_text().toLowerCase();
     const visible_categories = new Set();
 
-    widgets_map.forEach(({ widget, category }, demo_name) => {
+    widgets_map.forEach(({ entry_row, category }, demo_name) => {
       const is_match = demo_name.toLowerCase().includes(search_term);
-      widget.visible = is_match;
+      entry_row.visible = is_match;
       if (is_match) visible_categories.add(category);
     });