tauri: migrating to V2

.github/workflows/build.yaml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-20.04, windows-latest, macos-13, macos-15]
+        platform: [ubuntu-22.04, windows-latest, macos-13, macos-15]
     runs-on: ${{ matrix.platform }}
 
     steps:
@@ -40,10 +40,10 @@ jobs:
           workspaces: src-tauri
 
       - name: Install Linux Dependencies
-        if: matrix.platform == 'ubuntu-20.04'
+        if: matrix.platform == 'ubuntu-22.04'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev
 
       - name: Install NPM Dependencies
         run: |
@@ -55,6 +55,6 @@ jobs:
         timeout-minutes: 30
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
         with:
           args: "--verbose"

.github/workflows/release.yaml

@@ -55,9 +55,9 @@ jobs:
           cargo generate-lockfile
           cd ..
           echo "new_tag=v${NEW_VERSION}" >> $GITHUB_OUTPUT
-          echo -e "---\nVersion: $NEW_VERSION\nDate: $(date +'%Y-%m-%d')\n---" > metadata/news.yaml
-          appstreamcli news-to-metainfo metadata/news.yaml metadata/dev.opengoal.OpenGOAL.appdata.xml
-          rm metadata/news.yaml
+          echo -e "---\nVersion: $NEW_VERSION\nDate: $(date +'%Y-%m-%d')\n---" > resources/metadata/news.yaml
+          appstreamcli news-to-metainfo resources/metadata/news.yaml resources/metadata/dev.opengoal.OpenGOAL.appdata.xml
+          rm resources/metadata/news.yaml
 
       - name: Commit Version Bump
         uses: EndBug/add-and-commit@v9
@@ -112,7 +112,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-20.04, windows-latest, macos-13, macos-15]
+        platform: [ubuntu-22.04, windows-latest, macos-13, macos-15]
     runs-on: ${{ matrix.platform }}
     steps:
       # NOTE - there is technically a race condition here if multiple releases go out
@@ -140,7 +140,7 @@ jobs:
           workspaces: src-tauri
 
       - name: Install Linux Dependencies
-        if: matrix.platform == 'ubuntu-20.04'
+        if: matrix.platform == 'ubuntu-22.04'
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
@@ -156,7 +156,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_KEY_PASSWORD }}
         with:
           args: "--verbose --config ./.tauri/release-config.json"
           releaseId: ${{needs.create-release.outputs.release_id}}

.gitignore

@@ -7,6 +7,8 @@ yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
 
+.flatpak-builder/
+build-dir/
 node_modules
 dist
 dist-ssr

.tauri/release-config.json

