diff --git a/.cargo/config.toml b/.cargo/config.toml
index 39cc9ac10..10746d766 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -12,7 +12,13 @@ linker = "aarch64-linux-musl-gcc"
 rustflags = ["-C", "target-feature=-crt-static"]
 
 [target.wasm32-unknown-unknown]
-rustflags = ["-C", "link-arg=--export-table"]
+rustflags = [
+    "-C",
+    "link-arg=--export-table",
+    '--cfg',
+    'getrandom_backend="custom"',
+]
+
 
 # Statically link Visual Studio redistributables on Windows builds
 [target.x86_64-pc-windows-msvc]
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e81411540..10868f4a6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -47,6 +47,13 @@ yarn wasm:build
 yarn wasm:build-release
 ```
 
+Note: If you plan to build the WASM target, ensure that you have the required toolchain and binaries installed.
+
+```sh
+rustup target add wasm32-unknown-unknown
+cargo install wasm-opt
+```
+
 ## Website
 
 The website is built using [Parcel](https://parceljs.org). You can start the development server by running:
diff --git a/Cargo.lock b/Cargo.lock
index ee1a3a933..bb4bb2840 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,19 +8,19 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
- "getrandom",
+ "getrandom 0.3.3",
  "once_cell",
  "serde",
  "version_check",
@@ -142,32 +142,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "browserslist-rs"
-version = "0.17.0"
+name = "browserslist-data"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74c973b79d9b6b89854493185ab760c6ef8e54bcfad10ad4e33991e46b374ac8"
+checksum = "c49471c5ae53cefe3ac4acc4d3c75cb4b68995b70b3bbb864f8e08fae282098c"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
  "chrono",
- "either",
- "indexmap 2.7.0",
- "itertools 0.13.0",
- "nom",
- "serde",
- "serde_json",
- "thiserror",
 ]
 
 [[package]]
 name = "browserslist-rs"
-version = "0.18.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f95aff901882c66e4b642f3f788ceee152ef44f8a5ef12cb1ddee5479c483be"
+checksum = "8dd48a6ca358df4f7000e3fb5f08738b1b91a0e5d5f862e2f77b2b14647547f5"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
+ "browserslist-data",
  "chrono",
  "either",
- "indexmap 2.7.0",
  "itertools 0.13.0",
  "nom",
  "serde",
@@ -541,7 +534,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
 ]
 
 [[package]]
@@ -749,21 +754,21 @@ dependencies = [
 
 [[package]]
 name = "lightningcss"
-version = "1.0.0-alpha.67"
+version = "1.0.0-alpha.70"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
  "assert_cmd",
  "assert_fs",
  "atty",
  "bitflags 2.6.0",
- "browserslist-rs 0.18.1",
+ "browserslist-rs",
  "clap",
  "const-str",
  "cssparser",
  "cssparser-color",
  "dashmap",
  "data-encoding",
- "getrandom",
+ "getrandom 0.3.3",
  "indexmap 2.7.0",
  "indoc",
  "itertools 0.10.5",
@@ -772,13 +777,14 @@ dependencies = [
  "lightningcss-derive",
  "parcel_selectors",
  "parcel_sourcemap",
- "paste",
+ "pastey",
  "pathdiff",
  "predicates 2.1.5",
  "pretty_assertions",
  "rayon",
  "schemars",
  "serde",
+ "serde-content",
  "serde_json",
  "smallvec",
  "static-self",
@@ -796,7 +802,7 @@ dependencies = [
 
 [[package]]
 name = "lightningcss-napi"
-version = "0.4.4"
+version = "0.4.7"
 dependencies = [
  "crossbeam-channel",
  "cssparser",
@@ -805,6 +811,7 @@ dependencies = [
  "parcel_sourcemap",
  "rayon",
  "serde",
+ "serde-content",
  "serde-detach",
  "serde_bytes",
  "smallvec",
@@ -814,7 +821,7 @@ dependencies = [
 name = "lightningcss_c_bindings"
 version = "0.1.0"
 dependencies = [
- "browserslist-rs 0.17.0",
+ "browserslist-rs",
  "cbindgen",
  "lightningcss",
  "parcel_sourcemap",
@@ -1018,10 +1025,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "paste"
-version = "1.0.15"
+name = "pastey"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+checksum = "b3a8cb46bdc156b1c90460339ae6bfd45ba0394e5effbaa640badb4987fdc261"
 
 [[package]]
 name = "pathdiff"
@@ -1200,6 +1207,12 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -1397,13 +1410,23 @@ checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
 
 [[package]]
 name = "serde"
-version = "1.0.216"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
+ "serde_core",
  "serde_derive",
 ]
 
+[[package]]
+name = "serde-content"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3753ca04f350fa92d00b6146a3555e63c55388c9ef2e11e09bce2ff1c0b509c6"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde-detach"
 version = "0.0.1"
@@ -1423,11 +1446,20 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
 [[package]]
 name = "serde_derive"
-version = "1.0.216"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1678,6 +1710,15 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.99"
@@ -1845,6 +1886,15 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
 [[package]]
 name = "wyz"
 version = "0.2.0"
@@ -1868,18 +1918,18 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 9ad6422c9..c113a3921 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ members = [
 [package]
 authors = ["Devon Govett <devongovett@gmail.com>"]
 name = "lightningcss"
-version = "1.0.0-alpha.67"
+version = "1.0.0-alpha.70"
 description = "A CSS parser, transformer, and minifier"
 license = "MPL-2.0"
 edition = "2021"
@@ -39,9 +39,10 @@ browserslist = ["browserslist-rs"]
 bundler = ["dashmap", "sourcemap", "rayon"]
 cli = ["atty", "clap", "serde_json", "browserslist", "jemallocator"]
 jsonschema = ["schemars", "serde", "parcel_selectors/jsonschema"]
-nodejs = ["dep:serde"]
+nodejs = ["dep:serde", "dep:serde-content"]
 serde = [
   "dep:serde",
+  "dep:serde-content",
   "bitflags/serde",
   "smallvec/serde",
   "cssparser/serde",
@@ -59,7 +60,8 @@ into_owned = [
 substitute_variables = ["visitor", "into_owned"]
 
 [dependencies]
-serde = { version = "1.0.201", features = ["derive"], optional = true }
+serde = { version = "1.0.228", features = ["derive"], optional = true }
+serde-content = { version = "0.1.2", features = ["serde"], optional = true }
 cssparser = "0.33.0"
 cssparser-color = "0.1.0"
 parcel_selectors = { version = "0.28.2", path = "./selectors" }
@@ -72,12 +74,12 @@ lazy_static = "1.4.0"
 const-str = "0.3.1"
 pathdiff = "0.2.1"
 ahash = "0.8.7"
-paste = "1.0.12"
+pastey = "0.1.0"
 indexmap = { version = "2.2.6", features = ["serde"] }
 # CLI deps
 atty = { version = "0.2", optional = true }
 clap = { version = "3.0.6", features = ["derive"], optional = true }
-browserslist-rs = { version = "0.18.1", optional = true }
+browserslist-rs = { version = "0.19.0", optional = true }
 rayon = { version = "1.5.1", optional = true }
 dashmap = { version = "5.0.0", optional = true }
 serde_json = { version = "1.0.78", optional = true }
@@ -91,7 +93,7 @@ jemallocator = { version = "0.3.2", features = [
 ], optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-getrandom = { version = "0.2", features = ["custom"], default-features = false }
+getrandom = { version = "0.3", default-features = false }
 
 [dev-dependencies]
 indoc = "1.0.3"
diff --git a/c/Cargo.toml b/c/Cargo.toml
index 3d20add03..f9a9d167f 100644
--- a/c/Cargo.toml
+++ b/c/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 [dependencies]
 lightningcss = { path = "../", features = ["browserslist"] }
 parcel_sourcemap = { version = "2.1.1", features = ["json"] }
-browserslist-rs = { version = "0.17.0" }
+browserslist-rs = { version = "0.19.0" }
 
 [build-dependencies]
 cbindgen = "0.24.3"
diff --git a/napi/Cargo.toml b/napi/Cargo.toml
index 6638dd5bb..789062ea6 100644
--- a/napi/Cargo.toml
+++ b/napi/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Devon Govett <devongovett@gmail.com>"]
 name = "lightningcss-napi"
-version = "0.4.4"
+version = "0.4.7"
 description = "Node-API bindings for Lightning CSS"
 license = "MPL-2.0"
 repository = "https://github.com/parcel-bundler/lightningcss"
@@ -14,9 +14,10 @@ bundler = ["dep:crossbeam-channel", "dep:rayon"]
 
 [dependencies]
 serde = { version = "1.0.201", features = ["derive"] }
+serde-content = { version = "0.1.2", features = ["serde"] }
 serde_bytes = "0.11.5"
 cssparser = "0.33.0"
-lightningcss = { version = "1.0.0-alpha.66", path = "../", features = [
+lightningcss = { version = "1.0.0-alpha.70", path = "../", features = [
   "nodejs",
   "serde",
 ] }
diff --git a/napi/src/lib.rs b/napi/src/lib.rs
index dff488056..f43a8d46e 100644
--- a/napi/src/lib.rs
+++ b/napi/src/lib.rs
@@ -121,8 +121,8 @@ pub fn transform_style_attribute(ctx: CallContext) -> napi::Result<JsUnknown> {
 mod bundle {
   use super::*;
   use crossbeam_channel::{self, Receiver, Sender};
-  use lightningcss::bundler::FileProvider;
-  use napi::{Env, JsFunction, JsString, NapiRaw};
+  use lightningcss::bundler::{FileProvider, ResolveResult};
+  use napi::{Env, JsBoolean, JsFunction, JsString, NapiRaw};
   use std::path::{Path, PathBuf};
   use std::str::FromStr;
   use std::sync::Mutex;
@@ -169,6 +169,7 @@ mod bundle {
   // Allocate a single channel per thread to communicate with the JS thread.
   thread_local! {
     static CHANNEL: (Sender<napi::Result<String>>, Receiver<napi::Result<String>>) = crossbeam_channel::unbounded();
+    static RESOLVER_CHANNEL: (Sender<napi::Result<ResolveResult>>, Receiver<napi::Result<ResolveResult>>) = crossbeam_channel::unbounded();
   }
 
   impl SourceProvider for JsSourceProvider {
@@ -203,9 +204,9 @@ mod bundle {
       }
     }
 
-    fn resolve(&self, specifier: &str, originating_file: &Path) -> Result<PathBuf, Self::Error> {
+    fn resolve(&self, specifier: &str, originating_file: &Path) -> Result<ResolveResult, Self::Error> {
       if let Some(resolve) = &self.resolve {
-        return CHANNEL.with(|channel| {
+        return RESOLVER_CHANNEL.with(|channel| {
           let message = ResolveMessage {
             specifier: specifier.to_owned(),
             originating_file: originating_file.to_str().unwrap().to_owned(),
@@ -213,22 +214,18 @@ mod bundle {
           };
 
           resolve.call(message, ThreadsafeFunctionCallMode::Blocking);
-          let result = channel.1.recv().unwrap();
-          match result {
-            Ok(result) => Ok(PathBuf::from_str(&result).unwrap()),
-            Err(e) => Err(e),
-          }
+          channel.1.recv().unwrap()
         });
       }
 
-      Ok(originating_file.with_file_name(specifier))
+      Ok(originating_file.with_file_name(specifier).into())
     }
   }
 
   struct ResolveMessage {
     specifier: String,
     originating_file: String,
-    tx: Sender<napi::Result<String>>,
+    tx: Sender<napi::Result<ResolveResult>>,
   }
 
   struct ReadMessage {
@@ -241,7 +238,11 @@ mod bundle {
     tx: Sender<napi::Result<String>>,
   }
 
-  fn await_promise(env: Env, result: JsUnknown, tx: Sender<napi::Result<String>>) -> napi::Result<()> {
+  fn await_promise<T, Cb>(env: Env, result: JsUnknown, tx: Sender<napi::Result<T>>, parse: Cb) -> napi::Result<()>
+  where
+    T: 'static,
+    Cb: 'static + Fn(JsUnknown) -> Result<T, napi::Error>,
+  {
     // If the result is a promise, wait for it to resolve, and send the result to the channel.
     // Otherwise, send the result immediately.
     if result.is_promise()? {
@@ -249,9 +250,8 @@ mod bundle {
       let then: JsFunction = get_named_property(&result, "then")?;
       let tx2 = tx.clone();
       let cb = env.create_function_from_closure("callback", move |ctx| {
-        let res = ctx.get::<JsString>(0)?.into_utf8()?;
-        let s = res.into_owned()?;
-        tx.send(Ok(s)).unwrap();
+        let res = parse(ctx.get::<JsUnknown>(0)?)?;
+        tx.send(Ok(res)).unwrap();
         ctx.env.get_undefined()
       })?;
       let eb = env.create_function_from_closure("error_callback", move |ctx| {
@@ -261,10 +261,8 @@ mod bundle {
       })?;
       then.call(Some(&result), &[cb, eb])?;
     } else {
-      let result: JsString = result.try_into()?;
-      let utf8 = result.into_utf8()?;
-      let s = utf8.into_owned()?;
-      tx.send(Ok(s)).unwrap();
+      let result = parse(result)?;
+      tx.send(Ok(result)).unwrap();
     }
 
     Ok(())
@@ -274,10 +272,12 @@ mod bundle {
     let specifier = ctx.env.create_string(&ctx.value.specifier)?;
     let originating_file = ctx.env.create_string(&ctx.value.originating_file)?;
     let result = ctx.callback.unwrap().call(None, &[specifier, originating_file])?;
-    await_promise(ctx.env, result, ctx.value.tx)
+    await_promise(ctx.env, result, ctx.value.tx, move |unknown| {
+      ctx.env.from_js_value(unknown)
+    })
   }
 
-  fn handle_error(tx: Sender<napi::Result<String>>, res: napi::Result<()>) -> napi::Result<()> {
+  fn handle_error<T>(tx: Sender<napi::Result<T>>, res: napi::Result<()>) -> napi::Result<()> {
     match res {
       Ok(_) => Ok(()),
       Err(e) => {
@@ -295,7 +295,9 @@ mod bundle {
   fn read_on_js_thread(ctx: ThreadSafeCallContext<ReadMessage>) -> napi::Result<()> {
     let file = ctx.env.create_string(&ctx.value.file)?;
     let result = ctx.callback.unwrap().call(None, &[file])?;
-    await_promise(ctx.env, result, ctx.value.tx)
+    await_promise(ctx.env, result, ctx.value.tx, |unknown| {
+      JsString::try_from(unknown)?.into_utf8()?.into_owned()
+    })
   }
 
   fn read_on_js_thread_wrapper(ctx: ThreadSafeCallContext<ReadMessage>) -> napi::Result<()> {
@@ -421,10 +423,10 @@ mod bundle {
 #[cfg(target_arch = "wasm32")]
 mod bundle {
   use super::*;
+  use lightningcss::bundler::ResolveResult;
   use napi::{Env, JsFunction, JsString, NapiRaw, NapiValue, Ref};
   use std::cell::UnsafeCell;
-  use std::path::{Path, PathBuf};
-  use std::str::FromStr;
+  use std::path::Path;
 
   pub fn bundle(ctx: CallContext) -> napi::Result<JsUnknown> {
     let opts = ctx.get::<JsObject>(0)?;
@@ -497,7 +499,7 @@ mod bundle {
     );
   }
 
-  fn get_result(env: Env, mut value: JsUnknown) -> napi::Result<JsString> {
+  fn get_result(env: Env, mut value: JsUnknown) -> napi::Result<JsUnknown> {
     if value.is_promise()? {
       let mut result = std::ptr::null_mut();
       let mut error = std::ptr::null_mut();
@@ -513,7 +515,7 @@ mod bundle {
       value = unsafe { JsUnknown::from_raw(env.raw(), result)? };
     }
 
-    value.try_into()
+    Ok(value)
   }
 
   impl SourceProvider for JsSourceProvider {
@@ -523,7 +525,9 @@ mod bundle {
       let read: JsFunction = self.env.get_reference_value_unchecked(&self.read)?;
       let file = self.env.create_string(file.to_str().unwrap())?;
       let source: JsUnknown = read.call(None, &[file])?;
-      let source = get_result(self.env, source)?.into_utf8()?.into_owned()?;
+      let source = get_result(self.env, source)?;
+      let source: JsString = source.try_into()?;
+      let source = source.into_utf8()?.into_owned()?;
 
       // cache the result
       let ptr = Box::into_raw(Box::new(source));
@@ -535,16 +539,17 @@ mod bundle {
       Ok(unsafe { &*ptr })
     }
 
-    fn resolve(&self, specifier: &str, originating_file: &Path) -> Result<PathBuf, Self::Error> {
+    fn resolve(&self, specifier: &str, originating_file: &Path) -> Result<ResolveResult, Self::Error> {
       if let Some(resolve) = &self.resolve {
         let resolve: JsFunction = self.env.get_reference_value_unchecked(resolve)?;
         let specifier = self.env.create_string(specifier)?;
         let originating_file = self.env.create_string(originating_file.to_str().unwrap())?;
         let result: JsUnknown = resolve.call(None, &[specifier, originating_file])?;
-        let result = get_result(self.env, result)?.into_utf8()?;
-        Ok(PathBuf::from_str(result.as_str()?).unwrap())
+        let result = get_result(self.env, result)?;
+        let result = self.env.from_js_value(result)?;
+        Ok(result)
       } else {
-        Ok(originating_file.with_file_name(specifier))
+        Ok(ResolveResult::File(originating_file.with_file_name(specifier)))
       }
     }
   }
diff --git a/napi/src/transformer.rs b/napi/src/transformer.rs
index 29875b87c..bab931f2d 100644
--- a/napi/src/transformer.rs
+++ b/napi/src/transformer.rs
@@ -755,9 +755,8 @@ impl<'de, V: serde::Deserialize<'de>, const IS_VEC: bool> serde::Deserialize<'de
     D: serde::Deserializer<'de>,
   {
     use serde::Deserializer;
-    let content = serde::__private::de::Content::deserialize(deserializer)?;
-    let de: serde::__private::de::ContentRefDeserializer<D::Error> =
-      serde::__private::de::ContentRefDeserializer::new(&content);
+    let content = serde_content::Value::deserialize(deserializer)?;
+    let de = serde_content::Deserializer::new(content.clone()).coerce_numbers();
 
     // Try to deserialize as a sequence first.
     let mut was_seq = false;
@@ -769,13 +768,15 @@ impl<'de, V: serde::Deserialize<'de>, const IS_VEC: bool> serde::Deserialize<'de
     if was_seq {
       // Allow fallback if we know the value is also a list (e.g. selector).
       if res.is_ok() || !IS_VEC {
-        return res.map(ValueOrVec::Vec);
+        return res.map_err(|e| serde::de::Error::custom(e.to_string())).map(ValueOrVec::Vec);
       }
     }
 
     // If it wasn't a sequence, try a value.
-    let de = serde::__private::de::ContentRefDeserializer::new(&content);
-    return V::deserialize(de).map(ValueOrVec::Value);
+    let de = serde_content::Deserializer::new(content).coerce_numbers();
+    return V::deserialize(de)
+      .map_err(|e| serde::de::Error::custom(e.to_string()))
+      .map(ValueOrVec::Value);
 
     struct SeqVisitor<'a, V> {
       was_seq: &'a mut bool,
@@ -811,16 +812,14 @@ impl<'i, 'de: 'i> serde::Deserialize<'de> for TokensOrRaw<'i> {
   where
     D: serde::Deserializer<'de>,
   {
-    use serde::__private::de::ContentRefDeserializer;
-
     #[derive(serde::Deserialize)]
     struct Raw<'i> {
       #[serde(borrow)]
       raw: CowArcStr<'i>,
     }
 
-    let content = serde::__private::de::Content::deserialize(deserializer)?;
-    let de: ContentRefDeserializer<D::Error> = ContentRefDeserializer::new(&content);
+    let content = serde_content::Value::deserialize(deserializer)?;
+    let de = serde_content::Deserializer::new(content.clone()).coerce_numbers();
 
     if let Ok(res) = Raw::deserialize(de) {
       let res = TokenList::parse_string_with_options(res.raw.as_ref(), ParserOptions::default())
@@ -828,8 +827,10 @@ impl<'i, 'de: 'i> serde::Deserialize<'de> for TokensOrRaw<'i> {
       return Ok(TokensOrRaw(ValueOrVec::Vec(res.into_owned().0)));
     }
 
-    let de = ContentRefDeserializer::new(&content);
-    Ok(TokensOrRaw(ValueOrVec::deserialize(de)?))
+    let de = serde_content::Deserializer::new(content).coerce_numbers();
+    Ok(TokensOrRaw(
+      ValueOrVec::deserialize(de).map_err(|e| serde::de::Error::custom(e.to_string()))?,
+    ))
   }
 }
 
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 02823cf00..b5c7505c3 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-lightningcss-napi = { version = "0.4.4", path = "../napi", features = [
+lightningcss-napi = { version = "0.4.7", path = "../napi", features = [
   "bundler",
   "visitor",
 ] }
diff --git a/node/ast.d.ts b/node/ast.d.ts
index 08d9d786e..28e9d0930 100644
--- a/node/ast.d.ts
+++ b/node/ast.d.ts
@@ -134,6 +134,10 @@ export type MediaCondition =
        */
       operator: Operator;
       type: "operation";
+    }
+  | {
+      type: "unknown";
+      value: TokenOrValue[];
     };
 /**
  * A generic media feature or container feature.
@@ -2363,6 +2367,10 @@ export type PropertyId =
   | {
       property: "color-scheme";
     }
+  | {
+      property: "print-color-adjust";
+      vendorPrefix: VendorPrefix;
+    }
   | {
       property: "all";
     }
@@ -3851,6 +3859,11 @@ export type Declaration =
       property: "color-scheme";
       value: ColorScheme;
     }
+  | {
+      property: "print-color-adjust";
+      value: PrintColorAdjust;
+      vendorPrefix: VendorPrefix;
+    }
   | {
       property: "all";
       value: CSSWideKeyword;
@@ -5218,7 +5231,7 @@ export type RepeatCount =
     };
 export type AutoFlowDirection = "row" | "column";
 /**
- * A value for the [grid-template-areas](https://drafts.csswg.org/css-grid-2/#grid-template-areas-property) property.
+ * A value for the [grid-template-areas](https://drafts.csswg.org/css-grid-2/#grid-template-areas-property) property. none | <string>+
  */
 export type GridTemplateAreas =
   | {
@@ -6420,7 +6433,7 @@ export type ZIndex =
 /**
  * A value for the [container-type](https://drafts.csswg.org/css-contain-3/#container-type) property. Establishes the element as a query container for the purpose of container queries.
  */
-export type ContainerType = "normal" | "inline-size" | "size";
+export type ContainerType = "normal" | "inline-size" | "size" | "scroll-state";
 /**
  * A value for the [container-name](https://drafts.csswg.org/css-contain-3/#container-name) property.
  */
@@ -6447,6 +6460,10 @@ export type NoneOrCustomIdentList =
  */
 export type ViewTransitionGroup =
   "normal" | "contain" | "nearest" | String;
+/**
+ * A value for the [print-color-adjust](https://drafts.csswg.org/css-color-adjust/#propdef-print-color-adjust) property.
+ */
+export type PrintColorAdjust = "economy" | "exact";
 /**
  * A [CSS-wide keyword](https://drafts.csswg.org/css-cascade-5/#defaulting-keywords).
  */
@@ -6784,6 +6801,13 @@ export type PseudoClass =
        */
       type: String[];
     }
+  | {
+      kind: "state";
+      /**
+       * The custom state identifier.
+       */
+      state: String;
+    }
   | {
       kind: "local";
       /**
@@ -6944,6 +6968,25 @@ export type PseudoElement =
        */
       part: ViewTransitionPartSelector;
     }
+  | {
+      /**
+       * A form control identifier.
+       */
+      identifier: String;
+      kind: "picker-function";
+    }
+  | {
+      kind: "picker-icon";
+    }
+  | {
+      kind: "checkmark";
+    }
+  | {
+      kind: "grammar-error";
+    }
+  | {
+      kind: "spelling-error";
+    }
   | {
       kind: "custom";
       /**
@@ -7230,6 +7273,10 @@ export type ParsedComponent =
       type: "length-percentage";
       value: DimensionPercentageFor_LengthValue;
     }
+  | {
+      type: "string";
+      value: String;
+    }
   | {
       type: "color";
       value: CssColor;
@@ -7331,6 +7378,9 @@ export type SyntaxComponentKind =
   | {
       type: "length-percentage";
     }
+  | {
+      type: "string";
+    }
   | {
       type: "color";
     }
@@ -7390,6 +7440,14 @@ export type ContainerCondition<D = Declaration> = | {
 | {
     type: "style";
     value: StyleQuery<D>;
+  }
+| {
+    type: "scroll-state";
+    value: ScrollStateQuery;
+  }
+| {
+    type: "unknown";
+    value: TokenOrValue[];
   };
 /**
  * A generic media feature or container feature.
@@ -7485,6 +7543,97 @@ export type StyleQuery<D = Declaration> = | {
     operator: Operator;
     type: "operation";
   };
+/**
+ * Represents a scroll state query within a container condition.
+ */
+export type ScrollStateQuery =
+  | {
+      type: "feature";
+      value: QueryFeatureFor_ScrollStateFeatureId;
+    }
+  | {
+      type: "not";
+      value: ScrollStateQuery;
+    }
+  | {
+      /**
+       * The conditions for the operator.
+       */
+      conditions: ScrollStateQuery[];
+      /**
+       * The operator for the conditions.
+       */
+      operator: Operator;
+      type: "operation";
+    };
+/**
+ * A generic media feature or container feature.
+ */
+export type QueryFeatureFor_ScrollStateFeatureId =
+  | {
+      /**
+       * The name of the feature.
+       */
+      name: MediaFeatureNameFor_ScrollStateFeatureId;
+      type: "plain";
+      /**
+       * The feature value.
+       */
+      value: MediaFeatureValue;
+    }
+  | {
+      /**
+       * The name of the feature.
+       */
+      name: MediaFeatureNameFor_ScrollStateFeatureId;
+      type: "boolean";
+    }
+  | {
+      /**
+       * The name of the feature.
+       */
+      name: MediaFeatureNameFor_ScrollStateFeatureId;
+      /**
+       * A comparator.
+       */
+      operator: MediaFeatureComparison;
+      type: "range";
+      /**
+       * The feature value.
+       */
+      value: MediaFeatureValue;
+    }
+  | {
+      /**
+       * The end value.
+       */
+      end: MediaFeatureValue;
+      /**
+       * A comparator for the end value.
+       */
+      endOperator: MediaFeatureComparison;
+      /**
+       * The name of the feature.
+       */
+      name: MediaFeatureNameFor_ScrollStateFeatureId;
+      /**
+       * A start value.
+       */
+      start: MediaFeatureValue;
+      /**
+       * A comparator for the start value.
+       */
+      startOperator: MediaFeatureComparison;
+      type: "interval";
+    };
+/**
+ * A media feature name.
+ */
+export type MediaFeatureNameFor_ScrollStateFeatureId = ScrollStateFeatureId | String | String;
+/**
+ * A container query scroll state feature identifier.
+ */
+export type ScrollStateFeatureId = "stuck" | "snapped" | "scrollable" | "scrolled";
 /**
  * A property within a `@view-transition` rule.
  *
@@ -8358,6 +8507,8 @@ export interface GridAutoFlow {
 /**
  * A value for the [grid-template](https://drafts.csswg.org/css-grid-2/#explicit-grid-shorthand) shorthand property.
  *
+ * none | [ <'grid-template-rows'> / <'grid-template-columns'> ] | [ <line-names>? <string> <track-size>? <line-names>? ]+ [ / <explicit-track-list> ]?
+ *
  * If `areas` is not `None`, then `rows` must also not be `None`.
  */
 export interface GridTemplate {
@@ -8377,6 +8528,8 @@ export interface GridTemplate {
 /**
  * A value for the [grid](https://drafts.csswg.org/css-grid-2/#grid-shorthand) shorthand property.
  *
+ * <'grid-template'> | <'grid-template-rows'> / [ auto-flow && dense? ] <'grid-auto-columns'>? | [ auto-flow && dense? ] <'grid-auto-rows'>? / <'grid-template-columns'>
+ *
  * Explicit and implicit values may not be combined.
  */
 export interface Grid {
@@ -8406,7 +8559,7 @@ export interface Grid {
   rows: TrackSizing;
 }
 /**
- * A value for the [grid-row](https://drafts.csswg.org/css-grid-2/#propdef-grid-row) shorthand property.
+ * A value for the [grid-row](https://drafts.csswg.org/css-grid-2/#propdef-grid-row) shorthand property. <grid-line> [ / <grid-line> ]?
  */
 export interface GridRow {
   /**
@@ -8419,7 +8572,7 @@ export interface GridRow {
   start: GridLine;
 }
 /**
- * A value for the [grid-row](https://drafts.csswg.org/css-grid-2/#propdef-grid-column) shorthand property.
+ * A value for the [grid-column](https://drafts.csswg.org/css-grid-2/#propdef-grid-column) shorthand property. <grid-line> [ / <grid-line> ]?
  */
 export interface GridColumn {
   /**
@@ -8432,7 +8585,7 @@ export interface GridColumn {
   start: GridLine;
 }
 /**
- * A value for the [grid-area](https://drafts.csswg.org/css-grid-2/#propdef-grid-area) shorthand property.
+ * A value for the [grid-area](https://drafts.csswg.org/css-grid-2/#propdef-grid-area) shorthand property. <grid-line> [ / <grid-line> ]{0,3}
  */
 export interface GridArea {
   /**
@@ -9653,7 +9806,7 @@ export interface ContainerRule<D = Declaration, M = MediaQuery> {
   /**
    * The container condition.
    */
-  condition: ContainerCondition<D>;
+  condition?: ContainerCondition<D> | null;
   /**
    * The location of the rule in the source file.
    */
diff --git a/node/composeVisitors.js b/node/composeVisitors.js
index 9d5796e3b..f29934905 100644
--- a/node/composeVisitors.js
+++ b/node/composeVisitors.js
@@ -1,15 +1,23 @@
 // @ts-check
 /** @typedef {import('./index').Visitor} Visitor */
+/** @typedef {import('./index').VisitorFunction} VisitorFunction */
 
 /**
  * Composes multiple visitor objects into a single one.
- * @param {Visitor[]} visitors 
- * @return {Visitor}
+ * @param {(Visitor | VisitorFunction)[]} visitors 
+ * @return {Visitor | VisitorFunction}
  */
 function composeVisitors(visitors) {
   if (visitors.length === 1) {
     return visitors[0];
   }
+  
+  if (visitors.some(v => typeof v === 'function')) {
+    return (opts) => {
+      let v = visitors.map(v => typeof v === 'function' ? v(opts) : v);
+      return composeVisitors(v);
+    };
+  }
 
   /** @type Visitor */
   let res = {};
@@ -366,7 +374,7 @@ function createArrayVisitor(visitors, apply) {
       // For each value, call all visitors. If a visitor returns a new value,
       // we start over, but skip the visitor that generated the value or saw
       // it before (to avoid cycles). This way, visitors can be composed in any order. 
-      for (let v = 0; v < visitors.length;) {
+      for (let v = 0; v < visitors.length && i < arr.length;) {
         if (seen.get(v)) {
           v++;
           continue;
diff --git a/node/index.d.ts b/node/index.d.ts
index 76d405729..6d727d75a 100644
--- a/node/index.d.ts
+++ b/node/index.d.ts
@@ -63,7 +63,7 @@ export interface TransformOptions<C extends CustomAtRules> {
    * For optimal performance, visitors should be as specific as possible about what types of values
    * they care about so that JavaScript has to be called as little as possible.
    */
-  visitor?: Visitor<C>,
+  visitor?: Visitor<C> | VisitorFunction<C>,
   /**
    * Defines how to parse custom CSS at-rules. Each at-rule can have a prelude, defined using a CSS
    * [syntax string](https://drafts.css-houdini.org/css-properties-values-api/#syntax-strings), and
@@ -213,6 +213,13 @@ export interface Visitor<C extends CustomAtRules> {
   EnvironmentVariableExit?: EnvironmentVariableVisitor | EnvironmentVariableVisitors;
 }
 
+export type VisitorDependency = FileDependency | GlobDependency;
+export interface VisitorOptions {
+  addDependency: (dep: VisitorDependency) => void
+}
+
+export type VisitorFunction<C extends CustomAtRules> = (options: VisitorOptions) => Visitor<C>;
+
 export interface CustomAtRules {
   [name: string]: CustomAtRuleDefinition
 }
@@ -358,7 +365,7 @@ export interface DependencyCSSModuleReference {
   specifier: string
 }
 
-export type Dependency = ImportDependency | UrlDependency;
+export type Dependency = ImportDependency | UrlDependency | FileDependency | GlobDependency;
 
 export interface ImportDependency {
   type: 'import',
@@ -384,6 +391,16 @@ export interface UrlDependency {
   placeholder: string
 }
 
+export interface FileDependency {
+  type: 'file',
+  filePath: string
+}
+
+export interface GlobDependency {
+  type: 'glob',
+  glob: string
+}
+
 export interface SourceLocation {
   /** The file path in which the dependency exists. */
   filePath: string,
@@ -438,7 +455,7 @@ export interface TransformAttributeOptions {
    * For optimal performance, visitors should be as specific as possible about what types of values
    * they care about so that JavaScript has to be called as little as possible.
    */
-  visitor?: Visitor<never>
+  visitor?: Visitor<never> | VisitorFunction<never>
 }
 
 export interface TransformAttributeResult {
@@ -474,4 +491,4 @@ export declare function bundleAsync<C extends CustomAtRules>(options: BundleAsyn
 /**
  * Composes multiple visitor objects into a single one.
  */
-export declare function composeVisitors<C extends CustomAtRules>(visitors: Visitor<C>[]): Visitor<C>;
+export declare function composeVisitors<C extends CustomAtRules>(visitors: (Visitor<C> | VisitorFunction<C>)[]): Visitor<C> | VisitorFunction<C>;
diff --git a/node/index.js b/node/index.js
index 011d04b45..6fe25aef4 100644
--- a/node/index.js
+++ b/node/index.js
@@ -13,16 +13,47 @@ if (process.platform === 'linux') {
   parts.push('msvc');
 }
 
-if (process.env.CSS_TRANSFORMER_WASM) {
-  module.exports = require(`../pkg`);
-} else {
-  try {
-    module.exports = require(`lightningcss-${parts.join('-')}`);
-  } catch (err) {
-    module.exports = require(`../lightningcss.${parts.join('-')}.node`);
-  }
+let native;
+try {
+  native = require(`lightningcss-${parts.join('-')}`);
+} catch (err) {
+  native = require(`../lightningcss.${parts.join('-')}.node`);
 }
 
+module.exports.transform = wrap(native.transform);
+module.exports.transformStyleAttribute = wrap(native.transformStyleAttribute);
+module.exports.bundle = wrap(native.bundle);
+module.exports.bundleAsync = wrap(native.bundleAsync);
 module.exports.browserslistToTargets = require('./browserslistToTargets');
 module.exports.composeVisitors = require('./composeVisitors');
 module.exports.Features = require('./flags').Features;
+
+function wrap(call) {
+  return (options) => {
+    if (typeof options.visitor === 'function') {
+      let deps = [];
+      options.visitor = options.visitor({
+        addDependency(dep) {
+          deps.push(dep);
+        }
+      });
+
+      let result = call(options);
+      if (result instanceof Promise) {
+        result = result.then(res => {
+          if (deps.length) {
+            res.dependencies ??= [];
+            res.dependencies.push(...deps);
+          }
+          return res;
+        });
+      } else if (deps.length) {
+        result.dependencies ??= [];
+        result.dependencies.push(...deps);
+      }
+      return result;
+    } else {
+      return call(options);
+    }
+  };
+}
diff --git a/node/src/lib.rs b/node/src/lib.rs
index e429b0f2e..822944124 100644
--- a/node/src/lib.rs
+++ b/node/src/lib.rs
@@ -3,7 +3,7 @@
 static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
 use napi::{CallContext, JsObject, JsUnknown};
-use napi_derive::{js_function, module_exports};
+use napi_derive::js_function;
 
 #[js_function(1)]
 fn transform(ctx: CallContext) -> napi::Result<JsUnknown> {
@@ -26,7 +26,7 @@ pub fn bundle_async(ctx: CallContext) -> napi::Result<JsObject> {
   lightningcss_napi::bundle_async(ctx)
 }
 
-#[cfg_attr(not(target_arch = "wasm32"), module_exports)]
+#[cfg_attr(not(target_arch = "wasm32"), napi_derive::module_exports)]
 fn init(mut exports: JsObject) -> napi::Result<()> {
   exports.create_named_method("transform", transform)?;
   exports.create_named_method("transformStyleAttribute", transform_style_attribute)?;
@@ -45,7 +45,6 @@ pub fn register_module() {
   unsafe fn register(raw_env: napi::sys::napi_env, raw_exports: napi::sys::napi_value) -> napi::Result<()> {
     use napi::{Env, JsObject, NapiValue};
 
-    let env = Env::from_raw(raw_env);
     let exports = JsObject::from_raw_unchecked(raw_env, raw_exports);
     init(exports)
   }
diff --git a/node/test/bundle.test.mjs b/node/test/bundle.test.mjs
index 50d113b57..4279e51c8 100644
--- a/node/test/bundle.test.mjs
+++ b/node/test/bundle.test.mjs
@@ -365,7 +365,7 @@ test('resolve return non-string', async () => {
   }
 
   if (!error) throw new Error(`\`testResolveReturnNonString()\` failed. Expected \`bundleAsync()\` to throw, but it did not.`);
