diff --git a/.gitignore b/.gitignore index 74c02a2f..910a3c73 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Derived *.tsbuildinfo stats.html +stats-*.html dist .solid .output diff --git a/Cargo.lock b/Cargo.lock index 8de70b2c..9a1ae9f9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,47 +82,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -130,9 +131,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" dependencies = [ "backtrace", ] @@ -212,7 +213,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", "synstructure 0.13.1", ] @@ -235,27 +236,26 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" +checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498" dependencies = [ "flate2", "futures-core", @@ -337,14 +337,14 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" @@ -354,29 +354,24 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] name = "async-web-client" -version = "0.5.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a820ef79f63962244fc33d3f17dafb41f1c6bb9754de97c3c09c57c1b8a360ce" +checksum = "37381fb4fad3cd9b579628c21a58f528ef029d1f072d10f16cb9431aa2236d29" dependencies = [ "async-http-codec", "async-net", "futures", "futures-rustls", - "gloo-net", "http 1.1.0", - "js-sys", "lazy_static", "log", "rustls-pki-types", "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", "webpki-roots", ] @@ -388,27 +383,28 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "aws-lc-rs" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5509d663b2c00ee421bda8d6a24d6c42e15970957de1701b8df9f6fbe5707df1" +checksum = "8487b59d62764df8231cb371c459314df895b41756df457a1fb1243d65c89195" dependencies = [ "aws-lc-sys", "mirai-annotations", "paste", + "untrusted 0.7.1", "zeroize", ] [[package]] name = "aws-lc-sys" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5d317212c2a78d86ba6622e969413c38847b62f48111f8b763af3dac2f9840" +checksum = "c15eb61145320320eb919d9bab524617a7aa4216c78d342fae3a758bc33073e4" dependencies = [ "bindgen", "cc", @@ -487,7 +483,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -532,11 +528,11 @@ dependencies = [ "chrono", "futures", "pem", - "rustls 0.22.2", + "rustls 0.23.6", "rustls-acme", "sha2", "tokio", - "x509-parser 0.15.1", + "x509-parser 0.16.0", ] [[package]] @@ -571,7 +567,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.60", + "syn 2.0.64", "which", ] @@ -610,25 +606,23 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ "async-channel", "async-lock", "async-task", - "fastrand", "futures-io", "futures-lite", "piper", - "tracing", ] [[package]] name = "borsh" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0901fc8eb0aca4c83be0106d6f2db17d86a08dfc2c25f0e84464bf381158add6" +checksum = "dbe5b10e214954177fb1dc9fbd20a1a2608fe99e6c832033bdc7cea287a20d77" dependencies = [ "borsh-derive", "cfg_aliases", @@ -636,15 +630,15 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51670c3aa053938b0ee3bd67c3817e471e626151131b934038e83c5bf8de48f5" +checksum = "d7a8646f94ab393e43e8b35a2558b1624bed28b97ee09c5d15456e3c9463f46d" dependencies = [ "once_cell", - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", "syn_derive", ] @@ -702,9 +696,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.95" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" dependencies = [ "jobserver", "libc", @@ -792,7 +786,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", ] [[package]] @@ -804,7 +798,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -824,9 +818,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "combine" @@ -840,9 +834,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -967,9 +961,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -977,34 +971,34 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.60", + "strsim", + "syn 2.0.64", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "der-parser" @@ -1069,7 +1063,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -1105,9 +1099,9 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" @@ -1126,9 +1120,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1168,9 +1162,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ "event-listener 5.3.0", "pin-project-lite", @@ -1178,15 +1172,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "libz-sys", @@ -1248,7 +1242,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -1260,7 +1254,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -1272,7 +1266,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -1356,17 +1350,17 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] name = "futures-rustls" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d8a2499f0fecc0492eb3e47eab4e92da7875e1028ad2528f214ac3346ca04e" +checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" dependencies = [ "futures-io", - "rustls 0.22.2", + "rustls 0.23.6", "rustls-pki-types", ] @@ -1412,9 +1406,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1435,31 +1429,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "gloo-net" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9902a044653b26b99f7e3693a42f171312d9be8b26b5697bd1e43ad1f8a35e10" -dependencies = [ - "gloo-utils", - "js-sys", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "gloo-utils" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" -dependencies = [ - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "graph-core" version = "2.0.0-beta.0" @@ -1604,15 +1573,15 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http 1.1.0", "indexmap", "slab", @@ -1657,9 +1626,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", @@ -1818,7 +1787,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.4", + "h2 0.4.5", "http 1.1.0", "http-body 1.0.0", "httparse", @@ -1925,7 +1894,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1967,6 +1936,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.12.1" @@ -2084,9 +2059,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -2123,15 +2098,15 @@ checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2149,7 +2124,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -2203,8 +2178,8 @@ dependencies = [ "nix", "openssl", "rand", - "rcgen 0.13.0", - "rustls 0.22.2", + "rcgen", + "rustls 0.23.6", "serde", "serde_json", "sha1", @@ -2341,7 +2316,7 @@ version = "0.0.1" dependencies = [ "chrono", "mysql_async", - "mysql_common 0.31.0", + "mysql_common", "refinery", "serde_json", ] @@ -2377,31 +2352,13 @@ dependencies = [ "mx-conflict", "mx-db", "mx-policy", - "rustls 0.23.5", + "rustls 0.23.6", "serde", "serde_json", "tracing", "x509-parser 0.16.0", ] -[[package]] -name = "mysql-common-derive" -version = "0.30.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b0d8a0db9bf6d2213e11f2c701cb91387b0614361625ab7b9743b41aa4938f" -dependencies = [ - "darling", - "heck 0.4.1", - "num-bigint", - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.60", - "termcolor", - "thiserror", -] - [[package]] name = "mysql-common-derive" version = "0.31.1" @@ -2411,11 +2368,11 @@ dependencies = [ "darling", "heck 0.4.1", "num-bigint", - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", "termcolor", "thiserror", ] @@ -2436,13 +2393,13 @@ dependencies = [ "lazy_static", "lru", "mio", - "mysql_common 0.32.2", + "mysql_common", "once_cell", "pem", "percent-encoding", "pin-project", "rand", - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pemfile 2.1.2", "serde", "serde_json", @@ -2460,9 +2417,9 @@ dependencies = [ [[package]] name = "mysql_common" -version = "0.31.0" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06f19e4cfa0ab5a76b627cec2d81331c49b034988eaf302c3bafeada684eadef" +checksum = "d1e52cf194ab414202ead9dfda216d2a9ec59cc97ac024ba499ca686d82f040d" dependencies = [ "base64 0.21.7", "bigdecimal", @@ -2479,7 +2436,7 @@ dependencies = [ "flate2", "frunk", "lazy_static", - "mysql-common-derive 0.30.2", + "mysql-common-derive", "num-bigint", "num-traits", "rand", @@ -2495,47 +2452,7 @@ dependencies = [ "thiserror", "time", "uuid", - "zstd 0.12.4", -] - -[[package]] -name = "mysql_common" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccdc1fe2bb3ef97e07ba4397327ed45509a1e2e499e2f8265243879cbc7313c" -dependencies = [ - "base64 0.21.7", - "bigdecimal", - "bindgen", - "bitflags 2.5.0", - "bitvec", - "btoi", - "byteorder", - "bytes", - "cc", - "chrono", - "cmake", - "crc32fast", - "flate2", - "frunk", - "lazy_static", - "mysql-common-derive 0.31.1", - "num-bigint", - "num-traits", - "rand", - "regex", - "rust_decimal", - "saturating", - "serde", - "serde_json", - "sha1", - "sha2", - "smallvec", - "subprocess", - "thiserror", - "time", - "uuid", - "zstd 0.13.1", + "zstd", ] [[package]] @@ -2596,9 +2513,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -2610,20 +2527,19 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -2645,9 +2561,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -2656,11 +2572,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -2668,9 +2583,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2738,9 +2653,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.1.2" +version = "5.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" +checksum = "2eb49fbd5616580e9974662cb96a3463da4476e649a7e4b258df0de065db0657" dependencies = [ "is-wsl", "libc", @@ -2770,7 +2685,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -2815,9 +2730,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -2825,22 +2740,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" @@ -2866,9 +2781,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -2877,9 +2792,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -2887,22 +2802,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] name = "pest_meta" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -2939,7 +2854,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -2968,7 +2883,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -2985,9 +2900,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" dependencies = [ "atomic-waker", "fastrand", @@ -3053,22 +2968,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.60", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", + "syn 2.0.64", ] [[package]] @@ -3106,9 +3011,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -3201,35 +3106,25 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rcgen" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1" -dependencies = [ - "pem", - "ring 0.17.8", - "time", - "yasna", -] - -[[package]] -name = "rcgen" -version = "0.13.0" -source = "git+https://github.com/oscartbeaumont/rcgen?rev=718f072790b36667eb84b1604f11dd279a448923#718f072790b36667eb84b1604f11dd279a448923" +version = "0.13.1" +source = "git+https://github.com/oscartbeaumont/rcgen?rev=a3cd77f13f51b441b5d172aeac2f528c4a79c3bc#a3cd77f13f51b441b5d172aeac2f528c4a79c3bc" dependencies = [ + "aws-lc-rs", "pem", "ring 0.17.8", + "rustls-pki-types", "time", - "x509-parser 0.15.1", + "x509-parser 0.16.0", "yasna", ] [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] @@ -3245,7 +3140,7 @@ dependencies = [ [[package]] name = "refinery-core" version = "0.8.14" -source = "git+https://github.com/oscartbeaumont/refinery?rev=03744dc3257ae734a9d2f305e59b95485da53468#03744dc3257ae734a9d2f305e59b95485da53468" +source = "git+https://github.com/rust-db/refinery?rev=ff1c5c07c00f196e8ec4f10827ab882db2fd9d14#ff1c5c07c00f196e8ec4f10827ab882db2fd9d14" dependencies = [ "async-trait", "cfg-if", @@ -3272,7 +3167,7 @@ dependencies = [ "quote", "refinery-core", "regex", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -3321,13 +3216,13 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "remain" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9f2390298a947ee0aa6073d440e221c0726188cfbcdf9604addb6ee393eb4a" +checksum = "46aef80f842736de545ada6ec65b81ee91504efd6853f4b96de7414c42ae7443" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -3393,7 +3288,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.4.4", + "h2 0.4.5", "http 1.1.0", "http-body 1.0.0", "http-body-util", @@ -3501,9 +3396,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3535,9 +3430,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring 0.17.8", @@ -3549,13 +3444,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.5" +version = "0.23.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afabcee0551bd1aa3e18e5adbf2c0544722014b899adb31bd186ec638d3da97e" +checksum = "94cf0812de1f0cee6b163ce35c2f57b90e1ef5a2bed57bcf07c16475bac8c852" dependencies = [ "aws-lc-rs", "log", "once_cell", + "ring 0.17.8", "rustls-pki-types", "rustls-webpki", "subtle", @@ -3564,13 +3460,14 @@ dependencies = [ [[package]] name = "rustls-acme" -version = "0.9.2" -source = "git+https://github.com/oscartbeaumont/rustls-acme?rev=f97fef46ed4ba6480f97719dc3a06181bc8ebea3#f97fef46ed4ba6480f97719dc3a06181bc8ebea3" +version = "0.10.1" +source = "git+https://github.com/oscartbeaumont/rustls-acme?rev=051ebd0433ad66855b728f7b848369a58ee4ebbf#051ebd0433ad66855b728f7b848369a58ee4ebbf" dependencies = [ "async-io", "async-trait", "async-web-client", - "base64 0.21.7", + "aws-lc-rs", + "base64 0.22.1", "blocking", "chrono", "futures", @@ -3578,15 +3475,14 @@ dependencies = [ "http 1.1.0", "log", "pem", - "rcgen 0.12.1", - "ring 0.17.8", + "rcgen", "serde", "serde_json", "thiserror", "tokio", "tokio-util", "webpki-roots", - "x509-parser 0.15.1", + "x509-parser 0.16.0", ] [[package]] @@ -3610,15 +3506,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "aws-lc-rs", "ring 0.17.8", @@ -3628,15 +3524,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3676,11 +3572,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -3689,9 +3585,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -3699,9 +3595,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.199" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] @@ -3719,20 +3615,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -3751,9 +3647,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -3886,9 +3782,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3948,12 +3844,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -3979,7 +3869,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -4011,9 +3901,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f" dependencies = [ "proc-macro2", "quote", @@ -4029,7 +3919,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -4064,7 +3954,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -4117,22 +4007,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -4221,7 +4111,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -4240,7 +4130,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.4", "rustls-pki-types", "tokio", ] @@ -4270,9 +4160,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -4280,41 +4170,29 @@ dependencies = [ "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.12", + "toml_edit 0.22.13", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.21.1" @@ -4328,15 +4206,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.12" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.7", + "winnow 0.6.8", ] [[package]] @@ -4399,7 +4277,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -4648,7 +4526,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", "wasm-bindgen-shared", ] @@ -4682,7 +4560,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4782,9 +4660,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134306a13c5647ad6453e8deaec55d3a44d6021970129e6188735e74bf546697" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ "windows-sys 0.52.0", ] @@ -5020,9 +4898,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] @@ -5068,7 +4946,6 @@ dependencies = [ "lazy_static", "nom", "oid-registry 0.6.1", - "ring 0.16.20", "rusticata-macros", "thiserror", "time", @@ -5124,22 +5001,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.64", ] [[package]] @@ -5148,32 +5025,13 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" -[[package]] -name = "zstd" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" -dependencies = [ - "zstd-safe 6.0.6", -] - [[package]] name = "zstd" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ - "zstd-safe 7.1.0", -] - -[[package]] -name = "zstd-safe" -version = "6.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" -dependencies = [ - "libc", - "zstd-sys", + "zstd-safe", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index d43e6af6..f7cf4ae6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,15 +25,16 @@ specta = { version = "=2.0.0-rc.11", features = [ [patch.crates-io] # TODO: This is likely a security risk, will fix it properly once the MVP is out. # TODO: This patch is from the unreleased `0.13.0` but I patched it to lie and pretend to be `0.21.1` -rcgen = { git = "https://github.com/oscartbeaumont/rcgen", rev = "718f072790b36667eb84b1604f11dd279a448923" } +rcgen = { git = "https://github.com/oscartbeaumont/rcgen", rev = "a3cd77f13f51b441b5d172aeac2f528c4a79c3bc" } # TODO: Waiting for https://github.com/FlorianUekermann/rustls-acme/pull/49 or my own PR cause that one is stale. -rustls-acme = { git = "https://github.com/oscartbeaumont/rustls-acme", rev = "f97fef46ed4ba6480f97719dc3a06181bc8ebea3" } +rustls-acme = { git = "https://github.com/oscartbeaumont/rustls-acme", rev = "051ebd0433ad66855b728f7b848369a58ee4ebbf" } + # Some minor improvements easy-xml = { git = "https://github.com/oscartbeaumont/easy-xml", rev = "f373c5bc85802e434274400865a9ba8dbc2313f1" } easy-xml-derive = { git = "https://github.com/oscartbeaumont/easy-xml", rev = "f373c5bc85802e434274400865a9ba8dbc2313f1" } -# Support for latest mysql-async -refinery-core = { git = "https://github.com/oscartbeaumont/refinery", rev = "03744dc3257ae734a9d2f305e59b95485da53468" } +# Support for latest mysql-async - https://github.com/rust-db/refinery/pull/327 +refinery-core = { git = "https://github.com/rust-db/refinery", rev = "ff1c5c07c00f196e8ec4f10827ab882db2fd9d14" } # https://github.com/zkat/chownr-rs/pull/1 chownr = { git = "https://github.com/oscartbeaumont/chownr-rs", rev = "05101de6d2eb27a18374688f9339772aff827f85" } diff --git a/apps/docs/package.json b/apps/docs/package.json index 34a5837c..4cd66467 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -9,31 +9,31 @@ }, "browserslist": "defaults, not ie <= 11", "dependencies": { - "@algolia/autocomplete-core": "^1.17.0", - "@headlessui/react": "^1.7.19", + "@algolia/autocomplete-core": "^1.17.1", + "@headlessui/react": "^2.0.3", "@headlessui/tailwindcss": "^0.2.0", "@mdx-js/loader": "^3.0.1", "@mdx-js/react": "^3.0.1", - "@next/mdx": "^14.2.2", + "@next/mdx": "^14.2.3", "@sindresorhus/slugify": "^2.2.1", - "@tailwindcss/typography": "^0.5.12", + "@tailwindcss/typography": "^0.5.13", "@types/mdx": "^2.0.13", - "@types/node": "^20.12.7", - "@types/react": "^18.2.79", - "@types/react-dom": "^18.2.25", + "@types/node": "^20.12.12", + "@types/react": "^18.3.2", + "@types/react-dom": "^18.3.0", "@types/react-highlight-words": "^0.16.7", "acorn": "^8.11.3", "autoprefixer": "^10.4.19", - "clsx": "^2.1.0", + "clsx": "^2.1.1", "fast-glob": "^3.3.2", "flexsearch": "^0.7.43", - "framer-motion": "^11.1.7", + "framer-motion": "^11.2.4", "mdast-util-to-string": "^4.0.0", "mdx-annotations": "^0.1.4", - "next": "^14.2.2", + "next": "^14.2.3", "next-themes": "^0.3.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "react-highlight-words": "^0.20.0", "remark": "^15.0.1", "remark-gfm": "^4.0.0", @@ -47,10 +47,10 @@ "zustand": "^4.5.2" }, "devDependencies": { - "eslint": "^9.1.0", - "eslint-config-next": "^14.2.2", + "eslint": "^9.2.0", + "eslint-config-next": "^14.2.3", "prettier": "^3.2.5", "prettier-plugin-tailwindcss": "^0.5.14", - "sharp": "0.33.3" + "sharp": "0.33.4" } } diff --git a/apps/landing/package.json b/apps/landing/package.json index 01b23fff..5622f1d6 100644 --- a/apps/landing/package.json +++ b/apps/landing/package.json @@ -8,24 +8,24 @@ "start": "vinxi start" }, "devDependencies": { - "@iconify/json": "^2.2.202", + "@iconify/json": "^2.2.211", "@tailwindcss/forms": "^0.5.7", - "@tailwindcss/typography": "^0.5.12", + "@tailwindcss/typography": "^0.5.13", "autoprefixer": "^10.4.19", "tailwindcss": "^3.4.3" }, "dependencies": { - "@fontsource-variable/inter": "^5.0.17", - "@fontsource/inter": "^5.0.17", - "@kobalte/core": "^0.12.6", + "@fontsource-variable/inter": "^5.0.18", + "@fontsource/inter": "^5.0.18", + "@kobalte/core": "^0.13.1", "@mattrax/ui": "workspace:*", - "@solidjs/router": "^0.13.2", - "@solidjs/start": "1.0.0-rc.0", - "@tanstack/solid-form": "=0.19.0", + "@solidjs/router": "^0.13.3", + "@solidjs/start": "1.0.0-rc.1", + "@tanstack/solid-form": "^0.19.5", "h3": "^1.11.1", - "solid-js": "^1.8.16", - "vinxi": "=0.3.10", - "vite": "^5.2.9", - "zod": "^3.22.5" + "solid-js": "^1.8.17", + "vinxi": "=0.3.11", + "vite": "^5.2.11", + "zod": "^3.23.8" } } diff --git a/apps/landing/src/routes/index.tsx b/apps/landing/src/routes/index.tsx index 9733ca9a..d11cd9d8 100644 --- a/apps/landing/src/routes/index.tsx +++ b/apps/landing/src/routes/index.tsx @@ -12,6 +12,7 @@ import { SelectTrigger, SelectValue, useController, + DialogTrigger, } from "@mattrax/ui"; import { z } from "zod"; import { @@ -20,7 +21,6 @@ import { SelectField, createZodForm, } from "@mattrax/ui/forms"; -import { As } from "@kobalte/core"; // TODO: Setup unplugin icons function PhLaptop(props: JSX.IntrinsicElements["svg"]) { @@ -220,7 +220,8 @@ export default function Page() { function Waitlist() { return ( - Join Waitlist}> + + Join Waitlist Join Waitlist diff --git a/apps/mattrax/Cargo.toml b/apps/mattrax/Cargo.toml index d9a626dc..9c022954 100644 --- a/apps/mattrax/Cargo.toml +++ b/apps/mattrax/Cargo.toml @@ -18,39 +18,39 @@ mx-db = { path = "../../crates/mx-db" } tracing = "0.1.40" tracing-subscriber = "0.3.18" -tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread"] } -clap = { version = "4.5.3", features = ["derive"] } -axum = { version = "0.7.4", features = ["http2", "macros", "ws"] } -rustls = "=0.22.2" # TODO: Upgrade -futures-rustls = "0.25.1" +tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread"] } +clap = { version = "4.5.4", features = ["derive"] } +axum = { version = "0.7.5", features = ["http2", "macros", "ws"] } +rustls = "0.23.6" +futures-rustls = "0.26.0" tower = "0.4.13" -hyper = { version = "1.2.0", features = ["http1", "http2", "server"] } -tokio-util = { version = "0.7.10", features = ["compat"] } +hyper = { version = "1.3.1", features = ["http1", "http2", "server"] } +tokio-util = { version = "0.7.11", features = ["compat"] } hyper-util = { version = "0.1.3", features = [ "http1", "http2", "server-auto", "tokio", ] } -thiserror = "1.0.58" +thiserror = "1.0.60" serde = { workspace = true } serde_json = { workspace = true } tokio-stream = "0.1.15" -getrandom = "0.2.12" -rcgen = { version = "=0.13.0", features = ["x509-parser"] } -base64 = "0.22.0" +getrandom = "0.2.15" +rcgen = { version = "0.13.1", features = ["x509-parser"] } +base64 = "0.22.1" sha1 = "0.10.6" hex = "0.4.3" futures = { version = "0.3.30", default-features = false } cuid2 = "0.1.2" -time = "0.3.34" +time = "0.3.36" urlencoding = "2.1.3" hmac = "0.12.1" jwt = "0.16.0" sha2 = "0.10.8" x509-parser = "0.16.0" mysql_async = { version = "0.34.1", default-features = false } -openssl = { version = "0.10.35", features = ["vendored"] } +openssl = { version = "0.10.64", features = ["vendored"] } arc-swap = "1.7.1" rand = "0.8.5" nix = { version = "0.28.0", features = ["user"] } diff --git a/apps/mattrax/src/api/mdm/enrollment.rs b/apps/mattrax/src/api/mdm/enrollment.rs index 6c501a54..5444e24c 100644 --- a/apps/mattrax/src/api/mdm/enrollment.rs +++ b/apps/mattrax/src/api/mdm/enrollment.rs @@ -21,7 +21,7 @@ use ms_mde::{ REQUEST_SECURITY_TOKEN_RESPONSE_COLLECTION, REQUEST_SECURITY_TOKEN_TYPE, WSSE_NAMESPACE, }; use rcgen::{ - Certificate, CertificateSigningRequestParams, CustomExtension, DistinguishedName, DnType, + CertificateSigningRequestParams, CustomExtension, DistinguishedName, DnType, ExtendedKeyUsagePurpose, IsCa, KeyUsagePurpose, SerialNumber, }; use serde::Deserialize; @@ -365,7 +365,7 @@ pub fn mount(state: Arc) -> Router> { }) else { return StatusCode::INTERNAL_SERVER_ERROR.into_response(); }; - let mut csr = CertificateSigningRequestParams::from_der(&csr).unwrap(); // TODO: Error handling + let mut csr = CertificateSigningRequestParams::from_der(&csr.try_into().unwrap()).unwrap(); // TODO: Error handling let device_id = cuid2::create_id(); // Version: csr.Version, @@ -387,7 +387,7 @@ pub fn mount(state: Arc) -> Router> { CustomExtension::from_oid_content(MICROSOFT_DEVICE_ID_EXTENSION, device_id.as_bytes().to_vec()), ]; - let certificate = Certificate::from_request(csr, &state.identity_cert_rcgen, &state.identity_key).unwrap(); // TODO: Error handling + let certificate = csr.signed_by(&state.identity_cert_rcgen, &state.identity_key).unwrap(); // TODO: Error handling // var wapProvisioningDocCharacteristics = []wap.Characteristic{ // certStoreCharacteristic, diff --git a/apps/mattrax/src/cli/init.rs b/apps/mattrax/src/cli/init.rs index b3dd501c..a05e15d4 100644 --- a/apps/mattrax/src/cli/init.rs +++ b/apps/mattrax/src/cli/init.rs @@ -6,7 +6,8 @@ use std::{ }; use rcgen::{ - BasicConstraints, Certificate, CertificateParams, DnType, IsCa, KeyPair, KeyUsagePurpose, + BasicConstraints, CertificateParams, DnType, IsCa, KeyPair, KeyUsagePurpose, + PKCS_ECDSA_P256_SHA256, }; use tracing::{error, info, warn}; @@ -74,8 +75,8 @@ impl Command { params.is_ca = IsCa::Ca(BasicConstraints::Unconstrained); // TODO: critical: true params.key_usages = vec![KeyUsagePurpose::KeyCertSign, KeyUsagePurpose::CrlSign]; // TODO: critical: true - let key_pair = KeyPair::generate().unwrap(); - let cert = Certificate::generate_self_signed(params, &key_pair).unwrap(); + let key_pair = KeyPair::generate_for(&PKCS_ECDSA_P256_SHA256).unwrap(); + let cert = params.self_signed(&key_pair).unwrap(); let mut secret = [0u8; 32]; getrandom::getrandom(&mut secret).unwrap(); @@ -184,7 +185,6 @@ WantedBy=multi-user.target"#, #[cfg(unix)] { - use std::os::unix::fs::PermissionsExt; fs::set_permissions( diff --git a/apps/mattrax/src/cli/serve/mod.rs b/apps/mattrax/src/cli/serve/mod.rs index 8ac456ac..ca667aab 100644 --- a/apps/mattrax/src/cli/serve/mod.rs +++ b/apps/mattrax/src/cli/serve/mod.rs @@ -7,7 +7,7 @@ use std::{ use better_acme::{Acme, FsStore}; use hmac::{Hmac, Mac}; -use rcgen::{Certificate, CertificateParams, KeyPair}; +use rcgen::{CertificateParams, KeyPair, PKCS_ECDSA_P256_SHA256}; use rustls::{ pki_types::CertificateDer, server::WebPkiClientVerifier, RootCertStore, ServerConfig, }; @@ -67,8 +67,6 @@ impl Command { let port = { let config = config_manager.get(); - - self.port.unwrap_or({ #[cfg(debug_assertions)] if config.domain == "localhost" { @@ -84,20 +82,32 @@ impl Command { let (acme_tx, acme_rx) = mpsc::channel(25); let state = { let config = config_manager.get(); - let identity_key = KeyPair::from_der(&config.certificates.identity_key).unwrap(); + let identity_key = KeyPair::from_der_and_sign_algo( + &config.certificates.identity_key.clone().try_into().unwrap(), + &PKCS_ECDSA_P256_SHA256, + ) + .unwrap(); let shared_secret = Hmac::new_from_slice(config.internal_secret.as_bytes()).unwrap(); + let identity_cert_rcgen = CertificateParams::from_ca_cert_der( + &config + .certificates + .identity_cert + .clone() + .try_into() + .unwrap(), + ) + .unwrap() + // TODO: https://github.com/rustls/rcgen/issues/274 + .self_signed(&identity_key) + .unwrap(); + Arc::new(api::Context { config: config_manager.clone(), is_dev: cfg!(debug_assertions), server_port: port, db, - identity_cert_rcgen: Certificate::generate_self_signed( - CertificateParams::from_ca_cert_der(&config.certificates.identity_cert) - .unwrap(), - &identity_key, - ) - .unwrap(), + identity_cert_rcgen, identity_cert_x509: { // TODO: We *have* to leak memory right because of how `x509_parser` is built. Should be fixed by https://github.com/rusticata/x509-parser/issues/76 let public_key = Vec::leak(config.certificates.identity_cert.clone()); diff --git a/apps/mattrax/src/main.rs b/apps/mattrax/src/main.rs index 8caa4272..1b2c811c 100644 --- a/apps/mattrax/src/main.rs +++ b/apps/mattrax/src/main.rs @@ -2,6 +2,7 @@ use std::path::PathBuf; use clap::Parser; use mx_utils::file_logger; +use rustls::crypto; pub(crate) mod api; mod cli; @@ -29,6 +30,8 @@ async fn main() { std::panic::set_hook(Box::new(move |panic| tracing::error!("{panic}"))); + crypto::ring::default_provider().install_default().ok(); + match cli.command { cli::Commands::Init(cmd) => cmd.run(data_dir).await, cli::Commands::Serve(cmd) => cmd.run(data_dir).await, diff --git a/apps/mattraxd/Cargo.toml b/apps/mattraxd/Cargo.toml index e3d987ce..b9467902 100644 --- a/apps/mattraxd/Cargo.toml +++ b/apps/mattraxd/Cargo.toml @@ -11,6 +11,6 @@ dist = true [dependencies] mx-utils = { path = "../../crates/mx-utils" } -clap = { version = "4.5.3", features = ["derive"] } +clap = { version = "4.5.4", features = ["derive"] } tracing-subscriber = "0.3.18" tracing = "0.1.40" diff --git a/apps/mttx/Cargo.toml b/apps/mttx/Cargo.toml index 140fb151..bf667966 100644 --- a/apps/mttx/Cargo.toml +++ b/apps/mttx/Cargo.toml @@ -12,15 +12,15 @@ dist = true mx-utils = { path = "../../crates/mx-utils" } ms-mdm = { path = "../../crates/ms-mdm" } -clap = { version = "4.5.3", features = ["derive"] } +clap = { version = "4.5.4", features = ["derive"] } tracing-subscriber = "0.3.18" tracing = "0.1.40" serde = { workspace = true } serde_json = { workspace = true } -serde_yaml = "0.9.33" -tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread"] } +serde_yaml = "0.9.34" +tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread"] } graph-rs-sdk = "2.0.0-beta.0" -reqwest = { version = "0.12.0", features = ["json"] } +reqwest = { version = "0.12.4", features = ["json"] } urlencoding = "2.1.3" -open = "5.1.2" +open = "5.1.3" easy-xml = "0.1.4" diff --git a/apps/web/app.config.ts b/apps/web/app.config.ts index 93ab5689..ad434b29 100644 --- a/apps/web/app.config.ts +++ b/apps/web/app.config.ts @@ -36,9 +36,11 @@ export default defineConfig({ root: ".", }), mattraxUI, - router === "client" - ? visualizer({ brotliSize: true, gzipSize: true }) - : undefined, + visualizer({ + brotliSize: true, + gzipSize: true, + filename: `stats${router === "client" ? "" : `-${router}`}.html`, + }), ], }), server: { diff --git a/apps/web/package.json b/apps/web/package.json index e77ef56e..a46fd704 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@hono/zod-validator": "^0.2.1", - "@kobalte/core": "^0.12.6", + "@kobalte/core": "^0.13.1", "@kobalte/tailwindcss": "^0.9.0", "@lucia-auth/adapter-drizzle": "^1.0.7", "@mattrax/configuration-schemas": "workspace:*", @@ -28,7 +28,7 @@ "@mattrax/ui": "workspace:*", "@microsoft/microsoft-graph-client": "^3.0.7", "@paralleldrive/cuid2": "^2.2.2", - "@planetscale/database": "^1.16.0", + "@planetscale/database": "^1.18.0", "@solid-mediakit/trpc": "^3.0.2", "@solid-primitives/context": "^0.2.3", "@solid-primitives/date": "^2.0.21", @@ -38,58 +38,57 @@ "@solid-primitives/map": "^0.4.11", "@solid-primitives/memo": "^1.3.8", "@solid-primitives/scheduled": "^1.4.3", - "@solid-primitives/storage": "^3.3.0", + "@solid-primitives/storage": "^3.5.0", "@solid-primitives/timer": "^1.3.9", - "@solidjs/router": "^0.13.2", - "@solidjs/start": "1.0.0-rc.0", - "@t3-oss/env-core": "^0.9.2", - "@tanstack/query-broadcast-client-experimental": "^5.29.0", - "@tanstack/solid-form": "=0.19.0", - "@tanstack/solid-query": "^5.35.1", - "@tanstack/solid-query-devtools": "^5.35.1", - "@tanstack/solid-query-persist-client": "^5.30.6", - "@tanstack/solid-table": "^8.16.1", - "@tanstack/zod-form-adapter": "=0.19.0", + "@solidjs/router": "=0.13.3", + "@solidjs/start": "1.0.0-rc.1", + "@t3-oss/env-core": "^0.10.1", + "@tanstack/solid-form": "^0.19.5", + "@tanstack/solid-query": "^5.36.1", + "@tanstack/solid-query-devtools": "^5.36.1", + "@tanstack/solid-query-persist-client": "^5.36.1", + "@tanstack/solid-table": "^8.17.3", + "@tanstack/zod-form-adapter": "^0.19.5", "@trpc/client": "^10.45.2", "@trpc/server": "^10.45.2", "@types/pluralize": "^0.0.33", "aws4fetch": "^1.0.18", "base58": "^2.0.1", "class-variance-authority": "^0.7.0", - "clsx": "^2.1.0", + "clsx": "^2.1.1", "codejar": "^4.2.0", "cookie-es": "^1.1.0", "dexie": "^4.0.4", - "drizzle-orm": "^0.30.8", + "drizzle-orm": "^0.30.10", "h3": "^1.11.1", - "hono": "^4.2.5", + "hono": "^4.3.7", "input-otp": "^1.2.4", - "jose": "^5.2.4", - "lucia": "^3.1.1", + "jose": "^5.3.0", + "lucia": "^3.2.0", "oslo": "^1.2.0", "pluralize": "^8.0.0", - "prism-code-editor": "^3.3.0", + "prism-code-editor": "^3.3.1", "prism-themes": "^1.9.0", "prismjs": "^1.29.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "solid-js": "^1.8.16", - "solid-sonner": "^0.2.6", - "stripe": "^15.3.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", + "solid-js": "^1.8.17", + "solid-sonner": "^0.2.7", + "stripe": "^15.7.0", "superjson": "^2.2.1", "tailwindcss": "^3.4.3", "ts-pattern": "^5.1.1", - "vinxi": "=0.3.10", + "vinxi": "=0.3.11", "xml2js": "^0.6.2", - "zod": "^3.22.5" + "zod": "^3.23.8" }, "devDependencies": { - "@iconify/json": "^2.2.202", + "@iconify/json": "^2.2.211", "@microsoft/microsoft-graph-types": "^2.40.0", "@tailwindcss/forms": "^0.5.7", - "@types/prismjs": "^1.26.3", - "@types/react": "^18.2.79", - "@types/react-dom": "^18.2.25", + "@types/prismjs": "^1.26.4", + "@types/react": "^18.3.2", + "@types/react-dom": "^18.3.0", "autoprefixer": "^10.4.19", "mysql2": "^3.9.7", "postcss": "^8.4.38", @@ -98,9 +97,9 @@ "tailwind-scrollbar": "^3.1.0", "tailwindcss-animate": "^1.0.7", "unenv": "^1.9.0", - "unplugin-auto-import": "^0.17.5", - "unplugin-icons": "^0.18.5", - "vite": "^5.2.9", + "unplugin-auto-import": "^0.17.6", + "unplugin-icons": "^0.19.0", + "vite": "^5.2.11", "vite-plugin-html": "^3.2.2", "vite-plugin-solid": "^2.10.2", "vite-tsconfig-paths": "^4.3.2" diff --git a/apps/web/src/api/emails.ts b/apps/web/src/api/emails.ts index 60661f8f..fdcd2f8f 100644 --- a/apps/web/src/api/emails.ts +++ b/apps/web/src/api/emails.ts @@ -1,4 +1,4 @@ -import { type RequestSchema } from "@mattrax/email"; +import type { RequestSchema } from "@mattrax/email"; import { AwsClient } from "aws4fetch"; import { env } from "~/env"; diff --git a/apps/web/src/api/stripe.ts b/apps/web/src/api/stripe.ts index e54c9e7c..0eb4d1d2 100644 --- a/apps/web/src/api/stripe.ts +++ b/apps/web/src/api/stripe.ts @@ -1,10 +1,13 @@ -import Stripe from "stripe"; import { env } from "~/env"; -const httpClient = Stripe.createFetchHttpClient(); +export async function useStripe() { + return import("stripe").then((mod) => { + const Stripe = mod.default; -export const stripe = new Stripe(env.STRIPE_SECRET_KEY, { - apiVersion: "2024-04-10", - timeout: 1500, - httpClient, -}); + return new Stripe(env.STRIPE_SECRET_KEY, { + apiVersion: "2024-04-10", + timeout: 1500, + httpClient: Stripe.createFetchHttpClient(), + }); + }); +} diff --git a/apps/web/src/api/trpc/routers/org/billing.ts b/apps/web/src/api/trpc/routers/org/billing.ts index d19b3aa5..59432412 100644 --- a/apps/web/src/api/trpc/routers/org/billing.ts +++ b/apps/web/src/api/trpc/routers/org/billing.ts @@ -1,6 +1,6 @@ import { eq } from "drizzle-orm"; import type Stripe from "stripe"; -import { stripe } from "~/api/stripe"; +import { useStripe } from "~/api/stripe"; import { organisations } from "~/db"; import { env } from "~/env"; import { createTRPCRouter, orgProcedure } from "../../helpers"; @@ -22,7 +22,7 @@ export const billingRouter = createTRPCRouter({ let customerId: string; if (!org.stripeCustomerId) { try { - const customer = await stripe.customers.create({ + const customer = await (await useStripe()).customers.create({ name: org.name, email: org.billingEmail || undefined, }); diff --git a/apps/web/src/app/(dash)/MultiSwitcher.tsx b/apps/web/src/app/(dash)/MultiSwitcher.tsx index a11ba8e7..3c7985fd 100644 --- a/apps/web/src/app/(dash)/MultiSwitcher.tsx +++ b/apps/web/src/app/(dash)/MultiSwitcher.tsx @@ -82,7 +82,7 @@ export function MultiSwitcher(props: ParentProps) { setOpen(o); }} > - {props.children} + {props.children}
{/*
diff --git a/apps/web/src/app/(dash)/TopBar/NavItems/index.tsx b/apps/web/src/app/(dash)/TopBar/NavItems/index.tsx index 32057d24..55346fa2 100644 --- a/apps/web/src/app/(dash)/TopBar/NavItems/index.tsx +++ b/apps/web/src/app/(dash)/TopBar/NavItems/index.tsx @@ -1,5 +1,5 @@ import { A } from "@solidjs/router"; -import { As, Tabs } from "@kobalte/core"; +import { Tabs } from "@kobalte/core"; import { For, Show } from "solid-js"; import { useNavItemsContext } from "./Context"; @@ -20,21 +20,20 @@ export function NavItems() { {(item) => ( - - -
- {item.title} -
-
+ +
+ {item.title} +
)}
diff --git a/apps/web/src/app/(dash)/TopBar/index.tsx b/apps/web/src/app/(dash)/TopBar/index.tsx index 628fe9fb..bc05ed16 100644 --- a/apps/web/src/app/(dash)/TopBar/index.tsx +++ b/apps/web/src/app/(dash)/TopBar/index.tsx @@ -1,5 +1,4 @@ import { A, useIsRouting, useMatch, useNavigate } from "@solidjs/router"; -import { As } from "@kobalte/core"; import clsx from "clsx"; import { Avatar, @@ -71,13 +70,11 @@ export function TopBar() {
)} - - - Mattrax icon - - Alpha - - + + Mattrax icon + + Alpha + @@ -100,14 +97,14 @@ export function TopBar() {
- + - - - {/* TODO: Properly hook this up + Gravatar support */} - {/* */} - - {getInitials(useAuth()().name)} - - + + {/* TODO: Properly hook this up + Gravatar support */} + {/* */} + + {getInitials(useAuth()().name)} + {useAuth()().email} - - - Account - + + Account {user.data?.superadmin && ( - - - Settings{" "} - - Superadmin - - + + Settings{" "} + + Superadmin + )} logout.mutate()}> @@ -176,7 +167,7 @@ function FeedbackPopover(props: ParentProps) { return ( - {props.children} + {props.children}

We welcome all feedback or bug reports: diff --git a/apps/web/src/app/(dash)/o.[orgSlug].tsx b/apps/web/src/app/(dash)/o.[orgSlug].tsx index 368e227e..885fa2ac 100644 --- a/apps/web/src/app/(dash)/o.[orgSlug].tsx +++ b/apps/web/src/app/(dash)/o.[orgSlug].tsx @@ -1,6 +1,5 @@ /* @refresh skip */ -import { As } from "@kobalte/core"; import { Button } from "@mattrax/ui"; import { type RouteDefinition, A, createAsync } from "@solidjs/router"; import { createMemo, type ParentProps } from "solid-js"; @@ -54,9 +53,9 @@ export const route = {

); diff --git a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug].tsx b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug].tsx index 948a2ab9..ee693226 100644 --- a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug].tsx +++ b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug].tsx @@ -6,7 +6,6 @@ import { useZodParams } from "~/lib/useZodParams"; import { MErrorBoundary } from "~c/MattraxErrorBoundary"; import IconPhCaretUpDown from "~icons/ph/caret-up-down.jsx"; import { MultiSwitcher } from "../MultiSwitcher"; -import { As } from "@kobalte/core"; import { Button } from "@mattrax/ui"; import { trpc } from "~/lib"; import { createQueryCacher, useCachedQueryData } from "~/cache"; @@ -64,9 +63,9 @@ export const route = { ); diff --git a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/apps/index.tsx b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/apps/index.tsx index 24288b34..b7c84946 100644 --- a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/apps/index.tsx +++ b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/apps/index.tsx @@ -1,4 +1,4 @@ -import { As, RadioGroup } from "@kobalte/core"; +import { RadioGroup } from "@kobalte/core"; import { createColumnHelper } from "@tanstack/solid-table"; import { type ParentProps, @@ -67,9 +67,7 @@ export default function Page() { <> Applications - - Create Application - + } @@ -77,10 +75,14 @@ export default function Page() {
- + Columns - +
@@ -94,6 +96,7 @@ import { A, useNavigate, type RouteDefinition } from "@solidjs/router"; import { createQuery, queryOptions } from "@tanstack/solid-query"; import { Button, + DropdownMenuTrigger, Input, Sheet, SheetContent, @@ -205,10 +208,9 @@ function CreateApplicationSheet(props: ParentProps) { return ( - {props.children} - - {props.children} + +
@@ -292,7 +294,7 @@ function CreateApplicationSheet(props: ParentProps) { - +
); diff --git a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/devices/[deviceId]/assignments.tsx b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/devices/[deviceId]/assignments.tsx index 842a05b7..5231410c 100644 --- a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/devices/[deviceId]/assignments.tsx +++ b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/devices/[deviceId]/assignments.tsx @@ -1,6 +1,5 @@ -import { As } from "@kobalte/core"; import { Suspense } from "solid-js"; -import { Button } from "@mattrax/ui"; +import { Button, SheetTrigger } from "@mattrax/ui"; import pluralize from "pluralize"; import { trpc } from "~/lib"; @@ -79,9 +78,9 @@ export default function Page() { }) } > - + Add Assignments - + } diff --git a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/devices/[deviceId]/index.tsx b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/devices/[deviceId]/index.tsx index 14335500..3b3cc2af 100644 --- a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/devices/[deviceId]/index.tsx +++ b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/devices/[deviceId]/index.tsx @@ -1,6 +1,5 @@ import { A } from "@solidjs/router"; import { createTimeAgo } from "@solid-primitives/date"; -import { As } from "@kobalte/core"; import { Button, @@ -52,10 +51,8 @@ export default function Page() { Overview - - {/* // TODO: Make this button's UI indicate dropdown menu not button */} - Actions - + {/* // TODO: Make this button's UI indicate dropdown menu not button */} + Actions - + Columns - +
diff --git a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/groups/[groupId]/assignments.tsx b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/groups/[groupId]/assignments.tsx index 1da72d6b..5fea123c 100644 --- a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/groups/[groupId]/assignments.tsx +++ b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/groups/[groupId]/assignments.tsx @@ -9,9 +9,9 @@ import { DialogRoot, DialogTitle, DropdownMenuItem, + SheetTrigger, } from "@mattrax/ui"; import { Match, Suspense, Switch, createSignal } from "solid-js"; -import { As, Dialog as DialogPrimitive } from "@kobalte/core"; import pluralize from "pluralize"; import { trpc } from "~/lib"; @@ -33,6 +33,7 @@ import { toTitleCase } from "~/lib/utils"; import { createAssignmentsVariants } from "./utils"; import { cacheMetadata } from "../../metadataCache"; import { withDependantQueries } from "@mattrax/trpc-server-function/client"; +import { Dialog } from "@kobalte/core"; export const route = { load: ({ params }) => @@ -141,9 +142,9 @@ export default function Page() { addAssignments.mutateAsync({ id: groupId(), assignments }) } > - + Add Assignments - + } @@ -167,11 +168,9 @@ export default function Page() { - - - Cancel - - + + Cancel +
@@ -215,11 +214,9 @@ export default function Page() { - - - Cancel - - + + Cancel +
diff --git a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/groups/[groupId]/members.tsx b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/groups/[groupId]/members.tsx index c98a9c9f..ee6ce14f 100644 --- a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/groups/[groupId]/members.tsx +++ b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/groups/[groupId]/members.tsx @@ -1,4 +1,3 @@ -import { As, Dialog as DialogPrimitive } from "@kobalte/core"; import type { RouteDefinition } from "@solidjs/router"; import { AsyncButton, @@ -11,6 +10,7 @@ import { DialogRoot, DialogTitle, DropdownMenuItem, + SheetTrigger, } from "@mattrax/ui"; import pluralize from "pluralize"; import { Match, Suspense, Switch, createSignal } from "solid-js"; @@ -33,6 +33,7 @@ import { useGroupId } from "../[groupId]"; import { toTitleCase } from "~/lib/utils"; import { createMembersVariants } from "./utils"; import { cacheMetadata } from "../../metadataCache"; +import { Dialog } from "@kobalte/core"; export const route = { load: ({ params }) => @@ -138,9 +139,9 @@ export default function Page() { addMembers.mutateAsync({ id: groupId(), members }) } > - + Add Members - + } @@ -164,11 +165,9 @@ export default function Page() { - - - Cancel - - + + Cancel +
@@ -212,11 +211,9 @@ export default function Page() { - - - Cancel - - + + Cancel +
diff --git a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/groups/index.tsx b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/groups/index.tsx index 6ae030e0..39d8fe9f 100644 --- a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/groups/index.tsx +++ b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/groups/index.tsx @@ -1,4 +1,3 @@ -import { As } from "@kobalte/core"; import { A, type RouteDefinition, useNavigate } from "@solidjs/router"; import { createColumnHelper } from "@tanstack/solid-table"; import { type ParentProps, Suspense, startTransition } from "solid-js"; @@ -44,7 +43,7 @@ import { selectCheckboxColumn, createSearchParamFilter, } from "~c/StandardTable"; -import { Button } from "@mattrax/ui"; +import { Button, DropdownMenuTrigger } from "@mattrax/ui"; // TODO: Disable search, filters and sort until all backend metadata has loaded in. Show tooltip so it's clear what's going on. @@ -71,9 +70,9 @@ export default function Page() { <> Groups - + Create New Group - + } @@ -81,10 +80,14 @@ export default function Page() {
- + Columns - +
@@ -128,7 +131,7 @@ function CreateGroupDialog(props: ParentProps) { return ( - {props.children} + {props.children} Create Group diff --git a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/policies/[policyId]/assignees.tsx b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/policies/[policyId]/assignees.tsx index d0642395..e177bbec 100644 --- a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/policies/[policyId]/assignees.tsx +++ b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/policies/[policyId]/assignees.tsx @@ -1,4 +1,3 @@ -import { As, Dialog as DialogPrimitive } from "@kobalte/core"; import { Switch, Match, Suspense, createSignal } from "solid-js"; import { AsyncButton, @@ -11,6 +10,7 @@ import { DialogRoot, DialogTitle, DropdownMenuItem, + SheetTrigger, } from "@mattrax/ui"; import pluralize from "pluralize"; import { withDependantQueries } from "@mattrax/trpc-server-function/client"; @@ -32,6 +32,7 @@ import { usePolicyId } from "../[policyId]"; import { trpc } from "~/lib"; import type { RouteDefinition } from "@solidjs/router"; import { toTitleCase } from "~/lib/utils"; +import { Dialog } from "@kobalte/core"; export const route = { load: ({ params }) => @@ -135,9 +136,9 @@ export default function Page() { }) } > - + Assign Policy - + } @@ -164,11 +165,9 @@ export default function Page() { - - - Cancel - - + + Cancel +
@@ -212,11 +211,9 @@ export default function Page() { - - - Cancel - - + + Cancel +
diff --git a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/policies/[policyId]/deploys/index.tsx b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/policies/[policyId]/deploys/index.tsx index 78def623..14ff566e 100644 --- a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/policies/[policyId]/deploys/index.tsx +++ b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/policies/[policyId]/deploys/index.tsx @@ -21,7 +21,6 @@ import { import { PolicyContext, usePolicy } from "../Context"; import { createSignal, Suspense, For } from "solid-js"; import { trpc } from "~/lib"; -import { As } from "@kobalte/core"; import { createColumnHelper } from "@tanstack/solid-table"; import { createTimeAgo } from "@solid-primitives/date"; import type { RouterOutput } from "~/api"; @@ -164,16 +163,14 @@ function DeployButton() { return ( - - { - trpcCtx.policy.overview.ensureData({ id: policy().id }); - }} - > - Deploy - + { + trpcCtx.policy.overview.ensureData({ id: policy().id }); + }} + > + Deploy diff --git a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/policies/index.tsx b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/policies/index.tsx index 67aef6b2..81f63c96 100644 --- a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/policies/index.tsx +++ b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/policies/index.tsx @@ -1,4 +1,3 @@ -import { As } from "@kobalte/core"; import { A, type RouteDefinition } from "@solidjs/router"; import { createColumnHelper } from "@tanstack/solid-table"; import { Suspense, startTransition } from "solid-js"; @@ -11,8 +10,15 @@ import { createSearchParamPagination, selectCheckboxColumn, createSearchParamFilter, + ColumnsDropdown, } from "~c/StandardTable"; -import { Button, Popover, PopoverContent, PopoverTrigger } from "@mattrax/ui"; +import { + Button, + DropdownMenuTrigger, + Popover, + PopoverContent, + PopoverTrigger, +} from "@mattrax/ui"; import { trpc } from "~/lib"; export const route = { @@ -68,12 +74,16 @@ export default function Page() { Policies}>
- {/* - + + Columns - - */} + +
@@ -127,9 +137,7 @@ function CreatePolicyButton() { return ( - - Add New - + Add New
- - - ? - + + ? diff --git a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/users/[userId]/index.tsx b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/users/[userId]/index.tsx index ab5f4059..3375a3aa 100644 --- a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/users/[userId]/index.tsx +++ b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/users/[userId]/index.tsx @@ -1,7 +1,6 @@ import { type ParentProps, Show, createSignal, For, Suspense } from "solid-js"; import { Form, InputField, createZodForm } from "@mattrax/ui/forms"; import { A, type RouteDefinition } from "@solidjs/router"; -import { As } from "@kobalte/core"; import pluralize from "pluralize"; import clsx from "clsx"; import { z } from "zod"; @@ -14,6 +13,7 @@ import { DialogTitle, DialogTrigger, Label, + SheetTrigger, buttonVariants, } from "@mattrax/ui"; import { withDependantQueries } from "@mattrax/trpc-server-function/client"; @@ -112,9 +112,9 @@ function Devices() { - + Send Instructions - +
@@ -192,9 +192,9 @@ function Assignments() { }) } > - + Add Assignments - +
@@ -252,7 +252,7 @@ function SendInstructionsDialog( setOpen(o); }} > - {props.children} + {props.children} Send Instructions diff --git a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/users/index.tsx b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/users/index.tsx index 856edd49..2c67433b 100644 --- a/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/users/index.tsx +++ b/apps/web/src/app/(dash)/o.[orgSlug]/t.[tenantSlug]/users/index.tsx @@ -1,10 +1,10 @@ import { A, type RouteDefinition } from "@solidjs/router"; import { createColumnHelper } from "@tanstack/solid-table"; import { Show, Suspense } from "solid-js"; -import { As } from "@kobalte/core"; import { Badge, Button, + DropdownMenuTrigger, Tooltip, TooltipContent, TooltipTrigger, @@ -115,10 +115,14 @@ export default function Page() {
- + Columns - +
diff --git a/apps/web/src/components/ConfirmDialog.tsx b/apps/web/src/components/ConfirmDialog.tsx index b84496ea..02249892 100644 --- a/apps/web/src/components/ConfirmDialog.tsx +++ b/apps/web/src/components/ConfirmDialog.tsx @@ -1,4 +1,4 @@ -import { As, Dialog as KDialog } from "@kobalte/core"; +import { Dialog as KDialog } from "@kobalte/core"; import type { JSX } from "solid-js"; import { createStore } from "solid-js/store"; import { z } from "zod"; @@ -97,10 +97,8 @@ export function ConfirmDialog(props: ConfirmDialogProps) { )} - - - Cancel - + + Cancel {(form) => ( diff --git a/apps/web/src/components/StandardTable.tsx b/apps/web/src/components/StandardTable.tsx index fdd48457..5b485e83 100644 --- a/apps/web/src/components/StandardTable.tsx +++ b/apps/web/src/components/StandardTable.tsx @@ -204,14 +204,15 @@ import { import { useSearchParams } from "@solidjs/router"; import { z } from "zod"; import { createMemo } from "solid-js"; -import { As } from "@kobalte/core"; export function ColumnsDropdown( - props: ParentProps & { table: TTable }, + props: ParentProps & { + table: TTable; + }, ) { return ( - {props.children} + {props.children} (props: { id: "actions", header: (ctx) => ( - - - - + + {props.headerDropdownContent(ctx)} @@ -277,10 +281,13 @@ export function createActionsColumn(props: { ), cell: (ctx) => ( - - - - + + {props.cellDropdownContent(ctx)} diff --git a/apps/web/src/components/VariantTableSheet.tsx b/apps/web/src/components/VariantTableSheet.tsx index 5355a00c..42dfd488 100644 --- a/apps/web/src/components/VariantTableSheet.tsx +++ b/apps/web/src/components/VariantTableSheet.tsx @@ -129,7 +129,7 @@ export function VariantTableSheet( setOpen(o); }} > - {props.children} + {props.children} {key in value.data && (