Fix app builds not launching (#3035)

* Fix app builds not launching * Revert tauri version change
modrinth · Dec 18, 2024 · c1b1e67 · c1b1e67
1 parent b7f514c
commit c1b1e67
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 112 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,5 +20,5 @@ strip = true # Remove debug symbols
 [profile.dev.package.sqlx-macros]
 opt-level = 3
 
-[patch.crates-io]
-tauri = { git = "https://github.com/modrinth/tauri", rev = "9c36dd3" }
+# [patch.crates-io]
+# tauri = { git = "https://github.com/modrinth/tauri", rev = "67911d5" }
diff --git a/apps/app-frontend/package.json b/apps/app-frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@modrinth/app-frontend",
   "private": true,
-  "version": "0.9.0",
+  "version": "0.9.0-1",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/apps/app/Cargo.toml b/apps/app/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "theseus_gui"
-version = "0.9.0"
+version = "0.9.0-1"
 description = "The Modrinth App is a desktop application for managing your Minecraft mods"
 license = "GPL-3.0-only"
 repository = "https://github.com/modrinth/code/apps/app/"
@@ -17,7 +17,8 @@ serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_with = "3.0.0"
 
-tauri = { git = "https://github.com/modrinth/tauri", rev = "9c36dd3", features = ["devtools", "macos-private-api", "protocol-asset", "unstable"] }
+tauri = { version = "2.1.1",  features = ["devtools", "macos-private-api", "protocol-asset", "unstable"] }
+# tauri = { git = "https://github.com/modrinth/tauri", rev = "67911d5", features = ["devtools", "macos-private-api", "protocol-asset", "unstable"] }
 tauri-plugin-window-state = "2.2.0"
 tauri-plugin-deep-link = "2.2.0"
 tauri-plugin-os = "2.2.0"

diff --git a/apps/app/src/api/ads.rs b/apps/app/src/api/ads.rs
@@ -103,7 +103,8 @@ pub async fn init_ads_window<R: Runtime>(
                         AD_LINK.parse().unwrap(),
                     ),
                 )
-                    .initialization_script_for_main_only(LINK_SCRIPT, false)
+                    .initialization_script(LINK_SCRIPT)
+                    // .initialization_script_for_main_only(LINK_SCRIPT, false)
                     .user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36")
                     .zoom_hotkeys_enabled(false)
                     .transparent(true),

diff --git a/apps/app/tauri.conf.json b/apps/app/tauri.conf.json
@@ -44,7 +44,7 @@
     ]
   },
   "productName": "Modrinth App",
-  "version": "0.8.9",
+  "version": "0.9.0-1",
   "mainBinaryName": "Modrinth App",
   "identifier": "ModrinthApp",
   "plugins": {

diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "theseus"
-version = "0.9.0"
+version = "0.9.0-1"
 authors = ["Jai A <[email protected]>"]
 edition = "2021"
 

diff --git a/packages/ui/src/components/content/ContentListPanel.vue b/packages/ui/src/components/content/ContentListPanel.vue
@@ -79,11 +79,11 @@ function setSelected(value: boolean) {
     </div>
     <div class="bg-bg-raised rounded-xl">
       <VirtualScroller :items="items" :default-size="64" style="height: 100%">
-        <template #item="{ ref }">
+        <template #item="{ ref, index }">
           <ContentListItem
             v-model="selectionStates[ref.filename]"
             :item="ref"
-            :last="ref === items.length - 1"
+            :last="index === items.length - 1"
             class="mb-2"
             @update:model-value="updateSelection"
           >