diff --git a/Cargo.lock b/Cargo.lock index 11b5357bb..0fac01e07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,39 +28,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom 0.2.16", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" -dependencies = [ - "cfg-if", - "getrandom 0.3.3", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -336,22 +303,13 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64-simd" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" -dependencies = [ - "simd-abstraction", -] - [[package]] name = "base64-simd" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" dependencies = [ - "outref 0.5.2", + "outref", "vsimd", ] @@ -474,18 +432,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -521,7 +467,6 @@ version = "0.0.58" dependencies = [ "brk_rolldown", "log", - "minify-html-onepass", "notify", "sugar_path", "tokio", @@ -707,14 +652,14 @@ dependencies = [ "dunce", "futures", "indexmap 2.9.0", - "itertools 0.14.0", + "itertools", "itoa", "memchr", "notify", "oxc", "oxc_index", "petgraph", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde_json", "sugar_path", @@ -740,14 +685,14 @@ dependencies = [ "brk_rolldown_std_utils", "brk_rolldown_utils", "brk_string_wizard", - "dashmap 6.1.0", + "dashmap", "derive_more", "fast-glob", - "itertools 0.14.0", + "itertools", "oxc", "oxc_index", "oxc_resolver", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde_json", "sugar_path", @@ -761,8 +706,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1966b2aa72cbb9442a3158b818d6352d344270e3d148d9e0c4eb07b355cef959" dependencies = [ "brk_rolldown_debug_action", - "dashmap 6.1.0", - "rustc-hash 2.1.1", + "dashmap", + "rustc-hash", "serde", "serde_json", "tracing", @@ -819,7 +764,7 @@ dependencies = [ "oxc_resolver", "rolldown-ariadne", "ropey", - "rustc-hash 2.1.1", + "rustc-hash", "sugar_path", ] @@ -862,10 +807,10 @@ dependencies = [ "brk_rolldown_sourcemap", "brk_rolldown_utils", "brk_string_wizard", - "dashmap 6.1.0", + "dashmap", "derive_more", "oxc_index", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde_json", "sugar_path", @@ -881,7 +826,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bc4e963da4c646a8d9396042a1dd3414850bbb8411df9f052de6e69cd6d9495" dependencies = [ "arcstr", - "base64-simd 0.8.0", + "base64-simd", "brk_rolldown_common", "brk_rolldown_plugin", "brk_rolldown_utils", @@ -898,8 +843,8 @@ dependencies = [ "brk_rolldown_common", "brk_rolldown_fs", "brk_rolldown_utils", - "dashmap 6.1.0", - "itertools 0.14.0", + "dashmap", + "itertools", "oxc_resolver", "sugar_path", ] @@ -923,7 +868,7 @@ dependencies = [ "memchr", "oxc", "oxc_sourcemap", - "rustc-hash 2.1.1", + "rustc-hash", ] [[package]] @@ -956,10 +901,10 @@ dependencies = [ "arcstr", "async-scoped", "base-encode", - "base64-simd 0.8.0", + "base64-simd", "brk_rolldown_std_utils", "cow-utils", - "dashmap 6.1.0", + "dashmap", "fast-glob", "form_urlencoded", "futures", @@ -975,7 +920,7 @@ dependencies = [ "rayon", "regex", "regress", - "rustc-hash 2.1.1", + "rustc-hash", "serde_json", "simdutf8", "sugar_path", @@ -1044,7 +989,7 @@ checksum = "455a8c39f673a5eedbeee3d131f87abb6a8a405476b9f0766cfdd7d047750fc0" dependencies = [ "oxc_index", "oxc_sourcemap", - "rustc-hash 2.1.1", + "rustc-hash", "serde", ] @@ -1097,28 +1042,6 @@ dependencies = [ "allocator-api2", ] -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "bytecount" version = "0.6.9" @@ -1330,41 +1253,12 @@ version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea0095f6103c2a8b44acd6fd15960c801dafebf02e21940360833e0673f48ba7" -[[package]] -name = "const-str" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21077772762a1002bb421c3af42ac1725fa56066bfc53d9a55bb79905df2aaf3" -dependencies = [ - "const-str-proc-macro", -] - -[[package]] -name = "const-str-proc-macro" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1e0fdd2e5d3041e530e1b21158aeeef8b5d0e306bc5c1e3d6cf0930d10e25a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "constant_time_eq" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -1480,38 +1374,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "cssparser" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be934d936a0fbed5bcdc01042b770de1398bf79d0e192f49fa7faea0e99281e" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa", - "phf", - "smallvec", -] - -[[package]] -name = "cssparser-color" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556c099a61d85989d7af52b692e35a8d68a57e7df8c6d07563dc0778b3960c9f" -dependencies = [ - "cssparser", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.103", -] - [[package]] name = "ctrlc" version = "3.4.7" @@ -1557,19 +1419,6 @@ dependencies = [ "syn 2.0.103", ] -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - [[package]] name = "dashmap" version = "6.1.0" @@ -1584,21 +1433,6 @@ dependencies = [ "parking_lot_core", ] -[[package]] -name = "data-encoding" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" - -[[package]] -name = "data-url" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193" -dependencies = [ - "matches", -] - [[package]] name = "deflate64" version = "0.1.9" @@ -1675,27 +1509,18 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0d05e1c0dbad51b52c38bda7adceef61b9efc2baf04acfe8726a8c4630a6f57" -[[package]] -name = "dtoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04" - -[[package]] -name = "dtoa-short" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" -dependencies = [ - "dtoa", -] - [[package]] name = "dunce" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" +[[package]] +name = "dyn-clone" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" + [[package]] name = "either" version = "1.15.0" @@ -1804,7 +1629,7 @@ checksum = "13279146a877c2060f668bc4c477af8ef5aa42732c58dca32fcb4aff40edc5b4" dependencies = [ "byteorder", "byteview", - "dashmap 6.1.0", + "dashmap", "log", "lsm-tree", "path-absolutize", @@ -1854,12 +1679,6 @@ dependencies = [ "libc", ] -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures" version = "0.3.31" @@ -2001,19 +1820,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.12", - "bumpalo", -] [[package]] name = "hashbrown" @@ -2260,24 +2066,6 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -2295,9 +2083,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jiff" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93" +checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" dependencies = [ "jiff-static", "jiff-tzdb-platform", @@ -2310,9 +2098,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442" +checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" dependencies = [ "proc-macro2", "quote", @@ -2403,9 +2191,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.172" +version = "0.2.173" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "d8cfeafaffdbc32176b64fb251369d52ea9f0a8fbc6f8759edffef7b525d64bb" [[package]] name = "liblzma" @@ -2447,45 +2235,6 @@ dependencies = [ "zlib-rs", ] -[[package]] -name = "lightningcss" -version = "1.0.0-alpha.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a73ffa17de66534e4b527232f44aa0a89fad22c4f4e0735f9be35494f058e54" -dependencies = [ - "ahash 0.8.12", - "bitflags 2.9.1", - "const-str", - "cssparser", - "cssparser-color", - "dashmap 5.5.3", - "data-encoding", - "getrandom 0.2.16", - "indexmap 2.9.0", - "itertools 0.10.5", - "lazy_static", - "lightningcss-derive", - "parcel_selectors", - "parcel_sourcemap", - "paste", - "pathdiff", - "rayon", - "serde", - "smallvec", -] - -[[package]] -name = "lightningcss-derive" -version = "1.0.0-alpha.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12744d1279367caed41739ef094c325d53fb0ffcd4f9b84a368796f870252" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "linux-raw-sys" version = "0.9.4" @@ -2524,7 +2273,7 @@ dependencies = [ "lz4_flex", "path-absolutize", "quick_cache", - "rustc-hash 2.1.1", + "rustc-hash", "self_cell", "tempfile", "value-log", @@ -2534,9 +2283,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" +checksum = "2c592ad9fbc1b7838633b3ae55ce69b17d01150c72fcef229fbb819d39ee51ee" [[package]] name = "matchers" @@ -2547,12 +2296,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "matchit" version = "0.8.4" @@ -2580,47 +2323,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "minify-html-common" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697a6b40dffdc5de10c0cbd709dc2bc2039cea9dab8aaa636eb9a49d6b411780" -dependencies = [ - "aho-corasick 0.7.20", - "itertools 0.12.1", - "lazy_static", - "memchr", - "rustc-hash 1.1.0", - "serde", - "serde_json", -] - -[[package]] -name = "minify-html-onepass" -version = "0.16.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ebcce21183a0b3842371eb15b5dcf198b07e00cc02e65d48f6e2b52ad5d295c" -dependencies = [ - "ahash 0.8.12", - "aho-corasick 0.7.20", - "lightningcss", - "memchr", - "minify-html-common", - "minify-js", - "once_cell", -] - -[[package]] -name = "minify-js" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fa5546ee8bd66024113e506cabe4230e76635a094c06ea2051b66021dda92e" -dependencies = [ - "aho-corasick 0.7.20", - "lazy_static", - "parse-js", -] - [[package]] name = "miniz_oxide" version = "0.8.9" @@ -2773,12 +2475,6 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" -[[package]] -name = "outref" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" - [[package]] name = "outref" version = "0.5.2" @@ -2828,7 +2524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08f56cc6eaa393139eda31fc22b4638e3d3e58496122c1738026aa7c4a9631f9" dependencies = [ "nom", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde_json", "thiserror 2.0.12", @@ -2871,7 +2567,7 @@ dependencies = [ "hashbrown 0.15.4", "oxc_data_structures", "oxc_estree", - "rustc-hash 2.1.1", + "rustc-hash", "serde", ] @@ -2923,12 +2619,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "424c8259dc5bbd4f38b63ca6498e3140bd0ddff9f105599cc060013c89c94160" dependencies = [ "bitflags 2.9.1", - "itertools 0.14.0", + "itertools", "nonmax", "oxc_index", "oxc_syntax", "petgraph", - "rustc-hash 2.1.1", + "rustc-hash", ] [[package]] @@ -2948,7 +2644,7 @@ dependencies = [ "oxc_sourcemap", "oxc_span", "oxc_syntax", - "rustc-hash 2.1.1", + "rustc-hash", "ryu-js", ] @@ -3020,7 +2716,7 @@ dependencies = [ "oxc_ecmascript", "oxc_span", "oxc_syntax", - "rustc-hash 2.1.1", + "rustc-hash", ] [[package]] @@ -3030,14 +2726,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7e41bc4d7628015266d35f14e35db6e2a89d8d54235859acf56aa8146dbcef6" dependencies = [ "fixedbitset", - "itertools 0.14.0", + "itertools", "oxc_allocator", "oxc_ast", "oxc_data_structures", "oxc_index", "oxc_semantic", "oxc_span", - "rustc-hash 2.1.1", + "rustc-hash", ] [[package]] @@ -3059,7 +2755,7 @@ dependencies = [ "oxc_span", "oxc_syntax", "oxc_traverse", - "rustc-hash 2.1.1", + "rustc-hash", ] [[package]] @@ -3081,7 +2777,7 @@ dependencies = [ "oxc_regular_expression", "oxc_span", "oxc_syntax", - "rustc-hash 2.1.1", + "rustc-hash", "seq-macro", ] @@ -3097,7 +2793,7 @@ dependencies = [ "oxc_diagnostics", "oxc_span", "phf", - "rustc-hash 2.1.1", + "rustc-hash", "unicode-id-start", ] @@ -3112,7 +2808,7 @@ dependencies = [ "json-strip-comments", "once_cell", "papaya", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde_json", "simdutf8", @@ -3126,7 +2822,7 @@ version = "0.73.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5345a0f4645e74bc85bfb3bdc6f0d85b0810fd49f9947c85bc4be16feb901a2" dependencies = [ - "itertools 0.14.0", + "itertools", "oxc_allocator", "oxc_ast", "oxc_ast_visit", @@ -3138,7 +2834,7 @@ dependencies = [ "oxc_span", "oxc_syntax", "phf", - "rustc-hash 2.1.1", + "rustc-hash", "self_cell", ] @@ -3148,11 +2844,11 @@ version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24015d93ed1d8f0c2a0d9f534ca85690888990658a8fc4a87ff0c92640e73300" dependencies = [ - "base64-simd 0.8.0", + "base64-simd", "cfg-if", "cow-utils", "rayon", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde_json", ] @@ -3187,7 +2883,7 @@ dependencies = [ "oxc_index", "oxc_span", "phf", - "rustc-hash 2.1.1", + "rustc-hash", "ryu-js", "serde", "unicode-id-start", @@ -3218,7 +2914,7 @@ dependencies = [ "oxc_span", "oxc_syntax", "oxc_traverse", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde_json", "sha1", @@ -3243,7 +2939,7 @@ dependencies = [ "oxc_syntax", "oxc_transformer", "oxc_traverse", - "rustc-hash 2.1.1", + "rustc-hash", ] [[package]] @@ -3261,7 +2957,7 @@ dependencies = [ "oxc_semantic", "oxc_span", "oxc_syntax", - "rustc-hash 2.1.1", + "rustc-hash", ] [[package]] @@ -3285,36 +2981,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "parcel_selectors" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54fd03f1ad26cb6b3ec1b7414fa78a3bd639e7dbb421b1a60513c96ce886a196" -dependencies = [ - "bitflags 2.9.1", - "cssparser", - "log", - "phf", - "phf_codegen", - "precomputed-hash", - "rustc-hash 2.1.1", - "smallvec", -] - -[[package]] -name = "parcel_sourcemap" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "485b74d7218068b2b7c0e3ff12fbc61ae11d57cb5d8224f525bd304c6be05bbb" -dependencies = [ - "base64-simd 0.7.0", - "data-url", - "rkyv", - "serde", - "serde_json", - "vlq", -] - [[package]] name = "parking_lot_core" version = "0.9.11" @@ -3328,25 +2994,6 @@ dependencies = [ "windows-targets", ] -[[package]] -name = "parse-js" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2742b5e32dcb5930447ed9f9e401a7dfd883867fc079c4fac44ae8ba3593710e" -dependencies = [ - "aho-corasick 0.7.20", - "bumpalo", - "hashbrown 0.13.2", - "lazy_static", - "memchr", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - [[package]] name = "path-absolutize" version = "3.1.1" @@ -3365,12 +3012,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "pathdiff" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" - [[package]] name = "pbkdf2" version = "0.12.2" @@ -3409,16 +3050,6 @@ dependencies = [ "phf_shared", ] -[[package]] -name = "phf_codegen" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" -dependencies = [ - "phf_generator", - "phf_shared", -] - [[package]] name = "phf_generator" version = "0.11.3" @@ -3519,12 +3150,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - [[package]] name = "proc-macro-error-attr2" version = "2.0.0" @@ -3556,26 +3181,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "quick_cache" version = "0.6.14" @@ -3601,12 +3206,6 @@ version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - [[package]] name = "rand" version = "0.8.5" @@ -3672,13 +3271,33 @@ dependencies = [ "bitflags 2.9.1", ] +[[package]] +name = "ref-cast" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.103", +] + [[package]] name = "regex" version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ - "aho-corasick 1.1.3", + "aho-corasick", "memchr", "regex-automata 0.4.9", "regex-syntax 0.8.5", @@ -3699,7 +3318,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ - "aho-corasick 1.1.3", + "aho-corasick", "memchr", "regex-syntax 0.8.5", ] @@ -3726,15 +3345,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "rend" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck", -] - [[package]] name = "ring" version = "0.17.14" @@ -3749,35 +3359,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rkyv" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" -dependencies = [ - "bitvec", - "bytecheck", - "bytes", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "rlimit" version = "0.10.2" @@ -3813,12 +3394,6 @@ version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hash" version = "2.1.1" @@ -3887,6 +3462,18 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schemars" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -3903,12 +3490,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - [[package]] name = "secp256k1" version = "0.29.1" @@ -4027,15 +3608,16 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" +checksum = "bf65a400f8f66fb7b0552869ad70157166676db75ed8181f8104ea91cf9d0b42" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", "indexmap 2.9.0", + "schemars", "serde", "serde_derive", "serde_json", @@ -4045,9 +3627,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" +checksum = "81679d9ed988d5e9a5e6531dc3f2c28efbd639cbd1dfb628df08edea6004da77" dependencies = [ "darling", "proc-macro2", @@ -4081,15 +3663,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "simd-abstraction" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" -dependencies = [ - "outref 0.1.0", -] - [[package]] name = "simd-adler32" version = "0.3.7" @@ -4227,12 +3800,6 @@ dependencies = [ "syn 2.0.103", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tempfile" version = "3.20.0" @@ -4355,21 +3922,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tinyvec" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tokio" version = "1.45.1" @@ -4626,7 +4178,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63278e72ed4f207eb3216c944cbafb35bdb656d2eab97ef73c0c165a1cd3e319" dependencies = [ - "dashmap 6.1.0", + "dashmap", ] [[package]] @@ -4653,12 +4205,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - [[package]] name = "unicode-width" version = "0.2.1" @@ -4732,7 +4278,7 @@ dependencies = [ "interval-heap", "log", "path-absolutize", - "rustc-hash 2.1.1", + "rustc-hash", "tempfile", "varint-rs", "xxhash-rust", @@ -4765,12 +4311,6 @@ version = "0.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" -[[package]] -name = "vlq" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65dd7eed29412da847b0f78bcec0ac98588165988a8cfe41d4ea1d429f8ccfff" - [[package]] name = "vsimd" version = "0.8.0" @@ -5056,15 +4596,6 @@ dependencies = [ "bitflags 2.9.1", ] -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "xxhash-rust" version = "0.8.15" @@ -5119,9 +4650,9 @@ dependencies = [ [[package]] name = "zip" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "153a6fff49d264c4babdcfa6b4d534747f520e56e8f0f384f3b808c4b64cc1fd" +checksum = "af7dcdb4229c0e79c2531a24de7726a0e980417a74fb4d030a35f535665439a0" dependencies = [ "aes", "arbitrary", diff --git a/Cargo.toml b/Cargo.toml index 05211f457..fd4a8b9ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ clap_derive = "4.5.40" color-eyre = "0.6.5" derive_deref = "1.1.1" fjall = "2.11.0" -jiff = "0.2.14" +jiff = "0.2.15" log = { version = "0.4.27" } minreq = { version = "2.13.4", features = ["https", "serde_json"] } rayon = "1.10.0" diff --git a/README.md b/README.md index 56687cbcf..8e9b234b5 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ In contrast, existing alternatives tend to be either [very costly](https://studi - [`brk_state`](https://crates.io/crates/brk_state): Various states used mainly by the computer - [`brk_store`](https://crates.io/crates/brk_store): A thin wrapper around [`fjall`](https://crates.io/crates/fjall) - [`brk_vec`](https://crates.io/crates/brk_vec): A push-only, truncable, compressable, saveable Vec -- [`brk_bundler`](https://crates.io/crates/brk_bundler): A crate that bundles the selected website for the server +- [`brk_bundler`](https://crates.io/crates/brk_bundler): A thin wrapper around [`rolldown`](https://rolldown.rs/) ## Hosting as a service diff --git a/crates/brk/src/lib.rs b/crates/brk/src/lib.rs index c3659c520..cdf8732eb 100644 --- a/crates/brk/src/lib.rs +++ b/crates/brk/src/lib.rs @@ -2,7 +2,7 @@ #[cfg(feature = "bundler")] #[doc(inline)] -pub use brk_bundle as bundle; +pub use brk_bundler as bundler; #[doc(inline)] pub use brk_cli as cli; diff --git a/crates/brk_bundler/Cargo.toml b/crates/brk_bundler/Cargo.toml index 3c153100e..0b4986718 100644 --- a/crates/brk_bundler/Cargo.toml +++ b/crates/brk_bundler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "brk_bundler" -description = "A crate that bundles the selected website for the server" +description = "A thin wrapper around rolldown" version.workspace = true edition.workspace = true license.workspace = true @@ -9,7 +9,6 @@ repository.workspace = true [dependencies] log = { workspace = true } -minify-html-onepass = "0.16.4" notify = "8.0.0" brk_rolldown = "0.0.1" sugar_path = "1.2.0" diff --git a/crates/brk_bundler/src/lib.rs b/crates/brk_bundler/src/lib.rs index 660a421be..3b5f57749 100644 --- a/crates/brk_bundler/src/lib.rs +++ b/crates/brk_bundler/src/lib.rs @@ -2,7 +2,6 @@ use std::{fs, io, path::Path, sync::Arc}; use brk_rolldown::{Bundler, BundlerOptions, RawMinifyOptions, SourceMapType}; use log::error; -use minify_html_onepass::Cfg; use notify::{EventKind, RecursiveMode, Watcher}; use sugar_path::SugarPath; use tokio::sync::Mutex; @@ -56,15 +55,7 @@ pub async fn bundle(websites_path: &Path, source_folder: &str, watch: bool) -> i contents = contents.replace("/scripts/main.js", &format!("/scripts/{main_hashed}.js")); } - if let Ok(contents) = minify_html_onepass::in_place_str( - contents.as_mut_str(), - &Cfg { - minify_js: false, - minify_css: false, - }, - ) { - let _ = fs::write(&absolute_dist_index_path, contents); - } + let _ = fs::write(&absolute_dist_index_path, contents); }; let write_sw = move || { diff --git a/crates/brk_query/Cargo.toml b/crates/brk_query/Cargo.toml index b5585303e..35dfde5c6 100644 --- a/crates/brk_query/Cargo.toml +++ b/crates/brk_query/Cargo.toml @@ -18,5 +18,5 @@ color-eyre = { workspace = true } derive_deref = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -serde_with = "3.12.0" +serde_with = "3.13.0" tabled = { workspace = true } diff --git a/crates/brk_server/Cargo.toml b/crates/brk_server/Cargo.toml index 1b71d053d..eccc9786f 100644 --- a/crates/brk_server/Cargo.toml +++ b/crates/brk_server/Cargo.toml @@ -30,7 +30,7 @@ oxc = { version = "0.73.0", features = ["codegen", "minifier"] } serde = { workspace = true } tokio = { workspace = true } tower-http = { version = "0.6.6", features = ["compression-full", "trace"] } -zip = "4.0.0" +zip = "4.1.0" tracing = "0.1.41" [package.metadata.cargo-machete] diff --git a/websites/default/scripts/options.js b/websites/default/scripts/options.js index 8b99bf4a3..f3698a316 100644 --- a/websites/default/scripts/options.js +++ b/websites/default/scripts/options.js @@ -1424,7 +1424,7 @@ function createPartialOptions(colors) { key: `${fixKey(key)}realized-price`, name, color, - }) + }), ), } : createPriceWithRatio({ @@ -1507,7 +1507,7 @@ function createPartialOptions(colors) { /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({ type: "Baseline", key: `${fixKey( - key + key, )}net-realized-profit-and-loss-relative-to-realized-cap`, title: useGroupName ? name : "Net", color: useGroupName ? color : undefined, @@ -1578,7 +1578,7 @@ function createPartialOptions(colors) { /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({ type: "Baseline", key: `${fixKey( - key + key, )}adjusted-spent-output-profit-ratio`, title: useGroupName ? name : "asopr", color: useGroupName ? color : undefined, @@ -1601,7 +1601,7 @@ function createPartialOptions(colors) { key: `${fixKey(key)}sell-side-risk-ratio`, name: useGroupName ? name : "Risk", color: color, - }) + }), ), }, ], @@ -1690,7 +1690,7 @@ function createPartialOptions(colors) { /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({ type: "Baseline", key: `${fixKey( - key + key, )}net-unrealized-profit-and-loss-relative-to-market-cap`, title: useGroupName ? name : "Net", color: useGroupName ? color : undefined, @@ -1868,7 +1868,7 @@ function createPartialOptions(colors) { key: `${key}-sma`, name: key, color, - }) + }), ), }, ...averages.map(({ key, name, color }) => @@ -1878,7 +1878,7 @@ function createPartialOptions(colors) { title: `${name} Market Price Moving Average`, legend: "average", color, - }) + }), ), ], }, @@ -1969,7 +1969,7 @@ function createPartialOptions(colors) { }, }), ], - }) + }), ), .../** @type {const} */ ([ { name: "2 Year", key: "2y" }, @@ -2040,7 +2040,7 @@ function createPartialOptions(colors) { }, }), ], - }) + }), ), ], }, @@ -2056,7 +2056,7 @@ function createPartialOptions(colors) { name: `${year}`, color, defaultActive, - }) + }), ), }, ...dcaClasses.map( @@ -2083,7 +2083,7 @@ function createPartialOptions(colors) { }, }), ], - }) + }), ), ], }, @@ -2144,10 +2144,10 @@ function createPartialOptions(colors) { bottom: [ ...createAverageSumCumulativeMinMaxPercentilesSeries("fee"), ...createAverageSumCumulativeMinMaxPercentilesSeries( - "fee-in-btc" + "fee-in-btc", ), ...createAverageSumCumulativeMinMaxPercentilesSeries( - "fee-in-usd" + "fee-in-usd", ), ], }, @@ -2841,7 +2841,7 @@ function createPartialOptions(colors) { }, { name: "Status", - url: () => "https://status.kibo.money/", + url: () => "https://status.bitcoinresearchkit.org/", }, { name: "Crates", @@ -2903,7 +2903,7 @@ export function initOptions({ colors, signals, env, utils, qrcode }) { const detailsList = []; const treeElement = signals.createSignal( - /** @type {HTMLDivElement | null} */ (null) + /** @type {HTMLDivElement | null} */ (null), ); /** @type {string[] | undefined} */ @@ -3015,7 +3015,7 @@ export function initOptions({ colors, signals, env, utils, qrcode }) { return null; } }, - null + null, ); partialTree.forEach((anyPartial, partialIndex) => { @@ -3038,7 +3038,7 @@ export function initOptions({ colors, signals, env, utils, qrcode }) { if ("tree" in anyPartial) { const folderId = utils.stringToId( - `${(path || []).join(" ")} ${anyPartial.name} folder` + `${(path || []).join(" ")} ${anyPartial.name} folder`, ); /** @type {Omit} */ @@ -3053,13 +3053,13 @@ export function initOptions({ colors, signals, env, utils, qrcode }) { const thisPath = groupAddons.id; const passedDetails = signals.createSignal( - /** @type {HTMLDivElement | HTMLDetailsElement | null} */ (null) + /** @type {HTMLDivElement | HTMLDetailsElement | null} */ (null), ); const childOptionsCount = recursiveProcessPartialTree( anyPartial.tree, passedDetails, - [...(path || []), thisPath] + [...(path || []), thisPath], ); listForSum.push(childOptionsCount); @@ -3191,7 +3191,7 @@ export function initOptions({ colors, signals, env, utils, qrcode }) { }); return signals.createMemo(() => - listForSum.reduce((acc, s) => acc + s(), 0) + listForSum.reduce((acc, s) => acc + s(), 0), ); } recursiveProcessPartialTree(partialOptions, treeElement); @@ -3218,7 +3218,7 @@ export function initOptions({ colors, signals, env, utils, qrcode }) { console.log( [...m.entries()] .filter(([_, value]) => value > 1) - .map(([key, _]) => key) + .map(([key, _]) => key), ); throw Error("ID duplicate"); diff --git a/websites/default/scripts/vecid-to-indexes.js b/websites/default/scripts/vecid-to-indexes.js index f046e2f03..533d0d413 100644 --- a/websites/default/scripts/vecid-to-indexes.js +++ b/websites/default/scripts/vecid-to-indexes.js @@ -2,7 +2,7 @@ // File auto-generated, any modifications will be overwritten // -export const VERSION = "v0.0.57"; +export const VERSION = "v0.0.58"; /** @typedef {0} DateIndex */ /** @typedef {1} DecadeIndex */