From a4b82d9dba7053846b79c7278db37e0e13ec48a9 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Sun, 18 Feb 2024 22:31:35 -0300 Subject: [PATCH] chore: bump tauri-utils --- Cargo.lock | 2 +- core/tauri-build/Cargo.toml | 21 ++- core/tauri-codegen/Cargo.toml | 32 ++-- core/tauri-macros/Cargo.toml | 26 +-- core/tauri-runtime-wry/Cargo.toml | 43 +++-- core/tauri-runtime/Cargo.toml | 34 ++-- core/tauri-utils/CHANGELOG.md | 6 + core/tauri-utils/Cargo.toml | 2 +- core/tauri/Cargo.toml | 298 ++++++++++++++++-------------- tooling/bundler/Cargo.toml | 43 ++--- tooling/cli/Cargo.toml | 49 +++-- 11 files changed, 300 insertions(+), 256 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 17d4822e795..a4ce2a249df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4198,7 +4198,7 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.5.2" +version = "1.5.3" dependencies = [ "aes-gcm", "brotli", diff --git a/core/tauri-build/Cargo.toml b/core/tauri-build/Cargo.toml index aa687195580..459db3a4288 100644 --- a/core/tauri-build/Cargo.toml +++ b/core/tauri-build/Cargo.toml @@ -1,26 +1,29 @@ [package] name = "tauri-build" version = "1.5.1" -authors = [ "Tauri Programme within The Commons Conservancy" ] -categories = [ "gui", "web-programming" ] +authors = ["Tauri Programme within The Commons Conservancy"] +categories = ["gui", "web-programming"] license = "Apache-2.0 OR MIT" homepage = "https://tauri.app" repository = "https://github.com/tauri-apps/tauri/tree/dev/core/tauri-build" description = "build time code to pair with https://crates.io/crates/tauri" edition = "2021" rust-version = "1.60" -exclude = [ "CHANGELOG.md", "/target" ] +exclude = ["CHANGELOG.md", "/target"] readme = "README.md" [package.metadata.docs.rs] all-features = true -rustdoc-args = [ "--cfg", "doc_cfg" ] +rustdoc-args = ["--cfg", "doc_cfg"] [dependencies] anyhow = "1" quote = { version = "1", optional = true } tauri-codegen = { version = "1.4.2", path = "../tauri-codegen", optional = true } -tauri-utils = { version = "1.5.2", path = "../tauri-utils", features = [ "build", "resources" ] } +tauri-utils = { version = "1.5.3", path = "../tauri-utils", features = [ + "build", + "resources", +] } cargo_toml = "0.15" serde = "1" serde_json = "1" @@ -32,7 +35,7 @@ walkdir = "2" dirs-next = "2" [features] -codegen = [ "tauri-codegen", "quote" ] -isolation = [ "tauri-codegen/isolation", "tauri-utils/isolation" ] -config-json5 = [ "tauri-utils/config-json5" ] -config-toml = [ "tauri-utils/config-toml" ] +codegen = ["tauri-codegen", "quote"] +isolation = ["tauri-codegen/isolation", "tauri-utils/isolation"] +config-json5 = ["tauri-utils/config-json5"] +config-toml = ["tauri-utils/config-toml"] diff --git a/core/tauri-codegen/Cargo.toml b/core/tauri-codegen/Cargo.toml index ee31ca607eb..7c4b32a1bbb 100644 --- a/core/tauri-codegen/Cargo.toml +++ b/core/tauri-codegen/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "tauri-codegen" version = "1.4.2" -authors = [ "Tauri Programme within The Commons Conservancy" ] -categories = [ "gui", "web-programming" ] +authors = ["Tauri Programme within The Commons Conservancy"] +categories = ["gui", "web-programming"] license = "Apache-2.0 OR MIT" homepage = "https://tauri.app" repository = "https://github.com/tauri-apps/tauri/tree/dev/core/tauri-codegen" description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`" edition = "2021" rust-version = "1.60" -exclude = [ "CHANGELOG.md", "/target" ] +exclude = ["CHANGELOG.md", "/target"] readme = "README.md" [dependencies] @@ -17,14 +17,18 @@ sha2 = "0.10" base64 = "0.21" proc-macro2 = "1" quote = "1" -serde = { version = "1", features = [ "derive" ] } +serde = { version = "1", features = ["derive"] } serde_json = "1" -tauri-utils = { version = "1.5.2", path = "../tauri-utils", features = [ "build" ] } +tauri-utils = { version = "1.5.3", path = "../tauri-utils", features = [ + "build", +] } thiserror = "1" walkdir = "2" -brotli = { version = "3", optional = true, default-features = false, features = [ "std" ] } +brotli = { version = "3", optional = true, default-features = false, features = [ + "std", +] } regex = { version = "1", optional = true } -uuid = { version = "1", features = [ "v4" ] } +uuid = { version = "1", features = ["v4"] } semver = "1" ico = "0.3" png = "0.17" @@ -32,12 +36,12 @@ json-patch = "1.2" [target."cfg(target_os = \"macos\")".dependencies] plist = "1" -time = { version = "0.3", features = [ "parsing", "formatting" ] } +time = { version = "0.3", features = ["parsing", "formatting"] } [features] -default = [ "compression" ] -compression = [ "brotli", "tauri-utils/compression" ] -isolation = [ "tauri-utils/isolation" ] -shell-scope = [ "regex" ] -config-json5 = [ "tauri-utils/config-json5" ] -config-toml = [ "tauri-utils/config-toml" ] +default = ["compression"] +compression = ["brotli", "tauri-utils/compression"] +isolation = ["tauri-utils/isolation"] +shell-scope = ["regex"] +config-json5 = ["tauri-utils/config-json5"] +config-toml = ["tauri-utils/config-toml"] diff --git a/core/tauri-macros/Cargo.toml b/core/tauri-macros/Cargo.toml index b38db4ba594..383257cf579 100644 --- a/core/tauri-macros/Cargo.toml +++ b/core/tauri-macros/Cargo.toml @@ -1,33 +1,33 @@ [package] name = "tauri-macros" version = "1.4.3" -authors = [ "Tauri Programme within The Commons Conservancy" ] -categories = [ "gui", "os", "filesystem", "web-programming" ] +authors = ["Tauri Programme within The Commons Conservancy"] +categories = ["gui", "os", "filesystem", "web-programming"] license = "Apache-2.0 OR MIT" homepage = "https://tauri.app" repository = "https://github.com/tauri-apps/tauri" description = "Macros for the tauri crate." edition = "2021" rust-version = "1.60" -exclude = [ "CHANGELOG.md", "/target" ] +exclude = ["CHANGELOG.md", "/target"] readme = "README.md" [lib] proc-macro = true [dependencies] -proc-macro2 = { version = "1", features = [ "span-locations" ] } +proc-macro2 = { version = "1", features = ["span-locations"] } quote = "1" -syn = { version = "1", features = [ "full" ] } +syn = { version = "1", features = ["full"] } heck = "0.4" tauri-codegen = { version = "1.4.2", default-features = false, path = "../tauri-codegen" } -tauri-utils = { version = "1.5.2", path = "../tauri-utils" } +tauri-utils = { version = "1.5.3", path = "../tauri-utils" } [features] -custom-protocol = [ ] -compression = [ "tauri-codegen/compression" ] -isolation = [ "tauri-codegen/isolation" ] -shell-scope = [ "tauri-codegen/shell-scope" ] -config-json5 = [ "tauri-codegen/config-json5", "tauri-utils/config-json5" ] -config-toml = [ "tauri-codegen/config-toml", "tauri-utils/config-toml" ] -tracing = [ ] +custom-protocol = [] +compression = ["tauri-codegen/compression"] +isolation = ["tauri-codegen/isolation"] +shell-scope = ["tauri-codegen/shell-scope"] +config-json5 = ["tauri-codegen/config-json5", "tauri-utils/config-json5"] +config-toml = ["tauri-codegen/config-toml", "tauri-utils/config-toml"] +tracing = [] diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml index 0d9f25ec8c5..59f1758e56b 100644 --- a/core/tauri-runtime-wry/Cargo.toml +++ b/core/tauri-runtime-wry/Cargo.toml @@ -1,22 +1,25 @@ [package] name = "tauri-runtime-wry" version = "0.14.4" -authors = [ "Tauri Programme within The Commons Conservancy" ] -categories = [ "gui", "web-programming" ] +authors = ["Tauri Programme within The Commons Conservancy"] +categories = ["gui", "web-programming"] license = "Apache-2.0 OR MIT" homepage = "https://tauri.app" repository = "https://github.com/tauri-apps/tauri" description = "Wry bindings to the Tauri runtime" edition = "2021" rust-version = "1.60" -exclude = [ "CHANGELOG.md", "/target" ] +exclude = ["CHANGELOG.md", "/target"] readme = "README.md" [dependencies] -wry = { version = "0.24.6", default-features = false, features = [ "file-drop", "protocol" ] } +wry = { version = "0.24.6", default-features = false, features = [ + "file-drop", + "protocol", +] } tauri-runtime = { version = "0.14.2", path = "../tauri-runtime" } -tauri-utils = { version = "1.5.2", path = "../tauri-utils" } -uuid = { version = "1", features = [ "v4" ] } +tauri-utils = { version = "1.5.3", path = "../tauri-utils" } +uuid = { version = "1", features = ["v4"] } rand = "0.8" raw-window-handle = "0.5" tracing = { version = "0.1", optional = true } @@ -25,29 +28,29 @@ arboard = { version = "3", optional = true } [target."cfg(windows)".dependencies] webview2-com = "0.19.1" - [target."cfg(windows)".dependencies.windows] - version = "0.39.0" - features = [ "Win32_Foundation" ] +[target."cfg(windows)".dependencies.windows] +version = "0.39.0" +features = ["Win32_Foundation"] [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] -gtk = { version = "0.15", features = [ "v3_20" ] } -webkit2gtk = { version = "0.18.2", features = [ "v2_22" ] } +gtk = { version = "0.15", features = ["v3_20"] } +webkit2gtk = { version = "0.18.2", features = ["v2_22"] } percent-encoding = "2.1" [target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies] cocoa = "0.24" [features] -dox = [ "wry/dox" ] -devtools = [ "wry/devtools", "tauri-runtime/devtools" ] -system-tray = [ "tauri-runtime/system-tray", "wry/tray" ] +dox = ["wry/dox"] +devtools = ["wry/devtools", "tauri-runtime/devtools"] +system-tray = ["tauri-runtime/system-tray", "wry/tray"] macos-private-api = [ "wry/fullscreen", "wry/transparent", - "tauri-runtime/macos-private-api" + "tauri-runtime/macos-private-api", ] -objc-exception = [ "wry/objc-exception" ] -global-shortcut = [ "tauri-runtime/global-shortcut" ] -clipboard = [ "tauri-runtime/clipboard", "arboard/wayland-data-control" ] -linux-headers = [ "wry/linux-headers", "webkit2gtk/v2_36" ] -tracing = [ "dep:tracing", "wry/tracing" ] +objc-exception = ["wry/objc-exception"] +global-shortcut = ["tauri-runtime/global-shortcut"] +clipboard = ["tauri-runtime/clipboard", "arboard/wayland-data-control"] +linux-headers = ["wry/linux-headers", "webkit2gtk/v2_36"] +tracing = ["dep:tracing", "wry/tracing"] diff --git a/core/tauri-runtime/Cargo.toml b/core/tauri-runtime/Cargo.toml index cccd75221da..153d9016991 100644 --- a/core/tauri-runtime/Cargo.toml +++ b/core/tauri-runtime/Cargo.toml @@ -1,33 +1,33 @@ [package] name = "tauri-runtime" version = "0.14.2" -authors = [ "Tauri Programme within The Commons Conservancy" ] -categories = [ "gui", "web-programming" ] +authors = ["Tauri Programme within The Commons Conservancy"] +categories = ["gui", "web-programming"] license = "Apache-2.0 OR MIT" homepage = "https://tauri.app" repository = "https://github.com/tauri-apps/tauri" description = "Runtime for Tauri applications" edition = "2021" rust-version = "1.60" -exclude = [ "CHANGELOG.md", "/target" ] +exclude = ["CHANGELOG.md", "/target"] readme = "README.md" [package.metadata.docs.rs] all-features = true -rustdoc-args = [ "--cfg", "doc_cfg" ] +rustdoc-args = ["--cfg", "doc_cfg"] default-target = "x86_64-unknown-linux-gnu" targets = [ "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", - "x86_64-apple-darwin" + "x86_64-apple-darwin", ] [dependencies] -serde = { version = "1.0", features = [ "derive" ] } +serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" -tauri-utils = { version = "1.5.2", path = "../tauri-utils" } -uuid = { version = "1", features = [ "v4" ] } +tauri-utils = { version = "1.5.3", path = "../tauri-utils" } +uuid = { version = "1", features = ["v4"] } http = "0.2.4" http-range = "0.1.4" raw-window-handle = "0.5" @@ -37,16 +37,16 @@ url = { version = "2" } [target."cfg(windows)".dependencies] webview2-com = "0.19.1" - [target."cfg(windows)".dependencies.windows] - version = "0.39.0" - features = [ "Win32_Foundation" ] +[target."cfg(windows)".dependencies.windows] +version = "0.39.0" +features = ["Win32_Foundation"] [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] -gtk = { version = "0.15", features = [ "v3_20" ] } +gtk = { version = "0.15", features = ["v3_20"] } [features] -devtools = [ ] -system-tray = [ ] -macos-private-api = [ ] -global-shortcut = [ ] -clipboard = [ ] +devtools = [] +system-tray = [] +macos-private-api = [] +global-shortcut = [] +clipboard = [] diff --git a/core/tauri-utils/CHANGELOG.md b/core/tauri-utils/CHANGELOG.md index 56b7548e4f8..6b60f44fbe6 100644 --- a/core/tauri-utils/CHANGELOG.md +++ b/core/tauri-utils/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[1.5.3] + +### New features + +- [`7aa30dec`](https://www.github.com/tauri-apps/tauri/commit/7aa30dec85a17c3d3faaf3841b93e10991b991b0)([#8620](https://www.github.com/tauri-apps/tauri/pull/8620)) Add `priority`, `section` and `changelog` options in Debian config. + ## \[1.5.2] ### Bug Fixes diff --git a/core/tauri-utils/Cargo.toml b/core/tauri-utils/Cargo.toml index a7c2748fa3e..8a360757019 100644 --- a/core/tauri-utils/Cargo.toml +++ b/core/tauri-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-utils" -version = "1.5.2" +version = "1.5.3" authors = [ "Tauri Programme within The Commons Conservancy" ] license = "Apache-2.0 OR MIT" homepage = "https://tauri.app" diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 18b8995dbd4..83c8a411693 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -1,10 +1,10 @@ [package] -authors = [ "Tauri Programme within The Commons Conservancy" ] -categories = [ "gui", "web-programming" ] +authors = ["Tauri Programme within The Commons Conservancy"] +categories = ["gui", "web-programming"] description = "Make tiny, secure apps for all desktop platforms with Tauri" edition = "2021" rust-version = "1.60" -exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ] +exclude = ["/test", "/.scripts", "CHANGELOG.md", "/target"] homepage = "https://tauri.app" license = "Apache-2.0 OR MIT" name = "tauri" @@ -35,35 +35,43 @@ features = [ "process-exit", "protocol-asset", "process-command-api", - "shell-open" + "shell-open", ] -rustdoc-args = [ "--cfg", "doc_cfg" ] +rustdoc-args = ["--cfg", "doc_cfg"] default-target = "x86_64-unknown-linux-gnu" targets = [ "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", - "x86_64-apple-darwin" + "x86_64-apple-darwin", ] [package.metadata.cargo-udeps.ignore] -normal = [ "reqwest", "nix" ] +normal = ["reqwest", "nix"] [dependencies] -serde_json = { version = "1.0", features = [ "raw_value", "preserve_order" ] } -serde = { version = "1.0", features = [ "derive" ] } -tokio = { version = "1", features = [ "rt", "rt-multi-thread", "sync", "fs", "io-util" ] } +serde_json = { version = "1.0", features = ["raw_value", "preserve_order"] } +serde = { version = "1.0", features = ["derive"] } +tokio = { version = "1", features = [ + "rt", + "rt-multi-thread", + "sync", + "fs", + "io-util", +] } futures-util = "0.3" -uuid = { version = "1", features = [ "v4" ] } +uuid = { version = "1", features = ["v4"] } url = { version = "2.3" } anyhow = "1.0" thiserror = "1.0" once_cell = "1" tauri-runtime = { version = "0.14.2", path = "../tauri-runtime" } tauri-macros = { version = "1.4.3", path = "../tauri-macros" } -tauri-utils = { version = "1.5.2", features = [ "resources" ], path = "../tauri-utils" } +tauri-utils = { version = "1.5.3", features = [ + "resources", +], path = "../tauri-utils" } tauri-runtime-wry = { version = "0.14.4", path = "../tauri-runtime-wry", optional = true } rand = "0.8" -semver = { version = "1.0", features = [ "serde" ] } +semver = { version = "1.0", features = ["serde"] } serde_repr = "0.1" state = "0.5" tar = "0.4.38" @@ -76,14 +84,17 @@ dirs-next = "2.0" percent-encoding = "2.2" base64 = { version = "0.21", optional = true } clap = { version = "3", optional = true } -reqwest = { version = "0.11", features = [ "json", "stream" ], optional = true } -bytes = { version = "1", features = [ "serde" ], optional = true } +reqwest = { version = "0.11", features = ["json", "stream"], optional = true } +bytes = { version = "1", features = ["serde"], optional = true } open = { version = "3.2", optional = true } shared_child = { version = "1.0", optional = true } os_pipe = { version = "1.0", optional = true } raw-window-handle = "0.5" minisign-verify = { version = "0.2", optional = true } -time = { version = "0.3", features = [ "parsing", "formatting" ], optional = true } +time = { version = "0.3", features = [ + "parsing", + "formatting", +], optional = true } os_info = { version = "3", optional = true } regex = { version = "1", optional = true } glob = "0.3" @@ -95,17 +106,24 @@ ico = { version = "0.2.0", optional = true } encoding_rs = "0.8.31" sys-locale = { version = "0.2.3", optional = true } tracing = { version = "0.1", optional = true } -indexmap = { version = "1", features = [ "std", "serde" ], optional = true } +indexmap = { version = "1", features = ["std", "serde"], optional = true } [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] -rfd = { version = "0.10", optional = true, features = [ "gtk3", "common-controls-v6" ] } +rfd = { version = "0.10", optional = true, features = [ + "gtk3", + "common-controls-v6", +] } notify-rust = { version = "4.5", optional = true } [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] -gtk = { version = "0.15", features = [ "v3_20" ] } +gtk = { version = "0.15", features = ["v3_20"] } glib = "0.15" -webkit2gtk = { version = "0.18.2", features = [ "v2_22" ] } -nix = { version = "0.26.0", default-features = false, features = [ "user", "socket", "uio" ], optional = true } +webkit2gtk = { version = "0.18.2", features = ["v2_22"] } +nix = { version = "0.26.0", default-features = false, features = [ + "user", + "socket", + "uio", +], optional = true } [target."cfg(target_os = \"macos\")".dependencies] embed_plist = "1.2" @@ -117,9 +135,9 @@ dunce = "1" webview2-com = "0.19.1" win7-notifications = { version = "0.4", optional = true } - [target."cfg(windows)".dependencies.windows] - version = "0.39.0" - features = [ "Win32_Foundation" ] +[target."cfg(windows)".dependencies.windows] +version = "0.39.0" +features = ["Win32_Foundation"] [build-dependencies] heck = "0.4" @@ -130,61 +148,57 @@ mockito = "0.31" proptest = "1.0.0" quickcheck = "1.0.3" quickcheck_macros = "1.0.0" -serde = { version = "1.0", features = [ "derive" ] } +serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -tauri = { path = ".", default-features = false, features = [ "wry" ] } +tauri = { path = ".", default-features = false, features = ["wry"] } tokio-test = "0.4.2" -tokio = { version = "1", features = [ "full" ] } +tokio = { version = "1", features = ["full"] } cargo_toml = "0.11" [features] -default = [ "wry", "compression", "objc-exception" ] -tracing = [ - "dep:tracing", - "tauri-macros/tracing", - "tauri-runtime-wry/tracing" -] -test = [ ] -compression = [ "tauri-macros/compression", "tauri-utils/compression" ] -wry = [ "tauri-runtime-wry" ] -objc-exception = [ "tauri-runtime-wry/objc-exception" ] -linux-protocol-headers = [ "tauri-runtime-wry/linux-headers", "webkit2gtk/v2_36" ] -isolation = [ "tauri-utils/isolation", "tauri-macros/isolation" ] -custom-protocol = [ "tauri-macros/custom-protocol" ] +default = ["wry", "compression", "objc-exception"] +tracing = ["dep:tracing", "tauri-macros/tracing", "tauri-runtime-wry/tracing"] +test = [] +compression = ["tauri-macros/compression", "tauri-utils/compression"] +wry = ["tauri-runtime-wry"] +objc-exception = ["tauri-runtime-wry/objc-exception"] +linux-protocol-headers = ["tauri-runtime-wry/linux-headers", "webkit2gtk/v2_36"] +isolation = ["tauri-utils/isolation", "tauri-macros/isolation"] +custom-protocol = ["tauri-macros/custom-protocol"] updater = [ "minisign-verify", "time", "base64", "http-api", "dialog-ask", - "fs-extract-api" + "fs-extract-api", ] -http-api = [ "reqwest", "bytes", "indexmap" ] -http-multipart = [ "reqwest/multipart" ] -os-api = [ "sys-locale" ] -shell-open-api = [ "open", "regex", "tauri-macros/shell-scope" ] -fs-extract-api = [ "zip" ] -reqwest-client = [ "http-api" ] -reqwest-native-tls-vendored = [ "native-tls-vendored" ] -native-tls-vendored = [ "reqwest/native-tls-vendored" ] -process-command-api = [ "shared_child", "os_pipe" ] +http-api = ["reqwest", "bytes", "indexmap"] +http-multipart = ["reqwest/multipart"] +os-api = ["sys-locale"] +shell-open-api = ["open", "regex", "tauri-macros/shell-scope"] +fs-extract-api = ["zip"] +reqwest-client = ["http-api"] +reqwest-native-tls-vendored = ["native-tls-vendored"] +native-tls-vendored = ["reqwest/native-tls-vendored"] +process-command-api = ["shared_child", "os_pipe"] global-shortcut = [ "tauri-runtime/global-shortcut", - "tauri-runtime-wry/global-shortcut" + "tauri-runtime-wry/global-shortcut", ] -clipboard = [ "tauri-runtime/clipboard", "tauri-runtime-wry/clipboard" ] -dialog = [ "rfd" ] -notification = [ "notify-rust", "nix" ] -cli = [ "clap" ] -system-tray = [ "tauri-runtime/system-tray", "tauri-runtime-wry/system-tray" ] -devtools = [ "tauri-runtime/devtools", "tauri-runtime-wry/devtools" ] -dox = [ "tauri-runtime-wry/dox" ] +clipboard = ["tauri-runtime/clipboard", "tauri-runtime-wry/clipboard"] +dialog = ["rfd"] +notification = ["notify-rust", "nix"] +cli = ["clap"] +system-tray = ["tauri-runtime/system-tray", "tauri-runtime-wry/system-tray"] +devtools = ["tauri-runtime/devtools", "tauri-runtime-wry/devtools"] +dox = ["tauri-runtime-wry/dox"] macos-private-api = [ "tauri-runtime/macos-private-api", - "tauri-runtime-wry/macos-private-api" + "tauri-runtime-wry/macos-private-api", ] -windows7-compat = [ "win7-notifications" ] -window-data-url = [ "data-url" ] +windows7-compat = ["win7-notifications"] +window-data-url = ["data-url"] api-all = [ "clipboard-all", "dialog-all", @@ -198,17 +212,17 @@ api-all = [ "protocol-all", "shell-all", "window-all", - "app-all" + "app-all", ] -clipboard-all = [ "clipboard-write-text", "clipboard-read-text" ] -clipboard-read-text = [ "clipboard" ] -clipboard-write-text = [ "clipboard" ] -dialog-all = [ "dialog-open", "dialog-save", "dialog-message", "dialog-ask" ] -dialog-ask = [ "dialog" ] -dialog-confirm = [ "dialog" ] -dialog-message = [ "dialog" ] -dialog-open = [ "dialog" ] -dialog-save = [ "dialog" ] +clipboard-all = ["clipboard-write-text", "clipboard-read-text"] +clipboard-read-text = ["clipboard"] +clipboard-write-text = ["clipboard"] +dialog-all = ["dialog-open", "dialog-save", "dialog-message", "dialog-ask"] +dialog-ask = ["dialog"] +dialog-confirm = ["dialog"] +dialog-message = ["dialog"] +dialog-open = ["dialog"] +dialog-save = ["dialog"] fs-all = [ "fs-copy-file", "fs-create-dir", @@ -218,33 +232,35 @@ fs-all = [ "fs-remove-dir", "fs-remove-file", "fs-rename-file", - "fs-write-file" + "fs-write-file", +] +fs-copy-file = [] +fs-create-dir = [] +fs-exists = [] +fs-read-file = [] +fs-read-dir = [] +fs-remove-dir = [] +fs-remove-file = [] +fs-rename-file = [] +fs-write-file = [] +global-shortcut-all = ["global-shortcut"] +http-all = ["http-request"] +http-request = ["http-api"] +notification-all = ["notification", "dialog-ask"] +os-all = ["os_info", "os-api"] +path-all = [] +process-all = ["process-relaunch", "process-exit"] +process-exit = [] +process-relaunch = [] +process-relaunch-dangerous-allow-symlink-macos = [ + "tauri-utils/process-relaunch-dangerous-allow-symlink-macos", ] -fs-copy-file = [ ] -fs-create-dir = [ ] -fs-exists = [ ] -fs-read-file = [ ] -fs-read-dir = [ ] -fs-remove-dir = [ ] -fs-remove-file = [ ] -fs-rename-file = [ ] -fs-write-file = [ ] -global-shortcut-all = [ "global-shortcut" ] -http-all = [ "http-request" ] -http-request = [ "http-api" ] -notification-all = [ "notification", "dialog-ask" ] -os-all = [ "os_info", "os-api" ] -path-all = [ ] -process-all = [ "process-relaunch", "process-exit" ] -process-exit = [ ] -process-relaunch = [ ] -process-relaunch-dangerous-allow-symlink-macos = [ "tauri-utils/process-relaunch-dangerous-allow-symlink-macos" ] -protocol-all = [ "protocol-asset" ] -protocol-asset = [ ] -shell-all = [ "shell-execute", "shell-sidecar", "shell-open" ] -shell-execute = [ "process-command-api", "regex", "tauri-macros/shell-scope" ] -shell-sidecar = [ "process-command-api", "regex", "tauri-macros/shell-scope" ] -shell-open = [ "shell-open-api" ] +protocol-all = ["protocol-asset"] +protocol-asset = [] +shell-all = ["shell-execute", "shell-sidecar", "shell-open"] +shell-execute = ["process-command-api", "regex", "tauri-macros/shell-scope"] +shell-sidecar = ["process-command-api", "regex", "tauri-macros/shell-scope"] +shell-open = ["shell-open-api"] window-all = [ "window-create", "window-center", @@ -278,48 +294,48 @@ window-all = [ "window-set-cursor-position", "window-set-ignore-cursor-events", "window-start-dragging", - "window-print" + "window-print", ] -window-create = [ ] -window-center = [ ] -window-request-user-attention = [ ] -window-set-resizable = [ ] -window-set-maximizable = [ ] -window-set-minimizable = [ ] -window-set-closable = [ ] -window-set-title = [ ] -window-maximize = [ ] -window-unmaximize = [ ] -window-minimize = [ ] -window-unminimize = [ ] -window-show = [ ] -window-hide = [ ] -window-close = [ ] -window-set-decorations = [ ] -window-set-always-on-top = [ ] -window-set-content-protected = [ ] -window-set-size = [ ] -window-set-min-size = [ ] -window-set-max-size = [ ] -window-set-position = [ ] -window-set-fullscreen = [ ] -window-set-focus = [ ] -window-set-icon = [ ] -window-set-skip-taskbar = [ ] -window-set-cursor-grab = [ ] -window-set-cursor-visible = [ ] -window-set-cursor-icon = [ ] -window-set-cursor-position = [ ] -window-set-ignore-cursor-events = [ ] -window-start-dragging = [ ] -window-print = [ ] -app-all = [ "app-show", "app-hide" ] -app-show = [ ] -app-hide = [ ] -config-json5 = [ "tauri-macros/config-json5" ] -config-toml = [ "tauri-macros/config-toml" ] -icon-ico = [ "infer", "ico" ] -icon-png = [ "infer", "png" ] +window-create = [] +window-center = [] +window-request-user-attention = [] +window-set-resizable = [] +window-set-maximizable = [] +window-set-minimizable = [] +window-set-closable = [] +window-set-title = [] +window-maximize = [] +window-unmaximize = [] +window-minimize = [] +window-unminimize = [] +window-show = [] +window-hide = [] +window-close = [] +window-set-decorations = [] +window-set-always-on-top = [] +window-set-content-protected = [] +window-set-size = [] +window-set-min-size = [] +window-set-max-size = [] +window-set-position = [] +window-set-fullscreen = [] +window-set-focus = [] +window-set-icon = [] +window-set-skip-taskbar = [] +window-set-cursor-grab = [] +window-set-cursor-visible = [] +window-set-cursor-icon = [] +window-set-cursor-position = [] +window-set-ignore-cursor-events = [] +window-start-dragging = [] +window-print = [] +app-all = ["app-show", "app-hide"] +app-show = [] +app-hide = [] +config-json5 = ["tauri-macros/config-json5"] +config-toml = ["tauri-macros/config-toml"] +icon-ico = ["infer", "ico"] +icon-png = ["infer", "png"] [[example]] name = "commands" @@ -332,7 +348,7 @@ path = "../../examples/helloworld/main.rs" [[example]] name = "multiwindow" path = "../../examples/multiwindow/main.rs" -required-features = [ "window-create" ] +required-features = ["window-create"] [[example]] name = "parent-window" @@ -341,7 +357,7 @@ path = "../../examples/parent-window/main.rs" [[example]] name = "navigation" path = "../../examples/navigation/main.rs" -required-features = [ "window-create" ] +required-features = ["window-create"] [[example]] name = "splashscreen" @@ -358,4 +374,4 @@ path = "../../examples/streaming/main.rs" [[example]] name = "isolation" path = "../../examples/isolation/main.rs" -required-features = [ "isolation" ] +required-features = ["isolation"] diff --git a/tooling/bundler/Cargo.toml b/tooling/bundler/Cargo.toml index 1ec71bf7218..e2bf4849be7 100644 --- a/tooling/bundler/Cargo.toml +++ b/tooling/bundler/Cargo.toml @@ -1,38 +1,42 @@ -workspace = { } +workspace = {} [package] name = "tauri-bundler" version = "1.5.0" authors = [ "George Burton ", - "Tauri Programme within The Commons Conservancy" + "Tauri Programme within The Commons Conservancy", ] -categories = [ "command-line-utilities", "development-tools::cargo-plugins" ] +categories = ["command-line-utilities", "development-tools::cargo-plugins"] license = "Apache-2.0 OR MIT" -keywords = [ "bundle", "cargo", "tauri" ] +keywords = ["bundle", "cargo", "tauri"] repository = "https://github.com/tauri-apps/tauri" description = "Wrap rust executables in OS-specific app bundles for Tauri" edition = "2021" rust-version = "1.60" -exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ] +exclude = ["CHANGELOG.md", "/target", "rustfmt.toml"] [dependencies] -tauri-utils = { version = "1.5.2", path = "../../core/tauri-utils", features = [ "resources" ] } +tauri-utils = { version = "1.5.3", path = "../../core/tauri-utils", features = [ + "resources", +] } image = "0.24.7" flate2 = "1.0" anyhow = "1.0" thiserror = "1.0" serde_json = "1.0" -serde = { version = "1.0", features = [ "derive" ] } +serde = { version = "1.0", features = ["derive"] } strsim = "0.10.0" tar = "0.4.40" walkdir = "2" handlebars = "4.5" tempfile = "3.8.1" -log = { version = "0.4.20", features = [ "kv_unstable" ] } +log = { version = "0.4.20", features = ["kv_unstable"] } dirs-next = "2.0" os_pipe = "1" -ureq = { version = "2.9.1", default-features = false, features = [ "socks-proxy" ] } +ureq = { version = "2.9.1", default-features = false, features = [ + "socks-proxy", +] } native-tls = { version = "0.2", optional = true } hex = "0.4" semver = "1" @@ -42,20 +46,17 @@ zip = "0.6" dunce = "1" [target."cfg(target_os = \"windows\")".dependencies] -uuid = { version = "1", features = [ "v4", "v5" ] } +uuid = { version = "1", features = ["v4", "v5"] } winreg = "0.51" glob = "0.3" - [target."cfg(target_os = \"windows\")".dependencies.windows-sys] - version = "0.48" - features = [ - "Win32_System_SystemInformation", - "Win32_System_Diagnostics_Debug" -] +[target."cfg(target_os = \"windows\")".dependencies.windows-sys] +version = "0.48" +features = ["Win32_System_SystemInformation", "Win32_System_Diagnostics_Debug"] [target."cfg(target_os = \"macos\")".dependencies] icns = { package = "tauri-icns", version = "0.1" } -time = { version = "0.3", features = [ "formatting" ] } +time = { version = "0.3", features = ["formatting"] } plist = "1" [target."cfg(any(target_os = \"macos\", target_os = \"windows\"))".dependencies] @@ -71,7 +72,7 @@ name = "tauri_bundler" path = "src/lib.rs" [features] -default = [ "rustls" ] -native-tls = [ "ureq/native-tls" ] -native-tls-vendored = [ "native-tls", "native-tls/vendored" ] -rustls = [ "ureq/tls" ] +default = ["rustls"] +native-tls = ["ureq/native-tls"] +native-tls-vendored = ["native-tls", "native-tls/vendored"] +rustls = ["ureq/tls"] diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index c707a8e16af..413d1d8f893 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -1,13 +1,13 @@ [workspace] -members = [ "node" ] +members = ["node"] [package] name = "tauri-cli" version = "1.5.10" -authors = [ "Tauri Programme within The Commons Conservancy" ] +authors = ["Tauri Programme within The Commons Conservancy"] edition = "2021" rust-version = "1.60" -categories = [ "gui", "web-programming" ] +categories = ["gui", "web-programming"] license = "Apache-2.0 OR MIT" homepage = "https://tauri.app" repository = "https://github.com/tauri-apps/tauri" @@ -20,7 +20,7 @@ include = [ "*.rs", "tauri.gitignore", "tauri-dev-watcher.gitignore", - "LICENSE*" + "LICENSE*", ] [package.metadata.binstall] @@ -40,52 +40,63 @@ path = "src/main.rs" [dependencies] clap_complete = "4" -clap = { version = "4.4", features = [ "derive" ] } +clap = { version = "4.4", features = ["derive"] } anyhow = "1.0" tauri-bundler = { version = "1.5.0", path = "../bundler", default-features = false } colored = "2.0" once_cell = "1" -serde = { version = "1.0", features = [ "derive" ] } +serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" notify = "6.1" notify-debouncer-mini = "0.4" shared_child = "1.0" toml_edit = "0.21" json-patch = "1.2" -tauri-utils = { version = "1.5.2", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] } +tauri-utils = { version = "1.5.3", path = "../../core/tauri-utils", features = [ + "isolation", + "schema", + "config-json5", + "config-toml", +] } toml = "0.8" jsonschema = "0.17" handlebars = "4.4" include_dir = "0.7" minisign = "=0.7.3" base64 = "0.21.5" -ureq = { version = "2.9.1", default-features = false, features = [ "gzip" ] } +ureq = { version = "2.9.1", default-features = false, features = ["gzip"] } os_info = "3" semver = "1.0" regex = "1.10.2" unicode-width = "0.1" zeroize = "1.6" -heck = { version = "0.4", features = [ "unicode" ] } +heck = { version = "0.4", features = ["unicode"] } dialoguer = "0.11" -url = { version = "2.4", features = [ "serde" ] } +url = { version = "2.4", features = ["serde"] } os_pipe = "1" ignore = "0.4" ctrlc = "3.4" -log = { version = "0.4.20", features = [ "kv_unstable", "kv_unstable_std" ] } +log = { version = "0.4.20", features = ["kv_unstable", "kv_unstable_std"] } env_logger = "0.10.0" icns = { package = "tauri-icns", version = "0.1" } -image = { version = "0.24", default-features = false, features = [ "ico" ] } -axum = { version = "0.6.20", features = [ "ws" ] } +image = { version = "0.24", default-features = false, features = ["ico"] } +axum = { version = "0.6.20", features = ["ws"] } html5ever = "0.26" kuchiki = { package = "kuchikiki", version = "0.8" } -tokio = { version = "1", features = [ "macros", "sync" ] } +tokio = { version = "1", features = ["macros", "sync"] } common-path = "1" serde-value = "0.7.0" itertools = "0.11" glob = "0.3" [target."cfg(windows)".dependencies] -winapi = { version = "0.3", features = [ "handleapi", "processenv", "winbase", "wincon", "winnt" ] } +winapi = { version = "0.3", features = [ + "handleapi", + "processenv", + "winbase", + "wincon", + "winnt", +] } cc = "1" [target."cfg(unix)".dependencies] @@ -95,7 +106,7 @@ libc = "0.2" lto = true [features] -default = [ "rustls" ] -native-tls = [ "tauri-bundler/native-tls", "ureq/native-tls" ] -native-tls-vendored = [ "native-tls", "tauri-bundler/native-tls-vendored" ] -rustls = [ "tauri-bundler/rustls", "ureq/tls" ] +default = ["rustls"] +native-tls = ["tauri-bundler/native-tls", "ureq/native-tls"] +native-tls-vendored = ["native-tls", "tauri-bundler/native-tls-vendored"] +rustls = ["tauri-bundler/rustls", "ureq/tls"]