From 0e2bd375fcbb4832adb05896c896aa548fc97c02 Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Sat, 25 Jul 2026 21:14:01 -0700 Subject: [PATCH] pin kstring and bump the lightningcss minimum --- Cargo.lock | 54 +++++++++++------------------------------ packages/cli/Cargo.toml | 5 +++- 2 files changed, 18 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 29de5e11dd..8bf0c36451 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2308,15 +2308,6 @@ dependencies = [ "syn 2.0.117", ] -[[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" version = "0.7.1" @@ -2324,15 +2315,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0664d2867b4a32697dfe655557f5c3b187e9b605b38612a748e5ec99811d160" [[package]] -name = "const-str-proc-macro" -version = "0.3.2" +name = "const-str" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1e0fdd2e5d3041e530e1b21158aeeef8b5d0e306bc5c1e3d6cf0930d10e25a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "18f12cc9948ed9604230cdddc7c86e270f9401ccbe3c2e98a4378c5e7632212f" [[package]] name = "const_format" @@ -2687,19 +2673,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "cssparser" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be934d936a0fbed5bcdc01042b770de1398bf79d0e192f49fa7faea0e99281e" -dependencies = [ - "cssparser-macros 0.6.1", - "dtoa-short", - "itoa", - "phf 0.11.3", - "smallvec", -] - [[package]] name = "cssparser" version = "0.36.0" @@ -2729,11 +2702,11 @@ dependencies = [ [[package]] name = "cssparser-color" -version = "0.1.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556c099a61d85989d7af52b692e35a8d68a57e7df8c6d07563dc0778b3960c9f" +checksum = "bbaa233e1dcd9c13a5d3e3a8a2c0f5a727bac380398345dbcb31db4597edc86b" dependencies = [ - "cssparser 0.33.0", + "cssparser 0.37.0", ] [[package]] @@ -3283,6 +3256,7 @@ dependencies = [ "indoc", "itertools 0.14.0", "krates", + "kstring", "lightningcss", "log", "manganis", @@ -7854,15 +7828,15 @@ dependencies = [ [[package]] name = "lightningcss" -version = "1.0.0-alpha.71" +version = "1.0.0-alpha.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6314c2f0590ac93c86099b98bb7ba8abcf759bfd89604ffca906472bb54937" +checksum = "d31b760f96e8fdfe1d0c295e4bf76c503d6f15d2d470d53bd8cd1f7aa8c7d934" dependencies = [ "ahash 0.8.12", "bitflags 2.11.1", "browserslist-rs", - "const-str 0.3.2", - "cssparser 0.33.0", + "const-str 1.1.0", + "cssparser 0.37.0", "cssparser-color", "dashmap 5.5.3", "data-encoding", @@ -9363,12 +9337,12 @@ dependencies = [ [[package]] name = "parcel_selectors" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54fd03f1ad26cb6b3ec1b7414fa78a3bd639e7dbb421b1a60513c96ce886a196" +checksum = "d05f71e01edca03d245ab0a9f7ce13a974ceb79baaae8faf2ba0b11de6b90913" dependencies = [ "bitflags 2.11.1", - "cssparser 0.33.0", + "cssparser 0.37.0", "log", "phf 0.11.3", "phf_codegen 0.11.3", diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index 5b5606766d..06847065e5 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -86,6 +86,9 @@ cargo-generate = "=0.23.10" # cargo-generate pulls in rhai, whose 1.24.0 release accepts newer incompatible # rhai_codegen releases in fresh `cargo install --path .` resolutions. rhai_codegen = "=3.1.0" +# cargo-generate also pulls in liquid -> kstring. kstring 2.0.3 raised its +# rust-version to 1.96, above the toolchain the workspace builds with. +kstring = "=2.0.2" toml_edit = "0.22.27" # formatting @@ -93,7 +96,7 @@ toml_edit = "0.22.27" prettyplease = { workspace = true } # Assets -lightningcss = { version = "1.0.0-alpha.67", features = ["browserslist", "into_owned"] } +lightningcss = { version = "1.0.0-alpha.72", features = ["browserslist", "into_owned"] } grass = "0.13.4" codemap = "0.1.3" mozjpeg = { version = "0.10.13", default-features = false, features = ["parallel"] }