From a1c629581060e9a9c7f131b01b94859b65c13b56 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Tue, 10 Feb 2026 23:19:23 -0800
Subject: [PATCH] Clean up Flatpak manifest for v2026.2.0

- Update tag to v2026.2.0
- Use SKIP_WASM_BUILD env var instead of build-time package.json patch
- Install metainfo from git source (remove temporary type: file source)
- Fix fix-lockfile.mjs to skip workspace packages
- CI: commit metainfo releases back to app repo, bump permissions to write
---
 .github/workflows/flathub.yml | 11 ++++++++++-
 flatpak/app.yaak.Yaak.yml     | 18 ++++--------------
 flatpak/fix-lockfile.mjs      |  2 ++
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/flathub.yml b/.github/workflows/flathub.yml
index 5ecad626..30005891 100644
--- a/.github/workflows/flathub.yml
+++ b/.github/workflows/flathub.yml
@@ -4,7 +4,7 @@ on:
     types: [published]
 
 permissions:
-  contents: read
+  contents: write
 
 jobs:
   update-flathub:
@@ -34,6 +34,15 @@ jobs:
       - name: Run update-manifest.sh
         run: bash flatpak/update-manifest.sh "${{ github.event.release.tag_name }}"
 
+      - name: Commit metainfo update to app repo
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add flatpak/app.yaak.Yaak.metainfo.xml
+          git diff --cached --quiet && echo "No metainfo changes" && exit 0
+          git commit -m "Add ${{ github.event.release.tag_name }} to metainfo releases"
+          git push origin HEAD:main
+
       - name: Checkout Flathub repo
         uses: actions/checkout@v4
         with:
diff --git a/flatpak/app.yaak.Yaak.yml b/flatpak/app.yaak.Yaak.yml
index d5f6119c..81c1f68c 100644
--- a/flatpak/app.yaak.Yaak.yml
+++ b/flatpak/app.yaak.Yaak.yml
@@ -50,6 +50,7 @@ modules:
         npm_config_offline: "true"
         npm_config_nodedir: /usr/lib/sdk/node22
         NODE_OPTIONS: --max_old_space_size=4096
+        SKIP_WASM_BUILD: "1"
 
     build-commands:
       # Vendor Node.js binary (sidecar for plugin runtime)
@@ -80,14 +81,6 @@ modules:
       # Pre-fetch Cargo dependencies offline
       - cargo --offline fetch --manifest-path Cargo.toml
 
-      # Skip wasm-pack build (pre-built wasm is checked into the repo)
-      - >-
-        node -e "const fs=require('fs');
-        const p='crates/yaak-templates/package.json';
-        const d=JSON.parse(fs.readFileSync(p));
-        d.scripts['build:pack']='echo Skipping wasm-pack build';
-        fs.writeFileSync(p,JSON.stringify(d,null,2));"
-
       # Build all workspace packages (frontend, plugins, wasm, plugin-runtime)
       - npm run build
 
@@ -113,15 +106,15 @@ modules:
       - install -Dm644 yaak.desktop /app/share/applications/yaak.desktop
 
       # Install metainfo and license
-      - install -Dm644 app.yaak.Yaak.metainfo.xml /app/share/metainfo/app.yaak.Yaak.metainfo.xml
+      - install -Dm644 flatpak/app.yaak.Yaak.metainfo.xml /app/share/metainfo/app.yaak.Yaak.metainfo.xml
       - install -Dm644 LICENSE /app/share/licenses/app.yaak.Yaak/LICENSE
 
     sources:
       # Application source
       - type: git
         url: https://github.com/mountain-loop/yaak.git
-        tag: v2026.1.2
-        commit: bd7e840a5700ddefb5ef1f22771cc5555000f777
+        tag: v2026.2.0
+        commit: 76ee3fa61bebe8a5cc57cb286e8210155f516b75
         x-checker-data:
           type: git
           tag-pattern: ^v(\d+\.\d+\.\d+)$
@@ -170,6 +163,3 @@ modules:
       - type: file
         path: ../LICENSE
 
-      # Metainfo file (not in tagged source yet)
-      - type: file
-        path: app.yaak.Yaak.metainfo.xml
diff --git a/flatpak/fix-lockfile.mjs b/flatpak/fix-lockfile.mjs
index aa3826de..e8adc89c 100644
--- a/flatpak/fix-lockfile.mjs
+++ b/flatpak/fix-lockfile.mjs
@@ -47,7 +47,9 @@ let changesMade = false;
 async function fillAllResolved(packages) {
   for (const packagePath in packages) {
     if (packagePath === "") continue;
+    if (!packagePath.includes("node_modules/")) continue;
     const p = packages[packagePath];
+    if (p.link) continue;
     if (!p.inBundle && !p.bundled && (!p.resolved || !p.integrity)) {
       const packageName =
         p.name ||