diff --git a/.github/workflows/app-release.yml b/.github/workflows/app-release.yml index a0153d825..9954a0d59 100644 --- a/.github/workflows/app-release.yml +++ b/.github/workflows/app-release.yml @@ -44,7 +44,24 @@ jobs: - name: Setup rust cache uses: actions/cache@v4 with: - path: target/** + path: | + target/** + !target/*/release/bundle/*/*.dmg + !target/*/release/bundle/*/*.app.tar.gz + !target/*/release/bundle/*/*.app.tar.gz.sig + !target/release/bundle/*/*.dmg + !target/release/bundle/*/*.app.tar.gz + !target/release/bundle/*/*.app.tar.gz.sig + + !target/release/bundle/*/*.AppImage + !target/release/bundle/*/*.AppImage.tar.gz + !target/release/bundle/*/*.AppImage.tar.gz.sig + !target/release/bundle/*/*.deb + !target/release/bundle/*/*.rpm + + !target/release/bundle/*/*.msi + !target/release/bundle/*/*.msi.zip + !target/release/bundle/*/*.msi.zip.sig key: ${{ runner.os }}-rust-target-${{ hashFiles('**/Cargo.lock') }} restore-keys: | ${{ runner.os }}-rust-target- @@ -124,7 +141,7 @@ jobs: target/release/bundle/*/*.AppImage.tar.gz.sig target/release/bundle/*/*.deb target/release/bundle/*/*.rpm - + target/release/bundle/*/*.msi target/release/bundle/*/*.msi.zip target/release/bundle/*/*.msi.zip.sig diff --git a/Cargo.lock b/Cargo.lock index 3a549d8da..321453b4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -166,6 +166,30 @@ dependencies = [ "zstd-safe 7.2.1", ] +[[package]] +name = "async-executor" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock", + "blocking", + "futures-lite", +] + [[package]] name = "async-io" version = "2.3.4" @@ -5053,9 +5077,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "swift-rs" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bbdb58577b6301f8d17ae2561f32002a5bae056d444e0f69e611e504a276204" +checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7" dependencies = [ "base64 0.21.7", "serde", @@ -5227,9 +5251,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.0.0-rc.6" +version = "2.0.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "997e79de4c7a13b494a02c8104aa146a5d871ce83e5943e522bc5f8f35c8dab8" +checksum = "e8345ccc676ef16e26b61fc0f5340b4e770678b1e1f53f08c69ebdac5e56b422" dependencies = [ "anyhow", "bytes", @@ -5277,9 +5301,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-rc.6" +version = "2.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "032b966611a9324c2185fb9039ccfb938dbe00ec96fa1fe1596c9a1a98a6c87b" +checksum = "7d5ad5fcfaf02cf79aa6727f6c5df38567d8dce172b00b62690c6bc46c08b7ce" dependencies = [ "anyhow", "cargo_toml", @@ -5301,9 +5325,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-rc.6" +version = "2.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4138f3ee5fafa703c4504da58b6b94693655d0ddff8daf1e831b6dc04f4125" +checksum = "809ef6316726fc72593d296cf6f4e7461326e310c313d6a6c42b6e7f1e2671cf" dependencies = [ "base64 0.22.1", "brotli", @@ -5328,9 +5352,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-rc.5" +version = "2.0.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5995206394cd30411fc5c8ae195e498357f63e11ed960ea32b53512dcb2a5a5" +checksum = "1359e8861d210d25731f8b1bfbb4d111dd06406cf73c59659366ef450364d811" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5342,9 +5366,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-rc.6" +version = "2.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4658d4bfb0e9c8abc8fa9d3e45b4e5fcbfe1be850316d96cefa6a1d4ffc215be" +checksum = "a7dded420c86183f592d0fe925ef9447f41e26fa79f0bdfef8d3f17bfbcdbfb7" dependencies = [ "anyhow", "glob", @@ -5453,6 +5477,21 @@ dependencies = [ "tokio", ] +[[package]] +name = "tauri-plugin-single-instance" +version = "2.0.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d73c92c98d44d4daba0118d905f45243dfcd6eaac82216c3382a02d17cb74cf2" +dependencies = [ + "log", + "serde", + "serde_json", + "tauri", + "thiserror", + "windows-sys 0.59.0", + "zbus", +] + [[package]] name = "tauri-plugin-updater" version = "2.0.0-rc.1" @@ -5499,9 +5538,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-rc.6" +version = "2.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c0830152f7e56a6c43080ced8f1c30a785a237ca3cfaa559ddf52d4be633275" +checksum = "75c72b844f387bfc3341c355f3e16b8cbf4161848fa4e348670effb222cd3ba5" dependencies = [ "dpi", "gtk", @@ -5518,9 +5557,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-rc.6" +version = "2.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f185bd051f52bece7ef2b197e1f285dab57e3891faa8eacc991459792b077c1" +checksum = "73accf936a7cd01d1382de7850726fdf6c1f6ab3b01ccb7a0950cb852e332596" dependencies = [ "cocoa 0.26.0", "gtk", @@ -5542,9 +5581,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-rc.6" +version = "2.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04e02a821a99d544d93b44870799aaf75c8c0dda1853baf064261da3070b892" +checksum = "d53d9fe87e985b273696ae22ce2b9f099a8f1b44bc8fb127467bda5fcb3e4371" dependencies = [ "brotli", "cargo_metadata", @@ -5611,7 +5650,7 @@ dependencies = [ [[package]] name = "theseus" -version = "0.8.4" +version = "0.8.5" dependencies = [ "async-recursion", "async-tungstenite", @@ -5662,7 +5701,7 @@ dependencies = [ [[package]] name = "theseus_gui" -version = "0.8.4" +version = "0.8.5" dependencies = [ "chrono", "cocoa 0.25.0", @@ -5686,6 +5725,7 @@ dependencies = [ "tauri-plugin-dialog", "tauri-plugin-os", "tauri-plugin-shell", + "tauri-plugin-single-instance", "tauri-plugin-updater", "tauri-plugin-window-state", "theseus", @@ -6068,9 +6108,9 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b92252d649d771105448969f2b2dda4342ba48b77731b60d37c93665e26615b" +checksum = "131a65b2cef2081bc14dbcd414c906edbfa3bb5323dd7e748cc298614681196b" dependencies = [ "core-graphics 0.24.0", "crossbeam-channel", @@ -7114,9 +7154,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", "async-process", "async-recursion", + "async-task", "async-trait", + "blocking", "enumflags2", "event-listener", "futures-core", diff --git a/apps/app-frontend/index.html b/apps/app-frontend/index.html index d535376f7..891f575f2 100644 --- a/apps/app-frontend/index.html +++ b/apps/app-frontend/index.html @@ -3,7 +3,7 @@ - + Modrinth App diff --git a/apps/app-frontend/package.json b/apps/app-frontend/package.json index 232833726..5fbc35e92 100644 --- a/apps/app-frontend/package.json +++ b/apps/app-frontend/package.json @@ -1,7 +1,7 @@ { "name": "@modrinth/app-frontend", "private": true, - "version": "0.8.4", + "version": "0.8.5", "type": "module", "scripts": { "dev": "vite", @@ -18,6 +18,7 @@ "@tauri-apps/plugin-os": "^2.0.0-rc.0", "@tauri-apps/plugin-window-state": "^2.0.0-rc.0", "@tauri-apps/plugin-shell": "^2.0.0-rc.0", + "@tauri-apps/plugin-updater": "^2.0.0-rc.0", "@vintl/vintl": "^4.4.1", "dayjs": "^1.11.10", "floating-vue": "^5.2.2", diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue index 30976a333..f5cd667b8 100644 --- a/apps/app-frontend/src/App.vue +++ b/apps/app-frontend/src/App.vue @@ -1,7 +1,15 @@