From 6dd7cf7f7a4471539a391d90c56058efe5502041 Mon Sep 17 00:00:00 2001 From: Pauline Date: Fri, 2 Aug 2024 05:29:41 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20bump=20deps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.toml | 51 ++++---- apps/desktop/Cargo.toml | 1 + apps/desktop/src/api/mod.rs | 2 +- apps/desktop/src/api/statics.rs | 14 +-- apps/desktop/src/ext/updater.rs | 2 +- apps/desktop/src/lib.rs | 37 +++--- apps/desktop/src/main.rs | 1 + apps/testing/src/main.rs | 4 +- package.json | 2 +- packages/core/Cargo.toml | 3 - packages/core/src/api/java.rs | 4 +- packages/core/src/api/proxy/mod.rs | 2 +- packages/core/src/api/proxy/send.rs | 3 + packages/core/src/store/processor.rs | 14 +-- pnpm-lock.yaml | 172 +++++++++++++-------------- rust-toolchain.toml | 2 +- 16 files changed, 157 insertions(+), 157 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bff920a0..0a96d317 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,48 +25,52 @@ onelauncher = { path = "./packages/core" } onelauncher_macros = { path = "./packages/macros" } # tauri uses latest crates.io beta channel (temporarily can use v2 and main branches if necessary) -tauri = { version = "=2.0.0-beta.23", features = [ +tauri = { version = "=2.0.0-beta.25", features = [ "rustls-tls", "tracing", "specta", "uuid", "protocol-asset" ] } -tauri-utils = { version = "=2.0.0-beta.18" } -tauri-build = { version = "=2.0.0-beta.18" } -tauri-codegen = { version = "=2.0.0-beta.18" } -tauri-macros = { version = "=2.0.0-beta.18" } -tauri-plugin = { version = "=2.0.0-beta.18" } -tauri-runtime = { version = "=2.0.0-beta.19" } +tauri-utils = { version = "=2.0.0-beta.19" } +tauri-build = { version = "=2.0.0-beta.19" } +tauri-codegen = { version = "=2.0.0-beta.19" } +tauri-macros = { version = "=2.0.0-beta.19" } +tauri-plugin = { version = "=2.0.0-beta.19" } +tauri-runtime = { version = "=2.0.0-beta.21" } -tauri-plugin-authenticator = { version = "2.0.0-beta" } -tauri-plugin-shell = { version = "2.0.0-beta" } -tauri-plugin-window-state = { version = "2.0.0-beta" } -tauri-plugin-single-instance = { version = "2.0.0-beta" } -tauri-plugin-clipboard-manager = { version = "2.1.0-beta" } -tauri-plugin-updater = { version = "2.0.0-beta", features = [ "rustls-tls" ] } -tauri-plugin-dialog = { version = "2.0.0-beta" } +tauri-plugin-authenticator = { version = "=2.0.0-beta.10" } +tauri-plugin-shell = { version = "=2.0.0-beta.10" } +tauri-plugin-window-state = { version = "=2.0.0-beta.12" } +tauri-plugin-single-instance = { version = "=2.0.0-beta.12" } +tauri-plugin-clipboard-manager = { version = "=2.1.0-beta.7" } +tauri-plugin-updater = { version = "=2.0.0-beta.12", features = [ "rustls-tls" ] } +tauri-plugin-dialog = { version = "=2.0.0-beta.12" } # rspc is updated on the v0.x branch rspc = { version = "=0.2.0", features = [ "specta2" ] } # specta is updated on the main branch -specta = { version = "=2.0.0-rc.12", features = [ +specta = { version = "=2.0.0-rc.18", features = [ "chrono", "uuid", "serde", "serde_json", "function", + "derive", + "time" ] } # tauri-specta is updated on main branch -tauri-specta = { version = "=2.0.0-rc.11", features = [ +tauri-specta = { version = "=2.0.0-rc.12", features = [ "javascript", - "typescript" + "typescript", + "derive" ] } +specta-typescript = { version = "=0.0.5" } # rspc-tauri2 is updated on the main branch rspc-tauri2 = { version = "=0.0.1" } # interpulse is updated on the main branch -interpulse = { version = "=1.0.0", features = [ "specta" ] } +interpulse = { version = "1", features = [ "specta" ] } # all other dependencies are updated to latest crates.io release channel tracing = { version = "0.1" } @@ -115,7 +119,6 @@ reqwest = { version = "0.12", default-features = false, features = [ "brotli" ] } iota_stronghold = { version = "2.1" } -iota-crypto = { version = "0.23" } zeroize = { version = "1.8", features = [ "zeroize_derive" ] } quote = { version = "1.0" } syn = { version = "2.0", features = [ "full" ] } @@ -123,12 +126,10 @@ tempfile = { version = "3.10" } dunce = { version = "1.0.4" } serde_json = { version = "1.0" } serde_ini = { version = "0.2" } -tar = { version = "0.4" } zip = { version = "0.6" } thiserror = { version = "1.0" } anyhow = { version = "1.0" } dirs = { version = "5.0" } -open = { version = "5.1" } discord-rich-presence = { version = "0.2" } winreg = { version = "0.52" } paste = { version = "1.0" } @@ -147,7 +148,7 @@ async-compression = { version = "0.4.12", features = [ ] } flate2 = { version = "1.0" } regex = { version = "1.10" } -sysinfo = { version = "0.30" } +sysinfo = { version = "0.31", features = [ "serde" ] } sys-info = { version = "0.9" } whoami = { version = "1.5" } cocoa = { version = "0.25" } @@ -180,14 +181,14 @@ features = [ default-features = false [patch.crates-io] -specta = { git = "https://github.com/oscartbeaumont/specta", rev = "fadef54000e131008ff6e9dd7efe2ba36479c077" } -tauri-specta = { git = "https://github.com/oscartbeaumont/tauri-specta", rev = "a49885967adc01c80e33962e3ecac25fe7497839" } +# specta = { git = "https://github.com/oscartbeaumont/specta", rev = "c717656b322ae6ff68f1c9fde1fb9ec7173a1bf9" } +# tauri-specta = { git = "https://github.com/oscartbeaumont/tauri-specta", rev = "70a84efe1cc013842f26599f89a7491d6a6ba18d" } # todo # rspc = { git = "https://github.com/oscartbeaumont/rspc", rev = "9f26d6400affdb501837cb023678268ad72feb9b" } # rspc-tauri2 = { git = "https://github.com/specta-rs/tauri2", rev = "6b9419566e2a826fb2a62538c7647f4524ab0fea" } -interpulse = { git = "https://github.com/pulseflow/workers", rev = "4d247c78545703200435a4a063c3f77fd644370f" } +interpulse = { git = "https://github.com/pulseflow/workers", rev = "2969c74081a81a935ec7ccf76c3a302eae7d0a39" } [profile.dev] # add debug symbols/logic and optimize for reduced build time (parallel) diff --git a/apps/desktop/Cargo.toml b/apps/desktop/Cargo.toml index 08b07492..8f5eab87 100644 --- a/apps/desktop/Cargo.toml +++ b/apps/desktop/Cargo.toml @@ -48,6 +48,7 @@ tauri-plugin-dialog = { workspace = true } tauri-specta = { workspace = true } specta = { workspace = true } +specta-typescript = { workspace = true } interpulse.workspace = true diff --git a/apps/desktop/src/api/mod.rs b/apps/desktop/src/api/mod.rs index 89873033..6c79160a 100644 --- a/apps/desktop/src/api/mod.rs +++ b/apps/desktop/src/api/mod.rs @@ -63,7 +63,7 @@ macro_rules! impl_serialize_err { where S: Serializer, { - use serde::ser::SerializeStruct; + use serde::ser::SerializeStruct; match self { OneLauncherError::OneLauncher(onelauncher_error) => { $crate::error::display_tracing_error(onelauncher_error); diff --git a/apps/desktop/src/api/statics.rs b/apps/desktop/src/api/statics.rs index 4d050b96..b6c178b6 100644 --- a/apps/desktop/src/api/statics.rs +++ b/apps/desktop/src/api/statics.rs @@ -1,13 +1,13 @@ use onelauncher::constants::*; use serde::Serialize; use specta::Type; -use tauri_specta::StaticCollection; +// use tauri_specta::StaticCollection; -pub fn get_static_collection() -> StaticCollection { - StaticCollection::default() - .register("PROGRAM_INFO", get_program_info()) - .to_owned() -} +// pub fn get_static_collection() -> StaticCollection { +// StaticCollection::default() +// .register("PROGRAM_INFO", get_program_info()) +// .to_owned() +// } #[derive(Serialize, Type)] pub struct ProgramInfo { @@ -19,7 +19,7 @@ pub struct ProgramInfo { arch: String, } -fn get_program_info() -> ProgramInfo { +pub fn get_program_info() -> ProgramInfo { let webview_version = tauri::webview_version().unwrap_or("UNKNOWN".into()); let tauri_version = tauri::VERSION; let dev_build = tauri::is_dev(); diff --git a/apps/desktop/src/ext/updater.rs b/apps/desktop/src/ext/updater.rs index 33cf0947..1c2f58d3 100644 --- a/apps/desktop/src/ext/updater.rs +++ b/apps/desktop/src/ext/updater.rs @@ -1,5 +1,5 @@ use tauri::plugin::TauriPlugin; -use tauri::{Manager, Runtime}; +use tauri::{Emitter, Runtime}; use tauri_plugin_updater::{Update as TauriPluginUpdate, UpdaterExt}; use tokio::sync::Mutex; diff --git a/apps/desktop/src/lib.rs b/apps/desktop/src/lib.rs index 8a95f3f4..a2c98864 100644 --- a/apps/desktop/src/lib.rs +++ b/apps/desktop/src/lib.rs @@ -1,5 +1,7 @@ -use api::statics::get_static_collection; -use tauri::Manager; +#![recursion_limit = "1024"] + +// use api::statics::get_static_collection; +use tauri::{Manager, Emitter}; pub mod api; pub mod error; @@ -37,22 +39,19 @@ pub async fn run() { } pub async fn run_app(setup: F) { - let (invoke_handler, register_events) = { - let builder = tauri_specta::ts::builder() - .config( - specta::ts::ExportConfig::default() - .bigint(specta::ts::BigIntExportBehavior::BigInt), - ) - .header("/* eslint-disable -- auto-generated file */") - .statics(get_static_collection()) - .commands(collect_commands!()) - .events(collect_events!()); + let prebuild = tauri_specta::Builder::::new() + // .header("/* eslint-disable -- auto-generated file */") + // .statics(get_static_collection()) + .commands(collect_commands!()) + .events(collect_events!()); - #[cfg(debug_assertions)] - let builder = builder.path("../frontend/src/bindings.ts"); - - builder.build().unwrap() - }; + #[cfg(debug_assertions)] + prebuild + .export( + specta_typescript::Typescript::default(), + "../frontend/src/bindings.ts" + ) + .expect("failed to export debug bindings!"); let builder = tauri::Builder::default() .plugin(tauri_plugin_shell::init()) @@ -70,9 +69,9 @@ pub async fn run_app(setup: F) { // .plugin(tauri_plugin_window_state::Builder::default().build()) .plugin(api::init()) .menu(tauri::menu::Menu::new) - .invoke_handler(invoke_handler) + .invoke_handler(prebuild.invoke_handler()) .setup(move |app| { - register_events(app); + prebuild.mount_events(app.handle()); setup(app); Ok(()) }); diff --git a/apps/desktop/src/main.rs b/apps/desktop/src/main.rs index 9b80960f..325b487a 100644 --- a/apps/desktop/src/main.rs +++ b/apps/desktop/src/main.rs @@ -1,5 +1,6 @@ // Prevents additional console window on Windows in release, DO NOT REMOVE!! #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] +#![recursion_limit = "1024"] #[tokio::main] async fn main() { diff --git a/apps/testing/src/main.rs b/apps/testing/src/main.rs index 10c891a7..7470f075 100644 --- a/apps/testing/src/main.rs +++ b/apps/testing/src/main.rs @@ -57,7 +57,7 @@ pub async fn authenticate_mc() -> onelauncher::Result { Ok(creds) } -async fn modrinth() -> onelauncher::Result<()> { +pub async fn modrinth() -> onelauncher::Result<()> { let _state = State::get().await?; let provider = Providers::Modrinth; let result = provider.get("oneconfig").await?; @@ -98,7 +98,7 @@ async fn modrinth() -> onelauncher::Result<()> { Ok(()) } -async fn launch_and_authenticate() -> onelauncher::Result<()> { +pub async fn launch_and_authenticate() -> onelauncher::Result<()> { let state = State::get().await?; if minecraft::users().await?.is_empty() { diff --git a/package.json b/package.json index 92d4ac12..871e1e8d 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "eslint": "^9.8.0", "eslint-plugin-solid": "^0.14.1", "ts-node": "^10.9.2", - "tsx": "^4.16.3", + "tsx": "^4.16.4", "typescript": "^5.5.4", "vite": "^5.3.5", "vitest": "^2.0.5" diff --git a/packages/core/Cargo.toml b/packages/core/Cargo.toml index d7a27a78..07387d6c 100644 --- a/packages/core/Cargo.toml +++ b/packages/core/Cargo.toml @@ -44,7 +44,6 @@ tracing-appender = { workspace = true } notify = { workspace = true } notify-debouncer-mini = { workspace = true } iota_stronghold = { workspace = true } -iota-crypto = { workspace = true } zeroize = { workspace = true } tokio = { workspace = true } @@ -53,7 +52,6 @@ serde_json = { workspace = true } serde_ini = { workspace = true } paste = { workspace = true } futures = { workspace = true } -tar = { workspace = true } zip = { workspace = true } uuid = { workspace = true } thiserror = { workspace = true } @@ -61,7 +59,6 @@ anyhow = { workspace = true } chrono = { workspace = true } reqwest = { workspace = true } dirs = { workspace = true } -open = { workspace = true } sha1_smol = { workspace = true } sha2 = { workspace = true } async_zip = { workspace = true } diff --git a/packages/core/src/api/java.rs b/packages/core/src/api/java.rs index 94775c74..99363f11 100644 --- a/packages/core/src/api/java.rs +++ b/packages/core/src/api/java.rs @@ -132,7 +132,5 @@ pub async fn test_java(path: PathBuf, major: u32) -> crate::Result { } pub async fn get_max_memory() -> crate::Result { - Ok(sys_info::mem_info() - .map_err(|_| anyhow::anyhow!("failed to get computer memory"))? - .total) + Ok(sysinfo::System::new().total_memory()) } diff --git a/packages/core/src/api/proxy/mod.rs b/packages/core/src/api/proxy/mod.rs index 02274d30..2dbb5c81 100644 --- a/packages/core/src/api/proxy/mod.rs +++ b/packages/core/src/api/proxy/mod.rs @@ -56,7 +56,7 @@ impl Drop for IngressId { let event = ingress.ingress_type.clone(); let fraction = ingress.current / ingress.total; - use tauri::Manager; + use tauri::Emitter; let _ = proxy_state.app.emit( "ingress", IngressPayload { diff --git a/packages/core/src/api/proxy/send.rs b/packages/core/src/api/proxy/send.rs index af3ce6f5..f704b916 100644 --- a/packages/core/src/api/proxy/send.rs +++ b/packages/core/src/api/proxy/send.rs @@ -136,6 +136,9 @@ pub async fn send_ingress( .set_position((display * CLI_TOTAL_INGRESS as f64).round() as u64); } + #[cfg(feature = "tauri")] + use tauri::Emitter; + #[cfg(feature = "tauri")] proxy_state .app diff --git a/packages/core/src/store/processor.rs b/packages/core/src/store/processor.rs index 040738cc..4ac05702 100644 --- a/packages/core/src/store/processor.rs +++ b/packages/core/src/store/processor.rs @@ -145,12 +145,12 @@ impl ChildType { let state = crate::State::get().await?; let mut system = sysinfo::System::new(); - system.refresh_processes(); + system.refresh_processes(sysinfo::ProcessesToUpdate::All); let process = system .process(sysinfo::Pid::from_u32(pid)) .ok_or_else(|| anyhow::anyhow!("could not find process {}", pid))?; let start_time = process.start_time(); - let name = process.name().to_string(); + let name = process.name().to_string_lossy().to_string(); let Some(path) = process.exe() else { return Err(anyhow::anyhow!("cached process {} has no path", pid).into()); }; @@ -206,7 +206,7 @@ impl ChildType { ChildType::ChildProcess(child) => Ok(child.kill().await.map_err(IOError::from)?), ChildType::RescuedChild(pid) => { let mut system = sysinfo::System::new(); - if system.refresh_process(sysinfo::Pid::from_u32(*pid)) { + if system.refresh_processes(sysinfo::ProcessesToUpdate::Some(&[sysinfo::Pid::from_u32(*pid)])) != 0 { let process = system.process(sysinfo::Pid::from_u32(*pid)); if let Some(process) = process { process.kill(); @@ -226,7 +226,7 @@ impl ChildType { .map(|x| x.code().unwrap_or(0))), ChildType::RescuedChild(pid) => { let mut system = sysinfo::System::new(); - if !system.refresh_process(sysinfo::Pid::from_u32(*pid)) { + if !(system.refresh_processes(sysinfo::ProcessesToUpdate::Some(&[sysinfo::Pid::from_u32(*pid)])) != 0) { return Ok(Some(0)); } @@ -462,7 +462,7 @@ impl Processor { // ensure located stray process matches with our pid recorded process { let mut system = sysinfo::System::new(); - system.refresh_processes(); + system.refresh_processes(sysinfo::ProcessesToUpdate::All); let process = system .process(sysinfo::Pid::from_u32(cache.pid)) .ok_or_else(|| anyhow::anyhow!("could not find pid {}", cache.pid))?; @@ -475,11 +475,11 @@ impl Processor { ) .into()); } - if cache.name != process.name() { + if cache.name != process.name().to_string_lossy().to_string() { return Err(anyhow::anyhow!( "restored process {} has a mismatched name {}", cache.pid, - process.name() + process.name().to_string_lossy().to_string() ) .into()); } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c94e3d4f..ee7514df 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,8 +30,8 @@ importers: specifier: ^10.9.2 version: 10.9.2(@types/node@22.0.2)(typescript@5.5.4) tsx: - specifier: ^4.16.3 - version: 4.16.3 + specifier: ^4.16.4 + version: 4.16.4 typescript: specifier: ^5.5.4 version: 5.5.4 @@ -150,7 +150,7 @@ importers: version: 1.77.8 unocss: specifier: ^0.61.9 - version: 0.61.9(postcss@8.4.40)(rollup@4.19.1)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8)) + version: 0.61.9(postcss@8.4.40)(rollup@4.19.2)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8)) vite-plugin-solid: specifier: ^2.10.2 version: 2.10.2(@testing-library/jest-dom@6.4.8)(solid-js@1.8.19)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8)) @@ -926,8 +926,8 @@ packages: cpu: [arm] os: [android] - '@rollup/rollup-android-arm-eabi@4.19.1': - resolution: {integrity: sha512-XzqSg714++M+FXhHfXpS1tDnNZNpgxxuGZWlRG/jSj+VEPmZ0yg6jV4E0AL3uyBKxO8mO3xtOsP5mQ+XLfrlww==} + '@rollup/rollup-android-arm-eabi@4.19.2': + resolution: {integrity: sha512-OHflWINKtoCFSpm/WmuQaWW4jeX+3Qt3XQDepkkiFTsoxFc5BpF3Z5aDxFZgBqRjO6ATP5+b1iilp4kGIZVWlA==} cpu: [arm] os: [android] @@ -936,8 +936,8 @@ packages: cpu: [arm64] os: [android] - '@rollup/rollup-android-arm64@4.19.1': - resolution: {integrity: sha512-thFUbkHteM20BGShD6P08aungq4irbIZKUNbG70LN8RkO7YztcGPiKTTGZS7Kw+x5h8hOXs0i4OaHwFxlpQN6A==} + '@rollup/rollup-android-arm64@4.19.2': + resolution: {integrity: sha512-k0OC/b14rNzMLDOE6QMBCjDRm3fQOHAL8Ldc9bxEWvMo4Ty9RY6rWmGetNTWhPo+/+FNd1lsQYRd0/1OSix36A==} cpu: [arm64] os: [android] @@ -946,8 +946,8 @@ packages: cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-arm64@4.19.1': - resolution: {integrity: sha512-8o6eqeFZzVLia2hKPUZk4jdE3zW7LCcZr+MD18tXkgBBid3lssGVAYuox8x6YHoEPDdDa9ixTaStcmx88lio5Q==} + '@rollup/rollup-darwin-arm64@4.19.2': + resolution: {integrity: sha512-IIARRgWCNWMTeQH+kr/gFTHJccKzwEaI0YSvtqkEBPj7AshElFq89TyreKNFAGh5frLfDCbodnq+Ye3dqGKPBw==} cpu: [arm64] os: [darwin] @@ -956,8 +956,8 @@ packages: cpu: [x64] os: [darwin] - '@rollup/rollup-darwin-x64@4.19.1': - resolution: {integrity: sha512-4T42heKsnbjkn7ovYiAdDVRRWZLU9Kmhdt6HafZxFcUdpjlBlxj4wDrt1yFWLk7G4+E+8p2C9tcmSu0KA6auGA==} + '@rollup/rollup-darwin-x64@4.19.2': + resolution: {integrity: sha512-52udDMFDv54BTAdnw+KXNF45QCvcJOcYGl3vQkp4vARyrcdI/cXH8VXTEv/8QWfd6Fru8QQuw1b2uNersXOL0g==} cpu: [x64] os: [darwin] @@ -966,8 +966,8 @@ packages: cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-gnueabihf@4.19.1': - resolution: {integrity: sha512-MXg1xp+e5GhZ3Vit1gGEyoC+dyQUBy2JgVQ+3hUrD9wZMkUw/ywgkpK7oZgnB6kPpGrxJ41clkPPnsknuD6M2Q==} + '@rollup/rollup-linux-arm-gnueabihf@4.19.2': + resolution: {integrity: sha512-r+SI2t8srMPYZeoa1w0o/AfoVt9akI1ihgazGYPQGRilVAkuzMGiTtexNZkrPkQsyFrvqq/ni8f3zOnHw4hUbA==} cpu: [arm] os: [linux] @@ -976,8 +976,8 @@ packages: cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.19.1': - resolution: {integrity: sha512-DZNLwIY4ftPSRVkJEaxYkq7u2zel7aah57HESuNkUnz+3bZHxwkCUkrfS2IWC1sxK6F2QNIR0Qr/YXw7nkF3Pw==} + '@rollup/rollup-linux-arm-musleabihf@4.19.2': + resolution: {integrity: sha512-+tYiL4QVjtI3KliKBGtUU7yhw0GMcJJuB9mLTCEauHEsqfk49gtUBXGtGP3h1LW8MbaTY6rSFIQV1XOBps1gBA==} cpu: [arm] os: [linux] @@ -986,8 +986,8 @@ packages: cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.19.1': - resolution: {integrity: sha512-C7evongnjyxdngSDRRSQv5GvyfISizgtk9RM+z2biV5kY6S/NF/wta7K+DanmktC5DkuaJQgoKGf7KUDmA7RUw==} + '@rollup/rollup-linux-arm64-gnu@4.19.2': + resolution: {integrity: sha512-OR5DcvZiYN75mXDNQQxlQPTv4D+uNCUsmSCSY2FolLf9W5I4DSoJyg7z9Ea3TjKfhPSGgMJiey1aWvlWuBzMtg==} cpu: [arm64] os: [linux] @@ -996,8 +996,8 @@ packages: cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.19.1': - resolution: {integrity: sha512-89tFWqxfxLLHkAthAcrTs9etAoBFRduNfWdl2xUs/yLV+7XDrJ5yuXMHptNqf1Zw0UCA3cAutkAiAokYCkaPtw==} + '@rollup/rollup-linux-arm64-musl@4.19.2': + resolution: {integrity: sha512-Hw3jSfWdUSauEYFBSFIte6I8m6jOj+3vifLg8EU3lreWulAUpch4JBjDMtlKosrBzkr0kwKgL9iCfjA8L3geoA==} cpu: [arm64] os: [linux] @@ -1006,8 +1006,8 @@ packages: cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.19.1': - resolution: {integrity: sha512-PromGeV50sq+YfaisG8W3fd+Cl6mnOOiNv2qKKqKCpiiEke2KiKVyDqG/Mb9GWKbYMHj5a01fq/qlUR28PFhCQ==} + '@rollup/rollup-linux-powerpc64le-gnu@4.19.2': + resolution: {integrity: sha512-rhjvoPBhBwVnJRq/+hi2Q3EMiVF538/o9dBuj9TVLclo9DuONqt5xfWSaE6MYiFKpo/lFPJ/iSI72rYWw5Hc7w==} cpu: [ppc64] os: [linux] @@ -1016,8 +1016,8 @@ packages: cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.19.1': - resolution: {integrity: sha512-/1BmHYh+iz0cNCP0oHCuF8CSiNj0JOGf0jRlSo3L/FAyZyG2rGBuKpkZVH9YF+x58r1jgWxvm1aRg3DHrLDt6A==} + '@rollup/rollup-linux-riscv64-gnu@4.19.2': + resolution: {integrity: sha512-EAz6vjPwHHs2qOCnpQkw4xs14XJq84I81sDRGPEjKPFVPBw7fwvtwhVjcZR6SLydCv8zNK8YGFblKWd/vRmP8g==} cpu: [riscv64] os: [linux] @@ -1026,8 +1026,8 @@ packages: cpu: [s390x] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.19.1': - resolution: {integrity: sha512-0cYP5rGkQWRZKy9/HtsWVStLXzCF3cCBTRI+qRL8Z+wkYlqN7zrSYm6FuY5Kd5ysS5aH0q5lVgb/WbG4jqXN1Q==} + '@rollup/rollup-linux-s390x-gnu@4.19.2': + resolution: {integrity: sha512-IJSUX1xb8k/zN9j2I7B5Re6B0NNJDJ1+soezjNojhT8DEVeDNptq2jgycCOpRhyGj0+xBn7Cq+PK7Q+nd2hxLA==} cpu: [s390x] os: [linux] @@ -1036,8 +1036,8 @@ packages: cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.19.1': - resolution: {integrity: sha512-XUXeI9eM8rMP8aGvii/aOOiMvTs7xlCosq9xCjcqI9+5hBxtjDpD+7Abm1ZhVIFE1J2h2VIg0t2DX/gjespC2Q==} + '@rollup/rollup-linux-x64-gnu@4.19.2': + resolution: {integrity: sha512-OgaToJ8jSxTpgGkZSkwKE+JQGihdcaqnyHEFOSAU45utQ+yLruE1dkonB2SDI8t375wOKgNn8pQvaWY9kPzxDQ==} cpu: [x64] os: [linux] @@ -1046,8 +1046,8 @@ packages: cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.19.1': - resolution: {integrity: sha512-V7cBw/cKXMfEVhpSvVZhC+iGifD6U1zJ4tbibjjN+Xi3blSXaj/rJynAkCFFQfoG6VZrAiP7uGVzL440Q6Me2Q==} + '@rollup/rollup-linux-x64-musl@4.19.2': + resolution: {integrity: sha512-5V3mPpWkB066XZZBgSd1lwozBk7tmOkKtquyCJ6T4LN3mzKENXyBwWNQn8d0Ci81hvlBw5RoFgleVpL6aScLYg==} cpu: [x64] os: [linux] @@ -1056,8 +1056,8 @@ packages: cpu: [arm64] os: [win32] - '@rollup/rollup-win32-arm64-msvc@4.19.1': - resolution: {integrity: sha512-88brja2vldW/76jWATlBqHEoGjJLRnP0WOEKAUbMcXaAZnemNhlAHSyj4jIwMoP2T750LE9lblvD4e2jXleZsA==} + '@rollup/rollup-win32-arm64-msvc@4.19.2': + resolution: {integrity: sha512-ayVstadfLeeXI9zUPiKRVT8qF55hm7hKa+0N1V6Vj+OTNFfKSoUxyZvzVvgtBxqSb5URQ8sK6fhwxr9/MLmxdA==} cpu: [arm64] os: [win32] @@ -1066,8 +1066,8 @@ packages: cpu: [ia32] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.19.1': - resolution: {integrity: sha512-LdxxcqRVSXi6k6JUrTah1rHuaupoeuiv38du8Mt4r4IPer3kwlTo+RuvfE8KzZ/tL6BhaPlzJ3835i6CxrFIRQ==} + '@rollup/rollup-win32-ia32-msvc@4.19.2': + resolution: {integrity: sha512-Mda7iG4fOLHNsPqjWSjANvNZYoW034yxgrndof0DwCy0D3FvTjeNo+HGE6oGWgvcLZNLlcp0hLEFcRs+UGsMLg==} cpu: [ia32] os: [win32] @@ -1076,8 +1076,8 @@ packages: cpu: [x64] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.19.1': - resolution: {integrity: sha512-2bIrL28PcK3YCqD9anGxDxamxdiJAxA+l7fWIwM5o8UqNy1t3d1NdAweO2XhA0KTDJ5aH1FsuiT5+7VhtHliXg==} + '@rollup/rollup-win32-x64-msvc@4.19.2': + resolution: {integrity: sha512-DPi0ubYhSow/00YqmG1jWm3qt1F8aXziHc/UNy8bo9cpCacqhuWu+iSq/fp2SyEQK7iYTZ60fBU9cat3MXTjIQ==} cpu: [x64] os: [win32] @@ -3074,8 +3074,8 @@ packages: engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true - rollup@4.19.1: - resolution: {integrity: sha512-K5vziVlg7hTpYfFBI+91zHBEMo6jafYXpkMlqZjg7/zhIG9iHqazBf4xz9AVdjS9BruRn280ROqLI7G3OFRIlw==} + rollup@4.19.2: + resolution: {integrity: sha512-6/jgnN1svF9PjNYJ4ya3l+cqutg49vOZ4rVgsDKxdl+5gpGPnByFXWGyfH9YGx9i3nfBwSu1Iyu6vGwFFA0BdQ==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -3343,8 +3343,8 @@ packages: tslib@2.6.3: resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==} - tsx@4.16.3: - resolution: {integrity: sha512-MP8AEUxVnboD2rCC6kDLxnpDBNWN9k3BSVU/0/nNxgm70bPBnfn+yCKcnOsIVPQwdkbKYoFOlKjjWZWJ2XCXUg==} + tsx@4.16.4: + resolution: {integrity: sha512-E0EDobc7FtOxdNtG0ZQWztLa9PK/TqC5QvdV0heyIMJySwcJ8vyvziOznzO1MIM2IDfacLGBgfiCUmba6mvI7Q==} engines: {node: '>=18.0.0'} hasBin: true @@ -4294,108 +4294,108 @@ snapshots: '@polka/url@1.0.0-next.25': {} - '@rollup/pluginutils@5.1.0(rollup@4.19.1)': + '@rollup/pluginutils@5.1.0(rollup@4.19.2)': dependencies: '@types/estree': 1.0.5 estree-walker: 2.0.2 picomatch: 2.3.1 optionalDependencies: - rollup: 4.19.1 + rollup: 4.19.2 '@rollup/rollup-android-arm-eabi@4.19.0': optional: true - '@rollup/rollup-android-arm-eabi@4.19.1': + '@rollup/rollup-android-arm-eabi@4.19.2': optional: true '@rollup/rollup-android-arm64@4.19.0': optional: true - '@rollup/rollup-android-arm64@4.19.1': + '@rollup/rollup-android-arm64@4.19.2': optional: true '@rollup/rollup-darwin-arm64@4.19.0': optional: true - '@rollup/rollup-darwin-arm64@4.19.1': + '@rollup/rollup-darwin-arm64@4.19.2': optional: true '@rollup/rollup-darwin-x64@4.19.0': optional: true - '@rollup/rollup-darwin-x64@4.19.1': + '@rollup/rollup-darwin-x64@4.19.2': optional: true '@rollup/rollup-linux-arm-gnueabihf@4.19.0': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.19.1': + '@rollup/rollup-linux-arm-gnueabihf@4.19.2': optional: true '@rollup/rollup-linux-arm-musleabihf@4.19.0': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.19.1': + '@rollup/rollup-linux-arm-musleabihf@4.19.2': optional: true '@rollup/rollup-linux-arm64-gnu@4.19.0': optional: true - '@rollup/rollup-linux-arm64-gnu@4.19.1': + '@rollup/rollup-linux-arm64-gnu@4.19.2': optional: true '@rollup/rollup-linux-arm64-musl@4.19.0': optional: true - '@rollup/rollup-linux-arm64-musl@4.19.1': + '@rollup/rollup-linux-arm64-musl@4.19.2': optional: true '@rollup/rollup-linux-powerpc64le-gnu@4.19.0': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.19.1': + '@rollup/rollup-linux-powerpc64le-gnu@4.19.2': optional: true '@rollup/rollup-linux-riscv64-gnu@4.19.0': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.19.1': + '@rollup/rollup-linux-riscv64-gnu@4.19.2': optional: true '@rollup/rollup-linux-s390x-gnu@4.19.0': optional: true - '@rollup/rollup-linux-s390x-gnu@4.19.1': + '@rollup/rollup-linux-s390x-gnu@4.19.2': optional: true '@rollup/rollup-linux-x64-gnu@4.19.0': optional: true - '@rollup/rollup-linux-x64-gnu@4.19.1': + '@rollup/rollup-linux-x64-gnu@4.19.2': optional: true '@rollup/rollup-linux-x64-musl@4.19.0': optional: true - '@rollup/rollup-linux-x64-musl@4.19.1': + '@rollup/rollup-linux-x64-musl@4.19.2': optional: true '@rollup/rollup-win32-arm64-msvc@4.19.0': optional: true - '@rollup/rollup-win32-arm64-msvc@4.19.1': + '@rollup/rollup-win32-arm64-msvc@4.19.2': optional: true '@rollup/rollup-win32-ia32-msvc@4.19.0': optional: true - '@rollup/rollup-win32-ia32-msvc@4.19.1': + '@rollup/rollup-win32-ia32-msvc@4.19.2': optional: true '@rollup/rollup-win32-x64-msvc@4.19.0': optional: true - '@rollup/rollup-win32-x64-msvc@4.19.1': + '@rollup/rollup-win32-x64-msvc@4.19.2': optional: true '@rspc/client@0.2.0': {} @@ -4916,21 +4916,21 @@ snapshots: '@typescript-eslint/types': 8.0.0-alpha.55 eslint-visitor-keys: 3.4.3 - '@unocss/astro@0.61.9(rollup@4.19.1)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8))': + '@unocss/astro@0.61.9(rollup@4.19.2)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8))': dependencies: '@unocss/core': 0.61.9 '@unocss/reset': 0.61.9 - '@unocss/vite': 0.61.9(rollup@4.19.1)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8)) + '@unocss/vite': 0.61.9(rollup@4.19.2)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8)) optionalDependencies: vite: 5.3.5(@types/node@22.0.2)(sass@1.77.8) transitivePeerDependencies: - rollup - supports-color - '@unocss/cli@0.61.9(rollup@4.19.1)': + '@unocss/cli@0.61.9(rollup@4.19.2)': dependencies: '@ampproject/remapping': 2.3.0 - '@rollup/pluginutils': 5.1.0(rollup@4.19.1) + '@rollup/pluginutils': 5.1.0(rollup@4.19.2) '@unocss/config': 0.61.9 '@unocss/core': 0.61.9 '@unocss/preset-uno': 0.61.9 @@ -5072,10 +5072,10 @@ snapshots: dependencies: '@unocss/core': 0.61.9 - '@unocss/vite@0.61.9(rollup@4.19.1)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8))': + '@unocss/vite@0.61.9(rollup@4.19.2)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8))': dependencies: '@ampproject/remapping': 2.3.0 - '@rollup/pluginutils': 5.1.0(rollup@4.19.1) + '@rollup/pluginutils': 5.1.0(rollup@4.19.2) '@unocss/config': 0.61.9 '@unocss/core': 0.61.9 '@unocss/inspector': 0.61.9 @@ -6097,7 +6097,7 @@ snapshots: jiti-v1: jiti@1.21.6 pathe: 1.1.2 pkg-types: 1.1.3 - tsx: 4.16.3 + tsx: 4.16.4 transitivePeerDependencies: - supports-color @@ -6676,26 +6676,26 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.19.0 fsevents: 2.3.3 - rollup@4.19.1: + rollup@4.19.2: dependencies: '@types/estree': 1.0.5 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.19.1 - '@rollup/rollup-android-arm64': 4.19.1 - '@rollup/rollup-darwin-arm64': 4.19.1 - '@rollup/rollup-darwin-x64': 4.19.1 - '@rollup/rollup-linux-arm-gnueabihf': 4.19.1 - '@rollup/rollup-linux-arm-musleabihf': 4.19.1 - '@rollup/rollup-linux-arm64-gnu': 4.19.1 - '@rollup/rollup-linux-arm64-musl': 4.19.1 - '@rollup/rollup-linux-powerpc64le-gnu': 4.19.1 - '@rollup/rollup-linux-riscv64-gnu': 4.19.1 - '@rollup/rollup-linux-s390x-gnu': 4.19.1 - '@rollup/rollup-linux-x64-gnu': 4.19.1 - '@rollup/rollup-linux-x64-musl': 4.19.1 - '@rollup/rollup-win32-arm64-msvc': 4.19.1 - '@rollup/rollup-win32-ia32-msvc': 4.19.1 - '@rollup/rollup-win32-x64-msvc': 4.19.1 + '@rollup/rollup-android-arm-eabi': 4.19.2 + '@rollup/rollup-android-arm64': 4.19.2 + '@rollup/rollup-darwin-arm64': 4.19.2 + '@rollup/rollup-darwin-x64': 4.19.2 + '@rollup/rollup-linux-arm-gnueabihf': 4.19.2 + '@rollup/rollup-linux-arm-musleabihf': 4.19.2 + '@rollup/rollup-linux-arm64-gnu': 4.19.2 + '@rollup/rollup-linux-arm64-musl': 4.19.2 + '@rollup/rollup-linux-powerpc64le-gnu': 4.19.2 + '@rollup/rollup-linux-riscv64-gnu': 4.19.2 + '@rollup/rollup-linux-s390x-gnu': 4.19.2 + '@rollup/rollup-linux-x64-gnu': 4.19.2 + '@rollup/rollup-linux-x64-musl': 4.19.2 + '@rollup/rollup-win32-arm64-msvc': 4.19.2 + '@rollup/rollup-win32-ia32-msvc': 4.19.2 + '@rollup/rollup-win32-x64-msvc': 4.19.2 fsevents: 2.3.3 optional: true @@ -6934,7 +6934,7 @@ snapshots: tslib@2.6.3: {} - tsx@4.16.3: + tsx@4.16.4: dependencies: esbuild: 0.21.5 get-tsconfig: 4.7.6 @@ -6982,10 +6982,10 @@ snapshots: universalify@0.2.0: {} - unocss@0.61.9(postcss@8.4.40)(rollup@4.19.1)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8)): + unocss@0.61.9(postcss@8.4.40)(rollup@4.19.2)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8)): dependencies: - '@unocss/astro': 0.61.9(rollup@4.19.1)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8)) - '@unocss/cli': 0.61.9(rollup@4.19.1) + '@unocss/astro': 0.61.9(rollup@4.19.2)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8)) + '@unocss/cli': 0.61.9(rollup@4.19.2) '@unocss/core': 0.61.9 '@unocss/extractor-arbitrary-variants': 0.61.9 '@unocss/postcss': 0.61.9(postcss@8.4.40) @@ -7003,7 +7003,7 @@ snapshots: '@unocss/transformer-compile-class': 0.61.9 '@unocss/transformer-directives': 0.61.9 '@unocss/transformer-variant-group': 0.61.9 - '@unocss/vite': 0.61.9(rollup@4.19.1)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8)) + '@unocss/vite': 0.61.9(rollup@4.19.2)(vite@5.3.5(@types/node@22.0.2)(sass@1.77.8)) optionalDependencies: vite: 5.3.5(@types/node@22.0.2)(sass@1.77.8) transitivePeerDependencies: diff --git a/rust-toolchain.toml b/rust-toolchain.toml index c6ca3c89..7a655705 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "stable" +channel = "1.80" profile = "minimal" components = [ "cargo",