@@ -1,11 +1,14 @@
 {
-  "tauri": {
+  "bundle": {
+    "createUpdaterArtifacts": "v1Compatible"
+  },
+  "plugins": {
     "updater": {
       "active": true,
+      "dialog": false,
       "endpoints": [
         "https://raw.githubusercontent.com/open-goal/launcher/main/.tauri/latest-release-v2.json"
       ],
-      "dialog": false,
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDM5Q0RCMDMyRkYwQTQxOTIKUldTU1FRci9NckROT1FERSs0UjhTNzRsTHU0cjZGdTZzN1FTWGF4aldYdGFlTG56eWc5Uko4YzkK"
     }
   }

package.json

@@ -21,47 +21,51 @@
     "update-rust-bindings": "cd src-tauri && cargo test"
   },
   "devDependencies": {
-    "@fullhuman/postcss-purgecss": "^6.0.0",
-    "@iconify-json/ic": "^1.2.1",
-    "@iconify-json/mdi": "^1.2.1",
-    "@octokit/plugin-retry": "^7.1.2",
-    "@octokit/plugin-throttling": "^9.3.2",
-    "@octokit/rest": "^21.0.2",
+    "@iconify-json/ic": "^1.2.2",
+    "@iconify-json/mdi": "^1.2.3",
+    "@octokit/plugin-retry": "^7.1.4",
+    "@octokit/plugin-throttling": "^9.4.0",
+    "@octokit/rest": "^21.1.1",
     "@popperjs/core": "^2.11.7",
-    "@sveltejs/vite-plugin-svelte": "^3.1.2",
-    "@tauri-apps/cli": "^1.6.2",
-    "@testing-library/svelte": "^5.2.3",
+    "@sveltejs/vite-plugin-svelte": "^5.0.3",
+    "@tauri-apps/cli": "^2.4.0",
+    "@testing-library/svelte": "^5.2.7",
     "@tsconfig/svelte": "^5.0.4",
-    "@vitest/coverage-v8": "^2.1.3",
+    "@vitest/coverage-v8": "^3.0.8",
     "ansi-to-span": "^0.0.1",
-    "autoprefixer": "^10.4.20",
-    "classnames": "^2.5.1",
+    "autoprefixer": "^10.4.21",
     "escape-html": "^1.0.3",
-    "execa": "^9.4.0",
-    "flowbite": "^2.5.2",
-    "flowbite-svelte": "0.47.0",
-    "flowbite-svelte-icons": "1.6.2",
-    "jsdom": "^25.0.1",
-    "postcss": "^8.4.47",
+    "flowbite": "^3.1.2",
+    "flowbite-svelte": "0.48.4",
+    "flowbite-svelte-icons": "2.0.2",
+    "jsdom": "^26.0.0",
+    "postcss": "^8.5.3",
     "postcss-load-config": "^6.0.1",
-    "prettier": "^3.3.3",
-    "prettier-plugin-svelte": "^3.2.7",
-    "svelte": "^4.2.19",
-    "svelte-i18n": "^4.0.0",
+    "prettier": "^3.5.3",
+    "prettier-plugin-svelte": "^3.3.3",
+    "svelte": "^5.22.6",
+    "svelte-i18n": "^4.0.1",
+    "svelte-navigator": "^3.2.2",
     "svelte-preprocess": "^6.0.3",
     "tailwindcss": "^3.4.13",
-    "typescript": "^5.6.3",
-    "unplugin-icons": "^0.19.3",
-    "vite": "^5.4.9",
-    "vitest": "^2.1.3"
+    "typescript": "^5.8.2",
+    "unplugin-icons": "^22.1.0",
+    "vite": "^6.2.1",
+    "vitest": "^3.0.8"
   },
   "dependencies": {
-    "@tauri-apps/api": "^1.6.0",
-    "@types/semver": "^7.5.8",
-    "country-flag-emoji-polyfill": "^0.1.8",
-    "http-server": "^14.1.1",
-    "semver": "^7.6.3",
-    "svelte-navigator": "^3.2.2"
+    "@tauri-apps/api": "^2.2.0",
+    "@tauri-apps/plugin-clipboard-manager": "^2.0.0",
+    "@tauri-apps/plugin-dialog": "~2",
+    "@tauri-apps/plugin-fs": "~2",
+    "@tauri-apps/plugin-global-shortcut": "~2",
+    "@tauri-apps/plugin-http": "~2",
+    "@tauri-apps/plugin-notification": "~2",
+    "@tauri-apps/plugin-os": "~2",
+    "@tauri-apps/plugin-process": "~2",
+    "@tauri-apps/plugin-shell": "~2",
+    "@tauri-apps/plugin-updater": "~2",
+    "country-flag-emoji-polyfill": "^0.1.8"
   },
   "packageManager": "[email protected]"
 }

postcss.config.js

@@ -0,0 +1,6 @@
+export default {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+};

resources/dev.opengoal.OpenGOAL.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Categories=Development;
+Exec=OpenGOAL-Launcher
+Icon=OpenGOAL-Launcher
+Name=OpenGOAL-Launcher
+Terminal=false
+Type=Application

resources/metadata/dev.opengoal.OpenGOAL.appdata.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop-application">
+  <id>dev.opengoal.OpenGOAL</id>
+  <name>OpenGOAL</name>
+  <summary>Launcher for the OpenGOAL Project to simplify usage and installation</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>ISC License</project_license>
+  <developer_name>OpenGOAL Contributors</developer_name>
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+    <control>gamepad</control>
+  </supports>
+  <launchable type="desktop-id">dev.opengoal.OpenGOAL.desktop</launchable>
+  <url type="homepage">https://opengoal.dev/</url>
+  <url type="faq">https://opengoal.dev/docs/faq</url>
+  <url type="translate">https://crowdin.com/project/opengoal-launcher</url>
+  <url type="contact">https://discord.gg/VZbXMHXzWv</url>
+  <screenshots>
+    <screenshot>
+      <caption>Play the Jak and Daxter PlayStation 2 classics natively on your computer.</caption>
+      <image type="source">https://opengoal.dev/assets/images/launcher-install-a-33691bfe513b67a2b35bf13ab298a39e.png</image>
+    </screenshot>
+    <screenshot>
+      <caption>If at any point during the installation something goes wrong and you are going to ask for help or report an issue. Download the Support Package in order to easily give the person helping you everything they could ask for all at once.</caption>
+      <image type="source">https://opengoal.dev/assets/images/launcher-support-package-6e7fb3e810098907fb6bc7a83b6f91dc.png</image>
+    </screenshot>
+  </screenshots>
+  <releases>
+    <release type="stable" version="2.5.1" date="2024-10-03T00:00:00Z"/>
+  </releases>
+  <content_rating type="oars-1.1"/>
+</component>

src-tauri/.gitignore

@@ -4,3 +4,4 @@
 WixTools
 data/
 bin
+/gen