From b50615b2bc66f7c5da40bb291e9bccb73cf75a76 Mon Sep 17 00:00:00 2001 From: Tim Neutkens Date: Mon, 20 May 2024 21:40:30 +0200 Subject: [PATCH] Upgrade Lightning CSS (#308) Upgrade required for https://github.com/vercel/turbo/pull/8176 --- Cargo.lock | 9 +++++---- packages/styled-jsx/transform/Cargo.toml | 2 +- .../transform/src/transform_css_lightningcss.rs | 3 +++ .../tests/fixture/next-55679/output.lightningcss.js | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 536759f12..f7c9227ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1089,9 +1089,9 @@ checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "lightningcss" -version = "1.0.0-alpha.55" +version = "1.0.0-alpha.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd5bed3814fb631bfc1e24c2be6f7e86a9837c660909acab79a38374dcb8798" +checksum = "668e9f1774a4dda9e2233ad0f78c6987878bcf4201d2085bc3517a7f84d0ee92" dependencies = [ "ahash 0.8.11", "bitflags", @@ -1101,6 +1101,7 @@ dependencies = [ "dashmap", "data-encoding", "getrandom", + "indexmap", "itertools 0.10.5", "lazy_static", "lightningcss-derive", @@ -1367,9 +1368,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "parcel_selectors" -version = "0.26.4" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d74befe2d076330d9a58bf9ca2da424568724ab278adf15fb5718253133887" +checksum = "ce9c47a67c66fee4a5a42756f9784d92941bd0ab2b653539a9e90521a44b66f0" dependencies = [ "bitflags", "cssparser", diff --git a/packages/styled-jsx/transform/Cargo.toml b/packages/styled-jsx/transform/Cargo.toml index beaaf6eeb..58872ee92 100644 --- a/packages/styled-jsx/transform/Cargo.toml +++ b/packages/styled-jsx/transform/Cargo.toml @@ -18,7 +18,7 @@ custom_transform = ["swc_common/concurrent"] [dependencies] anyhow = "1" -lightningcss = { version = "1.0.0-alpha.55", features = [ +lightningcss = { version = "1.0.0-alpha.56", features = [ "visitor", "into_owned", ] } diff --git a/packages/styled-jsx/transform/src/transform_css_lightningcss.rs b/packages/styled-jsx/transform/src/transform_css_lightningcss.rs index de6453d1e..3c430a470 100644 --- a/packages/styled-jsx/transform/src/transform_css_lightningcss.rs +++ b/packages/styled-jsx/transform/src/transform_css_lightningcss.rs @@ -600,6 +600,9 @@ fn parse_token_list<'i>(tokens: &TokenList<'i>) -> Selector<'i> { TokenOrValue::UnresolvedColor(..) => { unimplemented!("parse_token_list: unresolved color") } + TokenOrValue::AnimationName(_) => { + unimplemented!("parse_token_list: animation name") + } } } diff --git a/packages/styled-jsx/transform/tests/fixture/next-55679/output.lightningcss.js b/packages/styled-jsx/transform/tests/fixture/next-55679/output.lightningcss.js index 9c3ed6f48..f979c1e8c 100644 --- a/packages/styled-jsx/transform/tests/fixture/next-55679/output.lightningcss.js +++ b/packages/styled-jsx/transform/tests/fixture/next-55679/output.lightningcss.js @@ -4,7 +4,7 @@ const someVar = "--var-1"; export default function App({ Component, pageProps }) { return <> - <_JSXStyle id={"f559f0d916e6258b"}>{`:root{${someVar}:red;background-color:var(${someVar})}`} + <_JSXStyle id={"f559f0d916e6258b"}>{`:root{background-color:var(${someVar});${someVar}:red}`}