From 14e4705d5512189eb580f83dc009ea70799d412d Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Thu, 13 Apr 2023 14:27:56 -0700 Subject: [PATCH 1/3] refactor(log): use NSString instead of SRString on iOS (#302) --- Cargo.lock | 2 ++ plugins/log/Cargo.toml | 2 ++ plugins/log/ios/Sources/LogPlugin.swift | 8 +++--- plugins/log/src/lib.rs | 37 +++++++++++++++++++++---- 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3555c1a3..8a529d68 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4430,8 +4430,10 @@ version = "0.1.0" dependencies = [ "android_logger", "byte-unit", + "cocoa", "fern", "log", + "objc", "serde", "serde_json", "serde_repr", diff --git a/plugins/log/Cargo.toml b/plugins/log/Cargo.toml index 864618ea..05a3b058 100644 --- a/plugins/log/Cargo.toml +++ b/plugins/log/Cargo.toml @@ -27,6 +27,8 @@ android_logger = "0.11" [target."cfg(target_os = \"ios\")".dependencies] swift-rs = "1.0.1" +objc = "0.2" +cocoa = "0.24" [features] colored = ["fern/colored"] \ No newline at end of file diff --git a/plugins/log/ios/Sources/LogPlugin.swift b/plugins/log/ios/Sources/LogPlugin.swift index 4ae3621d..954f357e 100644 --- a/plugins/log/ios/Sources/LogPlugin.swift +++ b/plugins/log/ios/Sources/LogPlugin.swift @@ -3,11 +3,11 @@ import Tauri import SwiftRs @_cdecl("tauri_log") -func log(level: Int, message: SRString) { +func log(level: Int, message: NSString) { switch level { - case 1: Logger.debug(message.toString()) - case 2: Logger.info(message.toString()) - case 3: Logger.error(message.toString()) + case 1: Logger.debug(message as String) + case 2: Logger.info(message as String) + case 3: Logger.error(message as String) default: break } } diff --git a/plugins/log/src/lib.rs b/plugins/log/src/lib.rs index 66d534b4..f7e5e25b 100644 --- a/plugins/log/src/lib.rs +++ b/plugins/log/src/lib.rs @@ -23,9 +23,36 @@ use tauri::{ pub use fern; #[cfg(target_os = "ios")] -swift_rs::swift!(fn tauri_log( - level: u8, message: &swift_rs::SRString -)); +mod ios { + use cocoa::base::id; + use objc::*; + + const UTF8_ENCODING: usize = 4; + pub struct NSString(pub id); + + impl NSString { + pub fn new(s: &str) -> Self { + // Safety: objc runtime calls are unsafe + NSString(unsafe { + let ns_string: id = msg_send![class!(NSString), alloc]; + let ns_string: id = msg_send![ns_string, + initWithBytes:s.as_ptr() + length:s.len() + encoding:UTF8_ENCODING]; + + // The thing is allocated in rust, the thing must be set to autorelease in rust to relinquish control + // or it can not be released correctly in OC runtime + let _: () = msg_send![ns_string, autorelease]; + + ns_string + }) + } + } + + swift_rs::swift!(pub fn tauri_log( + level: u8, message: *const std::ffi::c_void + )); +} const DEFAULT_MAX_FILE_SIZE: u128 = 40000; const DEFAULT_ROTATION_STRATEGY: RotationStrategy = RotationStrategy::KeepOne; @@ -268,13 +295,13 @@ impl Builder { fern::Output::call(move |record| { let message = format!("{}", record.args()); unsafe { - tauri_log( + ios::tauri_log( match record.level() { log::Level::Trace | log::Level::Debug => 1, log::Level::Info => 2, log::Level::Warn | log::Level::Error => 3, }, - &message.as_str().into(), + ios::NSString::new(message.as_str()).0 as _, ); } }) From bbdccefa2d4e01f5e56a09cf3d6a0d05227a27e2 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Fri, 14 Apr 2023 04:02:48 -0700 Subject: [PATCH 2/3] chore(deps): update to tauri alpha.8 (#303) --- Cargo.lock | 37 ++++++++++--------- Cargo.toml | 4 +- plugins/log/src/lib.rs | 2 +- plugins/persisted-scope/src/lib.rs | 4 +- .../examples/vanilla/src-tauri/Cargo.toml | 4 +- plugins/sql/src/plugin.rs | 5 +-- plugins/store/src/store.rs | 6 +-- .../examples/svelte-app/src-tauri/Cargo.toml | 4 +- plugins/window-state/src/lib.rs | 6 +-- 9 files changed, 35 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a529d68..da69dd56 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4128,9 +4128,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "swift-rs" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eab55f44d02ced20ffa22fd5b4bd083ab59c940c7637d37fec4426b1a01d769" +checksum = "8fa67d647176dfa7bdc5775430a1cb339e0ea48fe24707424023a4b17eb9688e" dependencies = [ "base64 0.21.0", "serde", @@ -4246,9 +4246,9 @@ dependencies = [ [[package]] name = "tauri" -version = "2.0.0-alpha.4" +version = "2.0.0-alpha.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113835bb47f8cab6d1fb3b1a2e3d96ddd64730248638a5ab3f46a598c02a81c" +checksum = "f25eefe4ca0a396a73fd0309f778eeb22a19953a3169bf316b893abadc2118fb" dependencies = [ "anyhow", "bytes 1.4.0", @@ -4298,9 +4298,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-alpha.2" +version = "2.0.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383f94e1b46fb4e249e4eafbd0589ffbe02b241b49dadebd47640598a17e584e" +checksum = "c492211c72b95f8866e5c1fbc0a915080a5ebb9f03f9b250a1c936534b680a76" dependencies = [ "anyhow", "cargo_toml", @@ -4318,9 +4318,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-alpha.2" +version = "2.0.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5914e68c4ba4d9b761373dcce86f6721de78c2ffd84f376b1e0fee9321c0fc7e" +checksum = "818c570932ebc2ff6d498be89d93494b89ff142131937a7e56d7cfb9c8ef0ad0" dependencies = [ "base64 0.21.0", "brotli", @@ -4344,9 +4344,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-alpha.2" +version = "2.0.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adedb0845af0d5840b54410f83135bb285ab372956678e0b12046a87999486fb" +checksum = "f3b596485d89003d2d7869469b2830e9a846de9ac2eecd69bc7c24890234aefc" dependencies = [ "heck", "proc-macro2", @@ -4568,9 +4568,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.13.0-alpha.2" +version = "0.13.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c9ce3ab30f6a95a09131510a624d5de24455ba9e8fcae6a6fe9e0922f833c8" +checksum = "404367cd32a5a8d33368448aab7da54bb2187b6a632526f1019de3fd13591cc2" dependencies = [ "gtk", "http", @@ -4590,9 +4590,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.13.0-alpha.2" +version = "0.13.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e176af0987e4ced285bec0faf56eed0f13a1b3851d9176fa6758181f867cdc3" +checksum = "203764d673b440877dea87b972772be4091ee0ab25141748008646ca774a20dc" dependencies = [ "cocoa", "gtk", @@ -4611,9 +4611,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-alpha.2" +version = "2.0.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a488bb0c60e2ce9efbe8283a11299675e01f55caf12304889f8639b3c35713c" +checksum = "49fa79bc56f04ece491268a64273de945f65627bcda30d9e8ecc8708b89bca26" dependencies = [ "brotli", "ctor", @@ -5666,9 +5666,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.27.0" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26712b3ea99abb29c3b0067b284515e2ccdf5d6df7ac5e21129d71550eb9c3e6" +checksum = "e8cf0dbfa7ccbd2e3832a3098b19d4b552360ea00a40b244a99caef46bffd84f" dependencies = [ "base64 0.13.1", "block", @@ -5682,6 +5682,7 @@ dependencies = [ "gtk", "html5ever", "http", + "javascriptcore-rs", "kuchiki", "libc", "log", diff --git a/Cargo.toml b/Cargo.toml index bbc07433..5f7de541 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,8 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = "2.0.0-alpha.4" -tauri-build = "2.0.0-alpha.2" +tauri = "2.0.0-alpha.8" +tauri-build = "2.0.0-alpha.4" serde_json = "1" thiserror = "1" diff --git a/plugins/log/src/lib.rs b/plugins/log/src/lib.rs index f7e5e25b..635206eb 100644 --- a/plugins/log/src/lib.rs +++ b/plugins/log/src/lib.rs @@ -327,7 +327,7 @@ impl Builder { LogTarget::LogDir => continue, #[cfg(desktop)] LogTarget::LogDir => { - let path = app_handle.path_resolver().app_log_dir().unwrap(); + let path = app_handle.path().app_log_dir().unwrap(); if !path.exists() { fs::create_dir_all(&path).unwrap(); } diff --git a/plugins/persisted-scope/src/lib.rs b/plugins/persisted-scope/src/lib.rs index e93f5002..c7fbc433 100644 --- a/plugins/persisted-scope/src/lib.rs +++ b/plugins/persisted-scope/src/lib.rs @@ -40,9 +40,9 @@ pub fn init() -> TauriPlugin { #[cfg(feature = "protocol-asset")] let asset_protocol_scope = app.asset_protocol_scope(); let app = app.clone(); - let app_dir = app.path_resolver().app_data_dir(); + let app_dir = app.path().app_data_dir(); - if let Some(app_dir) = app_dir { + if let Ok(app_dir) = app_dir { let scope_state_path = app_dir.join(SCOPE_STATE_FILENAME); let _ = fs_scope.forbid_file(&scope_state_path); diff --git a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml index 2446653b..40d08d7f 100644 --- a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml +++ b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml @@ -12,11 +12,11 @@ rust-version = "1.57" [dependencies] serde_json = "1.0" serde = { version = "1.0", features = [ "derive" ] } -tauri = { version = "1", features = ["api-all"] } +tauri = { version = "2.0.0-alpha.8", features = ["api-all"] } tauri-plugin-single-instance = { path = "../../../" } [build-dependencies] -tauri-build = { version = "1", features = [] } +tauri-build = { version = "2.0.0-alpha.4", features = [] } [features] default = [ "custom-protocol" ] diff --git a/plugins/sql/src/plugin.rs b/plugins/sql/src/plugin.rs index 656234b0..de501ea3 100644 --- a/plugins/sql/src/plugin.rs +++ b/plugins/sql/src/plugin.rs @@ -63,10 +63,7 @@ type Result = std::result::Result; /// Resolves the App's **file path** from the `AppHandle` context /// object fn app_path(app: &AppHandle) -> PathBuf { - #[allow(deprecated)] // FIXME: Change to non-deprecated function in Tauri v2 - app.path_resolver() - .app_dir() - .expect("No App path was found!") + app.path().app_config_dir().expect("No App path was found!") } #[cfg(feature = "sqlite")] diff --git a/plugins/store/src/store.rs b/plugins/store/src/store.rs index af106e30..c9746b45 100644 --- a/plugins/store/src/store.rs +++ b/plugins/store/src/store.rs @@ -10,7 +10,7 @@ use std::{ io::Write, path::PathBuf, }; -use tauri::{AppHandle, Runtime}; +use tauri::{AppHandle, Manager, Runtime}; type SerializeFn = fn(&HashMap) -> Result, Box>; type DeserializeFn = fn(&[u8]) -> Result, Box>; @@ -171,7 +171,7 @@ impl Store { /// Update the store from the on-disk state pub fn load(&mut self, app: &AppHandle) -> Result<(), Error> { let app_dir = app - .path_resolver() + .path() .app_data_dir() .expect("failed to resolve app dir"); let store_path = app_dir.join(&self.path); @@ -186,7 +186,7 @@ impl Store { /// Saves the store to disk pub fn save(&self, app: &AppHandle) -> Result<(), Error> { let app_dir = app - .path_resolver() + .path() .app_data_dir() .expect("failed to resolve app dir"); let store_path = app_dir.join(&self.path); diff --git a/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml b/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml index 48960dc1..e1d77550 100644 --- a/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml +++ b/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml @@ -9,14 +9,14 @@ edition = "2021" [dependencies] serde = { version = "1", features = ["derive"] } serde_json = "1" -tauri = { version = "1", features = [] } +tauri = { version = "2.0.0-alpha.8", features = [] } tokio = { version = "1.11", features = ["net"] } futures-util = "0.3" tauri-plugin-websocket = { path = "../../../" } tokio-tungstenite = "0.15" [build-dependencies] -tauri-build = { version = "1", features = [] } +tauri-build = { version = "2.0.0-alpha.4", features = [] } [features] default = [ "custom-protocol" ] diff --git a/plugins/window-state/src/lib.rs b/plugins/window-state/src/lib.rs index 5a224ad3..b7f34cb1 100644 --- a/plugins/window-state/src/lib.rs +++ b/plugins/window-state/src/lib.rs @@ -69,7 +69,7 @@ pub trait AppHandleExt { impl AppHandleExt for tauri::AppHandle { fn save_window_state(&self, flags: StateFlags) -> Result<()> { - if let Some(app_dir) = self.path_resolver().app_config_dir() { + if let Ok(app_dir) = self.path().app_config_dir() { let state_path = app_dir.join(STATE_FILENAME); let cache = self.state::(); let mut state = cache.0.lock().unwrap(); @@ -270,8 +270,8 @@ impl Builder { let flags = self.state_flags; PluginBuilder::new("window-state") .setup(|app, _api| { - let cache: Arc>> = if let Some(app_dir) = - app.path_resolver().app_config_dir() + let cache: Arc>> = if let Ok(app_dir) = + app.path().app_config_dir() { let state_path = app_dir.join(STATE_FILENAME); if state_path.exists() { From 4b229031b70e9e5f244d81078628f9664d5201a3 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Fri, 14 Apr 2023 08:15:46 -0300 Subject: [PATCH 3/3] chore(deps): update Tauri CLI --- .../examples/vanilla/package.json | 2 +- .../examples/svelte-app/package.json | 2 +- pnpm-lock.yaml | 66 +++++++++---------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/plugins/single-instance/examples/vanilla/package.json b/plugins/single-instance/examples/vanilla/package.json index 89a97c06..a2967169 100644 --- a/plugins/single-instance/examples/vanilla/package.json +++ b/plugins/single-instance/examples/vanilla/package.json @@ -9,6 +9,6 @@ "author": "", "license": "MIT", "dependencies": { - "@tauri-apps/cli": "^1.0.0" + "@tauri-apps/cli": "^2.0.0-alpha.8" } } diff --git a/plugins/websocket/examples/svelte-app/package.json b/plugins/websocket/examples/svelte-app/package.json index 4b29817e..987f2349 100644 --- a/plugins/websocket/examples/svelte-app/package.json +++ b/plugins/websocket/examples/svelte-app/package.json @@ -20,7 +20,7 @@ "vite": "^4.0.0" }, "dependencies": { - "@tauri-apps/cli": "^1.0.0", + "@tauri-apps/cli": "^2.0.0-alpha.8", "tauri-plugin-websocket-api": "link:../../" }, "type": "module" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a8fb00f2..ff0ca2aa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -90,9 +90,9 @@ importers: plugins/single-instance/examples/vanilla: specifiers: - '@tauri-apps/cli': ^1.0.0 + '@tauri-apps/cli': ^2.0.0-alpha.8 dependencies: - '@tauri-apps/cli': 1.2.2 + '@tauri-apps/cli': 2.0.0-alpha.8 plugins/sql: specifiers: @@ -143,7 +143,7 @@ importers: specifiers: '@sveltejs/adapter-auto': ^1.0.0 '@sveltejs/kit': ^1.0.0 - '@tauri-apps/cli': ^1.0.0 + '@tauri-apps/cli': ^2.0.0-alpha.8 svelte: ^3.54.0 svelte-check: ^2.9.2 tauri-plugin-websocket-api: link:../../ @@ -151,7 +151,7 @@ importers: typescript: ^4.9.3 vite: ^4.0.0 dependencies: - '@tauri-apps/cli': 1.2.2 + '@tauri-apps/cli': 2.0.0-alpha.8 tauri-plugin-websocket-api: link:../.. devDependencies: '@sveltejs/adapter-auto': 1.0.0_@sveltejs+kit@1.0.11 @@ -589,8 +589,8 @@ packages: engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} dev: false - /@tauri-apps/cli-darwin-arm64/1.2.2: - resolution: {integrity: sha512-W+Cp2weUMlvmGkRJeUjypbz9Lpl6o98xkgKAtobZSum5SNwpsBQfawJTESakNoD+FXyVg/snIk5sRdHge+tAaA==} + /@tauri-apps/cli-darwin-arm64/2.0.0-alpha.8: + resolution: {integrity: sha512-ZF9nkkYCDiAEKZFwjEbuqTcFVp+DBgem3edKjsZDYPQpWg0VcZOSYr0o3/RPC81T1/FAy1lq478mkcMe0efvEw==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] @@ -598,8 +598,8 @@ packages: dev: false optional: true - /@tauri-apps/cli-darwin-x64/1.2.2: - resolution: {integrity: sha512-vmVAqt+ECH2d6cbcGJ7ddcCAZgmKe5xmxlL5r4xoaphu7OqU4gnv4VFURYkVltOfwzIFQVOPVSqwYyIDToCYNQ==} + /@tauri-apps/cli-darwin-x64/2.0.0-alpha.8: + resolution: {integrity: sha512-N5V+tbP3qeAoXrrTZXvaLIeEWKCq11tqXoNFTkIZNGNC5yQdNpZSX0LqFqzmxVR1SHiOymebvcUlx+ADIpuXGw==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] @@ -607,8 +607,8 @@ packages: dev: false optional: true - /@tauri-apps/cli-linux-arm-gnueabihf/1.2.2: - resolution: {integrity: sha512-yYTdQurgi4QZR8z+fANjl522jdQz/VtesFpw+C/A0+zXg7tiRjicsywBDdPsvNzCqFeGKKkmTR+Lny5qxhGaeQ==} + /@tauri-apps/cli-linux-arm-gnueabihf/2.0.0-alpha.8: + resolution: {integrity: sha512-7LHfZA99ncMDUO/wCGMtrqmDHt1uEKZiNmuzPljWLUwVvbAn0pNWNygnvPNVLEOyav5NnZSGPqT1Zmn+L6Fpyg==} engines: {node: '>= 10'} cpu: [arm] os: [linux] @@ -616,8 +616,8 @@ packages: dev: false optional: true - /@tauri-apps/cli-linux-arm64-gnu/1.2.2: - resolution: {integrity: sha512-ZSOVT6Eq1ay2+27B8KfA0MnpO7KYzONU6TjenH7DNcQki6eWGG5JoNu8QQ9Mdn3dAzY0XBP9i1ZHQOFu4iPtEg==} + /@tauri-apps/cli-linux-arm64-gnu/2.0.0-alpha.8: + resolution: {integrity: sha512-imq2MdhWdREvL2sqbU26mzH9sgSvfNWP0uvCPvPxUhK157xqdtGw+Gqm00hwnhTuT5bOFlsUNfnG2U19k1qMpA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -625,8 +625,8 @@ packages: dev: false optional: true - /@tauri-apps/cli-linux-arm64-musl/1.2.2: - resolution: {integrity: sha512-/NHSkqNQ+Pr4PshvyD1CeNFaPCaCpe1OeuAQgVi0rboSecC9fXN96G5dQbSBoxOUcCo6f8aTVE7zkZ4WchFVog==} + /@tauri-apps/cli-linux-arm64-musl/2.0.0-alpha.8: + resolution: {integrity: sha512-7hXEyvCosBHIN6ahkbFOI5JoyWZAulc0sYd3hWh9V/MBfU+LlPiapsJi6fdde0zew5nnzwcCtfEKkoR737tAig==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -634,8 +634,8 @@ packages: dev: false optional: true - /@tauri-apps/cli-linux-x64-gnu/1.2.2: - resolution: {integrity: sha512-4YTmfPuyvlHsvCkATDMwhklfuQm3HKxYXv/IOW9H0ra6pS9efVhrFYIC9Vfv6XaKN85Vnn/FYTEGMJLwCxZw2Q==} + /@tauri-apps/cli-linux-x64-gnu/2.0.0-alpha.8: + resolution: {integrity: sha512-S9T/trKpXcLc7hVIv7xFrRBlaivHD/HLUz0nYAkI2izNGFmbP3QpkqQDdwpWN/fxneodNgI2/mDFC3NULClj+A==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -643,8 +643,8 @@ packages: dev: false optional: true - /@tauri-apps/cli-linux-x64-musl/1.2.2: - resolution: {integrity: sha512-wr46tbscwFuCcA931R+ItOiUTT0djMmgKLd1HFCmFF82V9BKE2reIjr6O9l0NCXCo2WeD4pe3jA/Pt1dxDu+JA==} + /@tauri-apps/cli-linux-x64-musl/2.0.0-alpha.8: + resolution: {integrity: sha512-90mx6vSFNBbctaPaKhkH+um51gOoRJwLFOadOkklHS5Q6S6GjtSa1lmBEFyKUTAfFPtmiacuNYtoKx7nqm+z1Q==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -652,8 +652,8 @@ packages: dev: false optional: true - /@tauri-apps/cli-win32-ia32-msvc/1.2.2: - resolution: {integrity: sha512-6VmbVJOWUZJK5/JKhb3mNFKrKGfq0KV7lJGumfN95WJgkHeyL61p8bZit+o6ZgUGUhrOabkAawhDkrRY+ZQhIw==} + /@tauri-apps/cli-win32-ia32-msvc/2.0.0-alpha.8: + resolution: {integrity: sha512-VAMsLJYfp6iVI7oJ+uIkfe8DKPRMtWDiSEkfFqvDyFX0WMTQl23B0AzYyapVwZc+WkTkLuoMLpIWMQCgAoQWfQ==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] @@ -661,8 +661,8 @@ packages: dev: false optional: true - /@tauri-apps/cli-win32-x64-msvc/1.2.2: - resolution: {integrity: sha512-YRPJguJma+zSuRZpFoSZqls6+laggG1vqG0FPQWQTi+ywATgMpai2b2RZnffDlpHKp9mt4V/s2dtqOy6bpGZHg==} + /@tauri-apps/cli-win32-x64-msvc/2.0.0-alpha.8: + resolution: {integrity: sha512-zvWd13hRfRM0AEJJZ4t4CeB/cyru8hvbB6c+sxYDS9GPRWfHSH5dIeKoHhnMwP5fEOPZLN7VaeEP6tC88trD6g==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -670,20 +670,20 @@ packages: dev: false optional: true - /@tauri-apps/cli/1.2.2: - resolution: {integrity: sha512-D8zib3A0vWCvPPSyYLxww/OdDlVcY7fpcDVBH6qUvheOjj2aCyU7H9AYMRBwpgCfz8zY5+vomee+laLeB0H13w==} + /@tauri-apps/cli/2.0.0-alpha.8: + resolution: {integrity: sha512-cXt6pxh7oiV8Htz7eTPor7if4aN9f9emn10+5h2Y82YzST7I7wKXsrjuk0HIyzUiqiQjUgl3iT9gh791zgtI3w==} engines: {node: '>= 10'} hasBin: true optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 1.2.2 - '@tauri-apps/cli-darwin-x64': 1.2.2 - '@tauri-apps/cli-linux-arm-gnueabihf': 1.2.2 - '@tauri-apps/cli-linux-arm64-gnu': 1.2.2 - '@tauri-apps/cli-linux-arm64-musl': 1.2.2 - '@tauri-apps/cli-linux-x64-gnu': 1.2.2 - '@tauri-apps/cli-linux-x64-musl': 1.2.2 - '@tauri-apps/cli-win32-ia32-msvc': 1.2.2 - '@tauri-apps/cli-win32-x64-msvc': 1.2.2 + '@tauri-apps/cli-darwin-arm64': 2.0.0-alpha.8 + '@tauri-apps/cli-darwin-x64': 2.0.0-alpha.8 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-alpha.8 + '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-alpha.8 + '@tauri-apps/cli-linux-arm64-musl': 2.0.0-alpha.8 + '@tauri-apps/cli-linux-x64-gnu': 2.0.0-alpha.8 + '@tauri-apps/cli-linux-x64-musl': 2.0.0-alpha.8 + '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-alpha.8 + '@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.8 dev: false /@types/cookie/0.5.1: