From 5f75ebbbbb9ae821d9f2e229ca0110e16f8f0316 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Oct 2023 02:26:11 +0000 Subject: [PATCH] chore(deps) Update Tauri CLI (1.x) (#8051) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lucas Nogueira --- tooling/cli/Cargo.lock | 20 +++++++++-------- tooling/cli/Cargo.toml | 22 +++++++++---------- .../jest/fixtures/app/src-tauri/Cargo.toml | 2 +- tooling/cli/src/helpers/web_dev_server.rs | 2 +- tooling/cli/src/init.rs | 8 +++---- tooling/cli/src/interface/rust.rs | 4 ++-- 6 files changed, 30 insertions(+), 28 deletions(-) diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index 7b7e66fbba5f..157c881e6238 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -742,13 +742,14 @@ dependencies = [ [[package]] name = "dialoguer" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" +checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" dependencies = [ "console", "shell-words", "tempfile", + "thiserror", "zeroize", ] @@ -1923,11 +1924,12 @@ dependencies = [ [[package]] name = "notify-debouncer-mini" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55ee272914f4563a2f8b8553eb6811f3c0caea81c756346bad15b7e3ef969f0" +checksum = "5d40b221972a1fc5ef4d858a2f671fb34c75983eb385463dff3780eeff6a9d43" dependencies = [ "crossbeam-channel", + "log", "notify", ] @@ -3435,7 +3437,7 @@ dependencies = [ "tauri-icns", "tauri-utils", "tokio", - "toml 0.7.8", + "toml 0.8.2", "toml_edit", "unicode-width", "ureq", @@ -3685,9 +3687,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", @@ -3706,9 +3708,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap 2.0.2", "serde", diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index 801c0a5553ca..e6ef98d571a5 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -40,33 +40,33 @@ path = "src/main.rs" [dependencies] clap_complete = "4" -clap = { version = "4.3", features = [ "derive" ] } +clap = { version = "4.4", features = [ "derive" ] } anyhow = "1.0" tauri-bundler = { version = "1.4.4", path = "../bundler", default-features = false } colored = "2.0" once_cell = "1" serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" -notify = "6.0" -notify-debouncer-mini = "0.3" +notify = "6.1" +notify-debouncer-mini = "0.4" shared_child = "1.0" -toml_edit = "0.19" -json-patch = "1.0" +toml_edit = "0.20" +json-patch = "1.2" tauri-utils = { version = "1.5.0", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] } -toml = "0.7" +toml = "0.8" jsonschema = "0.17" -handlebars = "4.3" +handlebars = "4.4" include_dir = "0.7" minisign = "=0.7.5" -base64 = "0.21.2" -ureq = { version = "2.7", default-features = false, features = [ "gzip" ] } +base64 = "0.21.4" +ureq = { version = "2.8", default-features = false, features = [ "gzip" ] } os_info = "3" semver = "1.0" -regex = "1.9.3" +regex = "1.10.2" unicode-width = "0.1" zeroize = "1.6" heck = { version = "0.4", features = [ "unicode" ] } -dialoguer = "0.10" +dialoguer = "0.11" url = { version = "2.4", features = [ "serde" ] } os_pipe = "1" ignore = "0.4" diff --git a/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml b/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml index 9a1ed09ae24a..99a4984ed2d7 100644 --- a/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml +++ b/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml @@ -24,7 +24,7 @@ icon = [ tauri-build = { path = "../../../../../../../../core/tauri-build", features = [] } [dependencies] -serde_json = "1.0.105" +serde_json = "1.0.107" serde = "1.0" serde_derive = "1.0" tauri = { path = "../../../../../../../../core/tauri", features = ["api-all"] } diff --git a/tooling/cli/src/helpers/web_dev_server.rs b/tooling/cli/src/helpers/web_dev_server.rs index 3db17ea6d316..ff05ab556416 100644 --- a/tooling/cli/src/helpers/web_dev_server.rs +++ b/tooling/cli/src/helpers/web_dev_server.rs @@ -47,7 +47,7 @@ pub fn start_dev_server>(path: P, port: Option) -> crate::Re let serve_dir_ = serve_dir.clone(); thread::spawn(move || { let (tx, rx) = sync_channel(1); - let mut watcher = new_debouncer(Duration::from_secs(1), None, move |r| { + let mut watcher = new_debouncer(Duration::from_secs(1), move |r| { if let Ok(events) = r { tx.send(events).unwrap() } diff --git a/tooling/cli/src/init.rs b/tooling/cli/src/init.rs index a2dcaceeccfb..d86fa40f69a1 100644 --- a/tooling/cli/src/init.rs +++ b/tooling/cli/src/init.rs @@ -294,12 +294,12 @@ where Ok(initial) } else { let theme = dialoguer::theme::ColorfulTheme::default(); - let mut builder = Input::with_theme(&theme); - builder.with_prompt(prompt); - builder.allow_empty(allow_empty); + let mut builder = Input::with_theme(&theme) + .with_prompt(prompt) + .allow_empty(allow_empty); if let Some(v) = initial { - builder.with_initial_text(v.to_string()); + builder = builder.with_initial_text(v.to_string()); } builder.interact_text().map(Some).map_err(Into::into) diff --git a/tooling/cli/src/interface/rust.rs b/tooling/cli/src/interface/rust.rs index d2fb9474fe61..88c391a6cc7c 100644 --- a/tooling/cli/src/interface/rust.rs +++ b/tooling/cli/src/interface/rust.rs @@ -129,7 +129,7 @@ impl Interface for Rust { fn new(config: &Config, target: Option) -> crate::Result { let manifest = { let (tx, rx) = sync_channel(1); - let mut watcher = new_debouncer(Duration::from_secs(1), None, move |r| { + let mut watcher = new_debouncer(Duration::from_secs(1), move |r| { if let Ok(events) = r { let _ = tx.send(events); } @@ -424,7 +424,7 @@ impl Rust { let common_ancestor = common_path::common_path_all(watch_folders.clone()).unwrap(); let ignore_matcher = build_ignore_matcher(&common_ancestor); - let mut watcher = new_debouncer(Duration::from_secs(1), None, move |r| { + let mut watcher = new_debouncer(Duration::from_secs(1), move |r| { if let Ok(events) = r { tx.send(events).unwrap() }