diff --git a/Cargo.lock b/Cargo.lock index 1f906a7..28bbb16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,13 +55,13 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "ammonia" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab99eae5ee58501ab236beb6f20f6ca39be615267b014899c89b2f0bc18a459" +checksum = "3ada2ee439075a3e70b6992fce18ac4e407cd05aea9ca3f75d2c0b0c20bbb364" dependencies = [ - "html5ever 0.27.0", + "cssparser 0.35.0", + "html5ever 0.31.0", "maplit", - "once_cell", "tendril", "url", ] @@ -613,9 +613,9 @@ dependencies = [ [[package]] name = "bon" -version = "3.6.0" +version = "3.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8baa8e2f74b721b16b14e6b8e0516c8df35708273d5e89ca7be391cb9a419ff9" +checksum = "ced38439e7a86a4761f7f7d5ded5ff009135939ecb464a24452eaa4c1696af7d" dependencies = [ "bon-macros", "rustversion", @@ -623,9 +623,9 @@ dependencies = [ [[package]] name = "bon-macros" -version = "3.6.0" +version = "3.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff68fc8bb0a7a05683bc799f9c50ec05379c4a6104446eb1fed7b07341eebc5" +checksum = "0ce61d2d3844c6b8d31b2353d9f66cf5e632b3e9549583fe3cac2f4f6136725e" dependencies = [ "darling 0.20.11", "ident_case", @@ -1280,6 +1280,19 @@ dependencies = [ "smallvec 1.15.0", ] +[[package]] +name = "cssparser" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e901edd733a1472f944a45116df3f846f54d37e67e68640ac8bb69689aca2aa" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 1.0.15", + "phf 0.11.3", + "smallvec 1.15.0", +] + [[package]] name = "cssparser-macros" version = "0.6.1" @@ -1368,9 +1381,9 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" [[package]] name = "der" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ "const-oid", "pem-rfc7468", @@ -1564,9 +1577,9 @@ dependencies = [ [[package]] name = "enclose" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef4f6f904480430009ad8f22edc9573e26e4f137365f014d7ea998d5341639a" +checksum = "eef75b364b1baff88ff28dc34e4c7c0ebd138abd76f4e58e24e37d9b7f54b8f1" [[package]] name = "encoding_rs" @@ -2382,6 +2395,18 @@ dependencies = [ "match_token", ] +[[package]] +name = "html5ever" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953cbbe631aae7fc0a112702ad5d3aaf09da38beaf45ea84610d6e1c358f569c" +dependencies = [ + "log", + "mac", + "markup5ever 0.16.1", + "match_token", +] + [[package]] name = "htmlescape" version = "0.3.1" @@ -3022,14 +3047,28 @@ dependencies = [ "tracing", ] +[[package]] +name = "letterbox-notmuch" +version = "0.17.2" +source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/" +checksum = "e68cf6f69a34d9dca43cf99a850eb4eaa81632057da58541c002ba58d4026e99" +dependencies = [ + "log", + "mailparse", + "serde", + "serde_json", + "thiserror 2.0.12", + "tracing", +] + [[package]] name = "letterbox-procmail2notmuch" version = "0.17.2" dependencies = [ "anyhow", "clap", - "letterbox-notmuch 0.16.0", - "letterbox-shared 0.16.0", + "letterbox-notmuch 0.17.2 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", + "letterbox-shared 0.17.2 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", "serde", "sqlx", "tokio 1.44.2", @@ -3055,8 +3094,8 @@ dependencies = [ "futures 0.3.31", "headers", "html-escape", - "letterbox-notmuch 0.16.0", - "letterbox-shared 0.16.0", + "letterbox-notmuch 0.17.2 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", + "letterbox-shared 0.17.2 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", "linkify", "log", "lol_html", @@ -3081,12 +3120,10 @@ dependencies = [ [[package]] name = "letterbox-shared" -version = "0.16.0" -source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/" -checksum = "18fcc018014a200754ea7524f41fc4e5e14f5edc4cb0ca5d7afbaa476cb0d297" +version = "0.17.2" dependencies = [ "build-info", - "letterbox-notmuch 0.16.0", + "letterbox-notmuch 0.17.2 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", "regex", "serde", "sqlx", @@ -3097,6 +3134,8 @@ dependencies = [ [[package]] name = "letterbox-shared" version = "0.17.2" +source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/" +checksum = "0e1a634b8bbfa38f847cda9d10142c41fba727c0efef1e159de6f60c157de8de" dependencies = [ "build-info", "letterbox-notmuch 0.16.0", @@ -3121,8 +3160,8 @@ dependencies = [ "graphql_client", "human_format", "itertools", - "letterbox-notmuch 0.16.0", - "letterbox-shared 0.16.0", + "letterbox-notmuch 0.17.2 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", + "letterbox-shared 0.17.2 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", "log", "seed", "seed_hooks", @@ -3145,9 +3184,9 @@ checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" [[package]] name = "libc" -version = "0.2.171" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libgit2-sys" @@ -3163,9 +3202,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" +checksum = "c9627da5196e5d8ed0b0495e61e518847578da83483c37288316d9b2e03a7f72" [[package]] name = "libredox" @@ -3253,9 +3292,9 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "lol_html" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1058123f6262982b891dccc395cff0144d9439de366460b47fab719258b96e" +checksum = "1e24940eb633a7240c1155e61595e18ec6c72b8571837531933f19de3a8c3786" dependencies = [ "bitflags 2.9.0", "cfg-if 1.0.0", @@ -3334,6 +3373,17 @@ dependencies = [ "tendril", ] +[[package]] +name = "markup5ever" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a8096766c229e8c88a3900c9b44b7e06aa7f7343cc229158c3e58ef8f9973a" +dependencies = [ + "log", + "tendril", + "web_atoms", +] + [[package]] name = "match_token" version = "0.1.0" @@ -3889,7 +3939,7 @@ dependencies = [ "glob", "opentelemetry", "percent-encoding", - "rand 0.9.0", + "rand 0.9.1", "serde_json", "thiserror 2.0.12", "tokio 1.44.2", @@ -4380,9 +4430,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -4441,13 +4491,13 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.10" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b820744eb4dc9b57a3398183639c511b5a26d2ed702cedd3febaa1393caa22cc" +checksum = "bcbafbbdbb0f638fe3f35f3c56739f77a8a1d070cb25603226c83339b391472b" dependencies = [ "bytes 1.10.1", "getrandom 0.3.2", - "rand 0.9.0", + "rand 0.9.1", "ring", "rustc-hash", "rustls", @@ -4532,13 +4582,12 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", - "zerocopy", ] [[package]] @@ -5518,9 +5567,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" dependencies = [ "libc", ] @@ -5995,9 +6044,9 @@ dependencies = [ [[package]] name = "tantivy" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b21ad8b222d71c57aa979353ed702f0bc6d97e66d368962cbded57fbd19eedd7" +checksum = "ca2374a21157427c5faff2d90930f035b6c22a5d7b0e5b0b7f522e988ef33c06" dependencies = [ "aho-corasick", "arc-swap", @@ -6841,7 +6890,7 @@ dependencies = [ "http 1.3.1", "httparse", "log", - "rand 0.9.0", + "rand 0.9.1", "sha1", "thiserror 2.0.12", "utf-8", @@ -7184,6 +7233,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web_atoms" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "954c5a41f2bcb7314344079d0891505458cc2f4b422bdea1d5bfbe6d1a04903b" +dependencies = [ + "phf 0.11.3", + "phf_codegen 0.11.3", + "string_cache", + "string_cache_codegen", +] + [[package]] name = "webpki-roots" version = "0.26.8" diff --git a/notmuch/Cargo.toml b/notmuch/Cargo.toml index c802ba4..b2a029f 100644 --- a/notmuch/Cargo.toml +++ b/notmuch/Cargo.toml @@ -11,14 +11,14 @@ version.workspace = true [dependencies] -log = "0.4.14" -mailparse = "0.16.0" +log = "0.4.27" +mailparse = "0.16.1" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["unbounded_depth"] } -thiserror = "2.0.0" +thiserror = "2.0.12" tracing = "0.1.41" [dev-dependencies] itertools = "0.14.0" pretty_assertions = "1" -rayon = "1.5" +rayon = "1.10" diff --git a/procmail2notmuch/Cargo.toml b/procmail2notmuch/Cargo.toml index d58d675..d7fbffd 100644 --- a/procmail2notmuch/Cargo.toml +++ b/procmail2notmuch/Cargo.toml @@ -11,10 +11,10 @@ version.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.69" +anyhow = "1.0.98" clap = { version = "4.5.37", features = ["derive", "env"] } -letterbox-notmuch = { version = "0.16.0", registry = "xinu" } -letterbox-shared = { version = "0.16.0", registry = "xinu" } +letterbox-notmuch = { version = "0.17.2", registry = "xinu" } +letterbox-shared = { version = "0.17.2", registry = "xinu" } serde = { version = "1.0.219", features = ["derive"] } sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio"] } tokio = { version = "1.44.2", features = ["rt", "macros", "rt-multi-thread"] } diff --git a/server/Cargo.toml b/server/Cargo.toml index b5b7f3c..ce9fa14 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -12,45 +12,45 @@ version.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ammonia = "4.0.0" -anyhow = "1.0.79" +ammonia = "4.1.0" +anyhow = "1.0.98" async-graphql = { version = "7", features = ["log"] } -async-graphql-axum = "7.0.15" -async-trait = "0.1.81" +async-graphql-axum = "7.0.16" +async-trait = "0.1.88" axum = { version = "0.8.3", features = ["ws"] } axum-macros = "0.5.0" build-info = "0.0.40" cacher = { version = "0.2.0", registry = "xinu" } -chrono = "0.4.39" -clap = { version = "4.5.36", features = ["derive"] } -css-inline = "0.14.0" +chrono = "0.4.40" +clap = { version = "4.5.37", features = ["derive"] } +css-inline = "0.14.4" futures = "0.3.31" headers = "0.4.0" html-escape = "0.2.13" -letterbox-notmuch = { version = "0.16.0", registry = "xinu" } -letterbox-shared = { version = "0.16.0", registry = "xinu" } +letterbox-notmuch = { version = "0.17.2", registry = "xinu" } +letterbox-shared = { version = "0.17.2", registry = "xinu" } linkify = "0.10.0" -log = "0.4.17" -lol_html = "2.0.0" -mailparse = "0.16.0" +log = "0.4.27" +lol_html = "2.3.0" +mailparse = "0.16.1" maplit = "1.0.2" memmap = "0.7.0" regex = "1.11.1" -reqwest = { version = "0.12.7", features = ["blocking"] } -scraper = "0.23.0" -serde = { version = "1.0.147", features = ["derive"] } -serde_json = "1.0.87" -sqlx = { version = "0.8.2", features = ["postgres", "runtime-tokio", "time"] } -tantivy = { version = "0.24.0", optional = true } -thiserror = "2.0.0" -tokio = "1.26.0" +reqwest = { version = "0.12.15", features = ["blocking"] } +scraper = "0.23.1" +serde = { version = "1.0.219", features = ["derive"] } +serde_json = "1.0.140" +sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio", "time"] } +tantivy = { version = "0.24.1", optional = true } +thiserror = "2.0.12" +tokio = "1.44.2" tower-http = { version = "0.6.2", features = ["trace"] } tracing = "0.1.41" -url = "2.5.2" +url = "2.5.4" urlencoding = "2.1.3" #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" } #xtracing = { path = "../../xtracing" } -xtracing = { version = "0.3.0", registry = "xinu" } +xtracing = { version = "0.3.1", registry = "xinu" } [build-dependencies] build-info-build = "0.0.40" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 96dd880..f9f0e70 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -12,9 +12,9 @@ version.workspace = true [dependencies] build-info = "0.0.40" -letterbox-notmuch = { version = "0.16.0", registry = "xinu" } +letterbox-notmuch = { version = "0.17.2", registry = "xinu" } regex = "1.11.1" -serde = { version = "1.0.147", features = ["derive"] } +serde = { version = "1.0.219", features = ["derive"] } sqlx = "0.8.5" strum_macros = "0.27.1" tracing = "0.1.41" diff --git a/web/Cargo.toml b/web/Cargo.toml index c1f193e..e665596 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -12,30 +12,30 @@ version.workspace = true build-info-build = "0.0.40" [dev-dependencies] -wasm-bindgen-test = "0.3.33" +wasm-bindgen-test = "0.3.50" [dependencies] console_error_panic_hook = "0.1.7" -log = "0.4.17" +log = "0.4.27" seed = { version = "0.10.0", features = ["routing"] } #seed = "0.9.2" -console_log = { version = "0.1.0", registry = "xinu" } -serde = { version = "1.0.147", features = ["derive"] } +console_log = { version = "0.1.4", registry = "xinu" } +serde = { version = "1.0.219", features = ["derive"] } itertools = "0.14.0" -serde_json = { version = "1.0.93", features = ["unbounded_depth"] } -chrono = "0.4.31" +serde_json = { version = "1.0.140", features = ["unbounded_depth"] } +chrono = "0.4.40" graphql_client = "0.14.0" -thiserror = "2.0.0" +thiserror = "2.0.12" gloo-net = { version = "0.6.0", features = ["json", "serde_json"] } human_format = "1.1.0" build-info = "0.0.40" wasm-bindgen = "=0.2.100" -uuid = { version = "1.13.1", features = [ +uuid = { version = "1.16.0", features = [ "js", ] } # direct dep to set js feature, prevents Rng issues -letterbox-shared = { version = "0.16.0", registry = "xinu" } -letterbox-notmuch = { version = "0.16.0", registry = "xinu" } -seed_hooks = { version = "0.4.0", registry = "xinu" } +letterbox-shared = { version = "0.17.2", registry = "xinu" } +letterbox-notmuch = { version = "0.17.2", registry = "xinu" } +seed_hooks = { version = "0.4.1", registry = "xinu" } strum_macros = "0.27.1" gloo-console = "0.3.0" [target.'cfg(target_arch = "wasm32")'.dependencies] @@ -45,7 +45,7 @@ wasm-sockets = "1.0.0" wasm-opt = ['-Os'] [dependencies.web-sys] -version = "0.3.58" +version = "0.3.77" features = [ "Clipboard", "DomRect",