Bump tauri version

.github/workflows/app-release.yml

@@ -42,7 +42,7 @@ jobs:
           components: rustfmt, clippy
 
       - name: Install Tauri CLI
-        run: cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev 5b26cbff93fe4697338e56dfc7299ac8864b3445
+        run: cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev 5e2942876c2266594ed1db516c1d9975c873c36a
 
       - name: Setup rust cache
         uses: actions/cache@v4

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
           sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
       - name: Install Tauri CLI
-        run: cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev 5b26cbff93fe4697338e56dfc7299ac8864b3445
+        run: cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev 5e2942876c2266594ed1db516c1d9975c873c36a
 
       - name: Setup Node.JS environment
         uses: actions/setup-node@v4

Cargo.toml

@@ -19,4 +19,4 @@ opt-level = 3
 
 [patch.crates-io]
 wry = { git = "https://github.com/modrinth/wry", rev = "5840108" }
-tauri = { git = "https://github.com/modrinth/tauri", rev = "5b26cbf" }
+tauri = { git = "https://github.com/modrinth/tauri", rev = "5e29428" }

apps/app/Cargo.toml

@@ -8,15 +8,15 @@ edition = "2021"
 build = "build.rs"
 
 [build-dependencies]
-tauri-build = { git = "https://github.com/modrinth/tauri", features = ["codegen"], rev = "5b26cbf" }
+tauri-build = { git = "https://github.com/modrinth/tauri", features = ["codegen"], rev = "5e29428" }
 
 [dependencies]
 theseus = { path = "../../packages/app-lib", features = ["tauri"] }
 
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 
-tauri = { git = "https://github.com/modrinth/tauri", features = ["devtools", "macos-private-api", "protocol-asset", "unstable"], rev = "5b26cbf" }
+tauri = { git = "https://github.com/modrinth/tauri", features = ["devtools", "macos-private-api", "protocol-asset", "unstable"], rev = "5e29428" }
 tauri-plugin-window-state = "2.0.0-rc"
 tauri-plugin-deep-link = "2.0.0-rc"
 tauri-plugin-os = "2.0.0-rc"

apps/app/README.md

@@ -22,7 +22,7 @@ Before you begin, ensure you have the following installed on your machine:
 Follow these steps to set up your development environment:
 
 ```bash
-cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev 5b26cbff93fe4697338e56dfc7299ac8864b3445
+cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev 5e2942876c2266594ed1db516c1d9975c873c36a
 pnpm install
 pnpm app:dev
 ```

packages/app-lib/Cargo.toml

@@ -36,7 +36,7 @@ tracing-error = "0.2.0"
 
 paste = { version = "1.0" }
 
-tauri = { git = "https://github.com/modrinth/tauri", rev = "5b26cbf", optional = true }
+tauri = { git = "https://github.com/modrinth/tauri", rev = "5e29428", optional = true }
 indicatif = { version = "0.17.3", optional = true }
 
 async-tungstenite = { version = "0.27.0", features = ["tokio-runtime", "tokio-rustls-webpki-roots"] }

packages/app-lib/src/api/profile/mod.rs

@@ -40,15 +40,10 @@ pub mod update;
 #[tracing::instrument]
 pub async fn remove(path: &str) -> crate::Result<()> {
     let state = State::get().await?;
-
-    let mut transaction = state.pool.begin().await?;
-
-    Profile::remove(path, &mut transaction).await?;
+    Profile::remove(path, &state.pool).await?;
 
     emit_profile(path, ProfilePayloadType::Removed).await?;
 
-    transaction.commit().await?;
-
     Ok(())
 }
 

packages/app-lib/src/state/cache.rs

@@ -738,8 +738,7 @@ impl CachedEntry {
                             .unwrap_or(false)
                 });
 
-                if let Some(data) = parsed_data
-                {
+                if let Some(data) = parsed_data {
                     return_vals.push(Self {
                         id: row.id,
                         alias: row.alias,

packages/app-lib/src/state/profiles.rs

@@ -501,23 +501,23 @@ impl Profile {
 
     pub async fn remove(
         profile_path: &str,
-        transaction: &mut sqlx::Transaction<'_, sqlx::Sqlite>,
+        pool: &SqlitePool,
     ) -> crate::Result<()> {
-        if let Ok(path) = crate::api::profile::get_full_path(profile_path).await
-        {
-            io::remove_dir_all(&path).await?;
-        }
-
         sqlx::query!(
             "
             DELETE FROM profiles
             WHERE path = $1
             ",
             profile_path
         )
-        .execute(&mut **transaction)
+        .execute(pool)
         .await?;
 
+        if let Ok(path) = crate::api::profile::get_full_path(profile_path).await
+        {
+            io::remove_dir_all(&path).await?;
+        }
+
         Ok(())
     }
 

packages/app-lib/src/util/platform.rs

@@ -85,8 +85,8 @@ pub fn os_rule(
         if minecraft_updated
             && (name != &Os::LinuxArm64 || name != &Os::LinuxArm32)
         {
-            rule_match &=
-                &Os::native() == &name.get_os() || &Os::native_arch(java_arch) == name;
+            rule_match &= &Os::native() == &name.get_os()
+                || &Os::native_arch(java_arch) == name;
         } else {
             rule_match &= &Os::native_arch(java_arch) == name;
         }