From 2ac4bdb673592e161bb76956a52c7ecbd0cda00c Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Mon, 25 Mar 2024 15:21:51 -0500 Subject: [PATCH] Switch to tracing for the cli (#2137) * switch to tracing in the dioxus-cli * bump manganis * fix manganis features * only print processing assets if skip assets is disabled * switch all logs to tracing * switch to published version of manganis * undo all changes to cargo.toml * remove reference to log --- Cargo.lock | 592 +++++++++++----------- packages/cli/Cargo.toml | 7 +- packages/cli/src/builder.rs | 37 +- packages/cli/src/cli/config.rs | 6 +- packages/cli/src/cli/create.rs | 8 +- packages/cli/src/cli/plugin.rs | 4 +- packages/cli/src/cli/translate.rs | 2 +- packages/cli/src/lib.rs | 3 - packages/cli/src/logging.rs | 46 -- packages/cli/src/main.rs | 7 +- packages/cli/src/plugin/interface/log.rs | 11 +- packages/cli/src/plugin/mod.rs | 14 +- packages/cli/src/server/desktop/mod.rs | 6 +- packages/cli/src/server/mod.rs | 12 +- packages/cli/src/server/output.rs | 4 +- packages/cli/src/server/web/hot_reload.rs | 10 +- packages/cli/src/server/web/mod.rs | 4 +- packages/cli/src/server/web/server.rs | 4 +- packages/cli/src/tools.rs | 4 +- 19 files changed, 365 insertions(+), 416 deletions(-) delete mode 100644 packages/cli/src/logging.rs diff --git a/Cargo.lock b/Cargo.lock index e32aa954c..b8131548e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -85,18 +85,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "aligned" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80a21b9440a626c7fc8573a9e3d3a06b75c7c97754c2949bc7857b90353ca655" +checksum = "377e4c0ba83e4431b10df45c1d4666f178ea9c552cac93e60c3a88bf32785923" dependencies = [ "as-slice", ] @@ -229,9 +229,9 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arc-swap" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arg_enum_proc_macro" @@ -241,7 +241,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -263,7 +263,7 @@ dependencies = [ "argh_shared", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -338,13 +338,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -355,13 +355,13 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -415,9 +415,9 @@ dependencies = [ [[package]] name = "auth-git2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e7771d4ab6635cbd685ce8db215b29c78a468098126de77c57f3b2e6eb3757" +checksum = "e51bd0e4592409df8631ca807716dc1e5caafae5d01ce0157c966c71c7e49c3c" dependencies = [ "dirs", "git2", @@ -455,14 +455,14 @@ dependencies = [ [[package]] name = "axum" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", "axum-macros", - "base64", + "base64 0.21.7", "bytes", "futures-util", "http 1.1.0", @@ -483,7 +483,7 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper", + "sync_wrapper 1.0.0", "tokio", "tokio-tungstenite", "tower", @@ -529,7 +529,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", "tracing", @@ -547,9 +547,9 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "895ff42f72016617773af68fb90da2a9677d89c62338ec09162d4909d86fdd8f" +checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" dependencies = [ "axum", "axum-core", @@ -565,6 +565,7 @@ dependencies = [ "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -589,7 +590,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -650,7 +651,7 @@ dependencies = [ "aes-gcm", "async-trait", "axum", - "base64", + "base64 0.21.7", "bytes", "chrono", "cookie", @@ -699,9 +700,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -718,6 +719,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64-simd" version = "0.7.0" @@ -733,15 +740,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "basic-toml" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" -dependencies = [ - "serde", -] - [[package]] name = "bigdecimal" version = "0.3.1" @@ -782,9 +780,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -858,15 +856,15 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", "syn_derive", ] [[package]] name = "brotli" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -960,9 +958,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bzip2" @@ -991,7 +989,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cairo-sys-rs", "glib", "libc", @@ -1037,7 +1035,7 @@ dependencies = [ "heck 0.4.1", "home", "ignore", - "indexmap 2.2.5", + "indexmap 2.2.6", "indicatif", "liquid", "liquid-core", @@ -1055,7 +1053,7 @@ dependencies = [ "serde", "tempfile", "thiserror", - "toml 0.8.11", + "toml 0.8.12", "walkdir", ] @@ -1074,9 +1072,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] @@ -1116,7 +1114,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3f9629bc6c4388ea699781dc988c2b99766d7679b151c81990b4fa1208fafd3" dependencies = [ "serde", - "toml 0.8.11", + "toml 0.8.12", ] [[package]] @@ -1126,7 +1124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "802b755090e39835a4b0440fb0bbee0df7495a8b337f63db21e616f7821c7e8c" dependencies = [ "serde", - "toml 0.8.11", + "toml 0.8.12", ] [[package]] @@ -1278,7 +1276,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1493,12 +1491,12 @@ dependencies = [ [[package]] name = "cookie" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ "aes-gcm", - "base64", + "base64 0.22.0", "percent-encoding", "rand 0.8.5", "subtle", @@ -1759,7 +1757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1790,7 +1788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1842,7 +1840,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1853,7 +1851,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1987,7 +1985,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1999,7 +1997,7 @@ dependencies = [ "pretty_assertions", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2040,7 +2038,6 @@ dependencies = [ "indicatif", "interprocess", "lazy_static", - "log", "manganis-cli-support", "mlua", "notify", @@ -2052,16 +2049,18 @@ dependencies = [ "serde", "serde_json", "subprocess", - "syn 2.0.52", + "syn 2.0.55", "tar", "tauri-bundler", "tempfile", "thiserror", "tokio", - "toml 0.8.11", + "toml 0.8.12", "toml_edit 0.21.1", "tower", "tower-http", + "tracing", + "tracing-subscriber", "walkdir", "wasm-bindgen-cli-support", "zip", @@ -2078,7 +2077,7 @@ dependencies = [ "serde_json", "tauri-bundler", "tauri-utils", - "toml 0.8.11", + "toml 0.8.12", "tracing", ] @@ -2090,20 +2089,6 @@ dependencies = [ "quote", ] -[[package]] -name = "dioxus-core" -version = "0.5.0-alpha.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f39bef0484998f724622964f04468ddfde7fd550f5f0f1aef9394306e9caba44" -dependencies = [ - "futures-channel", - "futures-util", - "longest-increasing-subsequence", - "rustc-hash", - "slab", - "tracing", -] - [[package]] name = "dioxus-core" version = "0.5.0-alpha.2" @@ -2126,6 +2111,21 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "dioxus-core" +version = "0.5.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a46ef05152c03e3511e39097271e411b1ac13c74782077ade25382be16dd3531" +dependencies = [ + "futures-channel", + "futures-util", + "longest-increasing-subsequence", + "rustc-hash", + "slab", + "tracing", + "tracing-subscriber", +] + [[package]] name = "dioxus-core-macro" version = "0.5.0-alpha.2" @@ -2138,7 +2138,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.55", "trybuild", ] @@ -2224,7 +2224,7 @@ dependencies = [ "async-compression", "async-trait", "axum", - "base64", + "base64 0.21.7", "bytes", "ciborium", "dioxus-cli-config", @@ -2320,7 +2320,7 @@ dependencies = [ "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", "trybuild", ] @@ -2461,7 +2461,7 @@ dependencies = [ "proc-macro2", "quote", "slab", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2475,7 +2475,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.52", + "syn 2.0.55", "tracing", ] @@ -2570,7 +2570,7 @@ dependencies = [ "proc-macro2", "quote", "server_fn_macro", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2647,7 +2647,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2716,7 +2716,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2737,7 +2737,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2889,7 +2889,7 @@ checksum = "ce8cd46a041ad005ab9c71263f9a0ff5b529eac0fe4cc9b4a20f4f0765d8cf4b" dependencies = [ "execute-command-tokens", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2937,9 +2937,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fdeflate" @@ -3048,7 +3048,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -3197,9 +3197,9 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ "futures-core", "pin-project-lite", @@ -3213,7 +3213,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -3477,11 +3477,11 @@ dependencies = [ [[package]] name = "git2" -version = "0.18.2" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "libgit2-sys", "log", @@ -3531,7 +3531,7 @@ version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbd06203b1a9b33a78c88252a625031b094d9e1b647260070c25b09910c0a804" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "bstr 1.9.1", "gix-path", "libc", @@ -3579,7 +3579,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5db19298c5eeea2961e5b3bf190767a2d1f09b8802aeb5f258e42276350aff19" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "bstr 1.9.1", "gix-features", "gix-path", @@ -3665,7 +3665,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fddc27984a643b20dd03e97790555804f98cf07404e0e552c0ad8133266a79a1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "gix-path", "libc", "windows-sys 0.52.0", @@ -3716,7 +3716,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", @@ -3744,7 +3744,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -4050,14 +4050,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] name = "h2" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" dependencies = [ "bytes", "fnv", @@ -4065,7 +4065,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.5", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -4074,9 +4074,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" +checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4" dependencies = [ "bytes", "fnv", @@ -4084,7 +4084,7 @@ dependencies = [ "futures-sink", "futures-util", "http 1.1.0", - "indexmap 2.2.5", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -4155,7 +4155,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "headers-core 0.2.0", "http 0.2.12", @@ -4170,7 +4170,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "headers-core 0.3.0", "http 1.1.0", @@ -4215,6 +4215,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -4236,6 +4242,51 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hickory-proto" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand 0.8.5", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "hkdf" version = "0.12.4" @@ -4399,7 +4450,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.24", + "h2 0.3.25", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -4422,7 +4473,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.2", + "h2 0.4.3", "http 1.1.0", "http-body 1.0.0", "httparse", @@ -4459,7 +4510,7 @@ dependencies = [ "hyper 1.2.0", "hyper-util", "log", - "rustls 0.22.2", + "rustls 0.22.3", "rustls-native-certs", "rustls-pki-types", "tokio", @@ -4614,9 +4665,9 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba6107a25f04af48ceeb4093eebc9b405ee5a1813a0bab5ecf1805d3eabb3337" +checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" dependencies = [ "byteorder", "thiserror", @@ -4654,9 +4705,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -4678,9 +4729,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "infer" @@ -4769,7 +4820,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -4997,7 +5048,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "serde", "unicode-segmentation", ] @@ -5024,9 +5075,9 @@ dependencies = [ [[package]] name = "krates" -version = "0.16.6" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320d34cfe880f2c6243b4cfff8aab3e34eab6325d0a26729f23356418fbdc809" +checksum = "b315eaab6cde3e2bcbd21810067a7b8bf4ced8cc63683ab7a96b18360c4e9df9" dependencies = [ "cargo_metadata 0.18.1", "cfg-expr", @@ -5141,7 +5192,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "redox_syscall", ] @@ -5192,9 +5243,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.15" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" +checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" dependencies = [ "cc", "libc", @@ -5209,7 +5260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bd5bed3814fb631bfc1e24c2be6f7e86a9837c660909acab79a38374dcb8798" dependencies = [ "ahash 0.8.11", - "bitflags 2.4.2", + "bitflags 2.5.0", "const-str", "cssparser 0.33.0", "cssparser-color", @@ -5235,12 +5286,9 @@ checksum = "9e69cdf6b85b5c8dce514f694089a2cf8b1a702f6cd28607bcb3cf296c9778db" [[package]] name = "line-wrap" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" [[package]] name = "linked-hash-map" @@ -5293,7 +5341,7 @@ checksum = "fc2fb41a9bb4257a3803154bdf7e2df7d45197d1941c9b1a90ad815231630721" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -5413,7 +5461,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a42db80aa639f70d6bf1d2ef93612d2ffbb33f6ea17d473b91bfeb3f67bc24bc" dependencies = [ - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", "manganis-macro", ] @@ -5447,12 +5495,12 @@ dependencies = [ [[package]] name = "manganis-common" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dfb4bb5592b0d130176add9893af527ab565fc1bcf58ece88acd6276688d1" +checksum = "86627eb778d7ba12272e8b80228559b04dec41af3bb0a7e76e438cbb5f85e961" dependencies = [ "anyhow", - "base64", + "base64 0.21.7", "home", "infer 0.11.0", "reqwest", @@ -5470,7 +5518,7 @@ dependencies = [ "manganis-common", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -5657,9 +5705,9 @@ dependencies = [ [[package]] name = "mozjpeg-sys" -version = "2.0.6" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cbdfefd09cf9e13ea54f07686db13e165709ea36ce8619794ed5b1ad59030f" +checksum = "69c32ce5e3419dca9b24e1d18218d12c36b8dbcfe020cd7de54830ac64148cbf" dependencies = [ "cc", "dunce", @@ -5770,9 +5818,9 @@ dependencies = [ [[package]] name = "new_debug_unreachable" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nix" @@ -5804,7 +5852,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "cfg_aliases", "libc", @@ -5918,7 +5966,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -6092,7 +6140,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -6109,7 +6157,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -6217,7 +6265,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05d74befe2d076330d9a58bf9ca2da424568724ab278adf15fb5718253133887" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cssparser 0.33.0", "fxhash", "log", @@ -6369,7 +6417,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -6390,7 +6438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.2.5", + "indexmap 2.2.6", ] [[package]] @@ -6497,7 +6545,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -6544,7 +6592,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -6599,12 +6647,12 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" dependencies = [ - "base64", - "indexmap 2.2.5", + "base64 0.21.7", + "indexmap 2.2.6", "line-wrap", "quick-xml", "serde", @@ -6710,12 +6758,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" dependencies = [ "proc-macro2", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -6807,7 +6855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -7036,9 +7084,9 @@ checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -7076,9 +7124,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -7130,16 +7178,17 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.26" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.24", + "h2 0.3.25", + "hickory-resolver", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", @@ -7159,14 +7208,13 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", "tokio-util", "tower-service", - "trust-dns-resolver", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -7225,7 +7273,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3625f343d89990133d013e39c46e350915178cf94f1bec9f49b0cbef98a3e3c" dependencies = [ "ahash 0.8.11", - "bitflags 2.4.2", + "bitflags 2.5.0", "instant", "num-traits", "once_cell", @@ -7242,7 +7290,7 @@ checksum = "853977598f084a492323fe2f7896b4100a86284ee8473612de60021ea341310f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -7301,9 +7349,9 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64", - "bitflags 2.4.2", - "indexmap 2.2.5", + "base64 0.21.7", + "bitflags 2.5.0", + "indexmap 2.2.6", "serde", "serde_derive", ] @@ -7340,7 +7388,7 @@ dependencies = [ "pretty_assertions", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -7382,11 +7430,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -7407,9 +7455,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" dependencies = [ "log", "ring", @@ -7438,7 +7486,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64", + "base64 0.21.7", ] [[package]] @@ -7447,15 +7495,15 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" dependencies = [ - "base64", + "base64 0.21.7", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" +checksum = "868e20fada228fefaf6b652e00cc73623d54f8171e7352c18bb281571f2d92da" [[package]] name = "rustls-webpki" @@ -7490,12 +7538,6 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - [[package]] name = "same-file" version = "1.0.6" @@ -7667,7 +7709,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -7720,7 +7762,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -7750,11 +7792,11 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ - "base64", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_derive", "serde_json", @@ -7771,7 +7813,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -7819,7 +7861,7 @@ dependencies = [ "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", "xxhash-rust", ] @@ -7830,7 +7872,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "060af1def72353a779fcc184c53e1965d3055a38b9e827f2259b2bff2d9c371e" dependencies = [ "server_fn_macro", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -7995,7 +8037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdd941cc539bd3dc694edaf9d0c4e1221d02baa67c6b45ec04fad1024d9e8139" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -8011,9 +8053,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smartstring" @@ -8144,7 +8186,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.2.5", + "indexmap 2.2.6", "ipnetwork", "log", "mac_address", @@ -8216,9 +8258,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" dependencies = [ "atoi", - "base64", + "base64 0.21.7", "bigdecimal", - "bitflags 2.4.2", + "bitflags 2.5.0", "byteorder", "bytes", "chrono", @@ -8263,10 +8305,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" dependencies = [ "atoi", - "base64", + "base64 0.21.7", "bigdecimal", "bit-vec", - "bitflags 2.4.2", + "bitflags 2.5.0", "byteorder", "chrono", "crc", @@ -8435,9 +8477,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" dependencies = [ "proc-macro2", "quote", @@ -8453,7 +8495,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -8462,6 +8504,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c" + [[package]] name = "system-configuration" version = "0.5.1" @@ -8485,14 +8533,14 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.1" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e9199467bcbc77c6a13cc6e32a6af21721ab8c96aa0261856c4fda5a4433f0" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck 0.4.1", + "heck 0.5.0", "pkg-config", - "toml 0.8.11", + "toml 0.8.12", "version-compare", ] @@ -8725,7 +8773,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -8849,7 +8897,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -8878,7 +8926,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.2", + "rustls 0.22.3", "rustls-pki-types", "tokio", ] @@ -8937,15 +8985,15 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.7", + "toml_edit 0.22.9", ] [[package]] @@ -8963,7 +9011,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -8976,7 +9024,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "toml_datetime", "winnow 0.5.40", ] @@ -8987,18 +9035,18 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.7" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -9028,8 +9076,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ "async-compression", - "base64", - "bitflags 2.4.2", + "base64 0.21.7", + "bitflags 2.5.0", "bytes", "futures-core", "futures-util", @@ -9084,7 +9132,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -9163,52 +9211,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "trust-dns-proto" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.4.0", - "ipnet", - "once_cell", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lru-cache", - "once_cell", - "parking_lot", - "rand 0.8.5", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto", -] - [[package]] name = "try-lock" version = "0.2.5" @@ -9217,11 +9219,10 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trybuild" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9d3ba662913483d6722303f619e75ea10b7855b0f8e0d72799cf8621bb488f" +checksum = "2aa6f84ec205ebf87fb7a0abdbcd1467fa5af0e86878eb6d888b78ecbb10b6d5" dependencies = [ - "basic-toml", "dissimilar", "glob", "once_cell", @@ -9229,6 +9230,7 @@ dependencies = [ "serde_derive", "serde_json", "termcolor", + "toml 0.8.12", ] [[package]] @@ -9344,11 +9346,11 @@ version = "2.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" dependencies = [ - "base64", + "base64 0.21.7", "log", "native-tls", "once_cell", - "rustls 0.22.2", + "rustls 0.22.3", "rustls-pki-types", "rustls-webpki 0.102.2", "url", @@ -9387,9 +9389,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom 0.2.12", "serde", @@ -9415,9 +9417,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec26a25bd6fca441cdd0f769fd7f891bae119f996de31f86a5eddccef54c1d" +checksum = "74797339c3b98616c009c7c3eb53a0ce41e85c8ec66bd3db96ed132d20cfdee8" [[package]] name = "vcpkg" @@ -9427,9 +9429,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -9529,7 +9531,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", "wasm-bindgen-shared", ] @@ -9540,7 +9542,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca821da8c1ae6c87c5e94493939a206daa8587caff227c6032e0061a3d80817f" dependencies = [ "anyhow", - "base64", + "base64 0.21.7", "log", "rustc-demangle", "serde_json", @@ -9595,7 +9597,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -9638,7 +9640,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -9821,7 +9823,7 @@ checksum = "ac1345798ecd8122468840bcdf1b95e5dc6d2206c5e4b0eafa078d061f59c9bc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -9929,7 +9931,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -9940,7 +9942,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -10184,7 +10186,7 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b717040ba9771fd88eb428c6ea6b555f8e734ff8534f02c13e8f10d97f5935e" dependencies = [ - "base64", + "base64 0.21.7", "block", "cfg_aliases", "cocoa", @@ -10302,7 +10304,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index e10d2c270..659ed34c6 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -15,9 +15,6 @@ thiserror = { workspace = true } wasm-bindgen-cli-support = "0.2" colored = "2.0.0" dioxus-cli-config = { workspace = true, features = ["cli"] } - -# features -log = "0.4.14" fern = { version = "0.6.0", features = ["colored"] } serde = { version = "1.0.136", features = ["derive"] } serde_json = "1.0.79" @@ -81,7 +78,7 @@ tauri-bundler = { version = "=1.4.*", features = ["native-tls-vendored"] } syn = { workspace = true } prettyplease = { workspace = true } -manganis-cli-support = { workspace = true, features = ["webp", "html"] } +manganis-cli-support = { workspace = true, features = ["html"] } dioxus-autofmt = { workspace = true } dioxus-check = { workspace = true } @@ -94,6 +91,8 @@ interprocess = { workspace = true } # interprocess-docfix = { version = "1.2.2" } ignore = "0.4.22" env_logger = "0.11.3" +tracing-subscriber = "0.3.18" +tracing.workspace = true [features] default = [] diff --git a/packages/cli/src/builder.rs b/packages/cli/src/builder.rs index 638572fda..1ccfc0136 100644 --- a/packages/cli/src/builder.rs +++ b/packages/cli/src/builder.rs @@ -97,7 +97,7 @@ pub fn build_web( let _guard = dioxus_cli_config::__private::save_config(config); // [1] Build the .wasm module - log::info!("🚅 Running build command..."); + tracing::info!("🚅 Running build command..."); // If the user has rustup, we can check if the wasm32-unknown-unknown target is installed // Otherwise we can just assume it is installed - which i snot great... @@ -105,7 +105,7 @@ pub fn build_web( if let Ok(wasm_check_command) = Command::new("rustup").args(["show"]).output() { let wasm_check_output = String::from_utf8(wasm_check_command.stdout).unwrap(); if !wasm_check_output.contains("wasm32-unknown-unknown") { - log::info!("wasm32-unknown-unknown target not detected, installing.."); + tracing::info!("wasm32-unknown-unknown target not detected, installing.."); let _ = Command::new("rustup") .args(["target", "add", "wasm32-unknown-unknown"]) .output()?; @@ -167,7 +167,7 @@ pub fn build_web( .context("No output location found")? .with_extension("wasm"); - log::info!("Running wasm-bindgen"); + tracing::info!("Running wasm-bindgen"); let bindgen_result = panic::catch_unwind(move || { // [3] Bindgen the final binary for use easy linking let mut bindgen_builder = Bindgen::new(); @@ -191,7 +191,7 @@ pub fn build_web( } // check binaryen:wasm-opt tool - log::info!("Running optimization with wasm-opt..."); + tracing::info!("Running optimization with wasm-opt..."); let dioxus_tools = dioxus_config.application.tools.clone(); if dioxus_tools.contains_key("binaryen") { let info = dioxus_tools.get("binaryen").unwrap(); @@ -202,7 +202,7 @@ pub fn build_web( if sub.contains_key("wasm_opt") && sub.get("wasm_opt").unwrap().as_bool().unwrap_or(false) { - log::info!("Optimizing WASM size with wasm-opt..."); + tracing::info!("Optimizing WASM size with wasm-opt..."); let target_file = out_dir .join("assets") .join("dioxus") @@ -221,12 +221,12 @@ pub fn build_web( } } } else { - log::warn!( + tracing::warn!( "Binaryen tool not found, you can use `dx tool add binaryen` to install it." ); } } else { - log::info!("Skipping optimization with wasm-opt, binaryen tool not found."); + tracing::info!("Skipping optimization with wasm-opt, binaryen tool not found."); } // [5][OPTIONAL] If tailwind is enabled and installed we run it to generate the CSS @@ -236,7 +236,7 @@ pub fn build_web( if tailwind.is_installed() { if let Some(sub) = info.as_table() { - log::info!("Building Tailwind bundle CSS file..."); + tracing::info!("Building Tailwind bundle CSS file..."); let input_path = match sub.get("input") { Some(val) => val.as_str().unwrap(), @@ -262,7 +262,7 @@ pub fn build_web( tailwind.call("tailwindcss", args)?; } } else { - log::warn!( + tracing::warn!( "Tailwind tool not found, you can use `dx tool add tailwindcss` to install it." ); } @@ -278,7 +278,7 @@ pub fn build_web( depth: 0, }; - log::info!("Copying public assets to the output directory..."); + tracing::info!("Copying public assets to the output directory..."); if asset_dir.is_dir() { for entry in std::fs::read_dir(config.asset_dir())?.flatten() { let path = entry.path(); @@ -288,7 +288,7 @@ pub fn build_web( match fs_extra::dir::copy(&path, &out_dir, ©_options) { Ok(_) => {} Err(_e) => { - log::warn!("Error copying dir: {}", _e); + tracing::warn!("Error copying dir: {}", _e); } } for ignore in &ignore_files { @@ -302,8 +302,8 @@ pub fn build_web( } } - log::info!("Processing assets"); let assets = if !skip_assets { + tracing::info!("Processing assets"); let assets = asset_manifest(executable.executable(), config); process_assets(config, &assets)?; Some(assets) @@ -327,7 +327,7 @@ pub fn build_desktop( skip_assets: bool, rust_flags: Option, ) -> Result { - log::info!("🚅 Running build [Desktop] command..."); + tracing::info!("🚅 Running build [Desktop] command..."); let t_start = std::time::Instant::now(); let ignore_files = build_assets(config)?; @@ -410,7 +410,7 @@ pub fn build_desktop( match fs_extra::dir::copy(&path, &config.out_dir(), ©_options) { Ok(_) => {} Err(e) => { - log::warn!("Error copying dir: {}", e); + tracing::warn!("Error copying dir: {}", e); } } for ignore in &ignore_files { @@ -425,6 +425,7 @@ pub fn build_desktop( } let assets = if !skip_assets { + tracing::info!("Processing assets"); let assets = asset_manifest(config.executable.executable(), config); // Collect assets process_assets(config, &assets)?; @@ -435,7 +436,7 @@ pub fn build_desktop( None }; - log::info!( + tracing::info!( "🚩 Build completed: [./{}]", config.dioxus_config.application.out_dir.clone().display() ); @@ -502,9 +503,9 @@ fn prettier_build(cmd: subprocess::Exec) -> anyhow::Result { } Message::BuildFinished(finished) => { if finished.success { - log::info!("👑 Build done."); + tracing::info!("👑 Build done."); } else { - log::info!("❌ Build failed."); + tracing::info!("❌ Build failed."); return Err(anyhow::anyhow!("Build failed")); } } @@ -736,7 +737,7 @@ fn build_assets(config: &CrateConfig) -> Result> { if res.is_ok() { result.push(path); } else { - log::error!("{:?}", res); + tracing::error!("{:?}", res); } } } diff --git a/packages/cli/src/cli/config.rs b/packages/cli/src/cli/config.rs index 1a1072c2f..139551aa4 100644 --- a/packages/cli/src/cli/config.rs +++ b/packages/cli/src/cli/config.rs @@ -37,7 +37,7 @@ impl Config { } => { let conf_path = crate_root.join("Dioxus.toml"); if conf_path.is_file() && !force { - log::warn!( + tracing::warn!( "config file `Dioxus.toml` already exist, use `--force` to overwrite it." ); return Ok(()); @@ -47,7 +47,7 @@ impl Config { .replace("{{project-name}}", &name) .replace("{{default-platform}}", &platform); file.write_all(content.as_bytes())?; - log::info!("🚩 Init config file completed."); + tracing::info!("🚩 Init config file completed."); } Config::FormatPrint {} => { println!( @@ -60,7 +60,7 @@ impl Config { let mut file = File::create(html_path)?; let content = include_str!("../assets/index.html"); file.write_all(content.as_bytes())?; - log::info!("🚩 Create custom html file done."); + tracing::info!("🚩 Create custom html file done."); } } Ok(()) diff --git a/packages/cli/src/cli/create.rs b/packages/cli/src/cli/create.rs index dd4ae2802..96fe11133 100644 --- a/packages/cli/src/cli/create.rs +++ b/packages/cli/src/cli/create.rs @@ -32,9 +32,9 @@ pub fn post_create(path: &PathBuf) -> Result<()> { let cmd = cmd.arg("fmt").current_dir(path); let output = cmd.output().expect("failed to execute process"); if !output.status.success() { - log::error!("cargo fmt failed"); - log::error!("stdout: {}", String::from_utf8_lossy(&output.stdout)); - log::error!("stderr: {}", String::from_utf8_lossy(&output.stderr)); + tracing::error!("cargo fmt failed"); + tracing::error!("stdout: {}", String::from_utf8_lossy(&output.stdout)); + tracing::error!("stderr: {}", String::from_utf8_lossy(&output.stderr)); } // then format the toml @@ -64,7 +64,7 @@ pub fn post_create(path: &PathBuf) -> Result<()> { let mut file = std::fs::File::create(readme_path)?; file.write_all(new_readme.as_bytes())?; - log::info!("Generated project at {}", path.display()); + tracing::info!("Generated project at {}", path.display()); Ok(()) } diff --git a/packages/cli/src/cli/plugin.rs b/packages/cli/src/cli/plugin.rs index 43375f700..5be2364f7 100644 --- a/packages/cli/src/cli/plugin.rs +++ b/packages/cli/src/cli/plugin.rs @@ -27,11 +27,11 @@ impl Plugin { if let Some(v) = plugin_dir.to_str() { println!("{}", v); } else { - log::error!("Plugin path get failed."); + tracing::error!("Plugin path get failed."); } } Plugin::Add { name: _ } => { - log::info!("You can use `dx plugin app-path` to get Installation position"); + tracing::info!("You can use `dx plugin app-path` to get Installation position"); } } Ok(()) diff --git a/packages/cli/src/cli/translate.rs b/packages/cli/src/cli/translate.rs index 2dfbfe8c2..b157e7cfe 100644 --- a/packages/cli/src/cli/translate.rs +++ b/packages/cli/src/cli/translate.rs @@ -105,7 +105,7 @@ fn indent_and_write(raw: &str, idx: usize, out: &mut String) { fn determine_input(file: Option, raw: Option) -> Result { // Make sure not both are specified if file.is_some() && raw.is_some() { - log::error!("Only one of --file or --raw should be specified."); + tracing::error!("Only one of --file or --raw should be specified."); exit(0); } diff --git a/packages/cli/src/lib.rs b/packages/cli/src/lib.rs index 5c904d7ba..37d234aa8 100644 --- a/packages/cli/src/lib.rs +++ b/packages/cli/src/lib.rs @@ -15,8 +15,5 @@ pub use cli::*; pub mod error; pub use error::*; -pub mod logging; -pub use logging::*; - #[cfg(feature = "plugin")] pub mod plugin; diff --git a/packages/cli/src/logging.rs b/packages/cli/src/logging.rs deleted file mode 100644 index 0d902f86f..000000000 --- a/packages/cli/src/logging.rs +++ /dev/null @@ -1,46 +0,0 @@ -use fern::colors::{Color, ColoredLevelConfig}; - -pub fn set_up_logging() { - // configure colors for the whole line - let colors_line = ColoredLevelConfig::new() - .error(Color::Red) - .warn(Color::Yellow) - // we actually don't need to specify the color for debug and info, they are white by default - .info(Color::White) - .debug(Color::White) - // depending on the terminals color scheme, this is the same as the background color - .trace(Color::BrightBlack); - - // configure colors for the name of the level. - // since almost all of them are the same as the color for the whole line, we - // just clone `colors_line` and overwrite our changes - let colors_level = colors_line.info(Color::Green); - // here we set up our fern Dispatch - fern::Dispatch::new() - .format(move |out, message, record| { - out.finish(format_args!( - "{color_line}[{level}{color_line}] {message}\x1B[0m", - color_line = format_args!( - "\x1B[{}m", - colors_line.get_color(&record.level()).to_fg_str() - ), - level = colors_level.color(record.level()), - )); - }) - .level(match std::env::var("DIOXUS_LOG") { - Ok(level) => match level.to_lowercase().as_str() { - "error" => log::LevelFilter::Error, - "warn" => log::LevelFilter::Warn, - "info" => log::LevelFilter::Info, - "debug" => log::LevelFilter::Debug, - "trace" => log::LevelFilter::Trace, - _ => { - panic!("Invalid log level: {}", level) - } - }, - Err(_) => log::LevelFilter::Info, - }) - .chain(std::io::stdout()) - .apply() - .unwrap(); -} diff --git a/packages/cli/src/main.rs b/packages/cli/src/main.rs index 4943e6e3b..47d290602 100644 --- a/packages/cli/src/main.rs +++ b/packages/cli/src/main.rs @@ -11,10 +11,7 @@ use Commands::*; async fn main() -> anyhow::Result<()> { let args = Cli::parse(); - #[cfg(debug_assertions)] - env_logger::init(); - - // set_up_logging(); + tracing_subscriber::fmt::init(); match args.action { Translate(opts) => opts @@ -53,7 +50,7 @@ async fn main() -> anyhow::Result<()> { let _dioxus_config = DioxusConfig::load(Some(bin.clone())) .context("Failed to load Dioxus config because")? .unwrap_or_else(|| { - log::info!("You appear to be creating a Dioxus project from scratch; we will use the default config"); + tracing::info!("You appear to be creating a Dioxus project from scratch; we will use the default config"); DioxusConfig::default() }); diff --git a/packages/cli/src/plugin/interface/log.rs b/packages/cli/src/plugin/interface/log.rs index bed8e2cbb..dbf65bb8d 100644 --- a/packages/cli/src/plugin/interface/log.rs +++ b/packages/cli/src/plugin/interface/log.rs @@ -1,27 +1,26 @@ -use log; use mlua::UserData; pub struct PluginLogger; impl UserData for PluginLogger { fn add_methods<'lua, M: mlua::UserDataMethods<'lua, Self>>(methods: &mut M) { methods.add_function("trace", |_, info: String| { - log::trace!("{}", info); + tracing::trace!("{}", info); Ok(()) }); methods.add_function("info", |_, info: String| { - log::info!("{}", info); + tracing::info!("{}", info); Ok(()) }); methods.add_function("debug", |_, info: String| { - log::debug!("{}", info); + tracing::debug!("{}", info); Ok(()) }); methods.add_function("warn", |_, info: String| { - log::warn!("{}", info); + tracing::warn!("{}", info); Ok(()) }); methods.add_function("error", |_, info: String| { - log::error!("{}", info); + tracing::error!("{}", info); Ok(()) }); } diff --git a/packages/cli/src/plugin/mod.rs b/packages/cli/src/plugin/mod.rs index 03bf34c5f..82267a784 100644 --- a/packages/cli/src/plugin/mod.rs +++ b/packages/cli/src/plugin/mod.rs @@ -68,7 +68,7 @@ impl PluginManager { let path = PathBuf::from(i); if !path.is_dir() { // for loader dir, we need check first, because we need give a error log. - log::error!("Plugin loader: {:?} path is not a exists directory.", path); + tracing::error!("Plugin loader: {:?} path is not a exists directory.", path); } path_list.push((path, true)); } @@ -97,7 +97,7 @@ impl PluginManager { && !from_loader { // found same name plugin, intercept load - log::warn!( + tracing::warn!( "Plugin {} has been intercepted. [mulit-load]", info.name ); @@ -139,12 +139,12 @@ impl PluginManager { } } Ok(false) => { - log::warn!( + tracing::warn!( "Plugin init function result is `false`, init failed." ); } Err(e) => { - log::warn!("Plugin init failed: {e}"); + tracing::warn!("Plugin init failed: {e}"); } } } @@ -158,7 +158,7 @@ impl PluginManager { } Err(_e) => { let dir_name = plugin_dir.file_name().unwrap().to_str().unwrap(); - log::error!("Plugin '{dir_name}' load failed."); + tracing::error!("Plugin '{dir_name}' load failed."); } } } @@ -287,10 +287,10 @@ impl PluginManager { let app_path = app_path(); let plugin_path = app_path.join("plugins"); if !plugin_path.is_dir() { - log::info!("📖 Start to init plugin library ..."); + tracing::info!("📖 Start to init plugin library ..."); let url = "https://github.com/DioxusLabs/cli-plugin-library"; if let Err(err) = clone_repo(&plugin_path, url) { - log::error!("Failed to init plugin dir, error caused by {}. ", err); + tracing::error!("Failed to init plugin dir, error caused by {}. ", err); } } plugin_path diff --git a/packages/cli/src/server/desktop/mod.rs b/packages/cli/src/server/desktop/mod.rs index 45ccb76cf..c574fccb4 100644 --- a/packages/cli/src/server/desktop/mod.rs +++ b/packages/cli/src/server/desktop/mod.rs @@ -39,7 +39,7 @@ pub(crate) async fn startup_with_platform( FileMap::::create(config.crate_dir.clone()).unwrap(); for err in errors { - log::error!("{}", err); + tracing::error!("{}", err); } let file_map = Arc::new(Mutex::new(map)); @@ -77,7 +77,7 @@ async fn serve( ) -> Result<()> { let platform = RwLock::new(P::start(&config, serve)?); - log::info!("🚀 Starting development server..."); + tracing::info!("🚀 Starting development server..."); // We got to own watcher so that it exists for the duration of serve // Otherwise full reload won't work. @@ -258,7 +258,7 @@ impl DesktopPlatform { ) -> Result { let (child, first_build_result) = start_desktop(config, serve.skip_assets, rust_flags)?; - log::info!("🚀 Starting development server..."); + tracing::info!("🚀 Starting development server..."); // Print serve info print_console_info( diff --git a/packages/cli/src/server/mod.rs b/packages/cli/src/server/mod.rs index b62d82108..6e3a74f5a 100644 --- a/packages/cli/src/server/mod.rs +++ b/packages/cli/src/server/mod.rs @@ -89,7 +89,7 @@ async fn setup_file_watcher Result + Send + 'static>( let mode = notify::RecursiveMode::Recursive; if let Err(err) = watcher.watch(path, mode) { - log::warn!("Failed to watch path: {}", err); + tracing::warn!("Failed to watch path: {}", err); } } @@ -157,7 +157,7 @@ fn full_rebuild( } Err(e) => { *last_update_time = chrono::Local::now().timestamp(); - log::error!("{:?}", e); + tracing::error!("{:?}", e); } } } @@ -195,12 +195,12 @@ fn hotreload_files( // If the file was not updated, we need to do a full rebuild Ok(UpdateResult::NeedsRebuild) => { - log::trace!("Needs full rebuild because file changed: {:?}", path); + tracing::trace!("Needs full rebuild because file changed: {:?}", path); *needs_full_rebuild = true; } // Not necessarily a fatal error, but we should log it - Err(err) => log::error!("{}", err), + Err(err) => tracing::error!("{}", err), } } @@ -214,7 +214,7 @@ fn hotreload_files( } = FileMap::::create(config.crate_dir.clone()).unwrap(); for err in errors { - log::error!("{}", err); + tracing::error!("{}", err); } *rsx_file_map = new_file_map; @@ -250,7 +250,7 @@ fn hotreload_file( // If the extension is a backup file, or a hidden file, ignore it completely (no rebuilds) if is_backup_file(path) { - log::trace!("Ignoring backup file: {:?}", path); + tracing::trace!("Ignoring backup file: {:?}", path); return None; } diff --git a/packages/cli/src/server/output.rs b/packages/cli/src/server/output.rs index 74c558cc5..2b2fd024e 100644 --- a/packages/cli/src/server/output.rs +++ b/packages/cli/src/server/output.rs @@ -145,9 +145,9 @@ pub fn print_console_info( println!(); if options.warnings.is_empty() { - log::info!("{}\n", "A perfect compilation!".green().bold()); + tracing::info!("{}\n", "A perfect compilation!".green().bold()); } else { - log::warn!( + tracing::warn!( "{}", format!( "There were {} warning messages during the build. Run `cargo check` to see them.", diff --git a/packages/cli/src/server/web/hot_reload.rs b/packages/cli/src/server/web/hot_reload.rs index 61a0f7d80..9df42227b 100644 --- a/packages/cli/src/server/web/hot_reload.rs +++ b/packages/cli/src/server/web/hot_reload.rs @@ -18,13 +18,13 @@ pub async fn hot_reload_handler( let err = hotreload_loop(socket, state).await; if let Err(err) = err { - log::error!("Hotreload receiver failed: {}", err); + tracing::error!("Hotreload receiver failed: {}", err); } }) } async fn hotreload_loop(mut socket: WebSocket, state: HotReloadState) -> anyhow::Result<()> { - log::info!("🔥 Hot Reload WebSocket connected"); + tracing::info!("🔥 Hot Reload WebSocket connected"); // update any rsx calls that changed before the websocket connected. // These templates will be sent down immediately so the page is in sync with the hotreloaded version @@ -51,9 +51,9 @@ async fn hotreload_loop(mut socket: WebSocket, state: HotReloadState) -> anyhow: msg = _rx => msg, e = _socket => { if let Some(Err(e)) = e { - log::info!("🔥 Hot Reload WebSocket Error: {}", e); + tracing::info!("🔥 Hot Reload WebSocket Error: {}", e); } else { - log::info!("🔥 Hot Reload WebSocket Closed"); + tracing::info!("🔥 Hot Reload WebSocket Closed"); } break; }, @@ -69,7 +69,7 @@ async fn hotreload_loop(mut socket: WebSocket, state: HotReloadState) -> anyhow: Message::Text(format!("reload-asset: {}", asset.display())) } HotReloadMsg::Shutdown => { - log::info!("🔥 Hot Reload WebSocket shutting down"); + tracing::info!("🔥 Hot Reload WebSocket shutting down"); break; } } diff --git a/packages/cli/src/server/web/mod.rs b/packages/cli/src/server/web/mod.rs index 01ecddf8b..b34324ab1 100644 --- a/packages/cli/src/server/web/mod.rs +++ b/packages/cli/src/server/web/mod.rs @@ -57,7 +57,7 @@ pub async fn serve( // generate dev-index page Serve::regen_dev_page(&config, first_build_result.assets.as_ref())?; - log::info!("🚀 Starting development server..."); + tracing::info!("🚀 Starting development server..."); // WS Reload Watching let (reload_tx, _) = broadcast::channel(100); @@ -205,7 +205,7 @@ fn build_hotreload_filemap(config: &CrateConfig) -> HotReloadState { let FileMapBuildResult { map, errors } = FileMap::create(config.crate_dir.clone()).unwrap(); for err in errors { - log::error!("{}", err); + tracing::error!("{}", err); } HotReloadState { diff --git a/packages/cli/src/server/web/server.rs b/packages/cli/src/server/web/server.rs index f70ce221c..7f26ced1f 100644 --- a/packages/cli/src/server/web/server.rs +++ b/packages/cli/src/server/web/server.rs @@ -219,8 +219,8 @@ pub fn get_rustls_with_mkcert(web_config: &WebHttpsConfig) -> Result<(String, St match cmd { Err(e) => { match e.kind() { - io::ErrorKind::NotFound => log::error!("mkcert is not installed. See https://github.com/FiloSottile/mkcert#installation for installation instructions."), - e => log::error!("an error occured while generating mkcert certificates: {}", e.to_string()), + io::ErrorKind::NotFound => tracing::error!("mkcert is not installed. See https://github.com/FiloSottile/mkcert#installation for installation instructions."), + e => tracing::error!("an error occured while generating mkcert certificates: {}", e.to_string()), }; return Err("failed to generate mkcert certificates".into()); } diff --git a/packages/cli/src/tools.rs b/packages/cli/src/tools.rs index 6bc4256d1..ec65abef8 100644 --- a/packages/cli/src/tools.rs +++ b/packages/cli/src/tools.rs @@ -49,7 +49,7 @@ pub fn clone_repo(dir: &Path, url: &str) -> anyhow::Result<()> { let res = cmd.arg("clone").arg(url).arg(dir_name).output(); if let Err(err) = res { if ErrorKind::NotFound == err.kind() { - log::warn!("Git program not found. Hint: Install git or check $PATH."); + tracing::warn!("Git program not found. Hint: Install git or check $PATH."); return Err(err.into()); } } @@ -216,7 +216,7 @@ impl Tool { let chunk = chunk_res.context("error reading chunk from download")?; let _ = file.write(chunk.as_ref()).await; } - // log::info!("temp file path: {:?}", temp_out); + // tracing::info!("temp file path: {:?}", temp_out); Ok(temp_out) }