-  assert.equal(error.message, 'expect String, got: Number');
+  assert.equal(error.message, 'data did not match any variant of untagged enum ResolveResult');
   assert.equal(error.fileName, 'tests/testdata/foo.css');
   assert.equal(error.loc, {
     line: 1,
@@ -414,4 +414,29 @@ test('should support throwing in visitors', async () => {
   assert.equal(error.message, 'Some error');
 });
 
+test('external import', async () => {
+  const { code: buffer } = await bundleAsync(/** @type {import('../index').BundleAsyncOptions} */ ({
+    filename: 'tests/testdata/has_external.css',
+    resolver: {
+      resolve(specifier, originatingFile) {
+        if (specifier === './does_not_exist.css' || specifier.startsWith('https:')) {
+          return {external: specifier};
+        }
+        return path.resolve(path.dirname(originatingFile), specifier);
+      }
+    }
+  }));
+  const code = buffer.toString('utf-8').trim();
+
+  const expected = `
+@import "https://fonts.googleapis.com/css2?family=Roboto&display=swap";
+@import "./does_not_exist.css";
+
+.b {
+  height: calc(100vh - 64px);
+}
+     `.trim();
+  if (code !== expected) throw new Error(`\`testResolver()\` failed. Expected:\n${expected}\n\nGot:\n${code}`);
+});
+
 test.run();
diff --git a/node/test/composeVisitors.test.mjs b/node/test/composeVisitors.test.mjs
index 7718ec067..4379cf481 100644
--- a/node/test/composeVisitors.test.mjs
+++ b/node/test/composeVisitors.test.mjs
@@ -800,4 +800,61 @@ test('StyleSheet', () => {
   assert.equal(styleSheetExitCalledCount, 2);
 });
 
+test('visitor function', () => {
+  let res = transform({
+    filename: 'test.css',
+    minify: true,
+    code: Buffer.from(`
+      @dep "foo.js";
+      @dep2 "bar.js";
+
+      .foo {
+        width: 32px;
+      }
+    `),
+    visitor: composeVisitors([
+      ({addDependency}) => ({
+        Rule: {
+          unknown: {
+            dep(rule) {
+              let file = rule.prelude[0].value.value;
+              addDependency({
+                type: 'file',
+                filePath: file
+              });
+              return [];
+            }
+          }
+        }
+      }),
+      ({addDependency}) => ({
+        Rule: {
+          unknown: {
+            dep2(rule) {
+              let file = rule.prelude[0].value.value;
+              addDependency({
+                type: 'file',
+                filePath: file
+              });
+              return [];
+            }
+          }
+        }
+      })
+    ])
+  });
+
+  assert.equal(res.code.toString(), '.foo{width:32px}');
+  assert.equal(res.dependencies, [
+    {
+      type: 'file',
+      filePath: 'foo.js'
+    },
+    {
+      type: 'file',
+      filePath: 'bar.js'
+    }
+  ]);
+});
+
 test.run();
diff --git a/node/test/visitor.test.mjs b/node/test/visitor.test.mjs
index 3a42a696b..149825b7d 100644
--- a/node/test/visitor.test.mjs
+++ b/node/test/visitor.test.mjs
@@ -249,6 +249,68 @@ test('specific environment variables', () => {
   assert.equal(res.code.toString(), '@media (width<=600px){body{padding:20px}}');
 });
 
+test('spacing with env substitution', () => {
+  // Test spacing for different cases when `env()` functions are replaced with actual values.
+  /** @type {Record<string, string>} */
+  let tokens = {
+    '--var1': 'var(--foo)',
+    '--var2': 'var(--bar)',
+    '--function': 'scale(1.5)',
+    '--length1': '10px',
+    '--length2': '20px',
+    '--x': '4',
+    '--y': '12',
+    '--num1': '5',
+    '--num2': '10',
+    '--num3': '15',
+    '--counter': '2',
+    '--ident1': 'solid',
+    '--ident2': 'auto',
+    '--rotate': '45deg',
+    '--percentage1': '25%',
+    '--percentage2': '75%',
+    '--color': 'red',
+    '--color1': '#ff1234',
+    '--string1': '"hello"',
+    '--string2': '" world"'
+  };
+
+  let res = transform({
+    filename: 'test.css',
+    minify: true,
+    code: Buffer.from(`
+      .test {
+        /* Asymmetric spacing - no space after var(). */
+        background: env(--var1) env(--var2);
+        border: env(--var1)env(--ident1);
+        transform: env(--function) env(--function);
+        /* Normal spacing between values. */
+        padding: env(--length1) env(--length2);
+        margin: env(--length1) env(--ident2);
+        outline: env(--color) env(--ident1);
+        /* Raw numbers that need spacing. */
+        cursor: url(cursor.png) env(--x) env(--y), auto;
+        stroke-dasharray: env(--num1) env(--num2) env(--num3);
+        counter-increment: myCounter env(--counter);
+        /* Mixed token types. */
+        background: linear-gradient(red env(--percentage1), blue env(--percentage2));
+        content: env(--string1) env(--string2);
+        /* Inside calc expressions. */
+        width: calc(env(--length1) - env(--length2));
+      }
+    `),
+    visitor: {
+      EnvironmentVariable(env) {
+        if (env.name.type === 'custom' && tokens[env.name.ident]) {
+          return { raw: tokens[env.name.ident] };
+        }
+      }
+    }
+  });
+
+  assert.equal(res.code.toString(), '.test{background:var(--foo) var(--bar);border:var(--foo)solid;transform:scale(1.5) scale(1.5);padding:10px 20px;margin:10px auto;outline:red solid;cursor:url(cursor.png) 4 12, auto;stroke-dasharray:5 10 15;counter-increment:myCounter 2;background:linear-gradient(red 25%, blue 75%);content:"hello" " world";width:calc(10px - 20px)}');
+});
+
 test('url', () => {
   // https://www.npmjs.com/package/postcss-url
   let res = transform({
@@ -1108,4 +1170,119 @@ test('visit stylesheet', () => {
   assert.equal(res.code.toString(), '.bar{width:80px}.foo{width:32px}');
 });
 
+test('visitor function', () => {
+  let res = transform({
+    filename: 'test.css',
+    minify: true,
+    code: Buffer.from(`
+      @dep "foo.js";
+
+      .foo {
+        width: 32px;
+      }
+    `),
+    visitor: ({addDependency}) => ({
+      Rule: {
+        unknown: {
+          dep(rule) {
+            let file = rule.prelude[0].value.value;
+            addDependency({
+              type: 'file',
+              filePath: file
+            });
+            return [];
+          }
+        }
+      }
+    })
+  });
+
+  assert.equal(res.code.toString(), '.foo{width:32px}');
+  assert.equal(res.dependencies, [{
+    type: 'file',
+    filePath: 'foo.js'
+  }]);
+});
+
+test('visitor function works with style attributes', () => {
+  let res = transformStyleAttribute({
+    filename: 'test.css',
+    minify: true,
+    code: Buffer.from('height: 12px'),
+    visitor: ({addDependency}) => ({
+      Length() {
+        addDependency({
+          type: 'file',
+          filePath: 'test.json'
+        });
+      }
+    })
+  });
+
+  assert.equal(res.dependencies, [{
+    type: 'file',
+    filePath: 'test.json'
+  }]);
+});
+
+test('visitor function works with bundler', () => {
+  let res = bundle({
+    filename: 'tests/testdata/a.css',
+    minify: true,
+    visitor: ({addDependency}) => ({
+      Length() {
+        addDependency({
+          type: 'file',
+          filePath: 'test.json'
+        });
+      }
+    })
+  });
+
+  assert.equal(res.dependencies, [
+    {
+      type: 'file',
+      filePath: 'test.json'
+    },
+    {
+      type: 'file',
+      filePath: 'test.json'
+    },
+    {
+      type: 'file',
+      filePath: 'test.json'
+    }
+  ]);
+});
+
+test('works with async bundler', async () => {
+  let res = await bundleAsync({
+    filename: 'tests/testdata/a.css',
+    minify: true,
+    visitor: ({addDependency}) => ({
+      Length() {
+        addDependency({
+          type: 'file',
+          filePath: 'test.json'
+        });
+      }
+    })
+  });
+
+  assert.equal(res.dependencies, [
+    {
+      type: 'file',
+      filePath: 'test.json'
+    },
+    {
+      type: 'file',
+      filePath: 'test.json'
+    },
+    {
+      type: 'file',
+      filePath: 'test.json'
+    }
+  ]);
+});
+
 test.run();
diff --git a/package.json b/package.json
index 747e67c46..af17c0a58 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lightningcss",
-  "version": "1.30.1",
+  "version": "1.31.1",
   "license": "MPL-2.0",
   "description": "A CSS parser, transformer, and minifier written in Rust",
   "main": "node/index.js",
@@ -48,10 +48,10 @@
     "@codemirror/lang-javascript": "^6.1.2",
     "@codemirror/lint": "^6.1.0",
     "@codemirror/theme-one-dark": "^6.1.0",
-    "@mdn/browser-compat-data": "~6.0.13",
+    "@mdn/browser-compat-data": "~7.2.4",
     "@napi-rs/cli": "^2.14.0",
-    "autoprefixer": "^10.4.21",
-    "caniuse-lite": "^1.0.30001717",
+    "autoprefixer": "^10.4.23",
+    "caniuse-lite": "^1.0.30001765",
     "codemirror": "^6.0.1",
     "cssnano": "^7.0.6",
     "esbuild": "^0.19.8",
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 80afd2d32..1a2165581 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.83.0"
+channel = "1.92.0"
 components = ["rustfmt", "clippy"]
diff --git a/scripts/build-npm.js b/scripts/build-npm.js
index ca89d669e..ef447a7ea 100644
--- a/scripts/build-npm.js
+++ b/scripts/build-npm.js
@@ -38,6 +38,9 @@ const triples = [
   },
   {
     name: 'x86_64-unknown-freebsd'
+  },
+  {
+    name: 'aarch64-linux-android'
   }
 ];
 const cpuToNodeArch = {
@@ -51,6 +54,7 @@ const sysToNodePlatform = {
   freebsd: 'freebsd',
   darwin: 'darwin',
   windows: 'win32',
+  android: 'android'
 };
 
 let optionalDependencies = {};
diff --git a/scripts/build-prefixes.js b/scripts/build-prefixes.js
index b4eace340..3a9f7945f 100644
--- a/scripts/build-prefixes.js
+++ b/scripts/build-prefixes.js
@@ -341,6 +341,22 @@ let mdnFeatures = {
   picker: mdn.css.selectors.picker.__compat.support,
   pickerIcon: mdn.css.selectors['picker-icon'].__compat.support,
   checkmark: mdn.css.selectors.checkmark.__compat.support,
+  grammarError: mdn.css.selectors['grammar-error'].__compat.support,
+  spellingError: mdn.css.selectors['spelling-error'].__compat.support,
+  statePseudoClass: Object.fromEntries(
+    Object.entries(mdn.css.selectors.state.__compat.support)
+      .map(([browser, value]) => {
+        // Chrome/Edge 90-124 supported old :--foo syntax which was removed.
+        // Only include full :state(foo) support from 125+.
+        if (Array.isArray(value)) {
+          value = value.filter(v => !v.partial_implementation)
+        } else if (value.partial_implementation) {
+          value = undefined;
+        }
+
+        return [browser, value];
+      })
+  ),
 };
 
 for (let key in mdn.css.types.length) {
@@ -388,7 +404,7 @@ for (let key in mdn.css.properties['list-style-type']) {
 }
 
 for (let key in mdn.css.properties['width']) {
-  if (key === '__compat' || key === 'animatable') {
+  if (key === '__compat' || key === 'is_animatable') {
     continue;
   }
 
@@ -649,7 +665,10 @@ impl Feature {
       if self.is_compatible(browsers) {
         return true
       }
-      browsers.${browser} = None;
+      #[allow(unused_assignments)]
+      {
+        browsers.${browser} = None;
+      }
     }\n`).join('    ')}
     false
   }
diff --git a/selectors/parser.rs b/selectors/parser.rs
index ed7b97f1e..19563d5f9 100644
--- a/selectors/parser.rs
+++ b/selectors/parser.rs
@@ -880,12 +880,12 @@ impl<'i, Impl: SelectorImpl<'i>> Selector<'i, Impl> {
   /// Returns an iterator over the entire sequence of simple selectors and
   /// combinators, in matching order (from right to left).
   #[inline]
-  pub fn iter_raw_match_order(&self) -> slice::Iter<Component<'i, Impl>> {
+  pub fn iter_raw_match_order(&self) -> slice::Iter<'_, Component<'i, Impl>> {
     self.1.iter()
   }
 
   #[inline]
-  pub fn iter_mut_raw_match_order(&mut self) -> slice::IterMut<Component<'i, Impl>> {
+  pub fn iter_mut_raw_match_order(&mut self) -> slice::IterMut<'_, Component<'i, Impl>> {
     self.1.iter_mut()
   }
 
@@ -903,7 +903,7 @@ impl<'i, Impl: SelectorImpl<'i>> Selector<'i, Impl> {
   /// combinators, in parse order (from left to right), starting from
   /// `offset`.
   #[inline]
-  pub fn iter_raw_parse_order_from(&self, offset: usize) -> Rev<slice::Iter<Component<'i, Impl>>> {
+  pub fn iter_raw_parse_order_from(&self, offset: usize) -> Rev<slice::Iter<'_, Component<'i, Impl>>> {
     self.1[..self.len() - offset].iter().rev()
   }
 
@@ -3938,6 +3938,11 @@ pub mod tests {
     assert!(parse("::picker(select)").is_ok());
     assert!(parse("select::picker-icon").is_ok());
     assert!(parse("option::checkmark").is_ok());
+
+    assert!(parse("::grammar-error").is_ok());
+    assert!(parse("::spelling-error").is_ok());
+    assert!(parse("::part(mypart)::grammar-error").is_ok());
+    assert!(parse("::part(mypart)::spelling-error").is_ok());
   }
 
   #[test]
diff --git a/src/bundler.rs b/src/bundler.rs
index 00988487c..e5009a863 100644
--- a/src/bundler.rs
+++ b/src/bundler.rs
@@ -79,7 +79,7 @@ enum AtRuleParserValue<'a, T> {
 
 struct BundleStyleSheet<'i, 'o, T> {
   stylesheet: Option<StyleSheet<'i, 'o, T>>,
-  dependencies: Vec<u32>,
+  dependencies: Vec<Dependency>,
   css_modules_deps: Vec<u32>,
   parent_source_index: u32,
   parent_dep_index: u32,
@@ -89,6 +89,33 @@ struct BundleStyleSheet<'i, 'o, T> {
   loc: Location,
 }
 
+#[derive(Debug, Clone)]
+enum Dependency {
+  File(u32),
+  External(String),
+}
+
+/// The result of [SourceProvider::resolve].
+#[derive(Debug)]
+#[cfg_attr(
+  any(feature = "serde", feature = "nodejs"),
+  derive(serde::Deserialize),
+  serde(rename_all = "lowercase")
+)]
+pub enum ResolveResult {
+  /// An external URL.
+  External(String),
+  /// A file path.
+  #[serde(untagged)]
+  File(PathBuf),
+}
+
+impl From<PathBuf> for ResolveResult {
+  fn from(path: PathBuf) -> Self {
+    ResolveResult::File(path)
+  }
+}
+
 /// A trait to provide the contents of files to a Bundler.
 ///
 /// See [FileProvider](FileProvider) for an implementation that uses the
@@ -102,7 +129,7 @@ pub trait SourceProvider: Send + Sync {
 
   /// Resolves the given import specifier to a file path given the file
   /// which the import originated from.
-  fn resolve(&self, specifier: &str, originating_file: &Path) -> Result<PathBuf, Self::Error>;
+  fn resolve(&self, specifier: &str, originating_file: &Path) -> Result<ResolveResult, Self::Error>;
 }
 
 /// Provides an implementation of [SourceProvider](SourceProvider)
@@ -136,9 +163,9 @@ impl SourceProvider for FileProvider {
     Ok(unsafe { &*ptr })
   }
 
-  fn resolve(&self, specifier: &str, originating_file: &Path) -> Result<PathBuf, Self::Error> {
+  fn resolve(&self, specifier: &str, originating_file: &Path) -> Result<ResolveResult, Self::Error> {
     // Assume the specifier is a relative file path and join it with current path.
-    Ok(originating_file.with_file_name(specifier))
+    Ok(originating_file.with_file_name(specifier).into())
   }
 }
 
@@ -162,6 +189,11 @@ pub enum BundleErrorKind<'i, T: std::error::Error> {
   UnsupportedLayerCombination,
   /// Unsupported media query boolean logic was encountered.
   UnsupportedMediaBooleanLogic,
+  /// An external module was referenced with a CSS module "from" clause.
+  ReferencedExternalModuleWithCssModuleFrom,
+  /// An external `@import` was found after a bundled `@import`.
+  /// This may result in unintended selector order.
+  ExternalImportAfterBundledImport,
   /// A custom resolver error.
   ResolverError(#[cfg_attr(any(feature = "serde", feature = "nodejs"), serde(skip))] T),
 }
@@ -183,6 +215,13 @@ impl<'i, T: std::error::Error> std::fmt::Display for BundleErrorKind<'i, T> {
       UnsupportedImportCondition => write!(f, "Unsupported import condition"),
       UnsupportedLayerCombination => write!(f, "Unsupported layer combination in @import"),
       UnsupportedMediaBooleanLogic => write!(f, "Unsupported boolean logic in @import media query"),
+      ReferencedExternalModuleWithCssModuleFrom => {
+        write!(f, "Referenced external module with CSS module \"from\" clause")
+      }
+      ExternalImportAfterBundledImport => write!(
+        f,
+        "An external `@import` was found after a bundled `@import`. This may result in unintended selector order."
+      ),
       ResolverError(err) => std::fmt::Display::fmt(&err, f),
     }
   }
@@ -265,7 +304,7 @@ where
 
     // Phase 3: concatenate.
     let mut rules: Vec<CssRule<'a, T::AtRule>> = Vec::new();
-    self.inline(&mut rules);
+    self.inline(&mut rules)?;
 
     let sources = self
       .stylesheets
@@ -428,7 +467,7 @@ where
     }
 
     // Collect and load dependencies for this stylesheet in parallel.
-    let dependencies: Result<Vec<u32>, _> = stylesheet
+    let dependencies: Result<Vec<Dependency>, _> = stylesheet
       .rules
       .0
       .par_iter_mut()
@@ -484,16 +523,19 @@ where
           };
 
           let result = match self.fs.resolve(&specifier, file) {
-            Ok(path) => self.load_file(
-              &path,
-              ImportRule {
-                layer,
-                media,
-                supports: combine_supports(rule.supports.clone(), &import.supports),
-                url: "".into(),
-                loc: import.loc,
-              },
-            ),
+            Ok(ResolveResult::File(path)) => self
+              .load_file(
+                &path,
+                ImportRule {
+                  layer,
+                  media,
+                  supports: combine_supports(rule.supports.clone(), &import.supports),
+                  url: "".into(),
+                  loc: import.loc,
+                },
+              )
+              .map(Dependency::File),
+            Ok(ResolveResult::External(url)) => Ok(Dependency::External(url)),
             Err(err) => Err(Error {
               kind: BundleErrorKind::ResolverError(err),
               loc: Some(ErrorLocation::new(
@@ -580,7 +622,7 @@ where
   ) -> Option<Result<u32, Error<BundleErrorKind<'a, P::Error>>>> {
     if let Some(Specifier::File(f)) = specifier {
       let result = match self.fs.resolve(&f, file) {
-        Ok(path) => {
+        Ok(ResolveResult::File(path)) => {
           let res = self.load_file(
             &path,
             ImportRule {
@@ -602,6 +644,13 @@ where
 
           res
         }
+        Ok(ResolveResult::External(_)) => Err(Error {
+          kind: BundleErrorKind::ReferencedExternalModuleWithCssModuleFrom,
+          loc: Some(ErrorLocation::new(
+            style_loc,
+            self.find_filename(style_loc.source_index),
+          )),
+        }),
         Err(err) => Err(Error {
           kind: BundleErrorKind::ResolverError(err),
           loc: Some(ErrorLocation::new(
@@ -646,7 +695,9 @@ where
       }
 
       for i in 0..stylesheets[source_index as usize].dependencies.len() {
-        let dep_source_index = stylesheets[source_index as usize].dependencies[i];
+        let Dependency::File(dep_source_index) = stylesheets[source_index as usize].dependencies[i] else {
+          continue;
+        };
         let resolved = &mut stylesheets[dep_source_index as usize];
 
         // In browsers, every instance of an @import is evaluated, so we preserve the last.
@@ -659,14 +710,16 @@ where
     }
   }
 
-  fn inline(&mut self, dest: &mut Vec<CssRule<'a, T::AtRule>>) {
-    process(self.stylesheets.get_mut().unwrap(), 0, dest);
-
-    fn process<'a, T>(
+  fn inline(
+    &mut self,
+    dest: &mut Vec<CssRule<'a, T::AtRule>>,
+  ) -> Result<(), Error<BundleErrorKind<'a, P::Error>>> {
+    fn process<'a, T, E: std::error::Error>(
       stylesheets: &mut Vec<BundleStyleSheet<'a, '_, T>>,
       source_index: u32,
       dest: &mut Vec<CssRule<'a, T>>,
-    ) {
+      filename: &String,
+    ) -> Result<(), Error<BundleErrorKind<'a, E>>> {
       let stylesheet = &mut stylesheets[source_index as usize];
       let mut rules = std::mem::take(&mut stylesheet.stylesheet.as_mut().unwrap().rules.0);
 
@@ -678,26 +731,47 @@ where
 
         // Include the dependency if this is the first instance as computed earlier.
         if resolved.parent_source_index == source_index && resolved.parent_dep_index == dep_index as u32 {
-          process(stylesheets, dep_source_index, dest);
+          process(stylesheets, dep_source_index, dest, filename)?;
         }
 
         dep_index += 1;
       }
 
       let mut import_index = 0;
+      let mut has_bundled_import = false;
       for rule in &mut rules {
         match rule {
-          CssRule::Import(_) => {
-            let dep_source_index = stylesheets[source_index as usize].dependencies[import_index];
-            let resolved = &stylesheets[dep_source_index as usize];
-
-            // Include the dependency if this is the last instance as computed earlier.
-            if resolved.parent_source_index == source_index && resolved.parent_dep_index == dep_index {
-              process(stylesheets, dep_source_index, dest);
+          CssRule::Import(import_rule) => {
+            let dep_source = &stylesheets[source_index as usize].dependencies[import_index];
+            match dep_source {
+              Dependency::File(dep_source_index) => {
+                let resolved = &stylesheets[*dep_source_index as usize];
+
+                // Include the dependency if this is the last instance as computed earlier.
+                if resolved.parent_source_index == source_index && resolved.parent_dep_index == dep_index {
+                  has_bundled_import = true;
+                  process(stylesheets, *dep_source_index, dest, filename)?;
+                }
+
+                *rule = CssRule::Ignored;
+                dep_index += 1;
+              }
+              Dependency::External(url) => {
+                if has_bundled_import {
+                  return Err(Error {
+                    kind: BundleErrorKind::ExternalImportAfterBundledImport,
+                    loc: Some(ErrorLocation {
+                      filename: filename.clone(),
+                      line: import_rule.loc.line,
+                      column: import_rule.loc.column,
+                    }),
+                  });
+                }
+                import_rule.url = url.to_owned().into();
+                let imp = std::mem::replace(rule, CssRule::Ignored);
+                dest.push(imp);
+              }
             }
-
-            *rule = CssRule::Ignored;
-            dep_index += 1;
             import_index += 1;
           }
           CssRule::LayerStatement(_) => {
@@ -739,7 +813,10 @@ where
       }
 
       dest.extend(rules);
+      Ok(())
     }
+
+    process(self.stylesheets.get_mut().unwrap(), 0, dest, &self.options.filename)
   }
 }
 
@@ -823,8 +900,12 @@ mod tests {
       Ok(self.map.get(file).unwrap())
     }
 
-    fn resolve(&self, specifier: &str, originating_file: &Path) -> Result<PathBuf, Self::Error> {
-      Ok(originating_file.with_file_name(specifier))
+    fn resolve(&self, specifier: &str, originating_file: &Path) -> Result<ResolveResult, Self::Error> {
+      if specifier.starts_with("https:") {
+        Ok(ResolveResult::External(specifier.to_owned()))
+      } else {
+        Ok(originating_file.with_file_name(specifier).into())
+      }
     }
   }
 
@@ -843,9 +924,9 @@ mod tests {
 
     /// Resolve by stripping a `foo:` prefix off any import. Specifiers without
     /// this prefix fail with an error.
-    fn resolve(&self, specifier: &str, _originating_file: &Path) -> Result<PathBuf, Self::Error> {
+    fn resolve(&self, specifier: &str, _originating_file: &Path) -> Result<ResolveResult, Self::Error> {
       if specifier.starts_with("foo:") {
-        Ok(Path::new(&specifier["foo:".len()..]).to_path_buf())
+        Ok(Path::new(&specifier["foo:".len()..]).to_path_buf().into())
       } else {
         let err = std::io::Error::new(
           std::io::ErrorKind::NotFound,
@@ -1548,6 +1629,49 @@ mod tests {
     "#}
     );
 
+    let res = bundle(
+      TestProvider {
+        map: fs! {
+          "/a.css": r#"
+          @import url('https://fonts.googleapis.com/css2?family=Roboto&display=swap');
+          @import './b.css';
+        "#,
+          "/b.css": r#"
+          .b { color: green }
+        "#
+        },
+      },
+      "/a.css",
+    );
+    assert_eq!(
+      res,
+      indoc! { r#"
+        @import "https://fonts.googleapis.com/css2?family=Roboto&display=swap";
+
+        .b {
+          color: green;
+        }
+    "#}
+    );
+
+    error_test(
+      TestProvider {
+        map: fs! {
+          "/a.css": r#"
+          @import './b.css';
+          @import url('https://fonts.googleapis.com/css2?family=Roboto&display=swap');
+        "#,
+          "/b.css": r#"
+          .b { color: green }
+        "#
+        },
+      },
+      "/a.css",
+      Some(Box::new(|err| {
+        assert!(matches!(err, BundleErrorKind::ExternalImportAfterBundledImport));
+      })),
+    );
+
     error_test(
       TestProvider {
         map: fs! {
diff --git a/src/compat.rs b/src/compat.rs
index 592a7eaff..f0c828d75 100644
--- a/src/compat.rs
+++ b/src/compat.rs
@@ -87,6 +87,7 @@ pub enum Feature {
   Gencontent,
   GeorgianListStyleType,
   GradientInterpolationHints,
+  GrammarError,
   GujaratiListStyleType,
   GurmukhiListStyleType,
   HasSelector,
@@ -99,7 +100,6 @@ pub enum Feature {
   ImageSet,
   InOutOfRange,
   IndeterminatePseudo,
-  IsAnimatableSize,
   IsSelector,
   JapaneseFormalListStyleType,
   JapaneseInformalListStyleType,
@@ -143,7 +143,6 @@ pub enum Feature {
   MinFunction,
   ModFunction,
   MongolianListStyleType,
-  MozAvailableSize,
   MyanmarListStyleType,
   Namespaces,
   Nesting,
@@ -190,7 +189,9 @@ pub enum Feature {
   SimpChineseInformalListStyleType,
   SomaliListStyleType,
   SpaceSeparatedColorNotation,
+  SpellingError,
   SquareListStyleType,
+  StatePseudoClass,
   StretchSize,
   StringListStyleType,
   SymbolsListStyleType,
@@ -451,7 +452,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -543,7 +544,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -588,7 +589,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -633,7 +634,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -678,7 +679,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -723,7 +724,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -768,7 +769,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -813,7 +814,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -905,7 +906,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -950,7 +951,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -1020,7 +1021,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -1065,7 +1066,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -1155,7 +1156,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -1200,7 +1201,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -1250,7 +1251,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -1337,7 +1338,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -1382,7 +1383,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -1427,7 +1428,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -1472,7 +1473,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -1517,7 +1518,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -1562,7 +1563,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -1629,7 +1630,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8847360 {
+          if version < 9371648 {
             return false;
           }
         }
@@ -1642,7 +1643,7 @@ impl Feature {
           return false;
         }
       }
-      Feature::CustomMediaQueries | Feature::FitContentFunctionSize | Feature::StretchSize => return false,
+      Feature::CustomMediaQueries | Feature::FitContentFunctionSize => return false,
       Feature::DoublePositionGradients => {
         if let Some(version) = browsers.chrome {
           if version < 4653056 {
@@ -2215,7 +2216,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.samsung {
-          if version < 327680 {
+          if version < 458752 {
             return false;
           }
         }
@@ -2519,6 +2520,16 @@ impl Feature {
             return false;
           }
         }
+        if let Some(version) = browsers.safari {
+          if version < 1704448 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.ios_saf {
+          if version < 1704448 {
+            return false;
+          }
+        }
         if let Some(version) = browsers.samsung {
           if version < 917504 {
             return false;
@@ -2529,7 +2540,7 @@ impl Feature {
             return false;
           }
         }
-        if browsers.ie.is_some() || browsers.ios_saf.is_some() || browsers.safari.is_some() {
+        if browsers.ie.is_some() {
           return false;
         }
       }
@@ -2934,11 +2945,26 @@ impl Feature {
         }
       }
       Feature::AbsFunction | Feature::SignFunction => {
+        if let Some(version) = browsers.chrome {
+          if version < 9043968 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.edge {
+          if version < 9043968 {
+            return false;
+          }
+        }
         if let Some(version) = browsers.firefox {
           if version < 7733248 {
             return false;
           }
         }
+        if let Some(version) = browsers.opera {
+          if version < 5963776 {
+            return false;
+          }
+        }
         if let Some(version) = browsers.safari {
           if version < 984064 {
             return false;
@@ -2949,13 +2975,12 @@ impl Feature {
             return false;
           }
         }
-        if browsers.android.is_some()
-          || browsers.chrome.is_some()
-          || browsers.edge.is_some()
-          || browsers.ie.is_some()
-          || browsers.opera.is_some()
-          || browsers.samsung.is_some()
-        {
+        if let Some(version) = browsers.android {
+          if version < 9043968 {
+            return false;
+          }
+        }
+        if browsers.ie.is_some() || browsers.samsung.is_some() {
           return false;
         }
       }
@@ -3486,6 +3511,11 @@ impl Feature {
             return false;
           }
         }
+        if let Some(version) = browsers.firefox {
+          if version < 9437184 {
+            return false;
+          }
+        }
         if let Some(version) = browsers.opera {
           if version < 4849664 {
             return false;
@@ -3511,7 +3541,7 @@ impl Feature {
             return false;
           }
         }
-        if browsers.firefox.is_some() || browsers.ie.is_some() {
+        if browsers.ie.is_some() {
           return false;
         }
       }
@@ -3526,6 +3556,11 @@ impl Feature {
             return false;
           }
         }
+        if let Some(version) = browsers.firefox {
+          if version < 9371648 {
+            return false;
+          }
+        }
         if let Some(version) = browsers.opera {
           if version < 5701632 {
             return false;
@@ -3541,12 +3576,17 @@ impl Feature {
             return false;
           }
         }
+        if let Some(version) = browsers.samsung {
+          if version < 1900544 {
+            return false;
+          }
+        }
         if let Some(version) = browsers.android {
           if version < 8585216 {
             return false;
           }
         }
-        if browsers.firefox.is_some() || browsers.ie.is_some() || browsers.samsung.is_some() {
+        if browsers.ie.is_some() {
           return false;
         }
       }
@@ -3597,22 +3637,27 @@ impl Feature {
       }
       Feature::Picker => {
         if let Some(version) = browsers.chrome {
-          if version < 8781824 {
+          if version < 8847360 {
             return false;
           }
         }
         if let Some(version) = browsers.edge {
-          if version < 8781824 {
+          if version < 8847360 {
             return false;
           }
         }
         if let Some(version) = browsers.opera {
-          if version < 5767168 {
+          if version < 5832704 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.samsung {
+          if version < 1900544 {
             return false;
           }
         }
         if let Some(version) = browsers.android {
-          if version < 8781824 {
+          if version < 8847360 {
             return false;
           }
         }
@@ -3620,7 +3665,6 @@ impl Feature {
           || browsers.ie.is_some()
           || browsers.ios_saf.is_some()
           || browsers.safari.is_some()
-          || browsers.samsung.is_some()
         {
           return false;
         }
@@ -3641,6 +3685,11 @@ impl Feature {
             return false;
           }
         }
+        if let Some(version) = browsers.samsung {
+          if version < 1900544 {
+            return false;
+          }
+        }
         if let Some(version) = browsers.android {
           if version < 8716288 {
             return false;
@@ -3650,11 +3699,95 @@ impl Feature {
           || browsers.ie.is_some()
           || browsers.ios_saf.is_some()
           || browsers.safari.is_some()
-          || browsers.samsung.is_some()
         {
           return false;
         }
       }
+      Feature::GrammarError | Feature::SpellingError => {
+        if let Some(version) = browsers.chrome {
+          if version < 7929856 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.edge {
+          if version < 7929856 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.opera {
+          if version < 5308416 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.safari {
+          if version < 1115136 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.ios_saf {
+          if version < 1115136 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.samsung {
+          if version < 1638400 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.android {
+          if version < 7929856 {
+            return false;
+          }
+        }
+        if browsers.firefox.is_some() || browsers.ie.is_some() {
+          return false;
+        }
+      }
+      Feature::StatePseudoClass => {
+        if let Some(version) = browsers.chrome {
+          if version < 8192000 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.edge {
+          if version < 8192000 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.firefox {
+          if version < 8257536 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.opera {
+          if version < 5439488 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.safari {
+          if version < 1115136 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.ios_saf {
+          if version < 1115136 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.samsung {
+          if version < 1769472 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.android {
+          if version < 8192000 {
+            return false;
+          }
+        }
+        if browsers.ie.is_some() {
+          return false;
+        }
+      }
       Feature::QUnit => {
         if let Some(version) = browsers.chrome {
           if version < 4128768 {
@@ -4036,6 +4169,11 @@ impl Feature {
             return false;
           }
         }
+        if let Some(version) = browsers.firefox {
+          if version < 9633792 {
+            return false;
+          }
+        }
         if let Some(version) = browsers.opera {
           if version < 5177344 {
             return false;
@@ -4061,7 +4199,7 @@ impl Feature {
             return false;
           }
         }
-        if browsers.firefox.is_some() || browsers.ie.is_some() {
+        if browsers.ie.is_some() {
           return false;
         }
       }
@@ -4076,6 +4214,11 @@ impl Feature {
             return false;
           }
         }
+        if let Some(version) = browsers.firefox {
+          if version < 9633792 {
+            return false;
+          }
+        }
         if let Some(version) = browsers.opera {
           if version < 4915200 {
             return false;
@@ -4101,7 +4244,7 @@ impl Feature {
             return false;
           }
         }
-        if browsers.firefox.is_some() || browsers.ie.is_some() {
+        if browsers.ie.is_some() {
           return false;
         }
       }
@@ -5332,67 +5475,33 @@ impl Feature {
             return false;
           }
         }
-        if let Some(version) = browsers.opera {
-          if version < 5439488 {
-            return false;
-          }
-        }
-        if let Some(version) = browsers.samsung {
-          if version < 1769472 {
-            return false;
-          }
-        }
-        if let Some(version) = browsers.android {
-          if version < 8192000 {
-            return false;
-          }
-        }
-        if browsers.firefox.is_some()
-          || browsers.ie.is_some()
-          || browsers.ios_saf.is_some()
-          || browsers.safari.is_some()
-        {
-          return false;
-        }
-      }
-      Feature::FitContentSize => {
-        if let Some(version) = browsers.chrome {
-          if version < 1638400 {
-            return false;
-          }
-        }
-        if let Some(version) = browsers.edge {
-          if version < 5177344 {
-            return false;
-          }
-        }
         if let Some(version) = browsers.firefox {
-          if version < 262144 {
+          if version < 9633792 {
             return false;
           }
         }
         if let Some(version) = browsers.opera {
-          if version < 917504 {
+          if version < 5439488 {
             return false;
           }
         }
         if let Some(version) = browsers.safari {
-          if version < 458752 {
+          if version < 1703936 {
             return false;
           }
         }
         if let Some(version) = browsers.ios_saf {
-          if version < 458752 {
+          if version < 1703936 {
             return false;
           }
         }
         if let Some(version) = browsers.samsung {
-          if version < 66816 {
+          if version < 1769472 {
             return false;
           }
         }
         if let Some(version) = browsers.android {
-          if version < 263168 {
+          if version < 8192000 {
             return false;
           }
         }
@@ -5400,24 +5509,19 @@ impl Feature {
           return false;
         }
       }
-      Feature::IsAnimatableSize => {
+      Feature::FitContentSize => {
         if let Some(version) = browsers.chrome {
-          if version < 1703936 {
+          if version < 1638400 {
             return false;
           }
         }
         if let Some(version) = browsers.edge {
-          if version < 786432 {
+          if version < 5177344 {
             return false;
           }
         }
         if let Some(version) = browsers.firefox {
-          if version < 1048576 {
-            return false;
-          }
-        }
-        if let Some(version) = browsers.ie {
-          if version < 720896 {
+          if version < 262144 {
             return false;
           }
         }
@@ -5446,6 +5550,9 @@ impl Feature {
             return false;
           }
         }
+        if browsers.ie.is_some() {
+          return false;
+        }
       }
       Feature::MaxContentSize => {
         if let Some(version) = browsers.chrome {
@@ -5537,49 +5644,54 @@ impl Feature {
           return false;
         }
       }
-      Feature::WebkitFillAvailableSize => {
+      Feature::StretchSize => {
         if let Some(version) = browsers.chrome {
-          if version < 1638400 {
+          if version < 9043968 {
             return false;
           }
         }
         if let Some(version) = browsers.edge {
-          if version < 5177344 {
+          if version < 9043968 {
             return false;
           }
         }
         if let Some(version) = browsers.opera {
-          if version < 917504 {
+          if version < 5963776 {
             return false;
           }
         }
-        if let Some(version) = browsers.safari {
-          if version < 458752 {
+        if let Some(version) = browsers.android {
+          if version < 9043968 {
             return false;
           }
         }
-        if let Some(version) = browsers.ios_saf {
-          if version < 458752 {
+        if browsers.firefox.is_some()
+          || browsers.ie.is_some()
+          || browsers.ios_saf.is_some()
+          || browsers.safari.is_some()
+          || browsers.samsung.is_some()
+        {
+          return false;
+        }
+      }
+      Feature::WebkitFillAvailableSize => {
+        if let Some(version) = browsers.firefox {
+          if version < 9568256 {
             return false;
           }
         }
-        if let Some(version) = browsers.samsung {
-          if version < 327680 {
+        if let Some(version) = browsers.safari {
+          if version < 458752 {
             return false;
           }
         }
-        if let Some(version) = browsers.android {
-          if version < 263168 {
+        if let Some(version) = browsers.ios_saf {
+          if version < 458752 {
             return false;
           }
         }
-        if browsers.firefox.is_some() || browsers.ie.is_some() {
-          return false;
-        }
-      }
-      Feature::MozAvailableSize => {
-        if let Some(version) = browsers.firefox {
-          if version < 262144 {
+        if let Some(version) = browsers.samsung {
+          if version < 327680 {
             return false;
           }
         }
@@ -5587,10 +5699,7 @@ impl Feature {
           || browsers.chrome.is_some()
           || browsers.edge.is_some()
           || browsers.ie.is_some()
-          || browsers.ios_saf.is_some()
           || browsers.opera.is_some()
-          || browsers.safari.is_some()
-          || browsers.samsung.is_some()
         {
           return false;
         }
@@ -5628,63 +5737,90 @@ impl Feature {
       if self.is_compatible(browsers) {
         return true;
       }
-      browsers.android = None;
+      #[allow(unused_assignments)]
+      {
+        browsers.android = None;
+      }
     }
     if targets.chrome.is_some() {
       browsers.chrome = targets.chrome;
       if self.is_compatible(browsers) {
         return true;
       }
-      browsers.chrome = None;
+      #[allow(unused_assignments)]
+      {
+        browsers.chrome = None;
+      }
     }
     if targets.edge.is_some() {
       browsers.edge = targets.edge;
       if self.is_compatible(browsers) {
         return true;
       }
-      browsers.edge = None;
+      #[allow(unused_assignments)]
+      {
+        browsers.edge = None;
+      }
     }
     if targets.firefox.is_some() {
       browsers.firefox = targets.firefox;
       if self.is_compatible(browsers) {
         return true;
       }
-      browsers.firefox = None;
+      #[allow(unused_assignments)]
+      {
+        browsers.firefox = None;
+      }
     }
     if targets.ie.is_some() {
       browsers.ie = targets.ie;
       if self.is_compatible(browsers) {
         return true;
       }
-      browsers.ie = None;
+      #[allow(unused_assignments)]
+      {
+        browsers.ie = None;
+      }
     }
     if targets.ios_saf.is_some() {
       browsers.ios_saf = targets.ios_saf;
       if self.is_compatible(browsers) {
         return true;
       }
-      browsers.ios_saf = None;
+      #[allow(unused_assignments)]
+      {
+        browsers.ios_saf = None;
+      }
     }
     if targets.opera.is_some() {
       browsers.opera = targets.opera;
       if self.is_compatible(browsers) {
         return true;
       }
-      browsers.opera = None;
+      #[allow(unused_assignments)]
+      {
+        browsers.opera = None;
+      }
     }
     if targets.safari.is_some() {
       browsers.safari = targets.safari;
       if self.is_compatible(browsers) {
         return true;
       }
-      browsers.safari = None;
+      #[allow(unused_assignments)]
+      {
+        browsers.safari = None;
+      }
     }
     if targets.samsung.is_some() {
       browsers.samsung = targets.samsung;
       if self.is_compatible(browsers) {
         return true;
       }
-      browsers.samsung = None;
+      #[allow(unused_assignments)]
+      {
+        browsers.samsung = None;
+      }
     }
 
     false
diff --git a/src/error.rs b/src/error.rs
index 4cca10692..b4b1b0ab8 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -84,6 +84,8 @@ pub enum ParserError<'i> {
   InvalidDeclaration,
   /// A media query was invalid.
   InvalidMediaQuery,
+  /// The brackets in a condition cannot be empty.
+  EmptyBracketInCondition,
   /// Invalid CSS nesting.
   InvalidNesting,
   /// The @nest rule is deprecated.
@@ -118,6 +120,7 @@ impl<'i> fmt::Display for ParserError<'i> {
       EndOfInput => write!(f, "Unexpected end of input"),
       InvalidDeclaration => write!(f, "Invalid declaration"),
       InvalidMediaQuery => write!(f, "Invalid media query"),
+      EmptyBracketInCondition => write!(f, "The brackets cannot be empty"),
       InvalidNesting => write!(f, "Invalid nesting"),
       DeprecatedNestRule => write!(f, "The @nest rule is deprecated"),
       DeprecatedCssModulesValueRule => write!(f, "The @value rule is deprecated"),
diff --git a/src/lib.rs b/src/lib.rs
index bcd47649c..2a41655ee 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -79,6 +79,13 @@ mod tests {
     assert_eq!(res.code, expected);
   }
 
+  fn test_with_printer_options<'i, 'o>(source: &'i str, expected: &'i str, options: PrinterOptions<'o>) {
+    let mut stylesheet = StyleSheet::parse(&source, ParserOptions::default()).unwrap();
+    stylesheet.minify(MinifyOptions::default()).unwrap();
+    let res = stylesheet.to_css(options).unwrap();
+    assert_eq!(res.code, expected);
+  }
+
   fn minify_test(source: &str, expected: &str) {
     minify_test_with_options(source, expected, ParserOptions::default())
   }
@@ -237,20 +244,23 @@ mod tests {
     }
   }
 
-  fn error_recovery_test(source: &str) {
+  fn error_recovery_test(source: &str) -> Vec<Error<ParserError<'_>>> {
     let warnings = Arc::new(RwLock::default());
-    let res = StyleSheet::parse(
-      &source,
-      ParserOptions {
-        error_recovery: true,
-        warnings: Some(warnings.clone()),
-        ..Default::default()
-      },
-    );
-    match res {
-      Ok(..) => {}
-      Err(e) => unreachable!("parser error should be recovered, but got {e:?}"),
+    {
+      let res = StyleSheet::parse(
+        &source,
+        ParserOptions {
+          error_recovery: true,
+          warnings: Some(warnings.clone()),
+          ..Default::default()
+        },
+      );
+      match res {
+        Ok(..) => {}
+        Err(e) => unreachable!("parser error should be recovered, but got {e:?}"),
+      }
     }
+    Arc::into_inner(warnings).unwrap().into_inner().unwrap()
   }
 
   fn css_modules_error_test(source: &str, error: ParserError) {
@@ -385,6 +395,122 @@ mod tests {
     );
   }
 
+  #[test]
+  pub fn test_math_fn() {
+    // max()
+    minify_test(
+      r#"
+      .foo {
+        color: rgb(max(255, 100), 0, 0);
+      }
+    "#,
+      indoc! {".foo{color:red}"
+      },
+    );
+    // min()
+    minify_test(
+      r#"
+      .foo {
+        color: rgb(min(255, 500), 0, 0);
+      }
+    "#,
+      indoc! {".foo{color:red}"
+      },
+    );
+    // abs()
+    minify_test(
+      r#"
+      .foo {
+        color: rgb(abs(-255), 0, 0);
+      }
+    "#,
+      indoc! {".foo{color:red}"
+      },
+    );
+    // clamp()
+    minify_test(
+      r#"
+      .foo {
+        flex: clamp(1, 5.20, 20);
+        color: rgb(clamp(0, 255, 300), 0, 0);
+      }
+    "#,
+      indoc! {".foo{color:red;flex:5.2}"
+      },
+    );
+    // round()
+    minify_test(
+      r#"
+      .round-color {
+        color: rgb(round(down, 255.6, 1), 0, 0);
+      }
+    "#,
+      indoc! {".round-color{color:red}"
+      },
+    );
+    // hypot()
+    minify_test(
+      r#"
+      .hypot-color {
+        color: rgb(hypot(255, 0), 0, 0);
+      }
+    "#,
+      indoc! {".hypot-color{color:red}"
+      },
+    );
+    // sign(), sign(50) = 1
+    minify_test(
+      r#"
+      .sign-color {
+        color: rgb(sign(50), 0, 0);
+      }
+    "#,
+      indoc! {".sign-color{color:#010000}"
+      },
+    );
+    // rem(), rem(21, 2) = 1
+    minify_test(
+      r#"
+      .rem-color {
+        color: rgb(rem(21, 2), 0, 0);
+      }
+    "#,
+      indoc! {".rem-color{color:#010000}"
+      },
+    );
+    // max() in width
+    minify_test(
+      r#"
+      .foo {
+        width: max(200px,   5px);
+      }
+    "#,
+      indoc! {".foo{width:200px}"
+      },
+    );
+    // max() in opacity
+    minify_test(
+      r#"
+      .foo {
+        opacity: max(1, 0.2);
+        filter: invert(min(1, 0.5));
+      }
+    "#,
+      indoc! {".foo{opacity:1;filter:invert(.5)}"
+      },
+    );
+    // TODO: support calc in Integer
+    // minify_test(
+    //   r#"
+    //   .foo {
+    //     z-index: max(100,    20);
+    //   }
+    // "#,
+    //   indoc! {".foo{z-index:100}"
+    //   },
+    // );
+  }
+
   #[test]
   pub fn test_border() {
     test(
@@ -4188,12 +4314,24 @@ mod tests {
     );
     minify_test(
       ".foo { background-position: left 10px center }",
-      ".foo{background-position:10px 50%}",
+      ".foo{background-position:10px}",
     );
     minify_test(
       ".foo { background-position: right 10px center }",
       ".foo{background-position:right 10px center}",
     );
+    minify_test(
+      ".foo { background-position: center top 10px }",
+      ".foo{background-position:50% 10px}",
+    );
+    minify_test(
+      ".foo { background-position: center bottom 10px }",
+      ".foo{background-position:center bottom 10px}",
+    );
+    minify_test(
+      ".foo { background-position: center 10px }",
+      ".foo{background-position:50% 10px}",
+    );
     minify_test(
       ".foo { background-position: right 10px top 20px }",
       ".foo{background-position:right 10px top 20px}",
@@ -4214,6 +4352,26 @@ mod tests {
       ".foo { background-position: bottom right }",
       ".foo{background-position:100% 100%}",
     );
+    minify_test(
+      ".foo { background-position: center top }",
+      ".foo{background-position:top}",
+    );
+    minify_test(
+      ".foo { background-position: center bottom }",
+      ".foo{background-position:bottom}",
+    );
+    minify_test(
+      ".foo { background-position: left center }",
+      ".foo{background-position:0}",
+    );
+    minify_test(
+      ".foo { background-position: right center }",
+      ".foo{background-position:100%}",
+    );
+    minify_test(
+      ".foo { background-position: 20px center }",
+      ".foo{background-position:20px}",
+    );
 
     minify_test(
       ".foo { background: url('img-sprite.png') no-repeat bottom right }",
@@ -6965,6 +7123,10 @@ mod tests {
         &format!(":root::{}(.foo.bar) {{position: fixed}}", name),
         &format!(":root::{}(.foo.bar){{position:fixed}}", name),
       );
+      minify_test(
+        &format!(":root::{}(  .foo.bar  ) {{position: fixed}}", name),
+        &format!(":root::{}(.foo.bar){{position:fixed}}", name),
+      );
       error_test(
         &format!(":root::{}(foo):first-child {{position: fixed}}", name),
         ParserError::SelectorError(SelectorError::InvalidPseudoClassAfterPseudoElement),
@@ -6998,7 +7160,56 @@ mod tests {
         ParserError::SelectorError(SelectorError::InvalidState),
       );
     }
+    minify_test(
+      "wa-checkbox:state(disabled) {color:red}",
+      "wa-checkbox:state(disabled){color:red}",
+    );
+    minify_test(
+      "button:state(checked) {background:blue}",
+      "button:state(checked){background:#00f}",
+    );
+    minify_test(
+      "input:state(custom-state) {border:1px solid}",
+      "input:state(custom-state){border:1px solid}",
+    );
+    minify_test(
+      "button:active:not(:state(disabled))::part(control) {border:1px solid}",
+      "button:active:not(:state(disabled))::part(control){border:1px solid}",
+    );
+    // Test nested CSS with :state() selector
+    nesting_test(
+      r#"
+        custom-element {
+          color: blue;
+          &:state(loading) {
+            opacity: 0.5;
+            & .spinner {
+              display: block;
+            }
+          }
+          &:state(error) {
+            border: 2px solid red;
+          }
+        }
+      "#,
+      indoc! {r#"
+        custom-element {
+          color: #00f;
+        }
+
+        custom-element:state(loading) {
+          opacity: .5;
+        }
 
+        custom-element:state(loading) .spinner {
+          display: block;
+        }
+
+        custom-element:state(error) {
+          border: 2px solid red;
+        }
+      "#},
+    );
     minify_test(".foo ::deep .bar {width: 20px}", ".foo ::deep .bar{width:20px}");
     minify_test(".foo::deep .bar {width: 20px}", ".foo::deep .bar{width:20px}");
     minify_test(".foo ::deep.bar {width: 20px}", ".foo ::deep.bar{width:20px}");
@@ -8013,7 +8224,22 @@ mod tests {
     );
     minify_test(
       ".foo { width: calc(100% - 2 (2 * var(--card-margin))); }",
-      ".foo{width:calc(100% - 2 (2*var(--card-margin)))}",
+      ".foo{width:calc(100% - 2 (2 * var(--card-margin)))}",
+    );
+
+    test(
+      indoc! {r#"
+    .test {
+      width: calc(var(--test) + 2px);
+      width: calc(var(--test) - 2px);
+    }
+    "#},
+      indoc! {r#"
+    .test {
+      width: calc(var(--test) + 2px);
+      width: calc(var(--test) - 2px);
+    }
+    "#},
     );
   }
 
@@ -8055,13 +8281,13 @@ mod tests {
     minify_test(".foo { rotate: acos(cos(45deg))", ".foo{rotate:45deg}");
     minify_test(".foo { rotate: acos(-1)", ".foo{rotate:180deg}");
     minify_test(".foo { rotate: acos(0)", ".foo{rotate:90deg}");
-    minify_test(".foo { rotate: acos(1)", ".foo{rotate:none}");
+    minify_test(".foo { rotate: acos(1)", ".foo{rotate:0deg}");
     minify_test(".foo { rotate: acos(45deg)", ".foo{rotate:acos(45deg)}"); // invalid
     minify_test(".foo { rotate: acos(-20)", ".foo{rotate:acos(-20)}"); // evaluates to NaN
 
     minify_test(".foo { rotate: atan(tan(45deg))", ".foo{rotate:45deg}");
     minify_test(".foo { rotate: atan(1)", ".foo{rotate:45deg}");
-    minify_test(".foo { rotate: atan(0)", ".foo{rotate:none}");
+    minify_test(".foo { rotate: atan(0)", ".foo{rotate:0deg}");
     minify_test(".foo { rotate: atan(45deg)", ".foo{rotate:atan(45deg)}"); // invalid
 
     minify_test(".foo { rotate: atan2(1px, -1px)", ".foo{rotate:135deg}");
@@ -8074,7 +8300,10 @@ mod tests {
     minify_test(".foo { rotate: atan2(0, -1)", ".foo{rotate:180deg}");
     minify_test(".foo { rotate: atan2(-1, 1)", ".foo{rotate:-45deg}");
     // incompatible units
-    minify_test(".foo { rotate: atan2(1px, -1vw)", ".foo{rotate:atan2(1px,-1vw)}");
+    minify_test(".foo { rotate: atan2(1px, -1vw)", ".foo{rotate:atan2(1px, -1vw)}");
+
+    minify_test(".foo { transform: rotate(acos(1)) }", ".foo{transform:rotate(0)}");
+    minify_test(".foo { transform: rotate(atan(0)) }", ".foo{transform:rotate(0)}");
   }
 
   #[test]
@@ -8106,7 +8335,10 @@ mod tests {
     minify_test(".foo { width: abs(1%)", ".foo{width:abs(1%)}"); // spec says percentages must be against resolved value
 
     minify_test(".foo { width: calc(10px * sign(-1vw)", ".foo{width:-10px}");
-    minify_test(".foo { width: calc(10px * sign(1%)", ".foo{width:calc(10px*sign(1%))}");
+    minify_test(
+      ".foo { width: calc(10px * sign(1%)",
+      ".foo{width:calc(10px * sign(1%))}",
+    );
   }
 
   #[test]
@@ -9064,6 +9296,31 @@ mod tests {
       },
     );
 
+    test_with_printer_options(
+      r#"
+        @media (width < 256px) or (hover: none) {
+          .foo {
+            color: #fff;
+          }
+        }
+      "#,
+      indoc! { r#"
+        @media (not (min-width: 256px)) or (hover: none) {
+          .foo {
+            color: #fff;
+          }
+        }
+      "#},
+      PrinterOptions {
+        targets: Targets {
+          browsers: None,
+          include: Features::MediaRangeSyntax,
+          exclude: Features::empty(),
+        },
+        ..Default::default()
+      },
+    );
+
     error_test(
       "@media (min-width: hi) { .foo { color: chartreuse }}",
       ParserError::InvalidMediaQuery,
@@ -9108,6 +9365,16 @@ mod tests {
       "@media (prefers-color-scheme = dark) { .foo { color: chartreuse }}",
       ParserError::InvalidMediaQuery,
     );
+    error_test(
+      "@media unknown(foo) {}",
+      ParserError::UnexpectedToken(crate::properties::custom::Token::Function("unknown".into())),
+    );
+
+    // empty brackets should return a clearer error message
+    error_test("@media () {}", ParserError::EmptyBracketInCondition);
+    error_test("@media screen and () {}", ParserError::EmptyBracketInCondition);
+
+    error_recovery_test("@media unknown(foo) {}");
   }
 
   #[test]
@@ -12366,6 +12633,35 @@ mod tests {
 
   #[test]
   fn test_transform() {
+    test(
+      ".foo { transform: perspective(500px)translate3d(10px, 0, 20px)rotateY(30deg) }",
+      indoc! {r#"
+      .foo {
+        transform: perspective(500px) translate3d(10px, 0, 20px) rotateY(30deg);
+      }
+      "#},
+    );
+    test(
+      ".foo { transform: translate3d(12px,50%,3em)scale(2,.5) }",
+      indoc! {r#"
+      .foo {
+        transform: translate3d(12px, 50%, 3em) scale(2, .5);
+      }
+      "#},
+    );
+    test(
+      ".foo { transform:matrix(1,2,-1,1,80,80) }",
+      indoc! {r#"
+      .foo {
+        transform: matrix(1, 2, -1, 1, 80, 80);
+      }
+      "#},
+    );
+
+    minify_test(
+      ".foo { transform: scale(  0.5 )translateX(10px ) }",
+      ".foo{transform:scale(.5)translate(10px)}",
+    );
     minify_test(
       ".foo { transform: translate(2px, 3px)",
       ".foo{transform:translate(2px,3px)}",
@@ -12568,16 +12864,31 @@ mod tests {
     minify_test(".foo { translate: 1px 2px 0px }", ".foo{translate:1px 2px}");
     minify_test(".foo { translate: 1px 0px 2px }", ".foo{translate:1px 0 2px}");
     minify_test(".foo { translate: none }", ".foo{translate:none}");
+    minify_test(".foo { rotate: none }", ".foo{rotate:none}");
+    minify_test(".foo { rotate: 0deg }", ".foo{rotate:0deg}");
+    minify_test(".foo { rotate: -0deg }", ".foo{rotate:0deg}");
     minify_test(".foo { rotate: 10deg }", ".foo{rotate:10deg}");
     minify_test(".foo { rotate: z 10deg }", ".foo{rotate:10deg}");
     minify_test(".foo { rotate: 0 0 1 10deg }", ".foo{rotate:10deg}");
     minify_test(".foo { rotate: x 10deg }", ".foo{rotate:x 10deg}");
     minify_test(".foo { rotate: 1 0 0 10deg }", ".foo{rotate:x 10deg}");
-    minify_test(".foo { rotate: y 10deg }", ".foo{rotate:y 10deg}");
+    minify_test(".foo { rotate: 2 0 0 10deg }", ".foo{rotate:x 10deg}");
+    minify_test(".foo { rotate: 0 2 0 10deg }", ".foo{rotate:y 10deg}");
+    minify_test(".foo { rotate: 0 0 2 10deg }", ".foo{rotate:10deg}");
+    minify_test(".foo { rotate: 0 0 5.3 10deg }", ".foo{rotate:10deg}");
+    minify_test(".foo { rotate: 0 0 1 0deg }", ".foo{rotate:0deg}");
+    minify_test(".foo { rotate: 10deg 0 0 -1 }", ".foo{rotate:-10deg}");
+    minify_test(".foo { rotate: 10deg 0 0 -233 }", ".foo{rotate:-10deg}");
+    minify_test(".foo { rotate: -1 0 0 0deg }", ".foo{rotate:x 0deg}");
+    minify_test(".foo { rotate: 0deg 0 0 1 }", ".foo{rotate:0deg}");
+    minify_test(".foo { rotate: 0deg 0 0 -1 }", ".foo{rotate:0deg}");
     minify_test(".foo { rotate: 0 1 0 10deg }", ".foo{rotate:y 10deg}");
+    minify_test(".foo { rotate: x 0rad }", ".foo{rotate:x 0deg}");
+    // TODO: In minify mode, convert units to the shortest form.
+    // minify_test(".foo { rotate: y 0turn }", ".foo{rotate:y 0deg}");
+    minify_test(".foo { rotate: z 0deg }", ".foo{rotate:0deg}");
+    minify_test(".foo { rotate: 10deg y }", ".foo{rotate:y 10deg}");
     minify_test(".foo { rotate: 1 1 1 10deg }", ".foo{rotate:1 1 1 10deg}");
-    minify_test(".foo { rotate: 0 0 1 0deg }", ".foo{rotate:none}");
-    minify_test(".foo { rotate: none }", ".foo{rotate:none}");
     minify_test(".foo { scale: 1 }", ".foo{scale:1}");
     minify_test(".foo { scale: 1 1 }", ".foo{scale:1}");
     minify_test(".foo { scale: 1 1 1 }", ".foo{scale:1}");
@@ -13909,7 +14220,7 @@ mod tests {
     // ref: https://github.com/parcel-bundler/lightningcss/pull/255#issuecomment-1219049998
     minify_test(
       "@font-face {src: url(\"foo.ttf\") tech(palettes  color-colrv0  variations) format(opentype);}",
-      "@font-face{src:url(foo.ttf) tech(palettes color-colrv0 variations)format(opentype)}",
+      "@font-face{src:url(foo.ttf) tech(palettes color-colrv0 variations) format(opentype)}",
     );
     // TODO(CGQAQ): make this test pass when we have strict mode
     // ref: https://github.com/web-platform-tests/wpt/blob/9f8a6ccc41aa725e8f51f4f096f686313bb88d8d/css/css-fonts/parsing/font-face-src-tech.html#L45
@@ -13931,7 +14242,7 @@ mod tests {
     // );
     minify_test(
       "@font-face {src: local(\"\") url(\"test.woff\");}",
-      "@font-face{src:local(\"\")url(test.woff)}",
+      "@font-face{src:local(\"\") url(test.woff)}",
     );
     minify_test("@font-face {font-weight: 200 400}", "@font-face{font-weight:200 400}");
     minify_test("@font-face {font-weight: 400 400}", "@font-face{font-weight:400}");
@@ -14029,7 +14340,7 @@ mod tests {
       font-family: Handover Sans;
       base-palette: 3;
       override-colors: 1 rgb(43, 12, 9), 3 var(--highlight);
-    }"#, "@font-palette-values --Cooler{font-family:Handover Sans;base-palette:3;override-colors:1 #2b0c09,3 var(--highlight)}");
+    }"#, "@font-palette-values --Cooler{font-family:Handover Sans;base-palette:3;override-colors:1 #2b0c09, 3 var(--highlight)}");
     prefix_test(
       r#"@font-palette-values --Cooler {
       font-family: Handover Sans;
@@ -14801,6 +15112,8 @@ mod tests {
       "@layer foo; @import url(foo.css); @layer bar; @import url(bar.css)",
       ParserError::UnexpectedImportRule,
     );
+    let warnings = error_recovery_test("@import './actual-styles.css';");
+    assert_eq!(warnings, vec![]);
   }
 
   #[test]
@@ -20401,19 +20714,19 @@ mod tests {
     );
     minify_test(
       ".foo { color: color-mix(in srgb, currentColor, blue); }",
-      ".foo{color:color-mix(in srgb,currentColor,blue)}",
+      ".foo{color:color-mix(in srgb, currentColor, blue)}",
     );
     minify_test(
       ".foo { color: color-mix(in srgb, blue, currentColor); }",
-      ".foo{color:color-mix(in srgb,blue,currentColor)}",
+      ".foo{color:color-mix(in srgb, blue, currentColor)}",
     );
     minify_test(
       ".foo { color: color-mix(in srgb, accentcolor, blue); }",
-      ".foo{color:color-mix(in srgb,accentcolor,blue)}",
+      ".foo{color:color-mix(in srgb, accentcolor, blue)}",
     );
     minify_test(
       ".foo { color: color-mix(in srgb, blue, accentcolor); }",
-      ".foo{color:color-mix(in srgb,blue,accentcolor)}",
+      ".foo{color:color-mix(in srgb, blue, accentcolor)}",
     );
 
     // regex for converting web platform tests:
@@ -21928,75 +22241,283 @@ mod tests {
       ".foo{grid-template-areas:\"head head\"\"nav main\"\". .\"}",
     );
 
+    // to grid-* shorthand
+    minify_test(
+      r#"
+      .test-miss-areas {
+        grid-template-columns: 1fr 90px;
+        grid-template-rows: auto 80px;
+        grid-template-areas: "one";
+      }
+    "#,
+      ".test-miss-areas{grid-template:\"one\"\".\"80px/1fr 90px}",
+    );
     test(
       r#"
-      .foo {
-        grid-template-areas: "head head" "nav  main" "foot ....";
+      .test-miss-areas-2 {
+        grid-template-columns: 1fr 1fr 1fr;      
+        grid-template-rows: 30px 60px 100px;
+        grid-template-areas: "a a a" "b c c";
       }
     "#,
       indoc! { r#"
-      .foo {
-        grid-template-areas: "head head"
-                             "nav main"
-                             "foot .";
+      .test-miss-areas-2 {
+        grid-template: "a a a" 30px
+                       "b c c" 60px
+                       ". . ." 100px
+                       / 1fr 1fr 1fr;
       }
     "#},
     );
 
-    minify_test(
+    test(
       r#"
-      .foo {
-        grid-template: [header-top] "a   a   a"     [header-bottom]
-                       [main-top] "b   b   b" 1fr [main-bottom];
+      .test-miss-areas-3 {
+        grid-template: 30px 60px 100px / 1fr 1fr 1fr;
+        grid-template-areas: "a a a" "b c c";
       }
     "#,
-      ".foo{grid-template:[header-top]\"a a a\"[header-bottom main-top]\"b b b\"1fr[main-bottom]}",
-    );
-    minify_test(
-      r#"
-      .foo {
-        grid-template: "head head"
-                       "nav  main" 1fr
-                       "foot ....";
+      indoc! { r#"
+      .test-miss-areas-3 {
+        grid-template: "a a a" 30px
+                       "b c c" 60px
+                       ". . ." 100px
+                       / 1fr 1fr 1fr;
       }
-    "#,
-      ".foo{grid-template:\"head head\"\"nav main\"1fr\"foot.\"}",
+    "#},
     );
-    minify_test(
+
+    test(
       r#"
-      .foo {
-        grid-template: [header-top] "a   a   a"     [header-bottom]
-                         [main-top] "b   b   b" 1fr [main-bottom]
-                                  / auto 1fr auto;
+      .test-miss-areas-4 {
+        grid: 30px 60px 100px / 1fr 1fr 1fr;
+        grid-template-areas: "a a a" "b c c";
       }
     "#,
-      ".foo{grid-template:[header-top]\"a a a\"[header-bottom main-top]\"b b b\"1fr[main-bottom]/auto 1fr auto}",
+      indoc! { r#"
+      .test-miss-areas-4 {
+        grid: "a a a" 30px
+              "b c c" 60px
+              ". . ." 100px
+              / 1fr 1fr 1fr;
+      }
+    "#},
     );
 
+    // test no unreachable error
     minify_test(
-      ".foo { grid-template: auto 1fr / auto 1fr auto; }",
-      ".foo{grid-template:auto 1fr/auto 1fr auto}",
+      r#"
+    .grid-shorthand-areas {
+      grid: auto / 1fr 3fr;
+      grid-template-areas: ". content .";
+    }
+  "#,
+      ".grid-shorthand-areas{grid:\".content.\"/1fr 3fr}",
     );
     minify_test(
-      ".foo { grid-template: [linename1 linename2] 100px repeat(auto-fit, [linename1] 300px) [linename3] / [linename1 linename2] 100px repeat(auto-fit, [linename1] 300px) [linename3]; }",
-      ".foo{grid-template:[linename1 linename2]100px repeat(auto-fit,[linename1]300px)[linename3]/[linename1 linename2]100px repeat(auto-fit,[linename1]300px)[linename3]}"
+      r#"
+    .grid-shorthand-areas-rows {
+      grid: auto / 1fr 3fr;
+      grid-template-rows: 20px;
+      grid-template-areas: ". content .";
+    }
+  "#,
+      ".grid-shorthand-areas-rows{grid:\".content.\"20px/1fr 3fr}",
     );
 
+    // test grid-auto-flow: row in grid shorthand
     test(
-      ".foo{grid-template:[header-top]\"a a a\"[header-bottom main-top]\"b b b\"1fr[main-bottom]/auto 1fr auto}",
-      indoc! {r#"
-        .foo {
-          grid-template: [header-top] "a a a" [header-bottom]
-                         [main-top] "b b b" 1fr [main-bottom]
-                         / auto 1fr auto;
-        }
-      "#},
+      r#"
+      .test-auto-flow-row-1 {
+        grid: auto-flow   /  1fr 2fr 1fr;
+        grid-template-areas: "  .   one  .  ";
+      }
+    "#,
+      indoc! { r#"
+      .test-auto-flow-row-1 {
+        grid: auto-flow / 1fr 2fr 1fr;
+        grid-template-areas: ". one .";
+      }
+    "#},
     );
     test(
-      ".foo{grid-template:[header-top]\"a a a\"[main-top]\"b b b\"1fr/auto 1fr auto}",
-      indoc! {r#"
-        .foo {
-          grid-template: [header-top] "a a a"
+      r#"
+      .test-auto-flow-row-2 {
+        grid: auto-flow   auto   /  100px   100px;
+        grid-template-areas: " one  two ";
+      }
+    "#,
+      indoc! { r#"
+      .test-auto-flow-row-2 {
+        grid: auto-flow / 100px 100px;
+        grid-template-areas: "one two";
+      }
+    "#},
+    );
+    test(
+      r#"
+      .test-auto-flow-dense {
+        grid: dense auto-flow  /  1fr 2fr;
+        grid-template-areas: "  .   content  .  ";
+      }
+    "#,
+      indoc! { r#"
+      .test-auto-flow-dense {
+        grid: auto-flow dense / 1fr 2fr;
+        grid-template-areas: ". content .";
+      }
+    "#},
+    );
+    minify_test(
+      r#"
+      .grid-auto-flow-row-auto-rows {
+        grid: auto-flow 40px / 1fr 90px;
+        grid-template-areas: "a";
+      }
+    "#,
+      ".grid-auto-flow-row-auto-rows{grid:auto-flow 40px/1fr 90px;grid-template-areas:\"a\"}",
+    );
+    minify_test(
+      r#"
+      .grid-auto-flow-row-auto-rows-multiple {
+        grid: auto-flow 40px max-content / 1fr;
+        grid-template-areas: ". a";
+      }
+    "#,
+      ".grid-auto-flow-row-auto-rows-multiple{grid:auto-flow 40px max-content/1fr;grid-template-areas:\".a\"}",
+    );
+
+    // test grid-auto-flow: column in grid shorthand
+    test(
+      r#"
+      .test-auto-flow-column-1 {
+        grid: 300px / auto-flow;
+        grid-template-areas: "  .   one  .  ";
+      }
+    "#,
+      indoc! { r#"
+      .test-auto-flow-column-1 {
+        grid: 300px / auto-flow;
+        grid-template-areas: ". one .";
+      }
+    "#},
+    );
+    test(
+      r#"
+      .test-auto-flow-column-2 {
+        grid: 200px 1fr / auto-flow auto;
+        grid-template-areas: "  .   one  .  ";
+      }
+    "#,
+      indoc! { r#"
+      .test-auto-flow-column-2 {
+        grid: 200px 1fr / auto-flow;
+        grid-template-areas: ". one .";
+      }
+    "#},
+    );
+    test(
+      r#"
+      .test-auto-flow-column-dense {
+        grid: 1fr 2fr / dense auto-flow;
+        grid-template-areas: "  .   content  .  ";
+      }
+    "#,
+      indoc! { r#"
+      .test-auto-flow-column-dense {
+        grid: 1fr 2fr / auto-flow dense;
+        grid-template-areas: ". content .";
+      }
+    "#},
+    );
+    minify_test(
+      r#"
+      .grid-auto-flow-column-auto-rows {
+        grid: 1fr 3fr / auto-flow 40px;
+        grid-template-areas: "a";
+      }
+    "#,
+      ".grid-auto-flow-column-auto-rows{grid:1fr 3fr/auto-flow 40px;grid-template-areas:\"a\"}",
+    );
+    minify_test(
+      r#"
+      .grid-auto-flow-column-auto-rows-multiple {
+        grid: 1fr / auto-flow 40px max-content ;
+        grid-template-areas: ". a";
+      }
+    "#,
+      ".grid-auto-flow-column-auto-rows-multiple{grid:1fr/auto-flow 40px max-content;grid-template-areas:\".a\"}",
+    );
+
+    test(
+      r#"
+      .foo {
+        grid-template-areas: "head head" "nav  main" "foot ....";
+      }
+    "#,
+      indoc! { r#"
+      .foo {
+        grid-template-areas: "head head"
+                             "nav main"
+                             "foot .";
+      }
+    "#},
+    );
+
+    minify_test(
+      r#"
+      .foo {
+        grid-template: [header-top] "a   a   a"     [header-bottom]
+                       [main-top] "b   b   b" 1fr [main-bottom];
+      }
+    "#,
+      ".foo{grid-template:[header-top]\"a a a\"[header-bottom main-top]\"b b b\"1fr[main-bottom]}",
+    );
+    minify_test(
+      r#"
+      .foo {
+        grid-template: "head head"
+                       "nav  main" 1fr
+                       "foot ....";
+      }
+    "#,
+      ".foo{grid-template:\"head head\"\"nav main\"1fr\"foot.\"}",
+    );
+    minify_test(
+      r#"
+      .foo {
+        grid-template: [header-top] "a   a   a"     [header-bottom]
+                         [main-top] "b   b   b" 1fr [main-bottom]
+                                  / auto 1fr auto;
+      }
+    "#,
+      ".foo{grid-template:[header-top]\"a a a\"[header-bottom main-top]\"b b b\"1fr[main-bottom]/auto 1fr auto}",
+    );
+
+    minify_test(
+      ".foo { grid-template: auto 1fr / auto 1fr auto; }",
+      ".foo{grid-template:auto 1fr/auto 1fr auto}",
+    );
+    minify_test(
+      ".foo { grid-template: [linename1 linename2] 100px repeat(auto-fit, [linename1] 300px) [linename3] / [linename1 linename2] 100px repeat(auto-fit, [linename1] 300px) [linename3]; }",
+      ".foo{grid-template:[linename1 linename2]100px repeat(auto-fit,[linename1]300px)[linename3]/[linename1 linename2]100px repeat(auto-fit,[linename1]300px)[linename3]}"
+    );
+
+    test(
+      ".foo{grid-template:[header-top]\"a a a\"[header-bottom main-top]\"b b b\"1fr[main-bottom]/auto 1fr auto}",
+      indoc! {r#"
+        .foo {
+          grid-template: [header-top] "a a a" [header-bottom]
+                         [main-top] "b b b" 1fr [main-bottom]
+                         / auto 1fr auto;
+        }
+      "#},
+    );
+    test(
+      ".foo{grid-template:[header-top]\"a a a\"[main-top]\"b b b\"1fr/auto 1fr auto}",
+      indoc! {r#"
+        .foo {
+          grid-template: [header-top] "a a a"
                          [main-top] "b b b" 1fr
                          / auto 1fr auto;
         }
@@ -22607,15 +23128,15 @@ mod tests {
     minify_test(".foo { --test: var(--foo, 20px); }", ".foo{--test:var(--foo,20px)}");
     minify_test(
       ".foo { transition: var(--foo, 20px),\nvar(--bar, 40px); }",
-      ".foo{transition:var(--foo,20px),var(--bar,40px)}",
+      ".foo{transition:var(--foo,20px), var(--bar,40px)}",
     );
     minify_test(
       ".foo { background: var(--color) var(--image); }",
-      ".foo{background:var(--color)var(--image)}",
+      ".foo{background:var(--color) var(--image)}",
     );
     minify_test(
       ".foo { height: calc(var(--spectrum-global-dimension-size-300) / 2);",
-      ".foo{height:calc(var(--spectrum-global-dimension-size-300)/2)}",
+      ".foo{height:calc(var(--spectrum-global-dimension-size-300) / 2)}",
     );
     minify_test(
       ".foo { color: var(--color, rgb(255, 255, 0)); }",
@@ -22627,11 +23148,72 @@ mod tests {
     );
     minify_test(
       ".foo { color: var(--color, rgb(var(--red), var(--green), 0)); }",
-      ".foo{color:var(--color,rgb(var(--red),var(--green),0))}",
+      ".foo{color:var(--color,rgb(var(--red), var(--green), 0))}",
     );
     minify_test(".foo { --test: .5s; }", ".foo{--test:.5s}");
     minify_test(".foo { --theme-sizes-1\\/12: 2 }", ".foo{--theme-sizes-1\\/12:2}");
     minify_test(".foo { --test: 0px; }", ".foo{--test:0px}");
+    test(
+      ".foo { transform: var(--bar, ) }",
+      indoc! {r#"
+      .foo {
+        transform: var(--bar, );
+      }
+      "#},
+    );
+    test(
+      ".foo { transform: env(--bar, ) }",
+      indoc! {r#"
+      .foo {
+        transform: env(--bar, );
+      }
+      "#},
+    );
+
+    // Test attr() function with type() syntax - minified
+    minify_test(
+      ".foo { background-color: attr(data-color type(<color>)); }",
+      ".foo{background-color:attr(data-color type(<color>))}",
+    );
+    minify_test(
+      ".foo { width: attr(data-width type(<length>), 100px); }",
+      ".foo{width:attr(data-width type(<length>), 100px)}",
+    );
+
+    minify_test(".foo { width: attr( data-foo    % ); }", ".foo{width:attr(data-foo %)}");
+
+    // <attr-args> = attr( <declaration-value>, <declaration-value>? )
+    // Like var(), a bare comma can be used with nothing following it, indicating that the second <declaration-value> was passed, just as an empty sequence.
+    // Spec: https://drafts.csswg.org/css-values-5/#funcdef-attr
+    minify_test(
+      ".foo { width: attr( data-foo    %, ); }",
+      ".foo{width:attr(data-foo %,)}",
+    );
+
+    minify_test(
+      ".foo { width: attr( data-foo    px ); }",
+      ".foo{width:attr(data-foo px)}",
+    );
+
+    minify_test(
+      ".foo { width: attr(data-foo    number ); }",
+      ".foo{width:attr(data-foo number)}",
+    );
+
+    minify_test(
+      ".foo { width: attr(data-foo    raw-string); }",
+      ".foo{width:attr(data-foo raw-string)}",
+    );
+
+    // Test attr() function with type() syntax - non-minified (issue with extra spaces)
+    test(
+      ".foo { background-color: attr(data-color type(<color>)); }",
+      ".foo {\n  background-color: attr(data-color type(<color>));\n}\n",
+    );
+    test(
+      ".foo { width: attr(data-width type(<length>), 100px); }",
+      ".foo {\n  width: attr(data-width type(<length>), 100px);\n}\n",
+    );
 
     prefix_test(
       r#"
@@ -23422,7 +24004,7 @@ mod tests {
     );
     attr_test(
       "text-decoration: var(--foo) lab(40% 56.6 39);",
-      "text-decoration:var(--foo)#b32323",
+      "text-decoration:var(--foo) #b32323",
       true,
       Some(Browsers {
         chrome: Some(90 << 16),
@@ -24648,7 +25230,9 @@ mod tests {
       indoc! {r#"
         div {
           color: #00f;
-          --button: focus { color: red; };
+          --button: focus {
+                    color: red;
+                  };
         }
       "#},
     );
@@ -24847,6 +25431,21 @@ mod tests {
         exclude: Features::empty(),
       },
     );
+
+    minify_test(
+      r#"
+    .foo {
+      color: red;
+      .bar {
+        color: green;
+      }
+      color: blue;
+      .baz {
+        color: pink;
+      }
+    }"#,
+      ".foo{color:red;& .bar{color:green}color:#00f;& .baz{color:pink}}",
+    );
   }
 
   #[test]
@@ -26306,6 +26905,8 @@ mod tests {
 
   #[test]
   fn test_svg() {
+    use crate::properties::svg;
+
     minify_test(".foo { fill: yellow; }", ".foo{fill:#ff0}");
     minify_test(".foo { fill: url(#foo); }", ".foo{fill:url(#foo)}");
     minify_test(".foo { fill: url(#foo) none; }", ".foo{fill:url(#foo) none}");
@@ -27134,6 +27735,21 @@ mod tests {
         ..Browsers::default()
       },
     );
+
+    let property =
+      Property::parse_string("text-rendering".into(), "geometricPrecision", ParserOptions::default()).unwrap();
+    assert_eq!(
+      property,
+      Property::TextRendering(svg::TextRendering::GeometricPrecision)
+    );
+    let property =
+      Property::parse_string("shape-rendering".into(), "geometricPrecision", ParserOptions::default()).unwrap();
+    assert_eq!(
+      property,
+      Property::ShapeRendering(svg::ShapeRendering::GeometricPrecision)
+    );
+    let property = Property::parse_string("color-interpolation".into(), "sRGB", ParserOptions::default()).unwrap();
+    assert_eq!(property, Property::ColorInterpolation(svg::ColorInterpolation::SRGB));
   }
 
   #[test]
@@ -27305,6 +27921,82 @@ mod tests {
     );
   }
 
+  #[test]
+  fn test_mix_blend_mode() {
+    minify_test(
+      ".foo { mix-blend-mode: normal }",
+      ".foo{mix-blend-mode:normal}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: multiply }",
+      ".foo{mix-blend-mode:multiply}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: screen }",
+      ".foo{mix-blend-mode:screen}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: overlay }",
+      ".foo{mix-blend-mode:overlay}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: darken }",
+      ".foo{mix-blend-mode:darken}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: lighten }",
+      ".foo{mix-blend-mode:lighten}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: color-dodge }",
+      ".foo{mix-blend-mode:color-dodge}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: color-burn }",
+      ".foo{mix-blend-mode:color-burn}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: hard-light }",
+      ".foo{mix-blend-mode:hard-light}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: soft-light }",
+      ".foo{mix-blend-mode:soft-light}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: difference }",
+      ".foo{mix-blend-mode:difference}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: exclusion }",
+      ".foo{mix-blend-mode:exclusion}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: hue }",
+      ".foo{mix-blend-mode:hue}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: saturation }",
+      ".foo{mix-blend-mode:saturation}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: color }",
+      ".foo{mix-blend-mode:color}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: luminosity }",
+      ".foo{mix-blend-mode:luminosity}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: plus-darker }",
+      ".foo{mix-blend-mode:plus-darker}",
+    );
+    minify_test(
+      ".foo { mix-blend-mode: plus-lighter }",
+      ".foo{mix-blend-mode:plus-lighter}",
+    );
+  }
+
   #[test]
   fn test_viewport() {
     minify_test(
@@ -28547,6 +29239,17 @@ mod tests {
       "@property --property-name{syntax:\"<length>\";inherits:true;initial-value:25px}",
     );
 
+    minify_test(
+      r#"
+      @property --property-name {
+        syntax: '<string>';
+        inherits: true;
+        initial-value: "hi";
+      }
+    "#,
+      "@property --property-name{syntax:\"<string>\";inherits:true;initial-value:\"hi\"}",
+    );
+
     error_test(
       r#"
       @property --property-name {
@@ -28742,6 +29445,44 @@ mod tests {
     "#,
       "@property --property-name{syntax:\"<color>\";inherits:true;initial-value:#00f}.foo{color:var(--property-name)}",
     );
+
+    test(
+      r#"
+      @media (width < 800px) {
+        @property --property-name {
+          syntax: '*';
+          inherits: false;
+        }
+      }
+    "#,
+      indoc! {r#"
+        @media (width < 800px) {
+          @property --property-name {
+            syntax: "*";
+            inherits: false
+          }
+        }
+    "#},
+    );
+
+    test(
+      r#"
+      @layer foo {
+        @property --property-name {
+          syntax: '*';
+          inherits: false;
+        }
+      }
+    "#,
+      indoc! {r#"
+        @layer foo {
+          @property --property-name {
+            syntax: "*";
+            inherits: false
+          }
+        }
+    "#},
+    );
   }
 
   #[test]
@@ -29005,6 +29746,18 @@ mod tests {
 
   #[test]
   fn test_container_queries() {
+    // name only (no condition) - new syntax
+    minify_test(
+      r#"
+      @container foo {
+        .inner {
+          background: green;
+        }
+      }
+    "#,
+      "@container foo{.inner{background:green}}",
+    );
+
     // with name
     minify_test(
       r#"
@@ -29335,6 +30088,56 @@ mod tests {
     "#,
       "@container style(width){.foo{color:red}}",
     );
+    minify_test(
+      r#"
+      @container scroll-state(scrollable: top) {
+        .foo {
+          color: red;
+        }
+      }
+    "#,
+      "@container scroll-state(scrollable:top){.foo{color:red}}",
+    );
+    minify_test(
+      r#"
+      @container scroll-state((stuck: top) and (stuck: left)) {
+        .foo {
+          color: red;
+        }
+      }
+    "#,
+      "@container scroll-state((stuck:top) and (stuck:left)){.foo{color:red}}",
+    );
+    minify_test(
+      r#"
+      @container scroll-state(not ((scrollable: bottom) and (scrollable: right))) {
+        .foo {
+          color: red;
+        }
+      }
+    "#,
+      "@container scroll-state(not ((scrollable:bottom) and (scrollable:right))){.foo{color:red}}",
+    );
+    minify_test(
+      r#"
+      @container (scroll-state(scrollable: inline-end)) {
+        .foo {
+          color: red;
+        }
+      }
+    "#,
+      "@container scroll-state(scrollable:inline-end){.foo{color:red}}",
+    );
+    minify_test(
+      r#"
+      @container not scroll-state(scrollable: top) {
+        .foo {
+          color: red;
+        }
+      }
+    "#,
+      "@container not scroll-state(scrollable:top){.foo{color:red}}",
+    );
 
     // Disallow 'none', 'not', 'and', 'or' as a `<container-name>`
     // https://github.com/w3c/csswg-drafts/issues/7203#issuecomment-1144257312
@@ -29379,6 +30182,29 @@ mod tests {
       "@container style(style(--foo: bar)) {}",
       ParserError::UnexpectedToken(crate::properties::custom::Token::Function("style".into())),
     );
+    error_test(
+      "@container scroll-state(scroll-state(scrollable: top)) {}",
+      ParserError::InvalidMediaQuery,
+    );
+    error_test(
+      "@container unknown(foo) {}",
+      ParserError::UnexpectedToken(crate::properties::custom::Token::Function("unknown".into())),
+    );
+
+    // empty container (no name and no condition) should error
+    error_test("@container {}", ParserError::EndOfInput);
+
+    // empty brackets should return a clearer error message
+    error_test("@container () {}", ParserError::EmptyBracketInCondition);
+
+    // invalid condition after a name should error
+    error_test("@container foo () {}", ParserError::EmptyBracketInCondition);
+    error_test(
+      "@container foo bar {}",
+      ParserError::UnexpectedToken(crate::properties::custom::Token::Ident("bar".into())),
+    );
+
+    error_recovery_test("@container unknown(foo) {}");
   }
 
   #[test]
@@ -29400,11 +30226,12 @@ mod tests {
         color: red;
       }
     }"#,
-      indoc! {r#"
-      @foo test {
-        div { color: red; }
-      }
-      "#},
+      indoc! { r#"@foo test {
+      div {
+            color: red;
+          }
+    }
+    "#},
     );
     minify_test(
       r#"@foo test {
@@ -29691,14 +30518,20 @@ mod tests {
     minify_test(".foo { color-scheme: dark light; }", ".foo{color-scheme:light dark}");
     minify_test(".foo { color-scheme: only light; }", ".foo{color-scheme:light only}");
     minify_test(".foo { color-scheme: only dark; }", ".foo{color-scheme:dark only}");
+    minify_test(".foo { color-scheme: inherit; }", ".foo{color-scheme:inherit}");
+    minify_test(":root { color-scheme: unset; }", ":root{color-scheme:unset}");
+    minify_test(".foo { color-scheme: unknow; }", ".foo{color-scheme:unknow}");
+    minify_test(".foo { color-scheme: only; }", ".foo{color-scheme:only}");
+    minify_test(".foo { color-scheme: dark foo; }", ".foo{color-scheme:dark foo}");
+    minify_test(".foo { color-scheme: normal dark; }", ".foo{color-scheme:normal dark}");
     minify_test(
       ".foo { color-scheme: dark light only; }",
       ".foo{color-scheme:light dark only}",
     );
-    minify_test(".foo { color-scheme: foo bar light; }", ".foo{color-scheme:light}");
+    minify_test(".foo { color-scheme: foo bar light; }", ".foo{color-scheme:foo bar light}");
     minify_test(
       ".foo { color-scheme: only foo dark bar; }",
-      ".foo{color-scheme:dark only}",
+      ".foo{color-scheme:only foo dark bar}",
     );
     prefix_test(
       ".foo { color-scheme: dark; }",
@@ -29924,6 +30757,35 @@ mod tests {
     );
   }
 
+  #[test]
+  fn test_print_color_adjust() {
+    prefix_test(
+      ".foo { print-color-adjust: exact; }",
+      indoc! { r#"
+      .foo {
+        -webkit-print-color-adjust: exact;
+        print-color-adjust: exact;
+      }
+      "#},
+      Browsers {
+        chrome: Some(135 << 16),
+        ..Browsers::default()
+      },
+    );
+    prefix_test(
+      ".foo { print-color-adjust: exact; }",
+      indoc! { r#"
+      .foo {
+        print-color-adjust: exact;
+      }
+      "#},
+      Browsers {
+        chrome: Some(137 << 16),
+        ..Browsers::default()
+      },
+    );
+  }
+
   #[test]
   fn test_all() {
     minify_test(".foo { all: initial; all: initial }", ".foo{all:initial}");
diff --git a/src/macros.rs b/src/macros.rs
index 8019c58cb..a50d54f5a 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -189,7 +189,7 @@ macro_rules! shorthand_property_bitflags {
     crate::macros::shorthand_property_bitflags!($name, [$($all),*] $($rest),* ; $last_index + 1; $($var = $index)* $cur = $last_index + 1);
   };
   ($name:ident, [$($all:ident),*] $cur:ident; $last_index:expr ; $($var:ident = $index:expr)+) => {
-    paste::paste! {
+    pastey::paste! {
       crate::macros::property_bitflags! {
         #[derive(Default, Debug)]
         struct [<$name Property>]: u8 {
@@ -216,7 +216,7 @@ macro_rules! shorthand_handler {
       $(
         pub $key: Option<$type>,
       )*
-      flushed_properties: paste::paste!([<$shorthand Property>]),
+      flushed_properties: pastey::paste!([<$shorthand Property>]),
       has_any: bool
     }
 
@@ -250,7 +250,7 @@ macro_rules! shorthand_handler {
 
             let mut unparsed = val.clone();
             context.add_unparsed_fallbacks(&mut unparsed);
-            paste::paste! {
+            pastey::paste! {
               self.flushed_properties.insert([<$shorthand Property>]::try_from(&unparsed.property_id).unwrap());
             };
             dest.push(Property::Unparsed(unparsed));
@@ -263,7 +263,7 @@ macro_rules! shorthand_handler {
 
       fn finalize(&mut self, dest: &mut DeclarationList<'i>, context: &mut PropertyHandlerContext<'i, '_>) {
         self.flush(dest, context);
-        self.flushed_properties = paste::paste!([<$shorthand Property>]::empty());
+        self.flushed_properties = pastey::paste!([<$shorthand Property>]::empty());
       }
     }
 
@@ -289,7 +289,7 @@ macro_rules! shorthand_handler {
           };
 
           $(
-            if $shorthand_fallback && !self.flushed_properties.intersects(paste::paste!([<$shorthand Property>]::$shorthand)) {
+            if $shorthand_fallback && !self.flushed_properties.intersects(pastey::paste!([<$shorthand Property>]::$shorthand)) {
               let fallbacks = shorthand.get_fallbacks(context.targets);
               for fallback in fallbacks {
                 dest.push(Property::$shorthand(fallback));
@@ -298,7 +298,7 @@ macro_rules! shorthand_handler {
           )?
 
           dest.push(Property::$shorthand(shorthand));
-          paste::paste! {
+          pastey::paste! {
             self.flushed_properties.insert([<$shorthand Property>]::$shorthand);
           };
         } else {
@@ -306,7 +306,7 @@ macro_rules! shorthand_handler {
             #[allow(unused_mut)]
             if let Some(mut val) = $key {
               $(
-                if $fallback && !self.flushed_properties.intersects(paste::paste!([<$shorthand Property>]::$prop)) {
+                if $fallback && !self.flushed_properties.intersects(pastey::paste!([<$shorthand Property>]::$prop)) {
                   let fallbacks = val.get_fallbacks(context.targets);
                   for fallback in fallbacks {
                     dest.push(Property::$prop(fallback));
@@ -315,7 +315,7 @@ macro_rules! shorthand_handler {
               )?
 
               dest.push(Property::$prop(val));
-              paste::paste! {
+              pastey::paste! {
                 self.flushed_properties.insert([<$shorthand Property>]::$prop);
               };
             }
@@ -390,7 +390,7 @@ macro_rules! impl_shorthand {
     impl<'i> Shorthand<'i> for $t {
       #[allow(unused_variables)]
       fn from_longhands(decls: &DeclarationBlock<'i>, vendor_prefix: crate::vendor_prefix::VendorPrefix) -> Option<(Self, bool)> {
-        use paste::paste;
+        use pastey::paste;
 
         $(
           $(
diff --git a/src/media_query.rs b/src/media_query.rs
index 1a68d7b51..2f0ee9de6 100644
--- a/src/media_query.rs
+++ b/src/media_query.rs
@@ -3,9 +3,9 @@ use crate::error::{ErrorWithLocation, MinifyError, MinifyErrorKind, ParserError,
 use crate::macros::enum_property;
 use crate::parser::starts_with_ignore_ascii_case;
 use crate::printer::Printer;
-use crate::properties::custom::EnvironmentVariable;
+use crate::properties::custom::{EnvironmentVariable, TokenList};
 #[cfg(feature = "visitor")]
-use crate::rules::container::ContainerSizeFeatureId;
+use crate::rules::container::{ContainerSizeFeatureId, ScrollStateFeatureId};
 use crate::rules::custom_media::CustomMediaRule;
 use crate::rules::Location;
 use crate::stylesheet::ParserOptions;
@@ -56,6 +56,10 @@ impl<'i> MediaList<'i> {
     options: &ParserOptions<'_, 'i>,
   ) -> Result<Self, ParseError<'i, ParserError<'i>>> {
     let mut media_queries = vec![];
+    if input.is_exhausted() {
+      return Ok(MediaList { media_queries });
+    }
+
     loop {
       match input.parse_until_before(Delimiter::Comma, |i| MediaQuery::parse_with_options(i, options)) {
         Ok(mq) => {
@@ -534,6 +538,9 @@ pub enum MediaCondition<'i> {
     /// The conditions for the operator.
     conditions: Vec<MediaCondition<'i>>,
   },
+  /// Unknown tokens.
+  #[cfg_attr(feature = "serde", serde(borrow, with = "ValueWrapper::<TokenList>"))]
+  Unknown(TokenList<'i>),
 }
 
 /// A trait for conditions such as media queries and container queries.
@@ -551,6 +558,13 @@ pub(crate) trait QueryCondition<'i>: Sized {
     Err(input.new_error_for_next_token())
   }
 
+  fn parse_scroll_state_query<'t>(
+    input: &mut Parser<'i, 't>,
+    _options: &ParserOptions<'_, 'i>,
+  ) -> Result<Self, ParseError<'i, ParserError<'i>>> {
+    Err(input.new_error_for_next_token())
+  }
+
   fn needs_parens(&self, parent_operator: Option<Operator>, targets: &Targets) -> bool;
 }
 
@@ -579,6 +593,7 @@ impl<'i> QueryCondition<'i> for MediaCondition<'i> {
       MediaCondition::Not(_) => true,
       MediaCondition::Operation { operator, .. } => Some(*operator) != parent_operator,
       MediaCondition::Feature(f) => f.needs_parens(parent_operator, targets),
+      MediaCondition::Unknown(_) => false,
     }
   }
 }
@@ -591,6 +606,8 @@ bitflags! {
     const ALLOW_OR = 1 << 0;
     /// Whether to allow style container queries.
     const ALLOW_STYLE = 1 << 1;
+    /// Whether to allow scroll state container queries.
+    const ALLOW_SCROLL_STATE = 1 << 2;
   }
 }
 
@@ -601,7 +618,16 @@ impl<'i> MediaCondition<'i> {
     flags: QueryConditionFlags,
     options: &ParserOptions<'_, 'i>,
   ) -> Result<Self, ParseError<'i, ParserError<'i>>> {
-    parse_query_condition(input, flags, options)
+    input
+      .try_parse(|input| parse_query_condition(input, flags, options))
+      .or_else(|e| {
+        if options.error_recovery {
+          options.warn(e);
+          Ok(MediaCondition::Unknown(TokenList::parse(input, options, 0)?))
+        } else {
+          Err(e)
+        }
+      })
   }
 
   fn get_necessary_prefixes(&self, targets: Targets) -> VendorPrefix {
@@ -673,28 +699,44 @@ pub(crate) fn parse_query_condition<'t, 'i, P: QueryCondition<'i>>(
   options: &ParserOptions<'_, 'i>,
 ) -> Result<P, ParseError<'i, ParserError<'i>>> {
   let location = input.current_source_location();
-  let (is_negation, is_style) = match *input.next()? {
-    Token::ParenthesisBlock => (false, false),
-    Token::Ident(ref ident) if ident.eq_ignore_ascii_case("not") => (true, false),
+  enum QueryFunction {
+    None,
+    Style,
+    ScrollState,
+  }
+
+  let (is_negation, function) = match *input.next()? {
+    Token::ParenthesisBlock => (false, QueryFunction::None),
+    Token::Ident(ref ident) if ident.eq_ignore_ascii_case("not") => (true, QueryFunction::None),
     Token::Function(ref f)
       if flags.contains(QueryConditionFlags::ALLOW_STYLE) && f.eq_ignore_ascii_case("style") =>
     {
-      (false, true)
+      (false, QueryFunction::Style)
+    }
+    Token::Function(ref f)
+      if flags.contains(QueryConditionFlags::ALLOW_SCROLL_STATE) && f.eq_ignore_ascii_case("scroll-state") =>
+    {
+      (false, QueryFunction::ScrollState)
     }
     ref t => return Err(location.new_unexpected_token_error(t.clone())),
   };
 
-  let first_condition = match (is_negation, is_style) {
-    (true, false) => {
+  let first_condition = match (is_negation, function) {
+    (true, QueryFunction::None) => {
       let inner_condition = parse_parens_or_function(input, flags, options)?;
       return Ok(P::create_negation(Box::new(inner_condition)));
     }
-    (true, true) => {
+    (true, QueryFunction::Style) => {
       let inner_condition = P::parse_style_query(input, options)?;
       return Ok(P::create_negation(Box::new(inner_condition)));
     }
-    (false, false) => parse_paren_block(input, flags, options)?,
-    (false, true) => P::parse_style_query(input, options)?,
+    (true, QueryFunction::ScrollState) => {
+      let inner_condition = P::parse_scroll_state_query(input, options)?;
+      return Ok(P::create_negation(Box::new(inner_condition)));
+    }
+    (false, QueryFunction::None) => parse_paren_block(input, flags, options)?,
+    (false, QueryFunction::Style) => P::parse_style_query(input, options)?,
+    (false, QueryFunction::ScrollState) => P::parse_scroll_state_query(input, options)?,
   };
 
   let operator = match input.try_parse(Operator::parse) {
@@ -738,6 +780,11 @@ fn parse_parens_or_function<'t, 'i, P: QueryCondition<'i>>(
     {
       P::parse_style_query(input, options)
     }
+    Token::Function(ref f)
+      if flags.contains(QueryConditionFlags::ALLOW_SCROLL_STATE) && f.eq_ignore_ascii_case("scroll-state") =>
+    {
+      P::parse_scroll_state_query(input, options)
+    }
     ref t => return Err(location.new_unexpected_token_error(t.clone())),
   }
 }
@@ -748,6 +795,11 @@ fn parse_paren_block<'t, 'i, P: QueryCondition<'i>>(
   options: &ParserOptions<'_, 'i>,
 ) -> Result<P, ParseError<'i, ParserError<'i>>> {
   input.parse_nested_block(|input| {
+    // Detect empty brackets and provide a clearer error message.
+    if input.is_exhausted() {
+      return Err(input.new_custom_error(ParserError::EmptyBracketInCondition));
+    }
+
     if let Ok(inner) =
       input.try_parse(|i| parse_query_condition(i, flags | QueryConditionFlags::ALLOW_OR, options))
     {
@@ -826,6 +878,7 @@ impl<'i> ToCss for MediaCondition<'i> {
         ref conditions,
         operator,
       } => operation_to_css(operator, conditions, dest),
+      MediaCondition::Unknown(ref tokens) => tokens.to_css(dest, false),
     }
   }
 }
@@ -905,7 +958,8 @@ impl MediaFeatureComparison {
   feature = "visitor",
   derive(Visit),
   visit(visit_media_feature, MEDIA_QUERIES, <'i, MediaFeatureId>),
-  visit(<'i, ContainerSizeFeatureId>)
+  visit(<'i, ContainerSizeFeatureId>),
+  visit(<'i, ScrollStateFeatureId>)
 )]
 #[cfg_attr(feature = "into_owned", derive(static_self::IntoOwned))]
 #[cfg_attr(
@@ -1086,17 +1140,16 @@ where
   }
 
   pub(crate) fn needs_parens(&self, parent_operator: Option<Operator>, targets: &Targets) -> bool {
-    if !should_compile!(targets, MediaIntervalSyntax) {
-      return false;
-    }
-
     match self {
-      QueryFeature::Interval { .. } => parent_operator != Some(Operator::And),
+      QueryFeature::Interval { .. } => {
+        should_compile!(targets, MediaIntervalSyntax) && parent_operator != Some(Operator::And)
+      }
       QueryFeature::Range { operator, .. } => {
-        matches!(
-          operator,
-          MediaFeatureComparison::GreaterThan | MediaFeatureComparison::LessThan
-        )
+        should_compile!(targets, MediaRangeSyntax)
+          && matches!(
+            operator,
+            MediaFeatureComparison::GreaterThan | MediaFeatureComparison::LessThan
+          )
       }
       _ => false,
     }
@@ -1844,7 +1897,7 @@ mod tests {
     targets::{Browsers, Targets},
   };
 
-  fn parse(s: &str) -> MediaQuery {
+  fn parse(s: &str) -> MediaQuery<'_> {
     let mut input = ParserInput::new(&s);
     let mut parser = Parser::new(&mut input);
     MediaQuery::parse_with_options(&mut parser, &ParserOptions::default()).unwrap()
diff --git a/src/parser.rs b/src/parser.rs
index af93d978e..0dd76041c 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -213,7 +213,9 @@ pub enum AtRulePrelude<'i, T> {
   /// An @property prelude.
   Property(DashedIdent<'i>),
   /// A @container prelude.
-  Container(Option<ContainerName<'i>>, ContainerCondition<'i>),
+  /// Spec: https://drafts.csswg.org/css-conditional-5/#container-rule
+  /// @container [ <container-name>? <container-query>? ]!
+  Container(Option<ContainerName<'i>>, Option<ContainerCondition<'i>>),
   /// A @starting-style prelude.
   StartingStyle,
   /// A @scope rule prelude.
@@ -320,10 +322,6 @@ impl<'a, 'o, 'i, T: crate::traits::AtRuleParser<'i>> AtRuleParser<'i> for TopLev
         let media = MediaList::parse(input, &self.options)?;
         return Ok(AtRulePrelude::CustomMedia(name, media))
       },
-      "property" => {
-        let name = DashedIdent::parse(input)?;
-        return Ok(AtRulePrelude::Property(name))
-      },
       _ => {}
     }
 
@@ -645,8 +643,18 @@ impl<'a, 'o, 'b, 'i, T: crate::traits::AtRuleParser<'i>> AtRuleParser<'i> for Ne
       },
       "container" => {
         let name = input.try_parse(ContainerName::parse).ok();
-        let condition = ContainerCondition::parse_with_options(input, &self.options)?;
-        AtRulePrelude::Container(name, condition)
+        match input.try_parse(|input| ContainerCondition::parse_with_options(input, &self.options)) {
+          Ok(condition) => AtRulePrelude::Container(name, Some(condition)),
+          Err(e) => {
+            if name.is_some() && input.is_exhausted() {
+              // name only, no condition - allowed by new syntax
+              AtRulePrelude::Container(name, None)
+            } else {
+              // condition parsing failed (e.g., empty brackets or invalid tokens)
+              return Err(e);
+            }
+          }
+        }
       },
       "starting-style" => {
         AtRulePrelude::StartingStyle
@@ -695,6 +703,10 @@ impl<'a, 'o, 'b, 'i, T: crate::traits::AtRuleParser<'i>> AtRuleParser<'i> for Ne
         return Err(input.new_custom_error(ParserError::DeprecatedCssModulesValueRule));
       },
 
+      "property" => {
+        let name = DashedIdent::parse(input)?;
+        return Ok(AtRulePrelude::Property(name))
+      },
 
       _ => parse_custom_at_rule_prelude(&name, input, self.options, self.at_rule_parser)?
     };
diff --git a/src/prefixes.rs b/src/prefixes.rs
index 7d6433721..63792255e 100644
--- a/src/prefixes.rs
+++ b/src/prefixes.rs
@@ -562,7 +562,7 @@ impl Feature {
       }
       Feature::Element => {
         if let Some(version) = browsers.firefox {
-          if version >= 131072 && version <= 9043968 {
+          if version >= 131072 {
             prefixes |= VendorPrefix::Moz;
           }
         }
@@ -672,7 +672,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.ios_saf {
-          if version >= 197120 && version <= 1180672 {
+          if version >= 197120 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
@@ -682,7 +682,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.safari {
-          if version >= 196864 && version <= 1180672 {
+          if version >= 196864 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
@@ -1190,17 +1190,17 @@ impl Feature {
       }
       Feature::Fill | Feature::FillAvailable => {
         if let Some(version) = browsers.chrome {
-          if version >= 1441792 && version <= 8912896 {
+          if version >= 1441792 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
         if let Some(version) = browsers.android {
-          if version >= 263168 && version <= 8716288 {
+          if version >= 263168 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
         if let Some(version) = browsers.edge {
-          if version >= 5177344 && version <= 8716288 {
+          if version >= 5177344 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
@@ -1268,28 +1268,28 @@ impl Feature {
         }
       }
       Feature::Stretch => {
-        if let Some(version) = browsers.chrome {
-          if version >= 1441792 && version <= 8912896 {
-            prefixes |= VendorPrefix::WebKit;
-          }
-        }
         if let Some(version) = browsers.firefox {
-          if version >= 196608 && version <= 9043968 {
+          if version >= 196608 {
             prefixes |= VendorPrefix::Moz;
           }
         }
         if let Some(version) = browsers.android {
-          if version >= 263168 && version <= 8716288 {
+          if version >= 263168 && version <= 263171 {
+            prefixes |= VendorPrefix::WebKit;
+          }
+        }
+        if let Some(version) = browsers.chrome {
+          if version >= 1441792 && version <= 8978432 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
         if let Some(version) = browsers.edge {
-          if version >= 5177344 && version <= 8716288 {
+          if version >= 5177344 && version <= 8978432 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
         if let Some(version) = browsers.ios_saf {
-          if version >= 458752 && version <= 1180672 {
+          if version >= 458752 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
@@ -1299,12 +1299,12 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.safari {
-          if version >= 458752 && version <= 1180672 {
+          if version >= 393472 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
         if let Some(version) = browsers.samsung {
-          if version >= 327680 {
+          if version >= 262144 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
@@ -1374,7 +1374,7 @@ impl Feature {
       }
       Feature::TextDecorationSkip | Feature::TextDecorationSkipInk => {
         if let Some(version) = browsers.ios_saf {
-          if version >= 524288 && version <= 1180672 {
+          if version >= 524288 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
@@ -1386,12 +1386,12 @@ impl Feature {
       }
       Feature::TextDecoration => {
         if let Some(version) = browsers.ios_saf {
-          if version >= 524288 && version <= 1180672 {
+          if version >= 524288 && version <= 1704192 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
         if let Some(version) = browsers.safari {
-          if version >= 524288 && version <= 1180672 {
+          if version >= 524288 && version <= 1704192 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
@@ -1414,10 +1414,8 @@ impl Feature {
         }
       }
       Feature::TextSizeAdjust => {
-        if let Some(version) = browsers.firefox {
-          if version <= 8847360 {
-            prefixes |= VendorPrefix::Moz;
-          }
+        if browsers.firefox.is_some() {
+          prefixes |= VendorPrefix::Moz;
         }
         if let Some(version) = browsers.edge {
           if version >= 786432 && version <= 1179648 {
@@ -1430,7 +1428,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.ios_saf {
-          if version >= 327680 && version <= 1180672 {
+          if version >= 327680 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
@@ -1534,7 +1532,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.ios_saf {
-          if version >= 458752 && version <= 1180672 {
+          if version >= 458752 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
@@ -1544,7 +1542,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.safari {
-          if version >= 393472 && version <= 1180672 {
+          if version >= 393472 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
@@ -1921,17 +1919,17 @@ impl Feature {
       }
       Feature::CrossFade => {
         if let Some(version) = browsers.chrome {
-          if version >= 1114112 && version <= 8912896 {
+          if version >= 1114112 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
         if let Some(version) = browsers.android {
-          if version >= 263168 && version <= 8716288 {
+          if version >= 263168 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
         if let Some(version) = browsers.edge {
-          if version >= 5177344 && version <= 8716288 {
+          if version >= 5177344 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
@@ -2155,18 +2153,18 @@ impl Feature {
         }
       }
       Feature::PrintColorAdjust | Feature::ColorAdjust => {
-        if let Some(version) = browsers.chrome {
-          if version >= 1114112 && version <= 8912896 {
+        if let Some(version) = browsers.android {
+          if version >= 263168 && version <= 263171 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
-        if let Some(version) = browsers.android {
-          if version >= 263168 && version <= 8716288 {
+        if let Some(version) = browsers.chrome {
+          if version >= 1114112 && version <= 8847360 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
         if let Some(version) = browsers.edge {
-          if version >= 5177344 && version <= 8716288 {
+          if version >= 5177344 && version <= 8847360 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
@@ -2191,7 +2189,7 @@ impl Feature {
           }
         }
         if let Some(version) = browsers.samsung {
-          if version >= 262144 {
+          if version >= 262144 && version <= 1835008 {
             prefixes |= VendorPrefix::WebKit;
           }
         }
diff --git a/src/properties/contain.rs b/src/properties/contain.rs
index 1c57bab49..27ad2bb95 100644
--- a/src/properties/contain.rs
+++ b/src/properties/contain.rs
@@ -30,6 +30,8 @@ enum_property! {
     InlineSize,
     /// Establishes a query container for container size queries on both the inline and block axis.
     Size,
+    /// Establishes a query container for container scroll-state queries
+    ScrollState,
   }
 }
 
diff --git a/src/properties/custom.rs b/src/properties/custom.rs
index 83a292730..26da05708 100644
--- a/src/properties/custom.rs
+++ b/src/properties/custom.rs
@@ -370,59 +370,37 @@ impl<'i> TokenList<'i> {
       return Err(input.new_custom_error(ParserError::MaximumNestingDepth));
     }
 
-    let mut last_is_delim = false;
-    let mut last_is_whitespace = false;
     loop {
       let state = input.state();
       match input.next_including_whitespace_and_comments() {
-        Ok(&cssparser::Token::WhiteSpace(..)) | Ok(&cssparser::Token::Comment(..)) => {
-          // Skip whitespace if the last token was a delimiter.
-          // Otherwise, replace all whitespace and comments with a single space character.
-          if !last_is_delim {
-            tokens.push(Token::WhiteSpace(" ".into()).into());
-            last_is_whitespace = true;
-          }
-        }
         Ok(&cssparser::Token::Function(ref f)) => {
           // Attempt to parse embedded color values into hex tokens.
           let f = f.into();
           if let Some(color) = try_parse_color_token(&f, &state, input) {
             tokens.push(TokenOrValue::Color(color));
-            last_is_delim = false;
-            last_is_whitespace = false;
           } else if let Ok(color) = input.try_parse(|input| UnresolvedColor::parse(&f, input, options)) {
             tokens.push(TokenOrValue::UnresolvedColor(color));
-            last_is_delim = true;
-            last_is_whitespace = false;
           } else if f == "url" {
             input.reset(&state);
             tokens.push(TokenOrValue::Url(Url::parse(input)?));
-            last_is_delim = false;
-            last_is_whitespace = false;
           } else if f == "var" {
             let var = input.parse_nested_block(|input| {
               let var = Variable::parse(input, options, depth + 1)?;
               Ok(TokenOrValue::Var(var))
             })?;
             tokens.push(var);
-            last_is_delim = true;
-            last_is_whitespace = false;
           } else if f == "env" {
             let env = input.parse_nested_block(|input| {
               let env = EnvironmentVariable::parse_nested(input, options, depth + 1)?;
               Ok(TokenOrValue::Env(env))
             })?;
             tokens.push(env);
-            last_is_delim = true;
-            last_is_whitespace = false;
           } else {
             let arguments = input.parse_nested_block(|input| TokenList::parse(input, options, depth + 1))?;
             tokens.push(TokenOrValue::Function(Function {
               name: Ident(f),
               arguments,
             }));
-            last_is_delim = true; // Whitespace is not required after any of these chars.
-            last_is_whitespace = false;
           }
         }
         Ok(&cssparser::Token::Hash(ref h)) | Ok(&cssparser::Token::IDHash(ref h)) => {
@@ -431,19 +409,13 @@ impl<'i> TokenList<'i> {
           } else {
             tokens.push(Token::Hash(h.into()).into());
           }
-          last_is_delim = false;
-          last_is_whitespace = false;
         }
         Ok(&cssparser::Token::UnquotedUrl(_)) => {
           input.reset(&state);
           tokens.push(TokenOrValue::Url(Url::parse(input)?));
-          last_is_delim = false;
-          last_is_whitespace = false;
         }
         Ok(&cssparser::Token::Ident(ref name)) if name.starts_with("--") => {
           tokens.push(TokenOrValue::DashedIdent(name.into()));
-          last_is_delim = false;
-          last_is_whitespace = false;
         }
         Ok(token @ &cssparser::Token::ParenthesisBlock)
         | Ok(token @ &cssparser::Token::SquareBracketBlock)
@@ -459,8 +431,6 @@ impl<'i> TokenList<'i> {
           input.parse_nested_block(|input| TokenList::parse_into(input, tokens, options, depth + 1))?;
 
           tokens.push(closing_delimiter.into());
-          last_is_delim = true; // Whitespace is not required after any of these chars.
-          last_is_whitespace = false;
         }
         Ok(token @ cssparser::Token::Dimension { .. }) => {
           let value = if let Ok(length) = LengthValue::try_from(token) {
@@ -475,8 +445,6 @@ impl<'i> TokenList<'i> {
             TokenOrValue::Token(token.into())
           };
           tokens.push(value);
-          last_is_delim = false;
-          last_is_whitespace = false;
         }
         Ok(token) if token.is_parse_error() => {
           return Err(ParseError {
@@ -485,18 +453,7 @@ impl<'i> TokenList<'i> {
           })
         }
         Ok(token) => {
-          last_is_delim = matches!(token, cssparser::Token::Delim(_) | cssparser::Token::Comma);
-
-          // If this is a delimiter, and the last token was whitespace,
-          // replace the whitespace with the delimiter since both are not required.
-          if last_is_delim && last_is_whitespace {
-            let last = tokens.last_mut().unwrap();
-            *last = Token::from(token).into();
-          } else {
-            tokens.push(Token::from(token).into());
-          }
-
-          last_is_whitespace = false;
+          tokens.push(Token::from(token).into());
         }
         Err(_) => break,
       }
@@ -532,20 +489,13 @@ impl<'i> TokenList<'i> {
   where
     W: std::fmt::Write,
   {
-    if !dest.minify && self.0.len() == 1 && matches!(self.0.first(), Some(token) if token.is_whitespace()) {
-      return Ok(());
-    }
-
-    let mut has_whitespace = false;
-    for (i, token_or_value) in self.0.iter().enumerate() {
-      has_whitespace = match token_or_value {
+    for token_or_value in self.0.iter() {
+      match token_or_value {
         TokenOrValue::Color(color) => {
           color.to_css(dest)?;
-          false
         }
         TokenOrValue::UnresolvedColor(color) => {
           color.to_css(dest, is_custom_property)?;
-          false
         }
         TokenOrValue::Url(url) => {
           if dest.dependencies.is_some() && is_custom_property && !url.is_absolute() {
@@ -557,77 +507,45 @@ impl<'i> TokenList<'i> {
             ));
           }
           url.to_css(dest)?;
-          false
         }
         TokenOrValue::Var(var) => {
           var.to_css(dest, is_custom_property)?;
-          self.write_whitespace_if_needed(i, dest)?
         }
         TokenOrValue::Env(env) => {
           env.to_css(dest, is_custom_property)?;
-          self.write_whitespace_if_needed(i, dest)?
         }
         TokenOrValue::Function(f) => {
           f.to_css(dest, is_custom_property)?;
-          self.write_whitespace_if_needed(i, dest)?
         }
         TokenOrValue::Length(v) => {
           // Do not serialize unitless zero lengths in custom properties as it may break calc().
           let (value, unit) = v.to_unit_value();
           serialize_dimension(value, unit, dest)?;
-          false
         }
         TokenOrValue::Angle(v) => {
           v.to_css(dest)?;
-          false
         }
         TokenOrValue::Time(v) => {
           v.to_css(dest)?;
-          false
         }
         TokenOrValue::Resolution(v) => {
           v.to_css(dest)?;
-          false
         }
         TokenOrValue::DashedIdent(v) => {
           v.to_css(dest)?;
-          false
         }
         TokenOrValue::AnimationName(v) => {
           v.to_css(dest)?;
-          false
         }
         TokenOrValue::Token(token) => match token {
-          Token::Delim(d) => {
-            if *d == '+' || *d == '-' {
-              dest.write_char(' ')?;
-              dest.write_char(*d)?;
-              dest.write_char(' ')?;
-            } else {
-              let ws_before = !has_whitespace && (*d == '/' || *d == '*');
-              dest.delim(*d, ws_before)?;
-            }
-            true
-          }
-          Token::Comma => {
-            dest.delim(',', false)?;
-            true
-          }
-          Token::CloseParenthesis | Token::CloseSquareBracket | Token::CloseCurlyBracket => {
-            token.to_css(dest)?;
-            self.write_whitespace_if_needed(i, dest)?
-          }
           Token::Dimension { value, unit, .. } => {
             serialize_dimension(*value, unit, dest)?;
-            false
           }
           Token::Number { value, .. } => {
             value.to_css(dest)?;
-            false
           }
           _ => {
             token.to_css(dest)?;
-            matches!(token, Token::WhiteSpace(..))
           }
         },
       };
@@ -657,24 +575,8 @@ impl<'i> TokenList<'i> {
     Ok(())
   }
 
-  #[inline]
-  fn write_whitespace_if_needed<W>(&self, i: usize, dest: &mut Printer<W>) -> Result<bool, PrinterError>
-  where
-    W: std::fmt::Write,
-  {
-    if !dest.minify
-      && i != self.0.len() - 1
-      && !matches!(
-        self.0[i + 1],
-        TokenOrValue::Token(Token::Comma) | TokenOrValue::Token(Token::CloseParenthesis)
-      )
-    {
-      // Whitespace is removed during parsing, so add it back if we aren't minifying.
-      dest.write_char(' ')?;
-      Ok(true)
-    } else {
-      Ok(false)
-    }
+  pub(crate) fn starts_with_whitespace(&self) -> bool {
+    matches!(self.0.get(0), Some(TokenOrValue::Token(Token::WhiteSpace(_))))
   }
 }
 
@@ -986,8 +888,18 @@ impl<'a> ToCss for Token<'a> {
         int_value: *int_value,
       }
       .to_css(dest)?,
-      Token::WhiteSpace(w) => cssparser::Token::WhiteSpace(w).to_css(dest)?,
-      Token::Comment(c) => cssparser::Token::Comment(c).to_css(dest)?,
+      Token::WhiteSpace(w) => {
+        if dest.minify {
+          dest.write_char(' ')?;
+        } else {
+          dest.write_str(&w)?;
+        }
+      }
+      Token::Comment(c) => {
+        if !dest.minify {
+          cssparser::Token::Comment(c).to_css(dest)?;
+        }
+      }
       Token::Colon => cssparser::Token::Colon.to_css(dest)?,
       Token::Semicolon => cssparser::Token::Semicolon.to_css(dest)?,
       Token::Comma => cssparser::Token::Comma.to_css(dest)?,
@@ -1081,7 +993,7 @@ impl<'a> std::hash::Hash for Token<'a> {
 /// Converts a floating point value into its mantissa, exponent,
 /// and sign components so that it can be hashed.
 fn integer_decode(v: f32) -> (u32, i16, i8) {
-  let bits: u32 = unsafe { std::mem::transmute(v) };
+  let bits: u32 = f32::to_bits(v);
   let sign: i8 = if bits >> 31 == 0 { 1 } else { -1 };
   let mut exponent: i16 = ((bits >> 23) & 0xff) as i16;
   let mantissa = if exponent == 0 {
@@ -1303,7 +1215,10 @@ impl<'i> Variable<'i> {
     dest.write_str("var(")?;
     self.name.to_css(dest)?;
     if let Some(fallback) = &self.fallback {
-      dest.delim(',', false)?;
+      dest.write_char(',')?;
+      if !fallback.starts_with_whitespace() {
+        dest.whitespace()?;
+      }
       fallback.to_css(dest, is_custom_property)?;
     }
     dest.write_char(')')
@@ -1477,7 +1392,10 @@ impl<'i> EnvironmentVariable<'i> {
     }
 
     if let Some(fallback) = &self.fallback {
-      dest.delim(',', false)?;
+      dest.write_char(',')?;
+      if !fallback.starts_with_whitespace() {
+        dest.whitespace()?;
+      }
       fallback.to_css(dest, is_custom_property)?;
     }
     dest.write_char(')')
diff --git a/src/properties/effects.rs b/src/properties/effects.rs
index 1ba69f6a6..95d403d43 100644
--- a/src/properties/effects.rs
+++ b/src/properties/effects.rs
@@ -1,5 +1,6 @@
 //! CSS properties related to filters and effects.
 
+use crate::macros::enum_property;
 use crate::error::{ParserError, PrinterError};
 use crate::printer::Printer;
 use crate::targets::{Browsers, Targets};
@@ -410,3 +411,45 @@ impl IsCompatible for FilterList<'_> {
     true
   }
 }
+
+enum_property! {
+  /// A [`<blend-mode>`](https://www.w3.org/TR/compositing-1/#ltblendmodegt) value.
+  pub enum BlendMode {
+    /// The default blend mode; the top layer is drawn over the bottom layer.
+    Normal,
+    /// The source and destination are multiplied.
+    Multiply,
+    /// Multiplies the complements of the backdrop and source, then complements the result.
+    Screen,
+    /// Multiplies or screens, depending on the backdrop color.
+    Overlay,
+    /// Selects the darker of the backdrop and source.
+    Darken,
+    /// Selects the lighter of the backdrop and source.
+    Lighten,
+    /// Brightens the backdrop to reflect the source.
+    ColorDodge,
+    /// Darkens the backdrop to reflect the source.
+    ColorBurn,
+    /// Multiplies or screens, depending on the source color.
+    HardLight,
+    /// Darkens or lightens, depending on the source color.
+    SoftLight,
+    /// Subtracts the darker from the lighter.
+    Difference,
+    /// Similar to difference, but with lower contrast.
+    Exclusion,
+    /// The hue of the source with the saturation and luminosity of the backdrop.
+    Hue,
+    /// The saturation of the source with the hue and luminosity of the backdrop.
+    Saturation,
+    /// The hue and saturation of the source with the luminosity of the backdrop.
+    Color,
+    /// The luminosity of the source with the hue and saturation of the backdrop.
+    Luminosity,
+    /// Adds the source to the backdrop, producing a darker result.
+    PlusDarker,
+    /// Adds the source to the backdrop, producing a lighter result.
+    PlusLighter,
+  }
+}
diff --git a/src/properties/font.rs b/src/properties/font.rs
index 55581d886..8b3031a9f 100644
--- a/src/properties/font.rs
+++ b/src/properties/font.rs
@@ -421,6 +421,13 @@ impl<'i> ToCss for FamilyName<'i> {
     // https://www.w3.org/TR/css-fonts-4/#family-name-syntax
     let val = &self.0;
     if !val.is_empty() && !GenericFontFamily::parse_string(val).is_ok() {
+      // Family names with two or more consecutive spaces must be quoted to preserve the spaces.
+      let needs_quotes = val.contains("  ");
+      if needs_quotes {
+        serialize_string(&val, dest)?;
+        return Ok(());
+      }
+
       let mut id = String::new();
       let mut first = true;
       for slice in val.split(' ') {
diff --git a/src/properties/grid.rs b/src/properties/grid.rs
index 6e7063197..553cdc542 100644
--- a/src/properties/grid.rs
+++ b/src/properties/grid.rs
@@ -533,6 +533,7 @@ impl ToCss for TrackSizeList {
 }
 
 /// A value for the [grid-template-areas](https://drafts.csswg.org/css-grid-2/#grid-template-areas-property) property.
+/// none | <string>+
 #[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "visitor", derive(Visit))]
 #[cfg_attr(
@@ -704,6 +705,8 @@ impl GridTemplateAreas {
 
 /// A value for the [grid-template](https://drafts.csswg.org/css-grid-2/#explicit-grid-shorthand) shorthand property.
 ///
+/// none | [ <'grid-template-rows'> / <'grid-template-columns'> ] | [ <line-names>? <string> <track-size>? <line-names>? ]+ [ / <explicit-track-list> ]?
+///
 /// If `areas` is not `None`, then `rows` must also not be `None`.
 #[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "visitor", derive(Visit))]
@@ -935,6 +938,8 @@ impl_shorthand! {
 bitflags! {
   /// A value for the [grid-auto-flow](https://drafts.csswg.org/css-grid-2/#grid-auto-flow-property) property.
   ///
+  /// [ row | column ] || dense
+  ///
   /// The `Row` or `Column` flags may be combined with the `Dense` flag, but the `Row` and `Column` flags may
   /// not be combined.
   #[cfg_attr(feature = "visitor", derive(Visit))]
@@ -1101,6 +1106,8 @@ impl ToCss for GridAutoFlow {
 
 /// A value for the [grid](https://drafts.csswg.org/css-grid-2/#grid-shorthand) shorthand property.
 ///
+/// <'grid-template'> | <'grid-template-rows'> / [ auto-flow && dense? ] <'grid-auto-columns'>? | [ auto-flow && dense? ] <'grid-auto-rows'>? / <'grid-template-columns'>
+///
 /// Explicit and implicit values may not be combined.
 #[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "visitor", derive(Visit))]
@@ -1199,6 +1206,41 @@ impl ToCss for Grid<'_> {
       && self.auto_columns == TrackSizeList::default()
       && self.auto_flow == GridAutoFlow::default();
 
+    // Handle the case where areas is set but rows is None (auto-flow syntax).
+    // In this case, output "auto-flow / columns" format.
+    if self.areas != GridTemplateAreas::None && self.rows == TrackSizing::None {
+      dest.write_str("auto-flow")?;
+      if self.auto_flow.contains(GridAutoFlow::Dense) {
+        dest.write_str(" dense")?;
+      }
+      if self.auto_rows != TrackSizeList::default() {
+        dest.write_char(' ')?;
+        self.auto_rows.to_css(dest)?;
+      }
+      dest.delim('/', true)?;
+      self.columns.to_css(dest)?;
+      return Ok(());
+    }
+
+    // Handle the case where areas is set but columns is None (auto-flow column syntax).
+    // In this case, output "rows / auto-flow" format.
+    if self.areas != GridTemplateAreas::None
+      && self.columns == TrackSizing::None
+      && self.auto_flow.direction() == GridAutoFlow::Column
+    {
+      self.rows.to_css(dest)?;
+      dest.delim('/', true)?;
+      dest.write_str("auto-flow")?;
+      if self.auto_flow.contains(GridAutoFlow::Dense) {
+        dest.write_str(" dense")?;
+      }
+      if self.auto_columns != TrackSizeList::default() {
+        dest.write_char(' ')?;
+        self.auto_columns.to_css(dest)?;
+      }
+      return Ok(());
+    }
+
     if self.areas != GridTemplateAreas::None
       || (self.rows != TrackSizing::None && self.columns != TrackSizing::None)
       || (self.areas == GridTemplateAreas::None && is_auto_initial)
@@ -1256,16 +1298,28 @@ impl<'i> Grid<'i> {
     auto_columns: &TrackSizeList,
     auto_flow: &GridAutoFlow,
   ) -> bool {
+    let default_track_size_list = TrackSizeList::default();
+
+    // When areas is set but rows is None (auto-flow syntax like "grid: auto-flow / 1fr"),
+    // we can output the auto-flow shorthand along with "grid-template-areas" separately.
+    // ⚠️ The case of `grid: 1fr / auto-flow` does not require such handling.
+    if *areas != GridTemplateAreas::None && *rows == TrackSizing::None {
+      return auto_flow.direction() == GridAutoFlow::Row;
+    }
+
     // The `grid` shorthand can either be fully explicit (e.g. same as `grid-template`),
     // or explicit along a single axis. If there are auto rows, then there cannot be explicit rows, for example.
     let is_template = GridTemplate::is_valid(rows, columns, areas);
-    let default_track_size_list = TrackSizeList::default();
     let is_explicit = *auto_rows == default_track_size_list
       && *auto_columns == default_track_size_list
       && *auto_flow == GridAutoFlow::default();
+    // grid-auto-flow: row shorthand syntax:
+    // [ auto-flow && dense? ] <'grid-auto-rows'>? / <'grid-template-columns'>
     let is_auto_rows = auto_flow.direction() == GridAutoFlow::Row
       && *rows == TrackSizing::None
       && *auto_columns == default_track_size_list;
+    // grid-auto-flow: column shorthand syntax:
+    // <'grid-template-rows'> / [ auto-flow && dense? ] <'grid-auto-columns'>?
     let is_auto_columns = auto_flow.direction() == GridAutoFlow::Column
       && *columns == TrackSizing::None
       && *auto_rows == default_track_size_list;
@@ -1274,6 +1328,7 @@ impl<'i> Grid<'i> {
   }
 }
 
+// TODO: shorthand `grid: auto-flow 1fr / 100px` https://drafts.csswg.org/css-grid/#example-dec34e0f
 impl_shorthand! {
   Grid(Grid<'i>) {
     rows: [GridTemplateRows],
@@ -1461,6 +1516,7 @@ macro_rules! impl_grid_placement {
 
 define_shorthand! {
   /// A value for the [grid-row](https://drafts.csswg.org/css-grid-2/#propdef-grid-row) shorthand property.
+  /// <grid-line> [ / <grid-line> ]?
   pub struct GridRow<'i> {
     /// The starting line.
     #[cfg_attr(feature = "serde", serde(borrow))]
@@ -1471,7 +1527,8 @@ define_shorthand! {
 }
 
 define_shorthand! {
-  /// A value for the [grid-row](https://drafts.csswg.org/css-grid-2/#propdef-grid-column) shorthand property.
+  /// A value for the [grid-column](https://drafts.csswg.org/css-grid-2/#propdef-grid-column) shorthand property.
+  /// <grid-line> [ / <grid-line> ]?
   pub struct GridColumn<'i> {
     /// The starting line.
     #[cfg_attr(feature = "serde", serde(borrow))]
@@ -1486,6 +1543,7 @@ impl_grid_placement!(GridColumn);
 
 define_shorthand! {
   /// A value for the [grid-area](https://drafts.csswg.org/css-grid-2/#propdef-grid-area) shorthand property.
+  /// <grid-line> [ / <grid-line> ]{0,3}
   pub struct GridArea<'i> {
     /// The grid row start placement.
     #[cfg_attr(feature = "serde", serde(borrow))]
@@ -1684,10 +1742,24 @@ impl<'i> PropertyHandler<'i> for GridHandler<'i> {
           auto_columns_val,
           auto_flow_val,
         ) {
+          let needs_separate_areas = *areas_val != GridTemplateAreas::None
+            && ((*rows_val == TrackSizing::None && auto_flow_val.direction() == GridAutoFlow::Row)
+              || (*columns_val == TrackSizing::None && auto_flow_val.direction() == GridAutoFlow::Column));
+
+          // Pad areas with "." for missing rows. But don't pad if we're using auto-flow syntax,
+          // because grid-template-areas should remain as-is in that case.
+          // Use tuple to avoid double cloning when needs_separate_areas is true.
+          let (areas_for_grid, areas_for_output) = if needs_separate_areas {
+            // Take the original areas directly to avoid cloning when needs_separate_areas is true
+            (areas_val.clone(), Some(areas_val.clone()))
+          } else {
+            (GridHandler::pad_grid_template_areas(rows_val, areas_val.clone()), None)
+          };
+
           dest.push(Property::Grid(Grid {
             rows: rows_val.clone(),
             columns: columns_val.clone(),
-            areas: areas_val.clone(),
+            areas: areas_for_grid,
             auto_rows: auto_rows_val.clone(),
             auto_columns: auto_columns_val.clone(),
             auto_flow: auto_flow_val.clone(),
@@ -1697,16 +1769,25 @@ impl<'i> PropertyHandler<'i> for GridHandler<'i> {
           auto_rows = None;
           auto_columns = None;
           auto_flow = None;
+
+          // When areas is set but rows/columns is None (auto-flow syntax), also output
+          // grid-template-areas separately since grid shorthand can't represent this combination.
+          if let Some(areas) = areas_for_output {
+            dest.push(Property::GridTemplateAreas(areas));
+          }
         }
       }
 
       // The `grid-template` shorthand supports only explicit track values (i.e. no `repeat()`)
       // combined with grid-template-areas. If there are no areas, then any track values are allowed.
       if has_template && GridTemplate::is_valid(rows_val, columns_val, areas_val) {
+        // Pad areas with "." for missing rows
+        let padded_areas = GridHandler::pad_grid_template_areas(rows_val, areas_val.clone());
+
         dest.push(Property::GridTemplate(GridTemplate {
           rows: rows_val.clone(),
           columns: columns_val.clone(),
-          areas: areas_val.clone(),
+          areas: padded_areas,
         }));
 
         has_template = false;
@@ -1763,6 +1844,39 @@ impl<'i> PropertyHandler<'i> for GridHandler<'i> {
   }
 }
 
+/// Pads grid template areas with "." (None) for missing rows.
+/// All the remaining unnamed areas in a grid can be referred using null cell
+/// tokens. A null cell token is a sequence of one or more . (U+002E FULL STOP)
+/// characters, e.g., ., ..., or ..... etc. A null cell token can be used to
+/// create empty spaces in the grid.
+/// Spec: https://drafts.csswg.org/css-grid/#ref-for-string-value①
+impl GridHandler<'_> {
+  fn pad_grid_template_areas(rows: &TrackSizing, areas: GridTemplateAreas) -> GridTemplateAreas {
+    match (rows, areas) {
+      (TrackSizing::TrackList(rows_list), GridTemplateAreas::Areas { columns, areas }) => {
+        let rows_count = rows_list.items.len();
+        let areas_rows_count = areas.len() / columns as usize;
+        if areas_rows_count < rows_count {
+          let mut padded_areas = areas;
+          // Fill each missing row with "." (represented as None)
+          for _ in areas_rows_count..rows_count {
+            for _ in 0..columns {
+              padded_areas.push(None);
+            }
+          }
+          GridTemplateAreas::Areas {
+            columns,
+            areas: padded_areas,
+          }
+        } else {
+          GridTemplateAreas::Areas { columns, areas }
+        }
+      }
+      (_, areas) => areas,
+    }
+  }
+}
+
 #[inline]
 fn is_grid_property(property_id: &PropertyId) -> bool {
   match property_id {
diff --git a/src/properties/list.rs b/src/properties/list.rs
index e411667de..e04ed7477 100644
--- a/src/properties/list.rs
+++ b/src/properties/list.rs
@@ -108,7 +108,7 @@ macro_rules! counter_styles {
       fn is_compatible(&self, browsers: Browsers) -> bool {
         match self {
           $(
-            PredefinedCounterStyle::$id => paste::paste! {
+            PredefinedCounterStyle::$id => pastey::paste! {
               crate::compat::Feature::[<$id ListStyleType>].is_compatible(browsers)
             },
           )+
diff --git a/src/properties/mod.rs b/src/properties/mod.rs
index fb552773d..c39b618ba 100644
--- a/src/properties/mod.rs
+++ b/src/properties/mod.rs
@@ -852,7 +852,10 @@ macro_rules! define_properties {
           },
           Custom(custom) => {
             custom.name.to_css(dest)?;
-            dest.delim(':', false)?;
+            dest.write_char(':')?;
+            if !custom.value.starts_with_whitespace() {
+              dest.whitespace()?;
+            }
             self.value_to_css(dest)?;
             write_important!();
             return Ok(())
@@ -989,7 +992,7 @@ macro_rules! define_properties {
         D: serde::Deserializer<'de>,
       {
         enum ContentOrRaw<'de> {
-          Content(serde::__private::de::Content<'de>),
+          Content(serde_content::Value<'de>),
           Raw(CowArcStr<'de>)
         }
 
@@ -1062,26 +1065,26 @@ macro_rules! define_properties {
           ContentOrRaw::Content(content) => content
         };
 
-        let deserializer = serde::__private::de::ContentDeserializer::new(content);
+        let deserializer = serde_content::Deserializer::new(content).coerce_numbers();
         match partial.property_id {
           $(
             $(#[$meta])*
             PropertyId::$property$((vp_name!($vp, prefix)))? => {
-              let value = <$type>::deserialize(deserializer)?;
+              let value = <$type>::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
               Ok(Property::$property(value $(, vp_name!($vp, prefix))?))
             },
           )+
           PropertyId::Custom(name) => {
             if name.as_ref() == "unparsed" {
-              let value = UnparsedProperty::deserialize(deserializer)?;
+              let value = UnparsedProperty::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
               Ok(Property::Unparsed(value))
             } else {
-              let value = CustomProperty::deserialize(deserializer)?;
+              let value = CustomProperty::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
               Ok(Property::Custom(value))
             }
           }
           PropertyId::All => {
-            let value = CSSWideKeyword::deserialize(deserializer)?;
+            let value = CSSWideKeyword::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
             Ok(Property::All(value))
           }
         }
@@ -1597,6 +1600,9 @@ define_properties! {
   "filter": Filter(FilterList<'i>, VendorPrefix) / WebKit,
   "backdrop-filter": BackdropFilter(FilterList<'i>, VendorPrefix) / WebKit,
 
+  // https://www.w3.org/TR/compositing-1/
+  "mix-blend-mode": MixBlendMode(BlendMode),
+
   // https://drafts.csswg.org/css2/
   "z-index": ZIndex(position::ZIndex),
 
@@ -1613,6 +1619,7 @@ define_properties! {
 
   // https://drafts.csswg.org/css-color-adjust/
   "color-scheme": ColorScheme(ColorScheme),
+  "print-color-adjust": PrintColorAdjust(PrintColorAdjust, VendorPrefix) / WebKit,
 }
 
 impl<'i, T: smallvec::Array<Item = V>, V: Parse<'i>> Parse<'i> for SmallVec<T> {
diff --git a/src/properties/prefix_handler.rs b/src/properties/prefix_handler.rs
index 7ad2dfe8e..b42234777 100644
--- a/src/properties/prefix_handler.rs
+++ b/src/properties/prefix_handler.rs
@@ -73,13 +73,14 @@ define_prefixes! {
   ClipPath,
   BoxDecorationBreak,
   TextSizeAdjust,
+  PrintColorAdjust,
 }
 
 macro_rules! define_fallbacks {
   (
     $( $name: ident$(($p: ident))?, )+
   ) => {
-    paste::paste! {
+    pastey::paste! {
       #[derive(Default)]
       pub(crate) struct FallbackHandler {
         $(
@@ -97,7 +98,7 @@ macro_rules! define_fallbacks {
               $(
                 $p = context.targets.prefixes($p, Feature::$name);
               )?
-              if paste::paste! { self.[<$name:snake>] }.is_none() {
+              if pastey::paste! { self.[<$name:snake>] }.is_none() {
                 let fallbacks = val.get_fallbacks(context.targets);
                 #[allow(unused_variables)]
                 let has_fallbacks = !fallbacks.is_empty();
@@ -112,10 +113,10 @@ macro_rules! define_fallbacks {
                 )?
               }
 
-              if paste::paste! { self.[<$name:snake>] }.is_none() || matches!(context.targets.browsers, Some(targets) if !val.is_compatible(targets)) {
-                paste::paste! { self.[<$name:snake>] = Some(dest.len()) };
+              if pastey::paste! { self.[<$name:snake>] }.is_none() || matches!(context.targets.browsers, Some(targets) if !val.is_compatible(targets)) {
+                pastey::paste! { self.[<$name:snake>] = Some(dest.len()) };
                 dest.push(Property::$name(val $(, $p)?));
-              } else if let Some(index) = paste::paste! { self.[<$name:snake>] } {
+              } else if let Some(index) = pastey::paste! { self.[<$name:snake>] } {
                 dest[index] = Property::$name(val $(, $p)?);
               }
             }
@@ -138,7 +139,7 @@ macro_rules! define_fallbacks {
                   }
 
                   let val = get_prefixed!($($p)?);
-                  (val, paste::paste! { &mut self.[<$name:snake>] })
+                  (val, pastey::paste! { &mut self.[<$name:snake>] })
                 }
               )+
               _ => return false
@@ -161,7 +162,7 @@ macro_rules! define_fallbacks {
 
       fn finalize(&mut self, _: &mut DeclarationList, _: &mut PropertyHandlerContext) {
         $(
-          paste::paste! { self.[<$name:snake>] = None };
+          pastey::paste! { self.[<$name:snake>] = None };
         )+
       }
     }
diff --git a/src/properties/size.rs b/src/properties/size.rs
index 0c8733572..c6a5eb2e6 100644
--- a/src/properties/size.rs
+++ b/src/properties/size.rs
@@ -144,8 +144,7 @@ impl IsCompatible for Size {
       }
       Stretch(vp) => match *vp {
         VendorPrefix::None => Feature::StretchSize,
-        VendorPrefix::WebKit => Feature::WebkitFillAvailableSize,
-        VendorPrefix::Moz => Feature::MozAvailableSize,
+        VendorPrefix::WebKit | VendorPrefix::Moz => Feature::WebkitFillAvailableSize,
         _ => return false,
       }
       .is_compatible(browsers),
@@ -278,8 +277,7 @@ impl IsCompatible for MaxSize {
       }
       Stretch(vp) => match *vp {
         VendorPrefix::None => Feature::StretchSize,
-        VendorPrefix::WebKit => Feature::WebkitFillAvailableSize,
-        VendorPrefix::Moz => Feature::MozAvailableSize,
+        VendorPrefix::WebKit | VendorPrefix::Moz => Feature::WebkitFillAvailableSize,
         _ => return false,
       }
       .is_compatible(browsers),
diff --git a/src/properties/svg.rs b/src/properties/svg.rs
index 16b384568..552dd2d25 100644
--- a/src/properties/svg.rs
+++ b/src/properties/svg.rs
@@ -211,6 +211,7 @@ pub enum Marker<'i> {
 
 /// A value for the [color-interpolation](https://www.w3.org/TR/SVG2/painting.html#ColorInterpolation) property.
 #[derive(Debug, Clone, Copy, PartialEq, Parse, ToCss)]
+#[css(case = lower)]
 #[cfg_attr(feature = "visitor", derive(Visit))]
 #[cfg_attr(
   feature = "serde",
@@ -249,6 +250,7 @@ pub enum ColorRendering {
 
 /// A value for the [shape-rendering](https://www.w3.org/TR/SVG2/painting.html#ShapeRendering) property.
 #[derive(Debug, Clone, Copy, PartialEq, Parse, ToCss)]
+#[css(case = lower)]
 #[cfg_attr(feature = "visitor", derive(Visit))]
 #[cfg_attr(
   feature = "serde",
@@ -270,6 +272,7 @@ pub enum ShapeRendering {
 
 /// A value for the [text-rendering](https://www.w3.org/TR/SVG2/painting.html#TextRendering) property.
 #[derive(Debug, Clone, Copy, PartialEq, Parse, ToCss)]
+#[css(case = lower)]
 #[cfg_attr(feature = "visitor", derive(Visit))]
 #[cfg_attr(
   feature = "serde",
diff --git a/src/properties/transform.rs b/src/properties/transform.rs
index c8f5a7f72..cc00e5783 100644
--- a/src/properties/transform.rs
+++ b/src/properties/transform.rs
@@ -7,7 +7,6 @@ use crate::error::{ParserError, PrinterError};
 use crate::macros::enum_property;
 use crate::prefixes::Feature;
 use crate::printer::Printer;
-use crate::stylesheet::PrinterOptions;
 use crate::traits::{Parse, PropertyHandler, ToCss, Zero};
 use crate::values::{
   angle::Angle,
@@ -59,20 +58,6 @@ impl ToCss for TransformList {
 
     // TODO: Re-enable with a better solution
     //       See: https://github.com/parcel-bundler/lightningcss/issues/288
-    if dest.minify {
-      let mut base = String::new();
-      self.to_css_base(&mut Printer::new(
-        &mut base,
-        PrinterOptions {
-          minify: true,
-          ..PrinterOptions::default()
-        },
-      ))?;
-
-      dest.write_str(&base)?;
-
-      return Ok(());
-    }
     // if dest.minify {
     //   // Combine transforms into a single matrix.
     //   if let Some(matrix) = self.to_matrix() {
@@ -141,7 +126,13 @@ impl TransformList {
   where
     W: std::fmt::Write,
   {
+    let mut first = true;
     for item in &self.0 {
+      if first {
+        first = false;
+      } else {
+        dest.whitespace()?;
+      }
       item.to_css(dest)?;
     }
     Ok(())
@@ -1518,29 +1509,39 @@ impl Translate {
 /// A value for the [rotate](https://drafts.csswg.org/css-transforms-2/#propdef-rotate) property.
 #[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "visitor", derive(Visit))]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(
+  feature = "serde",
+  derive(serde::Serialize, serde::Deserialize),
+  serde(rename_all = "lowercase")
+)]
 #[cfg_attr(feature = "jsonschema", derive(schemars::JsonSchema))]
 #[cfg_attr(feature = "into_owned", derive(static_self::IntoOwned))]
-pub struct Rotate {
-  /// Rotation around the x axis.
-  pub x: f32,
-  /// Rotation around the y axis.
-  pub y: f32,
-  /// Rotation around the z axis.
-  pub z: f32,
-  /// The angle of rotation.
-  pub angle: Angle,
+pub enum Rotate {
+  /// The `none` keyword.
+  None,
+
+  /// Rotation on the x, y, and z axes.
+  #[cfg_attr(feature = "serde", serde(untagged))]
+  XYZ {
+    /// Rotation around the x axis.
+    x: f32,
+    /// Rotation around the y axis.
+    y: f32,
+    /// Rotation around the z axis.
+    z: f32,
+    /// The angle of rotation.
+    angle: Angle,
+  },
 }
 
 impl<'i> Parse<'i> for Rotate {
   fn parse<'t>(input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i, ParserError<'i>>> {
+    // CSS Transforms 2 §5.1:
+    // "It must serialize as the keyword none if and only if none was originally specified."
+    // Keep `none` explicit so identity rotations (e.g. `0deg`) do not round-trip to `none`.
+    // https://drafts.csswg.org/css-transforms-2/#individual-transforms
     if input.try_parse(|i| i.expect_ident_matching("none")).is_ok() {
-      return Ok(Rotate {
-        x: 0.0,
-        y: 0.0,
-        z: 1.0,
-        angle: Angle::Deg(0.0),
-      });
+      return Ok(Rotate::None);
     }
 
     let angle = input.try_parse(Angle::parse);
@@ -1564,7 +1565,7 @@ impl<'i> Parse<'i> for Rotate {
       )
       .unwrap_or((0.0, 0.0, 1.0));
     let angle = angle.or_else(|_| Angle::parse(input))?;
-    Ok(Rotate { x, y, z, angle })
+    Ok(Rotate::XYZ { x, y, z, angle })
   }
 }
 
@@ -1573,32 +1574,46 @@ impl ToCss for Rotate {
   where
     W: std::fmt::Write,
   {
-    if self.x == 0.0 && self.y == 0.0 && self.z == 1.0 && self.angle.is_zero() {
-      dest.write_str("none")?;
-      return Ok(());
-    }
-
-    if self.x == 1.0 && self.y == 0.0 && self.z == 0.0 {
-      dest.write_str("x ")?;
-    } else if self.x == 0.0 && self.y == 1.0 && self.z == 0.0 {
-      dest.write_str("y ")?;
-    } else if !(self.x == 0.0 && self.y == 0.0 && self.z == 1.0) {
-      self.x.to_css(dest)?;
-      dest.write_char(' ')?;
-      self.y.to_css(dest)?;
-      dest.write_char(' ')?;
-      self.z.to_css(dest)?;
-      dest.write_char(' ')?;
+    match self {
+      Rotate::None => dest.write_str("none"),
+      Rotate::XYZ { x, y, z, angle } => {
+        // CSS Transforms 2 §5.1:
+        // "If the axis is parallel with the x or y axes, it must serialize as the appropriate keyword."
+        // "If a rotation about the z axis ... must serialize as just an <angle>."
+        // Normalize parallel vectors (including non-unit vectors); flip the angle for negative axis directions.
+        // https://drafts.csswg.org/css-transforms-2/#individual-transforms
+        if *y == 0.0 && *z == 0.0 && *x != 0.0 {
+          let angle = if *x < 0.0 { angle.clone() * -1.0 } else { angle.clone() };
+          dest.write_str("x ")?;
+          angle.to_css(dest)
+        } else if *x == 0.0 && *z == 0.0 && *y != 0.0 {
+          let angle = if *y < 0.0 { angle.clone() * -1.0 } else { angle.clone() };
+          dest.write_str("y ")?;
+          angle.to_css(dest)
+        } else if *x == 0.0 && *y == 0.0 && *z != 0.0 {
+          let angle = if *z < 0.0 { angle.clone() * -1.0 } else { angle.clone() };
+          angle.to_css(dest)
+        } else {
+          x.to_css(dest)?;
+          dest.write_char(' ')?;
+          y.to_css(dest)?;
+          dest.write_char(' ')?;
+          z.to_css(dest)?;
+          dest.write_char(' ')?;
+          angle.to_css(dest)
+        }
+      }
     }
-
-    self.angle.to_css(dest)
   }
 }
 
 impl Rotate {
   /// Converts the rotation to a transform function.
   pub fn to_transform(&self) -> Transform {
-    Transform::Rotate3d(self.x, self.y, self.z, self.angle.clone())
+    match self {
+      Rotate::None => Transform::Rotate3d(0.0, 0.0, 1.0, Angle::Deg(0.0)),
+      Rotate::XYZ { x, y, z, angle } => Transform::Rotate3d(*x, *y, *z, angle.clone()),
+    }
   }
 }
 
diff --git a/src/properties/ui.rs b/src/properties/ui.rs
index 9b0bb7149..e0802c500 100644
--- a/src/properties/ui.rs
+++ b/src/properties/ui.rs
@@ -433,33 +433,44 @@ bitflags! {
 impl<'i> Parse<'i> for ColorScheme {
   fn parse<'t>(input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i, ParserError<'i>>> {
     let mut res = ColorScheme::empty();
-    let ident = input.expect_ident()?;
-    match_ignore_ascii_case! { &ident,
-      "normal" => return Ok(res),
-      "only" => res |= ColorScheme::Only,
-      "light" => res |= ColorScheme::Light,
-      "dark" => res |= ColorScheme::Dark,
-      _ => {}
-    };
+    let mut has_any = false;
 
-    while let Ok(ident) = input.try_parse(|input| input.expect_ident_cloned()) {
-      match_ignore_ascii_case! { &ident,
-        "normal" => return Err(input.new_custom_error(ParserError::InvalidValue)),
-        "only" => {
-          // Only must be at the start or the end, not in the middle.
-          if res.contains(ColorScheme::Only) {
-            return Err(input.new_custom_error(ParserError::InvalidValue));
-          }
-          res |= ColorScheme::Only;
-          return Ok(res);
-        },
-        "light" => res |= ColorScheme::Light,
-        "dark" => res |= ColorScheme::Dark,
-        _ => {}
-      };
+    if input.try_parse(|input| input.expect_ident_matching("normal")).is_ok() {
+      return Ok(res);
     }
 
-    Ok(res)
+    if input.try_parse(|input| input.expect_ident_matching("only")).is_ok() {
+      res |= ColorScheme::Only;
+      has_any = true;
+    }
+
+    loop {
+      if input.try_parse(|input| input.expect_ident_matching("light")).is_ok() {
+        res |= ColorScheme::Light;
+        has_any = true;
+        continue;
+      }
+
+      if input.try_parse(|input| input.expect_ident_matching("dark")).is_ok() {
+        res |= ColorScheme::Dark;
+        has_any = true;
+        continue;
+      }
+
+      break;
+    }
+
+    // Only is allowed at the start or the end.
+    if !res.contains(ColorScheme::Only) && input.try_parse(|input| input.expect_ident_matching("only")).is_ok() {
+      res |= ColorScheme::Only;
+      has_any = true;
+    }
+
+    if has_any {
+      return Ok(res);
+    }
+
+    Err(input.new_custom_error(ParserError::InvalidValue))
   }
 }
 
@@ -484,6 +495,10 @@ impl ToCss for ColorScheme {
     }
 
     if self.contains(ColorScheme::Only) {
+      // Avoid parsing `color-scheme: only` as `color-scheme:  only`
+      if !self.intersects(ColorScheme::Light | ColorScheme::Dark) {
+        return dest.write_str("only");
+      }
       dest.write_str(" only")?;
     }
 
@@ -571,6 +586,16 @@ impl<'i> PropertyHandler<'i> for ColorSchemeHandler {
   fn finalize(&mut self, _: &mut DeclarationList<'i>, _: &mut PropertyHandlerContext<'i, '_>) {}
 }
 
+enum_property! {
+  /// A value for the [print-color-adjust](https://drafts.csswg.org/css-color-adjust/#propdef-print-color-adjust) property.
+  pub enum PrintColorAdjust {
+    /// The user agent is allowed to make adjustments to the element as it deems appropriate.
+    Economy,
+    /// The user agent is not allowed to make adjustments to the element.
+    Exact,
+  }
+}
+
 #[inline]
 fn define_var<'i>(name: &'static str, value: Token<'static>) -> Property<'i> {
   Property::Custom(CustomProperty {
diff --git a/src/rules/container.rs b/src/rules/container.rs
index a3ac87feb..97bb1b3a4 100644
--- a/src/rules/container.rs
+++ b/src/rules/container.rs
@@ -11,6 +11,7 @@ use crate::media_query::{
 };
 use crate::parser::{DefaultAtRule, ParserOptions};
 use crate::printer::Printer;
+use crate::properties::custom::TokenList;
 use crate::properties::{Property, PropertyId};
 #[cfg(feature = "serde")]
 use crate::serialization::ValueWrapper;
@@ -31,7 +32,7 @@ pub struct ContainerRule<'i, R = DefaultAtRule> {
   #[cfg_attr(feature = "serde", serde(borrow))]
   pub name: Option<ContainerName<'i>>,
   /// The container condition.
-  pub condition: ContainerCondition<'i>,
+  pub condition: Option<ContainerCondition<'i>>,
   /// The rules within the `@container` rule.
   pub rules: CssRuleList<'i, R>,
   /// The location of the rule in the source file.
@@ -68,6 +69,12 @@ pub enum ContainerCondition<'i> {
   /// A style query.
   #[cfg_attr(feature = "serde", serde(borrow, with = "ValueWrapper::<StyleQuery>"))]
   Style(StyleQuery<'i>),
+  /// A scroll state query.
+  #[cfg_attr(feature = "serde", serde(borrow, with = "ValueWrapper::<ScrollStateQuery>"))]
+  ScrollState(ScrollStateQuery<'i>),
+  /// Unknown tokens.
+  #[cfg_attr(feature = "serde", serde(borrow, with = "ValueWrapper::<TokenList>"))]
+  Unknown(TokenList<'i>),
 }
 
 /// A container query size feature.
@@ -133,6 +140,61 @@ pub enum StyleQuery<'i> {
   },
 }
 
+/// Represents a scroll state query within a container condition.
+#[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "visitor", derive(Visit))]
+#[cfg_attr(feature = "into_owned", derive(static_self::IntoOwned))]
+#[cfg_attr(
+  feature = "serde",
+  derive(serde::Serialize, serde::Deserialize),
+  serde(tag = "type", rename_all = "kebab-case")
+)]
+#[cfg_attr(feature = "jsonschema", derive(schemars::JsonSchema))]
+pub enum ScrollStateQuery<'i> {
+  /// A size container feature, implicitly parenthesized.
+  #[cfg_attr(feature = "serde", serde(borrow, with = "ValueWrapper::<ScrollStateFeature>"))]
+  Feature(ScrollStateFeature<'i>),
+  /// A negation of a condition.
+  #[cfg_attr(feature = "visitor", skip_type)]
+  #[cfg_attr(feature = "serde", serde(with = "ValueWrapper::<Box<ScrollStateQuery>>"))]
+  Not(Box<ScrollStateQuery<'i>>),
+  /// A set of joint operations.
+  #[cfg_attr(feature = "visitor", skip_type)]
+  Operation {
+    /// The operator for the conditions.
+    operator: Operator,
+    /// The conditions for the operator.
+    conditions: Vec<ScrollStateQuery<'i>>,
+  },
+}
+
+/// A container query size feature.
+pub type ScrollStateFeature<'i> = QueryFeature<'i, ScrollStateFeatureId>;
+
+define_query_features! {
+  /// A container query scroll state feature identifier.
+  pub enum ScrollStateFeatureId {
+    /// The [stuck](https://drafts.csswg.org/css-conditional-5/#stuck) scroll state feature.
+    "stuck": Stuck = Ident,
+    /// The [snapped](https://drafts.csswg.org/css-conditional-5/#snapped) scroll state feature.
+    "snapped": Snapped = Ident,
+    /// The [scrollable](https://drafts.csswg.org/css-conditional-5/#scrollable) scroll state feature.
+    "scrollable": Scrollable = Ident,
+    /// The [scrolled](https://drafts.csswg.org/css-conditional-5/#scrolled) scroll state feature.
+    "scrolled": Scrolled = Ident,
+  }
+}
+
+impl FeatureToCss for ScrollStateFeatureId {
+  fn to_css_with_prefix<W>(&self, prefix: &str, dest: &mut Printer<W>) -> Result<(), PrinterError>
+  where
+    W: std::fmt::Write,
+  {
+    dest.write_str(prefix)?;
+    self.to_css(dest)
+  }
+}
+
 impl<'i> QueryCondition<'i> for ContainerCondition<'i> {
   #[inline]
   fn parse_feature<'t>(
@@ -168,12 +230,58 @@ impl<'i> QueryCondition<'i> for ContainerCondition<'i> {
     })
   }
 
+  fn parse_scroll_state_query<'t>(
+    input: &mut Parser<'i, 't>,
+    options: &ParserOptions<'_, 'i>,
+  ) -> Result<Self, ParseError<'i, ParserError<'i>>> {
+    input.parse_nested_block(|input| {
+      if let Ok(res) =
+        input.try_parse(|input| parse_query_condition(input, QueryConditionFlags::ALLOW_OR, options))
+      {
+        return Ok(Self::ScrollState(res));
+      }
+
+      Ok(Self::ScrollState(ScrollStateQuery::parse_feature(input, options)?))
+    })
+  }
+
   fn needs_parens(&self, parent_operator: Option<Operator>, targets: &Targets) -> bool {
     match self {
       ContainerCondition::Not(_) => true,
       ContainerCondition::Operation { operator, .. } => Some(*operator) != parent_operator,
       ContainerCondition::Feature(f) => f.needs_parens(parent_operator, targets),
       ContainerCondition::Style(_) => false,
+      ContainerCondition::ScrollState(_) => false,
+      ContainerCondition::Unknown(_) => false,
+    }
+  }
+}
+
+impl<'i> QueryCondition<'i> for ScrollStateQuery<'i> {
+  #[inline]
+  fn parse_feature<'t>(
+    input: &mut Parser<'i, 't>,
+    options: &ParserOptions<'_, 'i>,
+  ) -> Result<Self, ParseError<'i, ParserError<'i>>> {
+    let feature = QueryFeature::parse_with_options(input, options)?;
+    Ok(Self::Feature(feature))
+  }
+
+  #[inline]
+  fn create_negation(condition: Box<Self>) -> Self {
+    Self::Not(condition)
+  }
+
+  #[inline]
+  fn create_operation(operator: Operator, conditions: Vec<Self>) -> Self {
+    Self::Operation { operator, conditions }
+  }
+
+  fn needs_parens(&self, parent_operator: Option<Operator>, targets: &Targets) -> bool {
+    match self {
+      ScrollStateQuery::Not(_) => true,
+      ScrollStateQuery::Operation { operator, .. } => Some(*operator) != parent_operator,
+      ScrollStateQuery::Feature(f) => f.needs_parens(parent_operator, targets),
     }
   }
 }
@@ -219,11 +327,24 @@ impl<'i> ParseWithOptions<'i> for ContainerCondition<'i> {
     input: &mut Parser<'i, 't>,
     options: &ParserOptions<'_, 'i>,
   ) -> Result<Self, ParseError<'i, ParserError<'i>>> {
-    parse_query_condition(
-      input,
-      QueryConditionFlags::ALLOW_OR | QueryConditionFlags::ALLOW_STYLE,
-      options,
-    )
+    input
+      .try_parse(|input| {
+        parse_query_condition(
+          input,
+          QueryConditionFlags::ALLOW_OR
+            | QueryConditionFlags::ALLOW_STYLE
+            | QueryConditionFlags::ALLOW_SCROLL_STATE,
+          options,
+        )
+      })
+      .or_else(|e| {
+        if options.error_recovery {
+          options.warn(e);
+          Ok(ContainerCondition::Unknown(TokenList::parse(input, options, 0)?))
+        } else {
+          Err(e)
+        }
+      })
   }
 }
 
@@ -247,6 +368,19 @@ impl<'i> ToCss for ContainerCondition<'i> {
         query.to_css(dest)?;
         dest.write_char(')')
       }
+      ContainerCondition::ScrollState(ref query) => {
+        let needs_parens = !matches!(query, ScrollStateQuery::Feature(_));
+        dest.write_str("scroll-state")?;
+        if needs_parens {
+          dest.write_char('(')?;
+        }
+        query.to_css(dest)?;
+        if needs_parens {
+          dest.write_char(')')?;
+        }
+        Ok(())
+      }
+      ContainerCondition::Unknown(ref tokens) => tokens.to_css(dest, false),
     }
   }
 }
@@ -271,6 +405,25 @@ impl<'i> ToCss for StyleQuery<'i> {
   }
 }
 
+impl<'i> ToCss for ScrollStateQuery<'i> {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> Result<(), PrinterError>
+  where
+    W: std::fmt::Write,
+  {
+    match *self {
+      ScrollStateQuery::Feature(ref f) => f.to_css(dest),
+      ScrollStateQuery::Not(ref c) => {
+        dest.write_str("not ")?;
+        to_css_with_parens_if_needed(&**c, dest, c.needs_parens(None, &dest.targets.current))
+      }
+      ScrollStateQuery::Operation {
+        ref conditions,
+        operator,
+      } => operation_to_css(operator, conditions, dest),
+    }
+  }
+}
+
 /// A [`<container-name>`](https://drafts.csswg.org/css-contain-3/#typedef-container-name) in a `@container` rule.
 #[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "visitor", derive(Visit))]
@@ -325,16 +478,22 @@ impl<'a, 'i, T: ToCss> ToCss for ContainerRule<'i, T> {
     #[cfg(feature = "sourcemap")]
     dest.add_mapping(self.loc);
     dest.write_str("@container ")?;
+    let has_condition = self.condition.is_some();
+
     if let Some(name) = &self.name {
       name.to_css(dest)?;
-      dest.write_char(' ')?;
+      if has_condition {
+        dest.write_char(' ')?;
+      }
     }
 
-    // Don't downlevel range syntax in container queries.
-    let exclude = dest.targets.current.exclude;
-    dest.targets.current.exclude.insert(Features::MediaQueries);
-    self.condition.to_css(dest)?;
-    dest.targets.current.exclude = exclude;
+    if let Some(condition) = &self.condition {
+      // Don't downlevel range syntax in container queries.
+      let exclude = dest.targets.current.exclude;
+      dest.targets.current.exclude.insert(Features::MediaQueries);
+      condition.to_css(dest)?;
+      dest.targets.current.exclude = exclude;
+    }
 
     dest.whitespace()?;
     dest.write_char('{')?;
diff --git a/src/rules/mod.rs b/src/rules/mod.rs
index 5981a42e6..5598c96f5 100644
--- a/src/rules/mod.rs
+++ b/src/rules/mod.rs
@@ -73,7 +73,7 @@ use crate::printer::Printer;
 use crate::rules::keyframes::KeyframesName;
 use crate::selector::{is_compatible, is_equivalent, Component, Selector, SelectorList};
 use crate::stylesheet::ParserOptions;
-use crate::targets::TargetsWithSupportsScope;
+use crate::targets::{should_compile, TargetsWithSupportsScope};
 use crate::traits::{AtRuleParser, ToCss};
 use crate::values::string::CowArcStr;
 use crate::vendor_prefix::VendorPrefix;
@@ -209,7 +209,7 @@ impl<'i, 'de: 'i, R: serde::Deserialize<'de>> serde::Deserialize<'de> for CssRul
 
     struct PartialRule<'de> {
       rule_type: CowArcStr<'de>,
-      content: serde::__private::de::Content<'de>,
+      content: serde_content::Value<'de>,
     }
 
     struct CssRuleVisitor;
@@ -226,7 +226,7 @@ impl<'i, 'de: 'i, R: serde::Deserialize<'de>> serde::Deserialize<'de> for CssRul
         A: serde::de::MapAccess<'de>,
       {
         let mut rule_type: Option<CowArcStr<'de>> = None;
-        let mut value: Option<serde::__private::de::Content> = None;
+        let mut value: Option<serde_content::Value> = None;
         while let Some(key) = map.next_key()? {
           match key {
             Field::Type => {
@@ -245,108 +245,122 @@ impl<'i, 'de: 'i, R: serde::Deserialize<'de>> serde::Deserialize<'de> for CssRul
     }
 
     let partial = deserializer.deserialize_map(CssRuleVisitor)?;
-    let deserializer = serde::__private::de::ContentDeserializer::new(partial.content);
+    let deserializer = serde_content::Deserializer::new(partial.content).coerce_numbers();
 
     match partial.rule_type.as_ref() {
       "media" => {
-        let rule = MediaRule::deserialize(deserializer)?;
+        let rule = MediaRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Media(rule))
       }
       "import" => {
-        let rule = ImportRule::deserialize(deserializer)?;
+        let rule = ImportRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Import(rule))
       }
       "style" => {
-        let rule = StyleRule::deserialize(deserializer)?;
+        let rule = StyleRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Style(rule))
       }
       "keyframes" => {
-        let rule = KeyframesRule::deserialize(deserializer)?;
+        let rule =
+          KeyframesRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Keyframes(rule))
       }
       "font-face" => {
-        let rule = FontFaceRule::deserialize(deserializer)?;
+        let rule = FontFaceRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::FontFace(rule))
       }
       "font-palette-values" => {
-        let rule = FontPaletteValuesRule::deserialize(deserializer)?;
+        let rule =
+          FontPaletteValuesRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::FontPaletteValues(rule))
       }
       "font-feature-values" => {
-        let rule = FontFeatureValuesRule::deserialize(deserializer)?;
+        let rule =
+          FontFeatureValuesRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::FontFeatureValues(rule))
       }
       "page" => {
-        let rule = PageRule::deserialize(deserializer)?;
+        let rule = PageRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Page(rule))
       }
       "supports" => {
-        let rule = SupportsRule::deserialize(deserializer)?;
+        let rule = SupportsRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Supports(rule))
       }
       "counter-style" => {
-        let rule = CounterStyleRule::deserialize(deserializer)?;
+        let rule =
+          CounterStyleRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::CounterStyle(rule))
       }
       "namespace" => {
-        let rule = NamespaceRule::deserialize(deserializer)?;
+        let rule =
+          NamespaceRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Namespace(rule))
       }
       "moz-document" => {
-        let rule = MozDocumentRule::deserialize(deserializer)?;
+        let rule =
+          MozDocumentRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::MozDocument(rule))
       }
       "nesting" => {
-        let rule = NestingRule::deserialize(deserializer)?;
+        let rule = NestingRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Nesting(rule))
       }
       "nested-declarations" => {
-        let rule = NestedDeclarationsRule::deserialize(deserializer)?;
+        let rule = NestedDeclarationsRule::deserialize(deserializer)
+          .map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::NestedDeclarations(rule))
       }
       "viewport" => {
-        let rule = ViewportRule::deserialize(deserializer)?;
+        let rule = ViewportRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Viewport(rule))
       }
       "custom-media" => {
-        let rule = CustomMediaRule::deserialize(deserializer)?;
+        let rule =
+          CustomMediaRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::CustomMedia(rule))
       }
       "layer-statement" => {
-        let rule = LayerStatementRule::deserialize(deserializer)?;
+        let rule =
+          LayerStatementRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::LayerStatement(rule))
       }
       "layer-block" => {
-        let rule = LayerBlockRule::deserialize(deserializer)?;
+        let rule =
+          LayerBlockRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::LayerBlock(rule))
       }
       "property" => {
-        let rule = PropertyRule::deserialize(deserializer)?;
+        let rule = PropertyRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Property(rule))
       }
       "container" => {
-        let rule = ContainerRule::deserialize(deserializer)?;
+        let rule =
+          ContainerRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Container(rule))
       }
       "scope" => {
-        let rule = ScopeRule::deserialize(deserializer)?;
+        let rule = ScopeRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Scope(rule))
       }
       "starting-style" => {
-        let rule = StartingStyleRule::deserialize(deserializer)?;
+        let rule =
+          StartingStyleRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::StartingStyle(rule))
       }
       "view-transition" => {
-        let rule = ViewTransitionRule::deserialize(deserializer)?;
+        let rule =
+          ViewTransitionRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::ViewTransition(rule))
       }
       "ignored" => Ok(CssRule::Ignored),
       "unknown" => {
-        let rule = UnknownAtRule::deserialize(deserializer)?;
+        let rule =
+          UnknownAtRule::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Unknown(rule))
       }
       "custom" => {
-        let rule = R::deserialize(deserializer)?;
+        let rule = R::deserialize(deserializer).map_err(|e| serde::de::Error::custom(e.to_string()))?;
         Ok(CssRule::Custom(rule))
       }
       t => Err(serde::de::Error::unknown_variant(t, &[])),
@@ -1011,7 +1025,7 @@ impl<'a, 'i, T: ToCss> ToCss for CssRuleList<'i, T> {
     let mut first = true;
     let mut last_without_block = false;
 
-    for rule in &self.0 {
+    for (i, rule) in self.0.iter().enumerate() {
       if let CssRule::Ignored = &rule {
         continue;
       }
@@ -1047,6 +1061,16 @@ impl<'a, 'i, T: ToCss> ToCss for CssRuleList<'i, T> {
         dest.newline()?;
       }
       rule.to_css(dest)?;
+
+      // If this is an invisible nested declarations rule, and not the last rule in the block, add a semicolon.
+      if dest.minify
+        && !should_compile!(dest.targets.current, Nesting)
+        && matches!(rule, CssRule::NestedDeclarations(_))
+        && i != self.0.len() - 1
+      {
+        dest.write_char(';')?;
+      }
+
       last_without_block = matches!(
         rule,
         CssRule::Import(..) | CssRule::Namespace(..) | CssRule::LayerStatement(..)
diff --git a/src/selector.rs b/src/selector.rs
index d5011076d..355ab66e3 100644
--- a/src/selector.rs
+++ b/src/selector.rs
@@ -230,6 +230,10 @@ impl<'a, 'o, 'i> parcel_selectors::parser::Parser<'i> for SelectorParser<'a, 'o,
         let kind = Parse::parse(parser)?;
         ActiveViewTransitionType { kind }
       },
+      "state" => {
+        let state = CustomIdent::parse(parser)?;
+        State { state }
+      },
       "local" if self.options.css_modules.is_some() => Local { selector: Box::new(Selector::parse(self, parser)?) },
       "global" if self.options.css_modules.is_some() => Global { selector: Box::new(Selector::parse(self, parser)?) },
       _ => {
@@ -297,6 +301,9 @@ impl<'a, 'o, 'i> parcel_selectors::parser::Parser<'i> for SelectorParser<'a, 'o,
 
       "view-transition" => ViewTransition,
 
+      "grammar-error" => GrammarError,
+      "spelling-error" => SpellingError,
+
       _ => {
         if !name.starts_with('-') {
           self.options.warn(loc.new_custom_error(SelectorParseErrorKind::UnsupportedPseudoElement(name.clone())));
@@ -531,6 +538,12 @@ pub enum PseudoClass<'i> {
     kind: SmallVec<[CustomIdent<'i>; 1]>,
   },
 
+  /// The [:state()](https://developer.mozilla.org/en-US/docs/Web/CSS/:state) pseudo class for custom element states.
+  State {
+    /// The custom state identifier.
+    state: CustomIdent<'i>,
+  },
+
   // CSS modules
   /// The CSS modules :local() pseudo class.
   Local {
@@ -673,6 +686,11 @@ where
       dir.to_css(dest)?;
       return dest.write_str(")");
     }
+    State { state } => {
+      dest.write_str(":state(")?;
+      state.to_css(dest)?;
+      return dest.write_str(")");
+    }
     _ => {}
   }
 
@@ -820,7 +838,7 @@ where
       })
     }
 
-    Lang { languages: _ } | Dir { direction: _ } => unreachable!(),
+    Lang { languages: _ } | Dir { direction: _ } | State { .. } => unreachable!(),
     Custom { name } => {
       dest.write_char(':')?;
       return dest.write_str(&name);
@@ -966,6 +984,10 @@ pub enum PseudoElement<'i> {
   PickerIcon,
   /// The [::checkmark](https://drafts.csswg.org/css-forms-1/#styling-checkmarks-the-checkmark-pseudo-element) pseudo element.
   Checkmark,
+  /// The [::grammar-error](https://drafts.csswg.org/css-pseudo/#selectordef-grammar-error) pseudo element.
+  GrammarError,
+  /// The [::spelling-error](https://drafts.csswg.org/css-pseudo/#selectordef-spelling-error) pseudo element.
+  SpellingError,
   /// An unknown pseudo element.
   Custom {
     /// The name of the pseudo element.
@@ -1083,10 +1105,14 @@ impl<'i> Parse<'i> for ViewTransitionPartSelector<'i> {
           _ => return Err(input.new_custom_error(ParserError::SelectorError(SelectorError::InvalidState))),
         }
       } else {
-        return Err(input.new_custom_error(ParserError::SelectorError(SelectorError::InvalidState)));
+        break;
       }
     }
 
+    if !input.is_exhausted() || (name.is_none() && classes.is_empty()) {
+      return Err(input.new_custom_error(ParserError::SelectorError(SelectorError::InvalidState)));
+    }
+
     Ok(ViewTransitionPartSelector { name, classes })
   }
 }
@@ -1233,6 +1259,8 @@ where
     }
     PickerIcon => dest.write_str("::picker-icon"),
     Checkmark => dest.write_str("::checkmark"),
+    GrammarError => dest.write_str("::grammar-error"),
+    SpellingError => dest.write_str("::spelling-error"),
     Custom { name: val } => {
       dest.write_str("::")?;
       return dest.write_str(val);
@@ -1903,6 +1931,8 @@ pub(crate) fn is_compatible(selectors: &[Selector], targets: Targets) -> bool {
 
             PseudoClass::Autofill(prefix) if *prefix == VendorPrefix::None => Feature::Autofill,
 
+            PseudoClass::State { .. } => Feature::StatePseudoClass,
+
             // Experimental, no browser support.
             PseudoClass::Current
             | PseudoClass::Past
@@ -1947,6 +1977,8 @@ pub(crate) fn is_compatible(selectors: &[Selector], targets: Targets) -> bool {
           PseudoElement::PickerFunction { identifier: _ } => Feature::Picker,
           PseudoElement::PickerIcon => Feature::PickerIcon,
           PseudoElement::Checkmark => Feature::Checkmark,
+          PseudoElement::GrammarError => Feature::GrammarError,
+          PseudoElement::SpellingError => Feature::SpellingError,
           PseudoElement::Custom { name: _ } | _ => return false,
         },
 
diff --git a/src/values/angle.rs b/src/values/angle.rs
index dff23a287..b7fb62329 100644
--- a/src/values/angle.rs
+++ b/src/values/angle.rs
@@ -121,6 +121,8 @@ impl ToCss for Angle {
       }
       Angle::Turn(val) => (*val, "turn"),
     };
+    // Canonicalize negative zero so serialization is stable (`0deg` instead of `-0deg`).
+    let value = if value == 0.0 { 0.0 } else { value };
 
     serialize_dimension(value, unit, dest)
   }
diff --git a/src/values/calc.rs b/src/values/calc.rs
index 6022cf2f4..c57cfb044 100644
--- a/src/values/calc.rs
+++ b/src/values/calc.rs
@@ -384,10 +384,10 @@ impl<
         })?;
 
         // According to the spec, the minimum should "win" over the maximum if they are in the wrong order.
-        let cmp = if let (Some(Calc::Value(max_val)), Calc::Value(center_val)) = (&max, &center) {
-          center_val.partial_cmp(&max_val)
-        } else {
-          None
+        let cmp = match (&max, &center) {
+          (Some(Calc::Value(max_val)), Calc::Value(center_val)) => center_val.partial_cmp(&max_val),
+          (Some(Calc::Number(max_val)), Calc::Number(center_val)) => center_val.partial_cmp(max_val),
+          _ => None,
         };
 
         // If center is known to be greater than the maximum, replace it with maximum and remove the max argument.
@@ -403,10 +403,10 @@ impl<
         }
 
         if cmp.is_some() {
-          let cmp = if let (Some(Calc::Value(min_val)), Calc::Value(center_val)) = (&min, &center) {
-            center_val.partial_cmp(&min_val)
-          } else {
-            None
+          let cmp = match (&min, &center) {
+            (Some(Calc::Value(min_val)), Calc::Value(center_val)) => center_val.partial_cmp(&min_val),
+            (Some(Calc::Number(min_val)), Calc::Number(center_val)) => center_val.partial_cmp(min_val),
+            _ => None,
           };
 
           // If center is known to be less than the minimum, replace it with minimum and remove the min argument.
@@ -658,6 +658,7 @@ impl<
   fn reduce_args(args: &mut Vec<Calc<V>>, cmp: std::cmp::Ordering) -> Vec<Calc<V>> {
     // Reduces the arguments of a min() or max() expression, combining compatible values.
     // e.g. min(1px, 1em, 2px, 3in) => min(1px, 1em)
+    // Also handles plain numbers: min(1, 2, 3) => min(1, 2)
     let mut reduced: Vec<Calc<V>> = vec![];
     for arg in args.drain(..) {
       let mut found = None;
@@ -679,6 +680,23 @@ impl<
             }
           }
         }
+        Calc::Number(val) => {
+          for b in reduced.iter_mut() {
+            if let Calc::Number(v) = b {
+              match val.partial_cmp(v) {
+                Some(ord) if ord == cmp => {
+                  found = Some(Some(b));
+                  break;
+                }
+                Some(_) => {
+                  found = Some(None);
+                  break;
+                }
+                None => {}
+              }
+            }
+          }
+        }
         _ => {}
       }
       if let Some(r) = found {
diff --git a/src/values/position.rs b/src/values/position.rs
index 61373cb87..32e4788d4 100644
--- a/src/values/position.rs
+++ b/src/values/position.rs
@@ -203,11 +203,32 @@ impl ToCss for Position {
         // `center` is assumed if omitted.
         x_lp.to_css(dest)
       }
+      (
+        &HorizontalPosition::Side {
+          side: HorizontalPositionKeyword::Left,
+          offset: Some(ref x_lp),
+        },
+        y,
+      ) if y.is_center() => {
+        // `left 10px center` => `10px` (omit Y when center)
+        x_lp.to_css(dest)
+      }
       (&HorizontalPosition::Side { side, offset: None }, y) if y.is_center() => {
         let p: LengthPercentage = side.into();
         p.to_css(dest)
       }
       (x, y_pos @ &VerticalPosition::Side { offset: None, .. }) if x.is_center() => y_pos.to_css(dest),
+      (
+        &HorizontalPosition::Center,
+        y_pos @ &VerticalPosition::Side {
+          side: VerticalPositionKeyword::Bottom,
+          offset: Some(_),
+        },
+      ) => {
+        // `center bottom 10px` must keep the keyword form
+        dest.write_str("center ")?;
+        y_pos.to_css(dest)
+      }
       (&HorizontalPosition::Side { side: x, offset: None }, &VerticalPosition::Side { side: y, offset: None }) => {
         let x: LengthPercentage = x.into();
         let y: LengthPercentage = y.into();
diff --git a/src/values/syntax.rs b/src/values/syntax.rs
index 42dfe485c..306f5e413 100644
--- a/src/values/syntax.rs
+++ b/src/values/syntax.rs
@@ -63,6 +63,8 @@ pub enum SyntaxComponentKind {
   Percentage,
   /// A `<length-percentage>` component.
   LengthPercentage,
+  /// A `<string>` component.
+  String,
   /// A `<color>` component.
   Color,
   /// An `<image>` component.
@@ -126,6 +128,8 @@ pub enum ParsedComponent<'i> {
   Percentage(values::percentage::Percentage),
   /// A `<length-percentage>` value.
   LengthPercentage(values::length::LengthPercentage),
+  /// A `<string>` value.
+  String(values::string::CSSString<'i>),
   /// A `<color>` value.
   Color(values::color::CssColor),
   /// An `<image>` value.
@@ -222,6 +226,7 @@ impl<'i> SyntaxString {
                 SyntaxComponentKind::LengthPercentage => {
                   ParsedComponent::LengthPercentage(values::length::LengthPercentage::parse(input)?)
                 }
+                SyntaxComponentKind::String => ParsedComponent::String(values::string::CSSString::parse(input)?),
                 SyntaxComponentKind::Color => ParsedComponent::Color(values::color::CssColor::parse(input)?),
                 SyntaxComponentKind::Image => ParsedComponent::Image(values::image::Image::parse(input)?),
                 SyntaxComponentKind::Url => ParsedComponent::Url(values::url::Url::parse(input)?),
@@ -343,6 +348,7 @@ impl SyntaxComponentKind {
         "number" => SyntaxComponentKind::Number,
         "percentage" => SyntaxComponentKind::Percentage,
         "length-percentage" => SyntaxComponentKind::LengthPercentage,
+        "string" => SyntaxComponentKind::String,
         "color" => SyntaxComponentKind::Color,
         "image" => SyntaxComponentKind::Image,
         "url" => SyntaxComponentKind::Url,
@@ -440,6 +446,7 @@ impl ToCss for SyntaxComponentKind {
       Number => "<number>",
       Percentage => "<percentage>",
       LengthPercentage => "<length-percentage>",
+      String => "<string>",
       Color => "<color>",
       Image => "<image>",
       Url => "<url>",
@@ -467,6 +474,7 @@ impl<'i> ToCss for ParsedComponent<'i> {
       Number(v) => v.to_css(dest),
       Percentage(v) => v.to_css(dest),
       LengthPercentage(v) => v.to_css(dest),
+      String(v) => v.to_css(dest),
       Color(v) => v.to_css(dest),
       Image(v) => v.to_css(dest),
       Url(v) => v.to_css(dest),
@@ -640,6 +648,12 @@ mod tests {
 
     test("foo | bar | baz", "bar", ParsedComponent::Literal("bar".into()));
 
+    test(
+      "<string>",
+      "'foo'",
+      ParsedComponent::String(values::string::CSSString("foo".into())),
+    );
+
     test(
       "<custom-ident>",
       "hi",
diff --git a/tests/testdata/has_external.css b/tests/testdata/has_external.css
new file mode 100644
index 000000000..191ac502b
--- /dev/null
+++ b/tests/testdata/has_external.css
@@ -0,0 +1,3 @@
+@import url('https://fonts.googleapis.com/css2?family=Roboto&display=swap');
+@import './does_not_exist.css';
+@import './b.css';
diff --git a/wasm/index.mjs b/wasm/index.mjs
index 7120fd0d6..b74898fb8 100644
--- a/wasm/index.mjs
+++ b/wasm/index.mjs
@@ -21,7 +21,7 @@ export default async function init(input) {
       env: {
         ...napi,
         await_promise_sync,
-        __getrandom_custom: (ptr, len) => {
+        __getrandom_v03_custom: (ptr, len) => {
           let buf = env.memory.subarray(ptr, ptr + len);
           crypto.getRandomValues(buf);
         },
@@ -38,19 +38,47 @@ export default async function init(input) {
 }
 
 export function transform(options) {
-  return wasm.transform(options);
+  return wrap(wasm.transform, options);
 }
 
 export function transformStyleAttribute(options) {
-  return wasm.transformStyleAttribute(options);
+  return wrap(wasm.transformStyleAttribute, options);
 }
 
 export function bundle(options) {
-  return wasm.bundle(options);
+  return wrap(wasm.bundle, options);
 }
 
 export function bundleAsync(options) {
-  return bundleAsyncInternal(options);
+  return wrap(bundleAsyncInternal, options);
+}
+
+function wrap(call, options) {
+  if (typeof options.visitor === 'function') {
+    let deps = [];
+    options.visitor = options.visitor({
+      addDependency(dep) {
+        deps.push(dep);
+      }
+    });
+
+    let result = call(options);
+    if (result instanceof Promise) {
+      result = result.then(res => {
+        if (deps.length) {
+          res.dependencies ??= [];
+          res.dependencies.push(...deps);
+        }
+        return res;
+      });
+    } else if (deps.length) {
+      result.dependencies ??= [];
+      result.dependencies.push(...deps);
+    }
+    return result;
+  } else {
+    return call(options);
+  }
 }
 
 export { browserslistToTargets } from './browserslistToTargets.js';
diff --git a/wasm/wasm-node.mjs b/wasm/wasm-node.mjs
index 7e8c69f20..93c05afd6 100644
--- a/wasm/wasm-node.mjs
+++ b/wasm/wasm-node.mjs
@@ -9,7 +9,7 @@ let instance = new WebAssembly.Instance(wasmModule, {
   env: {
     ...napi,
     await_promise_sync,
-    __getrandom_custom: (ptr, len) => {
+    __getrandom_v03_custom: (ptr, len) => {
       let buf = env.memory.subarray(ptr, ptr + len);
       crypto.getRandomValues(buf);
     },
@@ -25,15 +25,15 @@ export default async function init() {
 }
 
 export function transform(options) {
-  return wasm.transform(options);
+  return wrap(wasm.transform, options);
 }
 
 export function transformStyleAttribute(options) {
-  return wasm.transformStyleAttribute(options);
+  return wrap(wasm.transformStyleAttribute, options);
 }
 
 export function bundle(options) {
-  return wasm.bundle({
+  return wrap(wasm.bundle, {
     ...options,
     resolver: {
       read: (filePath) => fs.readFileSync(filePath, 'utf8')
@@ -49,7 +49,35 @@ export async function bundleAsync(options) {
     };
   }
 
-  return bundleAsyncInternal(options);
+  return wrap(bundleAsyncInternal, options);
+}
+
+function wrap(call, options) {
+  if (typeof options.visitor === 'function') {
+    let deps = [];
+    options.visitor = options.visitor({
+      addDependency(dep) {
+        deps.push(dep);
+      }
+    });
+
+    let result = call(options);
+    if (result instanceof Promise) {
+      result = result.then(res => {
+        if (deps.length) {
+          res.dependencies ??= [];
+          res.dependencies.push(...deps);
+        }
+        return res;
+      });
+    } else if (deps.length) {
+      result.dependencies ??= [];
+      result.dependencies.push(...deps);
+    }
+    return result;
+  } else {
+    return call(options);
+  }
 }
 
 export { browserslistToTargets } from './browserslistToTargets.js'
diff --git a/website/pages/transforms.md b/website/pages/transforms.md
index 7441cb5d8..0a36f13a8 100644
--- a/website/pages/transforms.md
+++ b/website/pages/transforms.md
@@ -353,6 +353,61 @@ let res = transform({
 assert.equal(res.code.toString(), '.foo{color:red}.foo.bar{color:#ff0}');
 ```
 
+## Dependencies
+
+Visitors can emit dependencies so the caller (e.g. bundler) knows to re-run the transformation or invalidate a cache when those files change. These are returned as part of the result's `dependencies` property (along with other dependencies when the `analyzeDependencies` option is enabled).
+
+By passing a function to the `visitor` option instead of an object, you get access to the `addDependency` function. This accepts a dependency object with `type: 'file'` or `type: 'glob'`. File dependencies invalidate the transformation whenever the `filePath` changes (created, updated, or deleted). Glob dependencies invalidate whenever any file matched by the glob changes. `composeVisitors` also supports function visitors.
+
+By default, Lightning CSS does not do anything with these dependencies except return them to the caller. It's the caller's responsibility to implement file watching and cache invalidation accordingly.
+
+```js
+let res = transform({
+  filename: 'test.css',
+  code: Buffer.from(`
+    @dep "foo.js";
+    @glob "**/*.json";
+
+    .foo {
+      width: 32px;
+    }
+  `),
+  visitor: ({addDependency}) => ({
+    Rule: {
+      unknown: {
+        dep(rule) {
+          let file = rule.prelude[0].value.value;
+          addDependency({
+            type: 'file',
+            filePath: file
+          });
+          return [];
+        },
+        glob(rule) {
+          let glob = rule.prelude[0].value.value;
+          addDependency({
+            type: 'glob',
+            glob
+          });
+          return [];
+        }
+      }
+    }
+  })
+});
+
+assert.equal(res.dependencies, [
+  {
+    type: 'file',
+    filePath: 'foo.js'
+  },
+  {
+    type: 'glob',
+    filePath: '**/*.json'
+  }
+]);
+```
+
 ## Examples
 
 For examples of visitors that perform a variety of real world tasks, see the Lightning CSS [visitor tests](https://github.com/parcel-bundler/lightningcss/blob/master/node/test/visitor.test.mjs).
diff --git a/yarn.lock b/yarn.lock
index 4c16f3337..2fe9dbf67 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -570,10 +570,10 @@
   resolved "https://registry.yarnpkg.com/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz#775374306116d51c0c500b8c4face0f9a04752d8"
   integrity sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==
 
-"@mdn/browser-compat-data@~6.0.13":
-  version "6.0.13"
-  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-6.0.13.tgz#1e2a45467a472d6e82d48ba544672b834ba26b61"
-  integrity sha512-RSYYaex/5lC4mim5pMTKHxfSpWf7Oc4r8Vk4exFVvt/KzIj7GacXAiYu5WfGnIWrBaa0KaSPda7oanQiFwjbeg==
+"@mdn/browser-compat-data@~7.2.4":
+  version "7.2.4"
+  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-7.2.4.tgz#f14464789fc03ba07a19953ec5154b903fcfaa98"
+  integrity sha512-qlZKXL9qvrxn2UNnlgjupk1sjz0X59oRvGBBaPqYtIxiM0q4m2D5ZF9P/T0qWm0gZYzb5jMZ1TpUViZZVv7cMg==
 
 "@mischnic/json-sourcemap@^0.1.0":
   version "0.1.1"
@@ -1505,15 +1505,14 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-autoprefixer@^10.4.21:
-  version "10.4.21"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.21.tgz#77189468e7a8ad1d9a37fbc08efc9f480cf0a95d"
-  integrity sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==
+autoprefixer@^10.4.23:
+  version "10.4.23"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.23.tgz#c6aa6db8e7376fcd900f9fd79d143ceebad8c4e6"
+  integrity sha512-YYTXSFulfwytnjAPlw8QHncHJmlvFKtczb8InXaAx9Q0LbfDnfEYDE55omerIJKihhmU61Ft+cAOSzQVaBUmeA==
   dependencies:
-    browserslist "^4.24.4"
-    caniuse-lite "^1.0.30001702"
-    fraction.js "^4.3.7"
-    normalize-range "^0.1.2"
+    browserslist "^4.28.1"
+    caniuse-lite "^1.0.30001760"
+    fraction.js "^5.3.4"
     picocolors "^1.1.1"
     postcss-value-parser "^4.2.0"
 
@@ -1541,6 +1540,11 @@ base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
+baseline-browser-mapping@^2.9.0:
+  version "2.9.15"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.15.tgz#6baaa0069883f50a99cdb31b56646491f47c05d7"
+  integrity sha512-kX8h7K2srmDyYnXRIppo4AH/wYgzWVCs+eKr3RusRSQ5PvRYoEFmR/I0PbdTjKFAoKqp5+kbxnNTFO9jOfSVJg==
+
 bl@^4.0.3:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
@@ -1580,15 +1584,16 @@ browserslist@^4.0.0, browserslist@^4.23.3, browserslist@^4.6.6:
     node-releases "^2.0.19"
     update-browserslist-db "^1.1.1"
 
-browserslist@^4.24.4:
-  version "4.24.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b"
-  integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==
+browserslist@^4.28.1:
+  version "4.28.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.1.tgz#7f534594628c53c63101079e27e40de490456a95"
+  integrity sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==
   dependencies:
-    caniuse-lite "^1.0.30001688"
-    electron-to-chromium "^1.5.73"
-    node-releases "^2.0.19"
-    update-browserslist-db "^1.1.1"
+    baseline-browser-mapping "^2.9.0"
+    caniuse-lite "^1.0.30001759"
+    electron-to-chromium "^1.5.263"
+    node-releases "^2.0.27"
+    update-browserslist-db "^1.2.0"
 
 buffer-crc32@~0.2.3:
   version "0.2.13"
@@ -1654,15 +1659,10 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001688:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz#f2d15e3aaf8e18f76b2b8c1481abde063b8104c8"
   integrity sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==
 
-caniuse-lite@^1.0.30001702:
-  version "1.0.30001704"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001704.tgz#6644fe909d924ac3a7125e8a0ab6af95b1f32990"
-  integrity sha512-+L2IgBbV6gXB4ETf0keSvLr7JUrRVbIaB/lrQ1+z8mRcQiisG5k+lG6O4n6Y5q6f5EuNfaYXKgymucphlEXQew==
-
-caniuse-lite@^1.0.30001717:
-  version "1.0.30001717"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001717.tgz#5d9fec5ce09796a1893013825510678928aca129"
-  integrity sha512-auPpttCq6BDEG8ZAuHJIplGw6GODhjw+/11e7IjpnYCxZcW/ONgPs0KVBJ0d1bY3e2+7PRe5RCLyP+PfwVgkYw==
+caniuse-lite@^1.0.30001759, caniuse-lite@^1.0.30001760, caniuse-lite@^1.0.30001765:
+  version "1.0.30001765"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001765.tgz#4a78d8a797fd4124ebaab2043df942eb091648ee"
+  integrity sha512-LWcNtSyZrakjECqmpP4qdg0MMGdN368D7X8XvvAqOcqMv0RxnlqVKZl2V6/mBR68oYMxOZPLw/gO7DuisMHUvQ==
 
 chalk@^2.4.2:
   version "2.4.2"
@@ -2072,6 +2072,11 @@ dunder-proto@^1.0.0:
     es-errors "^1.3.0"
     gopd "^1.2.0"
 
+electron-to-chromium@^1.5.263:
+  version "1.5.267"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz#5d84f2df8cdb6bfe7e873706bb21bd4bfb574dc7"
+  integrity sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==
+
 electron-to-chromium@^1.5.73:
   version "1.5.75"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.75.tgz#bba96eabf0e8ca36324679caa38b982800acc87d"
@@ -2320,10 +2325,10 @@ formdata-polyfill@^4.0.10:
   dependencies:
     fetch-blob "^3.1.2"
 
-fraction.js@^4.3.7:
-  version "4.3.7"
-  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
-  integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
+fraction.js@^5.3.4:
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-5.3.4.tgz#8c0fcc6a9908262df4ed197427bdeef563e0699a"
+  integrity sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==
 
 fs-constants@^1.0.0:
   version "1.0.0"
@@ -3018,10 +3023,10 @@ node-releases@^2.0.19:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314"
   integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==
 
-normalize-range@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
+node-releases@^2.0.27:
+  version "2.0.27"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.27.tgz#eedca519205cf20f650f61d56b070db111231e4e"
+  integrity sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==
 
 nth-check@^2.0.1:
   version "2.1.1"
@@ -3982,6 +3987,14 @@ update-browserslist-db@^1.1.1:
     escalade "^3.2.0"
     picocolors "^1.1.0"
 
+update-browserslist-db@^1.2.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz#64d76db58713136acbeb4c49114366cc6cc2e80d"
+  integrity sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==
+  dependencies:
+    escalade "^3.2.0"
+    picocolors "^1.1.1"
+
 util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"