From a4785896f5327448152d438dc2c5bb5fb051aa40 Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Tue, 11 Nov 2025 13:25:41 -0300 Subject: [PATCH 1/2] wip: rip out deps first --- packages/cli/Cargo.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index ddbe943d19..1f29903f42 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -137,9 +137,6 @@ memmap = "0.7.0" walrus = { workspace = true, features = ["parallel"] } wasmparser = { workspace = true } -tauri-utils = { workspace = true } -tauri-macos-sign = { workspace = true } -tauri-bundler = { workspace = true } include_dir = "0.7.4" flate2 = "1.1.2" tar = "0.4.44" From 56a45236e18243d1db45e0bdb246ea2b43f399e8 Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Wed, 19 Nov 2025 14:44:35 -0800 Subject: [PATCH 2/2] wip --- Cargo.lock | 1918 +---------------------------- packages/cli/Cargo.toml | 2 +- packages/cli/src/bundle_utils.rs | 194 --- packages/cli/src/cli/bundle.rs | 442 +++++-- packages/cli/src/config/bundle.rs | 72 +- packages/cli/src/main.rs | 1 - 6 files changed, 430 insertions(+), 2199 deletions(-) delete mode 100644 packages/cli/src/bundle_utils.rs diff --git a/Cargo.lock b/Cargo.lock index 1d2b8a57f3..12ece234ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -217,15 +217,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "aes-kw" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c" -dependencies = [ - "aes", -] - [[package]] name = "ahash" version = "0.7.8" @@ -529,142 +520,6 @@ dependencies = [ "serde", ] -[[package]] -name = "apple-bundles" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb7c27ee2ca7826adfdc84228cd4c5a84ab57b0a11d269d1d7cd0615238e5a2" -dependencies = [ - "anyhow", - "plist", - "simple-file-manifest", - "walkdir", -] - -[[package]] -name = "apple-codesign" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329820aac7259ca0529d3cc21dd3b4c11651225dfce9e0ce25b121b23f923164" -dependencies = [ - "anyhow", - "apple-bundles", - "apple-flat-package", - "apple-xar", - "base64 0.21.7", - "bcder", - "bitflags 2.9.4", - "bytes", - "chrono", - "clap", - "cryptographic-message-syntax", - "der", - "dialoguer", - "difference", - "digest", - "dirs 5.0.1", - "elliptic-curve", - "env_logger 0.10.2", - "figment", - "filetime", - "glob", - "goblin", - "hex", - "log", - "md-5", - "minicbor", - "num-traits", - "object 0.32.2", - "oid-registry", - "once_cell", - "p12", - "p256", - "pem", - "pkcs1", - "pkcs8", - "plist", - "rand 0.8.5", - "rasn", - "rayon", - "regex", - "reqwest 0.11.27", - "ring", - "rsa", - "scroll 0.12.0", - "security-framework 2.11.1", - "security-framework-sys", - "semver", - "serde", - "serde_json", - "serde_yaml", - "sha2", - "signature", - "simple-file-manifest", - "spake2", - "spki", - "subtle", - "tempfile", - "thiserror 1.0.69", - "tokio", - "tungstenite 0.21.0", - "uuid", - "walkdir", - "widestring", - "windows-sys 0.52.0", - "x509", - "x509-certificate", - "xml-rs", - "yasna", - "zeroize", - "zip 0.6.6", - "zip_structs", -] - -[[package]] -name = "apple-flat-package" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6adc520e05304de5ec383487786fa20e9c636fe972e59719cdd93621a2db6f1" -dependencies = [ - "apple-xar", - "cpio-archive", - "flate2", - "scroll 0.12.0", - "serde", - "serde-xml-rs 0.6.0", - "thiserror 1.0.69", -] - -[[package]] -name = "apple-xar" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "844e00dc1e665b3cf0bba745aa9c6464292ca512db0c11384511586701eb0335" -dependencies = [ - "base64 0.21.7", - "bcder", - "bzip2", - "chrono", - "cryptographic-message-syntax", - "digest", - "flate2", - "log", - "md-5", - "rand 0.8.5", - "reqwest 0.11.27", - "scroll 0.12.0", - "serde", - "serde-xml-rs 0.6.0", - "sha1", - "sha2", - "signature", - "thiserror 1.0.69", - "url", - "x509-certificate", - "xml-rs", - "xz2", -] - [[package]] name = "approx" version = "0.5.1" @@ -732,19 +587,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "argon2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" -dependencies = [ - "base64ct", - "blake2", - "cpufeatures", - "password-hash", - "zeroize", -] - [[package]] name = "arrayref" version = "0.3.9" @@ -823,44 +665,6 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3df27b8d5ddb458c5fb1bbc1ce172d4a38c614a97d550b0ac89003897fb01de4" -[[package]] -name = "asn1-rs" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom 7.1.3", - "num-traits", - "rusticata-macros", - "thiserror 1.0.69", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure 0.12.6", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "assert_type_match" version = "0.1.1" @@ -1170,15 +974,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "atomic" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340" -dependencies = [ - "bytemuck", -] - [[package]] name = "atomic-polyfill" version = "1.0.3" @@ -1270,7 +1065,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4888bf91cce63baf1670512d0f12b5d636179a4abbad6504812ac8ab124b3efe" dependencies = [ - "dirs 6.0.0", + "dirs", "git2", "terminal-prompt", ] @@ -1593,12 +1388,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d27c3610c36aee21ce8ac510e6224498de4228ad772a171ed65643a24693a5a8" -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - [[package]] name = "base64" version = "0.21.7" @@ -1636,16 +1425,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" -[[package]] -name = "bcder" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7c42c9913f68cf9390a225e81ad56a5c515347287eb98baa710090ca1de86d" -dependencies = [ - "bytes", - "smallvec", -] - [[package]] name = "better_scoped_tls" version = "1.0.1" @@ -2120,7 +1899,7 @@ dependencies = [ "image", "ktx2", "rectangle-pack", - "ruzstd 0.8.1", + "ruzstd", "serde", "thiserror 2.0.17", "tracing", @@ -2932,12 +2711,6 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6" -[[package]] -name = "bitfield" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" - [[package]] name = "bitflags" version = "1.3.2" @@ -2954,18 +2727,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bitness" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57792b99d555ebf109c83169228076f7d997e2b37ba1a653850ccd703ac7bab0" -dependencies = [ - "sysctl", - "thiserror 1.0.69", - "uname", - "winapi", -] - [[package]] name = "bitstream-io" version = "2.6.0" @@ -2984,25 +2745,6 @@ dependencies = [ "wyz", ] -[[package]] -name = "bitvec-nom2" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d988fcc40055ceaa85edc55875a08f8abd29018582647fd82ad6128dba14a5f0" -dependencies = [ - "bitvec", - "nom 7.1.3", -] - -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest", -] - [[package]] name = "blake3" version = "1.8.2" @@ -3154,15 +2896,6 @@ dependencies = [ "generic-array 0.14.9", ] -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array 0.14.9", -] - [[package]] name = "block2" version = "0.5.1" @@ -3194,16 +2927,6 @@ dependencies = [ "piper", ] -[[package]] -name = "blowfish" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" -dependencies = [ - "byteorder", - "cipher", -] - [[package]] name = "bluetooth-scanner" version = "0.1.1" @@ -3229,7 +2952,7 @@ dependencies = [ "itertools 0.14.0", "log", "serde", - "serde-xml-rs 0.8.1", + "serde-xml-rs", "thiserror 2.0.17", "tokio", "uuid", @@ -3371,15 +3094,6 @@ dependencies = [ "windows-future 0.2.1", ] -[[package]] -name = "buffer-redux" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8acf87c5b9f5897cd3ebb9a327f420e0cae9dd4e5c1d2e36f2c84c571a58f1" -dependencies = [ - "memchr", -] - [[package]] name = "built" version = "0.7.7" @@ -3500,32 +3214,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bytesize" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e93abca9e28e0a1b9877922aacb20576e05d4679ffa78c3d6dc22a26a216659" - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.13+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14" -dependencies = [ - "cc", - "pkg-config", -] - [[package]] name = "cairo-rs" version = "0.18.5" @@ -3577,16 +3265,6 @@ dependencies = [ "wayland-client", ] -[[package]] -name = "camellia" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3264e2574e9ef2b53ce6f536dea83a69ac0bc600b762d1523ff83fe07230ce30" -dependencies = [ - "byteorder", - "cipher", -] - [[package]] name = "camino" version = "1.2.1" @@ -3621,7 +3299,7 @@ dependencies = [ "clap", "console 0.16.1", "dialoguer", - "env_logger 0.11.8", + "env_logger", "fs-err", "git2", "gix-config", @@ -3711,15 +3389,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" -[[package]] -name = "cast5" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b07d673db1ccf000e90f54b819db9e75a8348d6eb056e9b8ab53231b7a9911" -dependencies = [ - "cipher", -] - [[package]] name = "castaway" version = "0.2.4" @@ -3729,15 +3398,6 @@ dependencies = [ "rustversion", ] -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - [[package]] name = "cc" version = "1.2.43" @@ -3776,15 +3436,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "cfb-mode" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738b8d467867f80a71351933f70461f5b56f24d5c93e0cf216e59229c968d330" -dependencies = [ - "cipher", -] - [[package]] name = "cfg-expr" version = "0.15.8" @@ -3944,17 +3595,6 @@ dependencies = [ "error-code", ] -[[package]] -name = "cmac" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8543454e3c3f5126effff9cd44d562af4e31fb8ce1cc0d3dcd8f084515dbc1aa" -dependencies = [ - "cipher", - "dbl", - "digest", -] - [[package]] name = "cmake" version = "0.1.54" @@ -4407,15 +4047,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "cookie-factory" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" -dependencies = [ - "futures", -] - [[package]] name = "cookie_store" version = "0.21.1" @@ -4583,24 +4214,6 @@ dependencies = [ "windows 0.54.0", ] -[[package]] -name = "cpio" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938e716cb1ade5d6c8f959c13a7248b889c07491fc7e41167c3afe20f8f0de1e" - -[[package]] -name = "cpio-archive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d5133d716d3d82da8c76367ddb0ab1733e2629f1462e4f39947e13b8b4b741" -dependencies = [ - "chrono", - "is_executable", - "simple-file-manifest", - "thiserror 1.0.69", -] - [[package]] name = "cpufeatures" version = "0.2.17" @@ -4640,12 +4253,6 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" -[[package]] -name = "crc24" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd121741cf3eb82c08dd3023eb55bf2665e5f60ec20f89760cf836ae4562e6a0" - [[package]] name = "crc32fast" version = "1.5.0" @@ -4809,18 +4416,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" -[[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "generic-array 0.14.9", - "rand_core 0.6.4", - "subtle", - "zeroize", -] - [[package]] name = "crypto-common" version = "0.1.6" @@ -4832,23 +4427,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "cryptographic-message-syntax" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c324ba1028cef7e3a71a00cbf585637bb0215dec2f6a2b566d094190a1309b" -dependencies = [ - "bcder", - "bytes", - "chrono", - "hex", - "pem", - "reqwest 0.11.27", - "ring", - "signature", - "x509-certificate", -] - [[package]] name = "cssparser" version = "0.29.6" @@ -4912,16 +4490,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "ctor" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" -dependencies = [ - "quote", - "syn 2.0.108", -] - [[package]] name = "ctr" version = "0.9.2" @@ -4958,8 +4526,7 @@ dependencies = [ "cpufeatures", "curve25519-dalek-derive", "digest", - "fiat-crypto 0.2.9", - "rand_core 0.6.4", + "fiat-crypto", "rustc_version", "subtle", "zeroize", @@ -5040,7 +4607,6 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", "syn 2.0.108", ] @@ -5120,15 +4686,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" -[[package]] -name = "dbl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd2735a791158376708f9347fe8faba9667589d82427ef3aed6794a8981de3d9" -dependencies = [ - "generic-array 0.14.9", -] - [[package]] name = "dbus" version = "0.9.9" @@ -5194,7 +4751,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", - "serde_core", ] [[package]] @@ -5252,34 +4808,13 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "derive_more" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" -dependencies = [ - "derive_more-impl 1.0.0", -] - [[package]] name = "derive_more" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" dependencies = [ - "derive_more-impl 2.0.1", -] - -[[package]] -name = "derive_more-impl" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.108", - "unicode-xid", + "derive_more-impl", ] [[package]] @@ -5295,15 +4830,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "des" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" -dependencies = [ - "cipher", -] - [[package]] name = "dialoguer" version = "0.11.0" @@ -5323,12 +4849,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - [[package]] name = "digest" version = "0.10.7" @@ -5370,7 +4890,7 @@ dependencies = [ "dioxus-ssr", "dioxus-stores", "dioxus-web", - "env_logger 0.11.8", + "env_logger", "futures-util", "manganis", "rand 0.9.2", @@ -5473,9 +4993,9 @@ dependencies = [ "dioxus-rsx-hotreload", "dioxus-rsx-rosetta", "dircpy", - "dirs 6.0.0", + "dirs", "dunce", - "env_logger 0.11.8", + "env_logger", "escargot", "flate2", "fs2", @@ -5526,9 +5046,6 @@ dependencies = [ "syn 2.0.108", "tar", "target-lexicon 0.13.3", - "tauri-bundler", - "tauri-macos-sign", - "tauri-utils", "tempfile", "thiserror 2.0.17", "throbber-widgets-tui", @@ -5550,7 +5067,7 @@ dependencies = [ "wasm-encoder 0.235.0", "wasm-split-cli", "wasmparser 0.235.0", - "which 8.0.0", + "which", ] [[package]] @@ -5622,7 +5139,7 @@ name = "dioxus-cli-telemetry" version = "0.7.1" dependencies = [ "chrono", - "dirs 6.0.0", + "dirs", "rand 0.9.2", "serde", "serde_json", @@ -5633,7 +5150,7 @@ dependencies = [ name = "dioxus-component-manifest" version = "0.7.1" dependencies = [ - "schemars 1.0.4", + "schemars", "serde", "serde_json", ] @@ -6518,34 +6035,13 @@ dependencies = [ "walkdir", ] -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - [[package]] name = "dirs" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" dependencies = [ - "dirs-sys 0.5.0", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users 0.4.6", - "windows-sys 0.48.0", + "dirs-sys", ] [[package]] @@ -6556,7 +6052,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", "option-ext", - "redox_users 0.5.2", + "redox_users", "windows-sys 0.61.2", ] @@ -6672,22 +6168,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" -[[package]] -name = "dsa" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48bc224a9084ad760195584ce5abb3c2c34a225fa312a128ad245a6b412b7689" -dependencies = [ - "digest", - "num-bigint-dig", - "num-traits", - "pkcs8", - "rfc6979", - "sha2", - "signature", - "zeroize", -] - [[package]] name = "dtoa" version = "1.0.10" @@ -6715,33 +6195,6 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" -[[package]] -name = "eax" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9954fabd903b82b9d7a68f65f97dc96dd9ad368e40ccc907a7c19d53e6bfac28" -dependencies = [ - "aead", - "cipher", - "cmac", - "ctr", - "subtle", -] - -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" -dependencies = [ - "der", - "digest", - "elliptic-curve", - "rfc6979", - "signature", - "spki", -] - [[package]] name = "ecommerce-site" version = "0.1.1" @@ -6777,17 +6230,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ed448-goldilocks" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b5fa9e9e3dd5fe1369f380acd3dcdfa766dbd0a1cd5b048fb40e38a6a78e79" -dependencies = [ - "fiat-crypto 0.1.20", - "hex", - "subtle", -] - [[package]] name = "either" version = "1.15.0" @@ -6797,27 +6239,6 @@ dependencies = [ "serde", ] -[[package]] -name = "elliptic-curve" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest", - "ff", - "generic-array 0.14.9", - "group", - "hkdf", - "pem-rfc7468", - "pkcs8", - "rand_core 0.6.4", - "sec1", - "subtle", - "zeroize", -] - [[package]] name = "embedded-io" version = "0.4.0" @@ -6883,28 +6304,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" -[[package]] -name = "enum-display-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16ef37b2a9b242295d61a154ee91ae884afff6b8b933b486b12481cc58310ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "enum-primitive-derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba7795da175654fe16979af73f81f26a8ea27638d8d9823d317016888a63dc4c" -dependencies = [ - "num-traits", - "quote", - "syn 2.0.108", -] - [[package]] name = "enumflags2" version = "0.7.12" @@ -6963,19 +6362,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe" -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.11.8" @@ -7211,22 +6597,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "ff" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" -dependencies = [ - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "fiat-crypto" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" - [[package]] name = "fiat-crypto" version = "0.2.9" @@ -7243,20 +6613,6 @@ dependencies = [ "rustc_version", ] -[[package]] -name = "figment" -version = "0.10.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" -dependencies = [ - "atomic", - "pear", - "serde", - "toml 0.8.23", - "uncased", - "version_check", -] - [[package]] name = "file-explorer" version = "0.1.0" @@ -7302,7 +6658,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", - "libz-rs-sys", "miniz_oxide", ] @@ -7838,7 +7193,6 @@ checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" dependencies = [ "typenum", "version_check", - "zeroize", ] [[package]] @@ -8509,17 +7863,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "goblin" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b363a30c165f666402fe6a3024d3bec7ebc898f96a4a23bd1c99f8dbf3f4f47" -dependencies = [ - "log", - "plain", - "scroll 0.12.0", -] - [[package]] name = "gpu-alloc" version = "0.6.0" @@ -8641,17 +7984,6 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12101ecc8225ea6d675bc70263074eab6169079621c2186fe0c66590b2df9681" -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -dependencies = [ - "ff", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "gtk" version = "0.18.2" @@ -9388,7 +8720,7 @@ dependencies = [ "hyper-util", "log", "rustls 0.23.34", - "rustls-native-certs 0.8.2", + "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls 0.26.4", @@ -9616,15 +8948,6 @@ dependencies = [ "rayon", ] -[[package]] -name = "idea" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "075557004419d7f2031b8bb7f44bb43e55a83ca7b63076a8fb8fe75753836477" -dependencies = [ - "cipher", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -9768,7 +9091,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] @@ -9833,12 +9155,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" -[[package]] -name = "inlinable_string" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" - [[package]] name = "inotify" version = "0.11.0" @@ -9865,7 +9181,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" dependencies = [ - "block-padding", "generic-array 0.14.9", ] @@ -10003,27 +9318,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" -[[package]] -name = "is_executable" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baabb8b4867b26294d818bf3f651a454b6901431711abb96e296245888d6e8c4" -dependencies = [ - "windows-sys 0.60.2", -] - [[package]] name = "is_terminal_polyfill" version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" -[[package]] -name = "iter-read" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071ed4cc1afd86650602c7b11aa2e1ce30762a1c27193201cb5cee9c6ebb1294" - [[package]] name = "itertools" version = "0.10.5" @@ -10208,66 +9508,15 @@ dependencies = [ ] [[package]] -name = "json-patch" -version = "3.0.1" +name = "jwalk" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" -dependencies = [ - "jsonptr", - "serde", - "serde_json", - "thiserror 1.0.69", -] - -[[package]] -name = "jsonptr" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "jwalk" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2735847566356cd2179a2a38264839308f7079fa96e6bd5a42d740460e003c56" +checksum = "2735847566356cd2179a2a38264839308f7079fa96e6bd5a42d740460e003c56" dependencies = [ "crossbeam", "rayon", ] -[[package]] -name = "jzon" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ab85f84ca42c5ec520e6f3c9966ba1fd62909ce260f8837e248857d2560509" - -[[package]] -name = "k256" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" -dependencies = [ - "cfg-if", - "ecdsa", - "elliptic-curve", - "once_cell", - "sha2", - "signature", -] - -[[package]] -name = "keccak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" -dependencies = [ - "cpufeatures", -] - [[package]] name = "keyboard-types" version = "0.7.0" @@ -10296,26 +9545,6 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" -[[package]] -name = "konst" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4381b9b00c55f251f2ebe9473aef7c117e96828def1a7cb3bd3f0f903c6894e9" -dependencies = [ - "const_panic", - "konst_kernel", - "typewit", -] - -[[package]] -name = "konst_kernel" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4b1eb7788f3824c629b1116a7a9060d6e898c358ebff59070093d51103dcc3c" -dependencies = [ - "typewit", -] - [[package]] name = "kqueue" version = "1.1.1" @@ -10617,15 +9846,6 @@ dependencies = [ "x11", ] -[[package]] -name = "libz-rs-sys" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "840db8cf39d9ec4dd794376f38acc40d0fc65eec2a8f484f7fd375b84602becd" -dependencies = [ - "zlib-rs", -] - [[package]] name = "libz-sys" version = "1.1.22" @@ -10850,17 +10070,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" -[[package]] -name = "lzma-sys" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "mac" version = "0.1.1" @@ -10914,7 +10123,7 @@ checksum = "f44db74bde26fdf427af23f1d146c211aed857c59e3be750cf2617f6b0b05c94" dependencies = [ "proc-macro2", "syn 2.0.108", - "synstructure 0.13.2", + "synstructure", ] [[package]] @@ -11045,12 +10254,6 @@ dependencies = [ "digest", ] -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - [[package]] name = "memchr" version = "2.7.6" @@ -11163,26 +10366,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "minicbor" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d15f4203d71fdf90903c2696e55426ac97a363c67b218488a73b534ce7aca10" -dependencies = [ - "minicbor-derive", -] - -[[package]] -name = "minicbor-derive" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1154809406efdb7982841adb6311b3d095b46f78342dd646736122fe6b19e267" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "minicov" version = "0.3.7" @@ -11694,20 +10877,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "num" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - [[package]] name = "num-bigint" version = "0.4.6" @@ -11732,20 +10901,10 @@ dependencies = [ "num-iter", "num-traits", "rand 0.8.5", - "serde", "smallvec", "zeroize", ] -[[package]] -name = "num-complex" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" -dependencies = [ - "num-traits", -] - [[package]] name = "num-conv" version = "0.1.0" @@ -12231,12 +11390,7 @@ version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ - "crc32fast", - "flate2", - "hashbrown 0.14.5", - "indexmap 2.12.0", "memchr", - "ruzstd 0.5.0", ] [[package]] @@ -12250,7 +11404,7 @@ dependencies = [ "hashbrown 0.15.5", "indexmap 2.12.0", "memchr", - "ruzstd 0.8.1", + "ruzstd", "wasmparser 0.236.1", ] @@ -12277,18 +11431,6 @@ dependencies = [ "cc", ] -[[package]] -name = "ocb3" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c196e0276c471c843dd5777e7543a36a298a4be942a2a688d8111cd43390dedb" -dependencies = [ - "aead", - "cipher", - "ctr", - "subtle", -] - [[package]] name = "offset-allocator" version = "0.2.0" @@ -12308,25 +11450,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "oid-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" -dependencies = [ - "asn1-rs", -] - -[[package]] -name = "once-cell-regex" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de7e389a5043420c8f2b95ed03f3f104ad6f4c41f7d7e27298f033abc253e8" -dependencies = [ - "once_cell", - "regex", -] - [[package]] name = "once_cell" version = "1.21.3" @@ -12452,16 +11575,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "os_pipe" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" -dependencies = [ - "libc", - "windows-sys 0.61.2", -] - [[package]] name = "ouroboros" version = "0.18.5" @@ -12517,61 +11630,6 @@ dependencies = [ "supports-color 3.0.2", ] -[[package]] -name = "p12" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4873306de53fe82e7e484df31e1e947d61514b6ea2ed6cd7b45d63006fd9224" -dependencies = [ - "cbc", - "cipher", - "des", - "getrandom 0.2.16", - "hmac", - "lazy_static", - "rc2", - "sha1", - "yasna", -] - -[[package]] -name = "p256" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p384" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p521" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" -dependencies = [ - "base16ct", - "ecdsa", - "elliptic-curve", - "primeorder", - "rand_core 0.6.4", - "sha2", -] - [[package]] name = "pango" version = "0.18.3" @@ -12690,17 +11748,6 @@ dependencies = [ "swash", ] -[[package]] -name = "password-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "paste" version = "1.0.15" @@ -12744,43 +11791,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82040a392923abe6279c00ab4aff62d5250d1c8555dc780e4b02783a7aa74863" dependencies = [ "fallible-iterator 0.2.0", - "scroll 0.11.0", + "scroll", "uuid", ] -[[package]] -name = "pear" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" -dependencies = [ - "inlinable_string", - "pear_codegen", - "yansi", -] - -[[package]] -name = "pear_codegen" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" -dependencies = [ - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "syn 2.0.108", -] - -[[package]] -name = "pem" -version = "3.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" -dependencies = [ - "base64 0.22.1", - "serde_core", -] - [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -12885,73 +11899,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "pgp" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1877a97fd422433220ad272eb008ec55691944b1200e9eb204e3cb2cb69d34e9" -dependencies = [ - "aes", - "aes-gcm", - "aes-kw", - "argon2", - "base64 0.22.1", - "bitfield", - "block-padding", - "blowfish", - "bstr", - "buffer-redux", - "byteorder", - "camellia", - "cast5", - "cfb-mode", - "chrono", - "cipher", - "const-oid", - "crc24", - "curve25519-dalek", - "derive_builder", - "derive_more 1.0.0", - "des", - "digest", - "dsa", - "eax", - "ecdsa", - "ed25519-dalek", - "elliptic-curve", - "flate2", - "generic-array 0.14.9", - "hex", - "hkdf", - "idea", - "iter-read", - "k256", - "log", - "md-5", - "nom 7.1.3", - "num-bigint-dig", - "num-traits", - "num_enum", - "ocb3", - "p256", - "p384", - "p521", - "rand 0.8.5", - "ripemd", - "rsa", - "sha1", - "sha1-checked", - "sha2", - "sha3", - "signature", - "smallvec", - "thiserror 1.0.69", - "twofish", - "x25519-dalek", - "x448", - "zeroize", -] - [[package]] name = "phf" version = "0.8.0" @@ -13187,12 +12134,6 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - [[package]] name = "plist" version = "1.8.0" @@ -13404,15 +12345,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "primeorder" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" -dependencies = [ - "elliptic-curve", -] - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -13893,48 +12825,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93e7e49bb0bf967717f7bd674458b3d6b0c5f48ec7e3038166026a69fc22223" [[package]] -name = "rasn" -version = "0.12.5" +name = "ratatui" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9b0d03fbc7d2dcfdd35086c43ce30ac5ff62ed7eff4397e4f4f2995a2b0e2a" -dependencies = [ - "arrayvec", - "bitvec", - "bitvec-nom2", - "bytes", - "chrono", - "either", - "jzon", - "konst", - "nom 7.1.3", - "num-bigint", - "num-integer", - "num-traits", - "once_cell", - "rasn-derive", - "snafu", -] - -[[package]] -name = "rasn-derive" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbaf7105cd254b632f4732fbcc243ce750cef87d8335826125ef6df5733b5a0c" -dependencies = [ - "either", - "itertools 0.10.5", - "proc-macro2", - "quote", - "rayon", - "syn 1.0.109", - "uuid", -] - -[[package]] -name = "ratatui" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" +checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" dependencies = [ "bitflags 2.9.4", "cassowary", @@ -14033,15 +12927,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rc2" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c64daa8e9438b84aaae55010a93f396f8e60e3911590fcba770d04643fc1dd" -dependencies = [ - "cipher", -] - [[package]] name = "read-fonts" version = "0.35.0" @@ -14077,17 +12962,6 @@ dependencies = [ "bitflags 2.9.4", ] -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom 0.2.16", - "libredox", - "thiserror 1.0.69", -] - [[package]] name = "redox_users" version = "0.5.2" @@ -14226,7 +13100,6 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.21.12", - "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -14295,16 +13168,6 @@ dependencies = [ "webpki-roots 1.0.3", ] -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - [[package]] name = "rfd" version = "0.15.4" @@ -14380,15 +13243,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "ripemd" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" -dependencies = [ - "digest", -] - [[package]] name = "rkyv" version = "0.7.45" @@ -14499,36 +13353,6 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" -[[package]] -name = "rpm" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ffe5b31ea4c7c76a361dc29b986e11fb6987313453088e1fd95f34ecc1ba6" -dependencies = [ - "bitflags 2.9.4", - "bzip2", - "chrono", - "cpio", - "digest", - "enum-display-derive", - "enum-primitive-derive", - "flate2", - "hex", - "itertools 0.13.0", - "log", - "md-5", - "nom 7.1.3", - "num", - "num-derive", - "num-traits", - "pgp", - "sha1", - "sha2", - "thiserror 2.0.17", - "xz2", - "zstd", -] - [[package]] name = "rsa" version = "0.9.8" @@ -14606,15 +13430,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom 7.1.3", -] - [[package]] name = "rustix" version = "0.38.44" @@ -14653,20 +13468,6 @@ dependencies = [ "sct", ] -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring", - "rustls-pki-types", - "rustls-webpki 0.102.8", - "subtle", - "zeroize", -] - [[package]] name = "rustls" version = "0.23.34" @@ -14683,31 +13484,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile 1.0.4", - "schannel", - "security-framework 2.11.1", -] - -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "schannel", - "security-framework 2.11.1", -] - [[package]] name = "rustls-native-certs" version = "0.8.2" @@ -14758,17 +13534,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "rustls-webpki" -version = "0.102.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - [[package]] name = "rustls-webpki" version = "0.103.7" @@ -14822,24 +13587,13 @@ dependencies = [ "unicode-script", ] -[[package]] -name = "ruzstd" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" -dependencies = [ - "byteorder", - "derive_more 0.99.20", - "twox-hash 1.6.3", -] - [[package]] name = "ruzstd" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3640bec8aad418d7d03c72ea2de10d5c646a598f9883c7babc160d91e3c1b26c" dependencies = [ - "twox-hash 2.1.2", + "twox-hash", ] [[package]] @@ -14890,18 +13644,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "schemars" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" -dependencies = [ - "dyn-clone", - "ref-cast", - "serde", - "serde_json", -] - [[package]] name = "schemars" version = "1.0.4" @@ -14945,26 +13687,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" -[[package]] -name = "scroll" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6" -dependencies = [ - "scroll_derive", -] - -[[package]] -name = "scroll_derive" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1783eabc414609e28a5ba76aee5ddd52199f7107a0b24c2e9746a1ecc34a683d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.108", -] - [[package]] name = "sct" version = "0.7.1" @@ -14994,20 +13716,6 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" -[[package]] -name = "sec1" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct", - "der", - "generic-array 0.14.9", - "pkcs8", - "subtle", - "zeroize", -] - [[package]] name = "security-framework" version = "2.11.1" @@ -15120,7 +13828,7 @@ dependencies = [ "tar", "tempfile", "urlencoding", - "zip 2.4.2", + "zip", "zipsign-api", ] @@ -15238,18 +13946,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "serde-xml-rs" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" -dependencies = [ - "log", - "serde", - "thiserror 1.0.69", - "xml-rs", -] - [[package]] name = "serde-xml-rs" version = "0.8.1" @@ -15380,51 +14076,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "3.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.12.0", - "schemars 0.9.0", - "schemars 1.0.4", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e" -dependencies = [ - "darling 0.21.3", - "proc-macro2", - "quote", - "syn 2.0.108", -] - -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap 2.12.0", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - [[package]] name = "servo_arc" version = "0.2.0" @@ -15464,7 +14115,6 @@ checksum = "89f599ac0c323ebb1c6082821a54962b839832b03984598375bff3975b804423" dependencies = [ "digest", "sha1", - "zeroize", ] [[package]] @@ -15484,16 +14134,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sha3" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" -dependencies = [ - "digest", - "keccak", -] - [[package]] name = "sharded-slab" version = "0.1.7" @@ -15585,12 +14225,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" -[[package]] -name = "simple-file-manifest" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd19be0257552dd56d1bb6946f89f193c6e5b9f13cc9327c4bc84a357507c74" - [[package]] name = "simplecss" version = "0.2.2" @@ -15727,29 +14361,6 @@ dependencies = [ "serde", ] -[[package]] -name = "snafu" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" -dependencies = [ - "backtrace", - "doc-comment", - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "socket2" version = "0.5.10" @@ -15770,17 +14381,6 @@ dependencies = [ "windows-sys 0.60.2", ] -[[package]] -name = "socks" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" -dependencies = [ - "byteorder", - "libc", - "winapi", -] - [[package]] name = "soup3" version = "0.5.0" @@ -15807,18 +14407,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "spake2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5482afe85a0b6ce956c945401598dbc527593c77ba51d0a87a586938b1b893a" -dependencies = [ - "curve25519-dalek", - "hkdf", - "rand_core 0.6.4", - "sha2", -] - [[package]] name = "spin" version = "0.9.8" @@ -16324,7 +14912,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.108", - "synstructure 0.13.2", + "synstructure", ] [[package]] @@ -16960,18 +15548,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - [[package]] name = "synstructure" version = "0.13.2" @@ -16992,19 +15568,6 @@ dependencies = [ "libc", ] -[[package]] -name = "sysctl" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225e483f02d0ad107168dc57381a8a40c3aeea6abe47f37506931f861643cfa8" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "libc", - "thiserror 1.0.69", - "walkdir", -] - [[package]] name = "sysinfo" version = "0.35.2" @@ -17184,131 +15747,23 @@ dependencies = [ [[package]] name = "target-lexicon" version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "target-lexicon" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" -dependencies = [ - "serde", -] - -[[package]] -name = "target-triple" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "591ef38edfb78ca4771ee32cf494cb8771944bee237a9b91fc9c1424ac4b777b" - -[[package]] -name = "tauri-bundler" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c47183072f4d7c9248d6cb28fd33d0e6af2d399db9d55fb98022c2e5316f7d6" -dependencies = [ - "anyhow", - "ar", - "bitness", - "dirs 6.0.0", - "dunce", - "flate2", - "glob", - "handlebars", - "heck 0.5.0", - "hex", - "image", - "log", - "md5", - "os_pipe", - "plist", - "regex", - "rpm", - "semver", - "serde", - "serde_json", - "sha1", - "sha2", - "strsim", - "tar", - "tauri-icns", - "tauri-macos-sign", - "tauri-utils", - "tempfile", - "thiserror 2.0.17", - "time", - "ureq", - "url", - "uuid", - "walkdir", - "which 7.0.3", - "windows-registry", - "windows-sys 0.60.2", - "zip 4.6.1", -] - -[[package]] -name = "tauri-icns" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b7eb4d0d43724ba9ba6a6717420ee68aee377816a3edbb45db8c18862b1431" -dependencies = [ - "byteorder", - "png", -] +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] -name = "tauri-macos-sign" -version = "2.2.0" +name = "target-lexicon" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e9edbc522842252c79713cfa3e1b0cf3f694f1428c749e939f8dcbdf62864a" +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" dependencies = [ - "anyhow", - "apple-codesign", - "chrono", - "dirs 6.0.0", - "log", - "once-cell-regex", - "os_pipe", - "p12", - "plist", - "rand 0.9.2", "serde", - "serde_json", - "tempfile", - "x509-certificate", ] [[package]] -name = "tauri-utils" -version = "2.5.0" +name = "target-triple" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41743bbbeb96c3a100d234e5a0b60a46d5aa068f266160862c7afdbf828ca02e" -dependencies = [ - "anyhow", - "ctor", - "dunce", - "glob", - "http 1.3.1", - "infer", - "json-patch", - "log", - "memchr", - "phf 0.11.3", - "regex", - "semver", - "serde", - "serde-untagged", - "serde_json", - "serde_with", - "thiserror 2.0.17", - "toml 0.8.23", - "url", - "urlpattern", - "uuid", - "walkdir", -] +checksum = "591ef38edfb78ca4771ee32cf494cb8771944bee237a9b91fc9c1424ac4b777b" [[package]] name = "tempfile" @@ -17563,7 +16018,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.108", - "synstructure 0.13.2", + "synstructure", ] [[package]] @@ -18027,7 +16482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3d5572781bee8e3f994d7467084e1b1fd7a93ce66bd480f8156ba89dee55a2b" dependencies = [ "crossbeam-channel", - "dirs 6.0.0", + "dirs", "libappindicator", "muda", "objc2 0.6.3", @@ -18094,28 +16549,6 @@ dependencies = [ "core_maths", ] -[[package]] -name = "tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.3.1", - "httparse", - "log", - "rand 0.8.5", - "rustls 0.22.4", - "rustls-native-certs 0.7.3", - "rustls-pki-types", - "sha1", - "thiserror 1.0.69", - "url", - "utf-8", -] - [[package]] name = "tungstenite" version = "0.27.0" @@ -18152,25 +16585,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "twofish" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78e83a30223c757c3947cd144a31014ff04298d8719ae10d03c31c0448c8013" -dependencies = [ - "cipher", -] - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - [[package]] name = "twox-hash" version = "2.1.2" @@ -18194,15 +16608,6 @@ name = "typewit" version = "1.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8c1ae7cc0fdb8b842d65d127cb981574b0d2b249b74d1c7a2986863dc134f71" -dependencies = [ - "typewit_proc_macros", -] - -[[package]] -name = "typewit_proc_macros" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" [[package]] name = "ucd-trie" @@ -18239,65 +16644,6 @@ dependencies = [ "arrayvec", ] -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - -[[package]] -name = "uncased" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" -dependencies = [ - "version_check", -] - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-ucd-ident" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - [[package]] name = "unicase" version = "2.8.1" @@ -18436,48 +16782,12 @@ dependencies = [ "subtle", ] -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - [[package]] name = "untrusted" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -[[package]] -name = "ureq" -version = "3.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ba1025f18a4a3fc3e9b48c868e9beb4f24f4b4b1a325bada26bd4119f46537" -dependencies = [ - "base64 0.22.1", - "log", - "percent-encoding", - "rustls 0.23.34", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "socks", - "ureq-proto", - "utf-8", - "webpki-roots 1.0.3", -] - -[[package]] -name = "ureq-proto" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b4531c118335662134346048ddb0e54cc86bd7e81866757873055f0e38f5d2" -dependencies = [ - "base64 0.22.1", - "http 1.3.1", - "httparse", - "log", -] - [[package]] name = "url" version = "2.5.7" @@ -18496,18 +16806,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" -[[package]] -name = "urlpattern" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d" -dependencies = [ - "regex", - "serde", - "unic-ucd-ident", - "url", -] - [[package]] name = "usvg" version = "0.45.1" @@ -19608,18 +17906,6 @@ dependencies = [ "wgpu 26.0.1", ] -[[package]] -name = "which" -version = "7.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762" -dependencies = [ - "either", - "env_home", - "rustix 1.1.2", - "winsafe", -] - [[package]] name = "which" version = "8.0.0" @@ -20424,7 +18710,7 @@ dependencies = [ "block2 0.6.2", "cookie", "crossbeam-channel", - "dirs 6.0.0", + "dirs", "dpi", "dunce", "gtk", @@ -20521,58 +18807,6 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" -[[package]] -name = "x25519-dalek" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" -dependencies = [ - "curve25519-dalek", - "rand_core 0.6.4", - "serde", - "zeroize", -] - -[[package]] -name = "x448" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd07d4fae29e07089dbcacf7077cd52dce7760125ca9a4dd5a35ca603ffebb" -dependencies = [ - "ed448-goldilocks", - "hex", - "rand_core 0.5.1", -] - -[[package]] -name = "x509" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3cec94c3999f31341553f358ef55f65fc031291a022cd42ec0ce7219560c76" -dependencies = [ - "chrono", - "cookie-factory", -] - -[[package]] -name = "x509-certificate" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66534846dec7a11d7c50a74b7cdb208b9a581cad890b7866430d438455847c85" -dependencies = [ - "bcder", - "bytes", - "chrono", - "der", - "hex", - "pem", - "ring", - "signature", - "spki", - "thiserror 1.0.69", - "zeroize", -] - [[package]] name = "xattr" version = "1.6.1" @@ -20646,27 +18880,12 @@ version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3" -[[package]] -name = "xz2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" -dependencies = [ - "lzma-sys", -] - [[package]] name = "yansi" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" -[[package]] -name = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" - [[package]] name = "yazi" version = "0.2.1" @@ -20705,7 +18924,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.108", - "synstructure 0.13.2", + "synstructure", ] [[package]] @@ -20907,7 +19126,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.108", - "synstructure 0.13.2", + "synstructure", ] [[package]] @@ -20915,20 +19134,6 @@ name = "zeroize" version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.108", -] [[package]] name = "zerotrie" @@ -20963,18 +19168,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "byteorder", - "crc32fast", - "crossbeam-utils", - "flate2", -] - [[package]] name = "zip" version = "2.4.2" @@ -20993,31 +19186,6 @@ dependencies = [ "zopfli", ] -[[package]] -name = "zip" -version = "4.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caa8cd6af31c3b31c6631b8f483848b91589021b28fffe50adada48d4f4d2ed1" -dependencies = [ - "arbitrary", - "crc32fast", - "flate2", - "indexmap 2.12.0", - "memchr", - "zopfli", -] - -[[package]] -name = "zip_structs" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce824a6bfffe8942820fa36d24973b7c83a40896749a42e33de0abdd11750ee5" -dependencies = [ - "byteorder", - "bytesize", - "thiserror 1.0.69", -] - [[package]] name = "zipsign-api" version = "0.1.5" @@ -21029,12 +19197,6 @@ dependencies = [ "thiserror 2.0.17", ] -[[package]] -name = "zlib-rs" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2" - [[package]] name = "zopfli" version = "0.8.2" diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index 1f29903f42..361fb2c96c 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -32,7 +32,7 @@ dioxus-component-manifest = { workspace = true } clap = { workspace = true, features = ["derive", "cargo"] } convert_case = { workspace = true } thiserror = { workspace = true } -uuid = { workspace = true, features = ["v4"] } +uuid = { workspace = true, features = ["v4", "v5"] } # swc uses serde internals that break with newer versions of serde. We should move off of swc eventually, # but pinning serde fixes the issue in the meantime serde = { version = "=1.0.221", features = ["derive"] } diff --git a/packages/cli/src/bundle_utils.rs b/packages/cli/src/bundle_utils.rs deleted file mode 100644 index e58e289ec7..0000000000 --- a/packages/cli/src/bundle_utils.rs +++ /dev/null @@ -1,194 +0,0 @@ -use crate::{ - config::BundleConfig, CustomSignCommandSettings, DebianSettings, MacOsSettings, - NSISInstallerMode, NsisSettings, PackageType, WebviewInstallMode, WindowsSettings, WixSettings, -}; - -impl From for tauri_bundler::NsisSettings { - fn from(val: NsisSettings) -> Self { - tauri_bundler::NsisSettings { - header_image: val.header_image, - sidebar_image: val.sidebar_image, - installer_icon: val.installer_icon, - install_mode: val.install_mode.into(), - languages: val.languages, - display_language_selector: val.display_language_selector, - custom_language_files: None, - template: None, - compression: tauri_utils::config::NsisCompression::None, - start_menu_folder: val.start_menu_folder, - installer_hooks: val.installer_hooks, - minimum_webview2_version: val.minimum_webview2_version, - } - } -} - -impl From for tauri_bundler::BundleSettings { - fn from(val: BundleConfig) -> Self { - tauri_bundler::BundleSettings { - identifier: val.identifier, - publisher: val.publisher, - icon: val.icon, - resources: val.resources, - copyright: val.copyright, - category: val.category.and_then(|c| c.parse().ok()), - short_description: val.short_description, - long_description: val.long_description, - external_bin: val.external_bin, - deb: val.deb.map(Into::into).unwrap_or_default(), - macos: val.macos.map(Into::into).unwrap_or_default(), - windows: val.windows.map(Into::into).unwrap_or_default(), - ..Default::default() - } - } -} - -impl From for tauri_bundler::DebianSettings { - fn from(val: DebianSettings) -> Self { - tauri_bundler::DebianSettings { - depends: val.depends, - files: val.files, - desktop_template: val.desktop_template, - provides: val.provides, - conflicts: val.conflicts, - replaces: val.replaces, - section: val.section, - priority: val.priority, - changelog: val.changelog, - pre_install_script: val.pre_install_script, - post_install_script: val.post_install_script, - pre_remove_script: val.pre_remove_script, - post_remove_script: val.post_remove_script, - recommends: val.recommends, - } - } -} - -impl From for tauri_bundler::WixSettings { - fn from(val: WixSettings) -> Self { - tauri_bundler::WixSettings { - language: tauri_bundler::bundle::WixLanguage({ - let mut languages: Vec<_> = val - .language - .iter() - .map(|l| { - ( - l.0.clone(), - tauri_bundler::bundle::WixLanguageConfig { - locale_path: l.1.clone(), - }, - ) - }) - .collect(); - if languages.is_empty() { - languages.push(("en-US".into(), Default::default())); - } - languages - }), - template: val.template, - fragment_paths: val.fragment_paths, - component_group_refs: val.component_group_refs, - component_refs: val.component_refs, - feature_group_refs: val.feature_group_refs, - feature_refs: val.feature_refs, - merge_refs: val.merge_refs, - enable_elevated_update_task: val.enable_elevated_update_task, - banner_path: val.banner_path, - dialog_image_path: val.dialog_image_path, - fips_compliant: val.fips_compliant, - version: val.version, - upgrade_code: val.upgrade_code, - } - } -} - -impl From for tauri_bundler::MacOsSettings { - fn from(val: MacOsSettings) -> Self { - tauri_bundler::MacOsSettings { - frameworks: val.frameworks, - minimum_system_version: val.minimum_system_version, - exception_domain: val.exception_domain, - signing_identity: val.signing_identity, - provider_short_name: val.provider_short_name, - entitlements: val.entitlements, - info_plist_path: val.info_plist_path, - files: val.files, - hardened_runtime: val.hardened_runtime, - bundle_version: val.bundle_version, - bundle_name: val.bundle_name, - } - } -} - -#[allow(deprecated)] -impl From for tauri_bundler::WindowsSettings { - fn from(val: WindowsSettings) -> Self { - tauri_bundler::WindowsSettings { - digest_algorithm: val.digest_algorithm, - certificate_thumbprint: val.certificate_thumbprint, - timestamp_url: val.timestamp_url, - tsp: val.tsp, - wix: val.wix.map(Into::into), - webview_install_mode: val.webview_install_mode.into(), - allow_downgrades: val.allow_downgrades, - nsis: val.nsis.map(Into::into), - sign_command: val.sign_command.map(Into::into), - - icon_path: val.icon_path.unwrap_or("./icons/icon.ico".into()), - } - } -} - -impl From for tauri_utils::config::NSISInstallerMode { - fn from(val: NSISInstallerMode) -> Self { - match val { - NSISInstallerMode::CurrentUser => tauri_utils::config::NSISInstallerMode::CurrentUser, - NSISInstallerMode::PerMachine => tauri_utils::config::NSISInstallerMode::PerMachine, - NSISInstallerMode::Both => tauri_utils::config::NSISInstallerMode::Both, - } - } -} - -impl From for tauri_bundler::PackageType { - fn from(value: PackageType) -> Self { - match value { - PackageType::MacOsBundle => Self::MacOsBundle, - PackageType::IosBundle => Self::IosBundle, - PackageType::WindowsMsi => Self::WindowsMsi, - PackageType::Deb => Self::Deb, - PackageType::Rpm => Self::Rpm, - PackageType::AppImage => Self::AppImage, - PackageType::Dmg => Self::Dmg, - PackageType::Updater => Self::Updater, - PackageType::Nsis => Self::Nsis, - } - } -} - -impl WebviewInstallMode { - fn into(self) -> tauri_utils::config::WebviewInstallMode { - match self { - Self::Skip => tauri_utils::config::WebviewInstallMode::Skip, - Self::DownloadBootstrapper { silent } => { - tauri_utils::config::WebviewInstallMode::DownloadBootstrapper { silent } - } - Self::EmbedBootstrapper { silent } => { - tauri_utils::config::WebviewInstallMode::EmbedBootstrapper { silent } - } - Self::OfflineInstaller { silent } => { - tauri_utils::config::WebviewInstallMode::OfflineInstaller { silent } - } - Self::FixedRuntime { path } => { - tauri_utils::config::WebviewInstallMode::FixedRuntime { path } - } - } - } -} - -impl From for tauri_bundler::CustomSignCommandSettings { - fn from(val: CustomSignCommandSettings) -> Self { - tauri_bundler::CustomSignCommandSettings { - cmd: val.cmd, - args: val.args, - } - } -} diff --git a/packages/cli/src/cli/bundle.rs b/packages/cli/src/cli/bundle.rs index ba6f0e9e3b..2dc46a27ac 100644 --- a/packages/cli/src/cli/bundle.rs +++ b/packages/cli/src/cli/bundle.rs @@ -1,9 +1,8 @@ -use crate::{AppBuilder, BuildArgs, BuildId, BuildMode, BuildRequest, BundleFormat}; +use crate::{AppBuilder, BuildArgs, BuildId, BuildMode, BuildRequest, BundleFormat, PackageType}; use anyhow::{bail, Context}; use path_absolutize::Absolutize; use std::collections::HashMap; -use tauri_bundler::{BundleBinary, BundleSettings, PackageSettings, SettingsBuilder}; - +// use tauri_bundler::{BundleBinary, BundleSettings, PackageSettings, SettingsBuilder}; use walkdir::WalkDir; use super::*; @@ -15,7 +14,7 @@ use super::*; pub struct Bundle { /// The package types to bundle #[clap(long)] - pub package_types: Option>, + pub package_types: Option>, /// The directory in which the final bundle will be placed. /// @@ -76,7 +75,7 @@ impl Bundle { BundleFormat::MacOS | BundleFormat::Linux | BundleFormat::Windows => { tracing::info!("Running desktop bundler..."); for bundle in Self::bundle_desktop(&client, &self.package_types)? { - bundles.extend(bundle.bundle_paths); + bundles.push(bundle); } } @@ -87,7 +86,6 @@ impl Bundle { bundles.push(client.root_dir()) } BundleFormat::Server => bundles.push(client.root_dir()), - BundleFormat::Android => { let aab = client .android_gradle_bundle() @@ -150,123 +148,319 @@ impl Bundle { fn bundle_desktop( build: &BuildRequest, - package_types: &Option>, - ) -> Result, Error> { - let krate = &build; - let exe = build.main_exe(); - - _ = std::fs::remove_dir_all(krate.bundle_dir(build.bundle)); - - let package = krate.package(); - let mut name: PathBuf = krate.executable_name().into(); - if cfg!(windows) { - name.set_extension("exe"); - } - std::fs::create_dir_all(krate.bundle_dir(build.bundle)) - .context("Failed to create bundle directory")?; - std::fs::copy(&exe, krate.bundle_dir(build.bundle).join(&name)) - .with_context(|| "Failed to copy the output executable into the bundle directory")?; - - let binaries = vec![ - // We use the name of the exe but it has to be in the same directory - BundleBinary::new(krate.executable_name().to_string(), true) - .set_src_path(Some(exe.display().to_string())), - ]; - - let mut bundle_settings: BundleSettings = krate.config.bundle.clone().into(); - - // Check if required fields are provided instead of failing silently. - if bundle_settings.identifier.is_none() { - bail!("\n\nBundle identifier was not provided in `Dioxus.toml`. Add it as:\n\n[bundle]\nidentifier = \"com.mycompany\"\n\n"); - } - if bundle_settings.publisher.is_none() { - bail!("\n\nBundle publisher was not provided in `Dioxus.toml`. Add it as:\n\n[bundle]\npublisher = \"MyCompany\"\n\n"); - } - - if cfg!(windows) { - let windows_icon_override = krate.config.bundle.windows.as_ref().map(|w| &w.icon_path); - if windows_icon_override.is_none() { - let icon_path = bundle_settings - .icon - .as_ref() - .and_then(|icons| icons.first()); - - if let Some(icon_path) = icon_path { - bundle_settings.icon = Some(vec![icon_path.into()]); - }; - } - } - - if bundle_settings.resources_map.is_none() { - bundle_settings.resources_map = Some(HashMap::new()); - } - - let asset_dir = build.asset_dir(); - if asset_dir.exists() { - for entry in WalkDir::new(&asset_dir) { - let entry = entry.unwrap(); - let path = entry.path(); - - if path.is_file() { - let old = path - .canonicalize() - .with_context(|| format!("Failed to canonicalize {entry:?}"))?; - let new = - PathBuf::from("assets").join(path.strip_prefix(&asset_dir).unwrap_or(path)); - - tracing::debug!("Bundled asset: {old:?} -> {new:?}"); - bundle_settings - .resources_map - .as_mut() - .expect("to be set") - .insert(old.display().to_string(), new.display().to_string()); - } - } - } - - for resource_path in bundle_settings.resources.take().into_iter().flatten() { - bundle_settings - .resources_map - .as_mut() - .expect("to be set") - .insert(resource_path, "".to_string()); - } - - let mut settings = SettingsBuilder::new() - .project_out_directory(krate.bundle_dir(build.bundle)) - .package_settings(PackageSettings { - product_name: krate.bundled_app_name(), - version: package.version.to_string(), - description: package.description.clone().unwrap_or_default(), - homepage: Some(package.homepage.clone().unwrap_or_default()), - authors: Some(package.authors.clone()), - default_run: Some(name.display().to_string()), - }) - .log_level(log::Level::Debug) - .binaries(binaries) - .bundle_settings(bundle_settings); - - if let Some(packages) = &package_types { - settings = settings.package_types(packages.iter().map(|p| (*p).into()).collect()); - } - - settings = settings.target(build.triple.to_string()); - - let settings = settings - .build() - .context("failed to bundle tauri bundle settings")?; - tracing::debug!("Bundling project with settings: {:#?}", settings); - if cfg!(target_os = "macos") { - std::env::set_var("CI", "true"); - } - - let bundles = tauri_bundler::bundle::bundle_project(&settings).inspect_err(|err| { - tracing::error!("Failed to bundle project: {:#?}", err); - if cfg!(target_os = "macos") { - tracing::error!("Make sure you have automation enabled in your terminal (https://github.com/tauri-apps/tauri/issues/3055#issuecomment-1624389208) and full disk access enabled for your terminal (https://github.com/tauri-apps/tauri/issues/3055#issuecomment-1624389208)"); - } - })?; - - Ok(bundles) + package_types: &Option>, + ) -> Result, Error> { + todo!() + // let krate = &build; + // let exe = build.main_exe(); + + // _ = std::fs::remove_dir_all(krate.bundle_dir(build.bundle)); + + // let package = krate.package(); + // let mut name: PathBuf = krate.executable_name().into(); + // if cfg!(windows) { + // name.set_extension("exe"); + // } + // std::fs::create_dir_all(krate.bundle_dir(build.bundle)) + // .context("Failed to create bundle directory")?; + // std::fs::copy(&exe, krate.bundle_dir(build.bundle).join(&name)) + // .with_context(|| "Failed to copy the output executable into the bundle directory")?; + + // let binaries = vec![ + // // We use the name of the exe but it has to be in the same directory + // BundleBinary::new(krate.executable_name().to_string(), true) + // .set_src_path(Some(exe.display().to_string())), + // ]; + + // let mut bundle_settings: BundleSettings = krate.config.bundle.clone().into(); + + // // Check if required fields are provided instead of failing silently. + // if bundle_settings.identifier.is_none() { + // bail!("\n\nBundle identifier was not provided in `Dioxus.toml`. Add it as:\n\n[bundle]\nidentifier = \"com.mycompany\"\n\n"); + // } + // if bundle_settings.publisher.is_none() { + // bail!("\n\nBundle publisher was not provided in `Dioxus.toml`. Add it as:\n\n[bundle]\npublisher = \"MyCompany\"\n\n"); + // } + + // if cfg!(windows) { + // let windows_icon_override = krate.config.bundle.windows.as_ref().map(|w| &w.icon_path); + // if windows_icon_override.is_none() { + // let icon_path = bundle_settings + // .icon + // .as_ref() + // .and_then(|icons| icons.first()); + + // if let Some(icon_path) = icon_path { + // bundle_settings.icon = Some(vec![icon_path.into()]); + // }; + // } + // } + + // if bundle_settings.resources_map.is_none() { + // bundle_settings.resources_map = Some(HashMap::new()); + // } + + // let asset_dir = build.asset_dir(); + // if asset_dir.exists() { + // for entry in WalkDir::new(&asset_dir) { + // let entry = entry.unwrap(); + // let path = entry.path(); + + // if path.is_file() { + // let old = path + // .canonicalize() + // .with_context(|| format!("Failed to canonicalize {entry:?}"))?; + // let new = + // PathBuf::from("assets").join(path.strip_prefix(&asset_dir).unwrap_or(path)); + + // tracing::debug!("Bundled asset: {old:?} -> {new:?}"); + // bundle_settings + // .resources_map + // .as_mut() + // .expect("to be set") + // .insert(old.display().to_string(), new.display().to_string()); + // } + // } + // } + + // for resource_path in bundle_settings.resources.take().into_iter().flatten() { + // bundle_settings + // .resources_map + // .as_mut() + // .expect("to be set") + // .insert(resource_path, "".to_string()); + // } + + // let mut settings = SettingsBuilder::new() + // .project_out_directory(krate.bundle_dir(build.bundle)) + // .package_settings(PackageSettings { + // product_name: krate.bundled_app_name(), + // version: package.version.to_string(), + // description: package.description.clone().unwrap_or_default(), + // homepage: Some(package.homepage.clone().unwrap_or_default()), + // authors: Some(package.authors.clone()), + // default_run: Some(name.display().to_string()), + // }) + // .log_level(log::Level::Debug) + // .binaries(binaries) + // .bundle_settings(bundle_settings); + + // if let Some(packages) = &package_types { + // settings = settings.package_types(packages.iter().map(|p| (*p).into()).collect()); + // } + + // settings = settings.target(build.triple.to_string()); + + // let settings = settings + // .build() + // .context("failed to bundle tauri bundle settings")?; + // tracing::debug!("Bundling project with settings: {:#?}", settings); + // // if cfg!(target_os = "macos") { + // // std::env::set_var("CI", "true"); + // // } + + // // let bundles = tauri_bundler::bundle::bundle_project(&settings).inspect_err(|err| { + // // tracing::error!("Failed to bundle project: {:#?}", err); + // // if cfg!(target_os = "macos") { + // // tracing::error!("Make sure you have automation enabled in your terminal (https://github.com/tauri-apps/tauri/issues/3055#issuecomment-1624389208) and full disk access enabled for your terminal (https://github.com/tauri-apps/tauri/issues/3055#issuecomment-1624389208)"); + // // } + // // })?; + + // Ok(bundles) } } + +// use crate::{ +// config::BundleConfig, CustomSignCommandSettings, DebianSettings, MacOsSettings, +// NSISInstallerMode, NsisSettings, PackageType, WebviewInstallMode, WindowsSettings, WixSettings, +// }; + +// impl From for tauri_bundler::NsisSettings { +// fn from(val: NsisSettings) -> Self { +// tauri_bundler::NsisSettings { +// header_image: val.header_image, +// sidebar_image: val.sidebar_image, +// installer_icon: val.installer_icon, +// install_mode: val.install_mode.into(), +// languages: val.languages, +// display_language_selector: val.display_language_selector, +// custom_language_files: None, +// template: None, +// compression: tauri_utils::config::NsisCompression::None, +// start_menu_folder: val.start_menu_folder, +// installer_hooks: val.installer_hooks, +// minimum_webview2_version: val.minimum_webview2_version, +// } +// } +// } + +// impl From for tauri_bundler::BundleSettings { +// fn from(val: BundleConfig) -> Self { +// tauri_bundler::BundleSettings { +// identifier: val.identifier, +// publisher: val.publisher, +// icon: val.icon, +// resources: val.resources, +// copyright: val.copyright, +// category: val.category.and_then(|c| c.parse().ok()), +// short_description: val.short_description, +// long_description: val.long_description, +// external_bin: val.external_bin, +// deb: val.deb.map(Into::into).unwrap_or_default(), +// macos: val.macos.map(Into::into).unwrap_or_default(), +// windows: val.windows.map(Into::into).unwrap_or_default(), +// ..Default::default() +// } +// } +// } + +// impl From for tauri_bundler::DebianSettings { +// fn from(val: DebianSettings) -> Self { +// tauri_bundler::DebianSettings { +// depends: val.depends, +// files: val.files, +// desktop_template: val.desktop_template, +// provides: val.provides, +// conflicts: val.conflicts, +// replaces: val.replaces, +// section: val.section, +// priority: val.priority, +// changelog: val.changelog, +// pre_install_script: val.pre_install_script, +// post_install_script: val.post_install_script, +// pre_remove_script: val.pre_remove_script, +// post_remove_script: val.post_remove_script, +// recommends: val.recommends, +// } +// } +// } + +// impl From for tauri_bundler::WixSettings { +// fn from(val: WixSettings) -> Self { +// tauri_bundler::WixSettings { +// language: tauri_bundler::bundle::WixLanguage({ +// let mut languages: Vec<_> = val +// .language +// .iter() +// .map(|l| { +// ( +// l.0.clone(), +// tauri_bundler::bundle::WixLanguageConfig { +// locale_path: l.1.clone(), +// }, +// ) +// }) +// .collect(); +// if languages.is_empty() { +// languages.push(("en-US".into(), Default::default())); +// } +// languages +// }), +// template: val.template, +// fragment_paths: val.fragment_paths, +// component_group_refs: val.component_group_refs, +// component_refs: val.component_refs, +// feature_group_refs: val.feature_group_refs, +// feature_refs: val.feature_refs, +// merge_refs: val.merge_refs, +// enable_elevated_update_task: val.enable_elevated_update_task, +// banner_path: val.banner_path, +// dialog_image_path: val.dialog_image_path, +// fips_compliant: val.fips_compliant, +// version: val.version, +// upgrade_code: val.upgrade_code, +// } +// } +// } + +// impl From for tauri_bundler::MacOsSettings { +// fn from(val: MacOsSettings) -> Self { +// tauri_bundler::MacOsSettings { +// frameworks: val.frameworks, +// minimum_system_version: val.minimum_system_version, +// exception_domain: val.exception_domain, +// signing_identity: val.signing_identity, +// provider_short_name: val.provider_short_name, +// entitlements: val.entitlements, +// info_plist_path: val.info_plist_path, +// files: val.files, +// hardened_runtime: val.hardened_runtime, +// bundle_version: val.bundle_version, +// bundle_name: val.bundle_name, +// } +// } +// } + +// #[allow(deprecated)] +// impl From for tauri_bundler::WindowsSettings { +// fn from(val: WindowsSettings) -> Self { +// tauri_bundler::WindowsSettings { +// digest_algorithm: val.digest_algorithm, +// certificate_thumbprint: val.certificate_thumbprint, +// timestamp_url: val.timestamp_url, +// tsp: val.tsp, +// wix: val.wix.map(Into::into), +// webview_install_mode: val.webview_install_mode.into(), +// allow_downgrades: val.allow_downgrades, +// nsis: val.nsis.map(Into::into), +// sign_command: val.sign_command.map(Into::into), + +// icon_path: val.icon_path.unwrap_or("./icons/icon.ico".into()), +// } +// } +// } + +// impl From for tauri_utils::config::NSISInstallerMode { +// fn from(val: NSISInstallerMode) -> Self { +// match val { +// NSISInstallerMode::CurrentUser => tauri_utils::config::NSISInstallerMode::CurrentUser, +// NSISInstallerMode::PerMachine => tauri_utils::config::NSISInstallerMode::PerMachine, +// NSISInstallerMode::Both => tauri_utils::config::NSISInstallerMode::Both, +// } +// } +// } + +// impl From for tauri_bundler::PackageType { +// fn from(value: PackageType) -> Self { +// match value { +// PackageType::MacOsBundle => Self::MacOsBundle, +// PackageType::IosBundle => Self::IosBundle, +// PackageType::WindowsMsi => Self::WindowsMsi, +// PackageType::Deb => Self::Deb, +// PackageType::Rpm => Self::Rpm, +// PackageType::AppImage => Self::AppImage, +// PackageType::Dmg => Self::Dmg, +// PackageType::Updater => Self::Updater, +// PackageType::Nsis => Self::Nsis, +// } +// } +// } + +// impl WebviewInstallMode { +// fn into(self) -> tauri_utils::config::WebviewInstallMode { +// match self { +// Self::Skip => tauri_utils::config::WebviewInstallMode::Skip, +// Self::DownloadBootstrapper { silent } => { +// tauri_utils::config::WebviewInstallMode::DownloadBootstrapper { silent } +// } +// Self::EmbedBootstrapper { silent } => { +// tauri_utils::config::WebviewInstallMode::EmbedBootstrapper { silent } +// } +// Self::OfflineInstaller { silent } => { +// tauri_utils::config::WebviewInstallMode::OfflineInstaller { silent } +// } +// Self::FixedRuntime { path } => { +// tauri_utils::config::WebviewInstallMode::FixedRuntime { path } +// } +// } +// } +// } + +// impl From for tauri_bundler::CustomSignCommandSettings { +// fn from(val: CustomSignCommandSettings) -> Self { +// tauri_bundler::CustomSignCommandSettings { +// cmd: val.cmd, +// args: val.args, +// } +// } +// } diff --git a/packages/cli/src/config/bundle.rs b/packages/cli/src/config/bundle.rs index 2a17b3af9e..8df320bcb3 100644 --- a/packages/cli/src/config/bundle.rs +++ b/packages/cli/src/config/bundle.rs @@ -6,28 +6,40 @@ use std::{collections::HashMap, str::FromStr}; pub(crate) struct BundleConfig { #[serde(default)] pub(crate) identifier: Option, + #[serde(default)] pub(crate) publisher: Option, + #[serde(default)] pub(crate) icon: Option>, + #[serde(default)] pub(crate) resources: Option>, + #[serde(default)] pub(crate) copyright: Option, + #[serde(default)] pub(crate) category: Option, + #[serde(default)] pub(crate) short_description: Option, + #[serde(default)] pub(crate) long_description: Option, + #[serde(default)] pub(crate) external_bin: Option>, + #[serde(default)] pub(crate) deb: Option, + #[serde(default)] pub(crate) macos: Option, + #[serde(default)] pub(crate) windows: Option, + #[serde(default)] pub(crate) android: Option, } @@ -38,50 +50,63 @@ pub(crate) struct DebianSettings { /// the list of debian dependencies. #[serde(default)] pub depends: Option>, + /// the list of recommended debian dependencies. #[serde(default)] pub recommends: Option>, + /// the list of dependencies the package provides. #[serde(default)] pub provides: Option>, + /// the list of package conflicts. #[serde(default)] pub conflicts: Option>, + /// the list of package replaces. #[serde(default)] pub replaces: Option>, + /// List of custom files to add to the deb package. /// Maps the path on the debian package to the path of the file to include (relative to the current working directory). #[serde(default)] pub files: HashMap, + /// Path to a custom desktop file Handlebars template. /// /// Available variables: `categories`, `comment` (optional), `exec`, `icon` and `name`. #[serde(default)] pub desktop_template: Option, + /// Define the section in Debian Control file. See : #[serde(default)] pub section: Option, + /// Change the priority of the Debian Package. By default, it is set to `optional`. /// Recognized Priorities as of now are : `required`, `important`, `standard`, `optional`, `extra` #[serde(default)] pub priority: Option, + /// Path of the uncompressed Changelog file, to be stored at /usr/share/doc/package-name/changelog.gz. See /// #[serde(default)] pub changelog: Option, + /// Path to script that will be executed before the package is unpacked. See /// #[serde(default)] pub pre_install_script: Option, + /// Path to script that will be executed after the package is unpacked. See /// #[serde(default)] pub post_install_script: Option, + /// Path to script that will be executed before the package is removed. See /// #[serde(default)] pub pre_remove_script: Option, + /// Path to script that will be executed after the package is removed. See /// #[serde(default)] @@ -92,35 +117,49 @@ pub(crate) struct DebianSettings { pub(crate) struct WixSettings { #[serde(default)] pub(crate) language: Vec<(String, Option)>, + #[serde(default)] pub(crate) template: Option, + #[serde(default)] pub(crate) fragment_paths: Vec, + #[serde(default)] pub(crate) component_group_refs: Vec, + #[serde(default)] pub(crate) component_refs: Vec, + #[serde(default)] pub(crate) feature_group_refs: Vec, + #[serde(default)] pub(crate) feature_refs: Vec, + #[serde(default)] pub(crate) merge_refs: Vec, + #[serde(default)] pub(crate) skip_webview_install: bool, + #[serde(default)] pub(crate) license: Option, + #[serde(default)] pub(crate) enable_elevated_update_task: bool, + #[serde(default)] pub(crate) banner_path: Option, + #[serde(default)] pub(crate) dialog_image_path: Option, + #[serde(default)] pub(crate) fips_compliant: bool, + /// MSI installer version in the format `major.minor.patch.build` (build is optional). /// - /// Because a valid version is required for MSI installer, it will be derived from [`tauri_bundler::PackageSettings::version`] if this field is not set. + /// Because a valid version is required for MSI installer, it will be derived from [`PackageSettings::version`] if this field is not set. /// /// The first field is the major version and has a maximum value of 255. The second field is the minor version and has a maximum value of 255. /// The third and fourth fields have a maximum value of 65,535. @@ -144,28 +183,39 @@ pub(crate) struct WixSettings { pub(crate) struct MacOsSettings { #[serde(default)] pub(crate) bundle_version: Option, + #[serde(default)] pub(crate) frameworks: Option>, + #[serde(default)] pub(crate) minimum_system_version: Option, + #[serde(default)] pub(crate) license: Option, + #[serde(default)] pub(crate) exception_domain: Option, + #[serde(default)] pub(crate) signing_identity: Option, + #[serde(default)] pub(crate) provider_short_name: Option, + #[serde(default)] pub(crate) entitlements: Option, + #[serde(default)] pub(crate) info_plist_path: Option, + #[serde(default)] pub(crate) bundle_name: Option, + /// List of custom files to add to the application bundle. /// Maps the path in the Contents directory in the app to the path of the file to include (relative to the current working directory). #[serde(default)] pub files: HashMap, + /// Preserve the hardened runtime version flag, see /// /// Settings this to `false` is useful when using an ad-hoc signature, making it less strict. @@ -181,22 +231,31 @@ fn default_hardened_runtime() -> bool { pub(crate) struct WindowsSettings { #[serde(default)] pub(crate) digest_algorithm: Option, + #[serde(default)] pub(crate) certificate_thumbprint: Option, + #[serde(default)] pub(crate) timestamp_url: Option, + #[serde(default)] pub(crate) tsp: bool, + #[serde(default)] pub(crate) wix: Option, + #[serde(default)] pub(crate) icon_path: Option, + #[serde(default)] pub(crate) webview_install_mode: WebviewInstallMode, + #[serde(default)] pub(crate) webview_fixed_runtime_path: Option, + #[serde(default)] pub(crate) allow_downgrades: bool, + #[serde(default)] pub(crate) nsis: Option, /// Specify a custom command to sign the binaries. @@ -219,26 +278,37 @@ pub(crate) struct WindowsSettings { pub(crate) struct NsisSettings { #[serde(default)] pub(crate) template: Option, + #[serde(default)] pub(crate) license: Option, + #[serde(default)] pub(crate) header_image: Option, + #[serde(default)] pub(crate) sidebar_image: Option, + #[serde(default)] pub(crate) installer_icon: Option, + #[serde(default)] pub(crate) install_mode: NSISInstallerMode, + #[serde(default)] pub(crate) languages: Option>, + #[serde(default)] pub(crate) custom_language_files: Option>, + #[serde(default)] pub(crate) display_language_selector: bool, + #[serde(default)] pub(crate) start_menu_folder: Option, + #[serde(default)] pub(crate) installer_hooks: Option, + /// Try to ensure that the WebView2 version is equal to or newer than this version, /// if the user's WebView2 is older than this version, /// the installer will try to trigger a WebView2 update. diff --git a/packages/cli/src/main.rs b/packages/cli/src/main.rs index 7e66665c9d..439cd5970f 100644 --- a/packages/cli/src/main.rs +++ b/packages/cli/src/main.rs @@ -5,7 +5,6 @@ #![allow(clippy::doc_overindented_list_items)] mod build; -mod bundle_utils; mod cargo_toml; mod cli; mod config;