.github/workflows/release.yml

@@ -48,7 +48,7 @@ jobs:
         if: ${{ matrix.strip }}
         run: ${{ matrix.strip }} *.node ${{ matrix.binary }}
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bindings-${{ matrix.target }}
           path: |
@@ -90,7 +90,7 @@ jobs:
       - name: Strip debug symbols # https://github.com/rust-lang/rust/issues/46034
         run: strip -x *.node lightningcss
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bindings-aarch64-apple-darwin
           path: |
@@ -153,7 +153,7 @@ jobs:
         if: ${{ matrix.strip }}
         run: ${{ matrix.strip }} *.node lightningcss
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bindings-${{ matrix.target }}
           path: |
@@ -201,7 +201,7 @@ jobs:
             rm -rf .yarn/cache
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bindings-x86_64-unknown-freebsd
           path: |
@@ -232,7 +232,7 @@ jobs:
           export PATH="$PATH:./binaryen-version_111/bin"
           yarn wasm:build-release
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wasm
           path: wasm/lightningcss_node.wasm
@@ -250,9 +250,11 @@ jobs:
       - uses: actions/checkout@v3
       - uses: bahmutov/npm-install@v1.8.32
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
+      - name: Show artifacts
+        run: ls -R artifacts
       - name: Build npm packages
         run: |
           node scripts/build-npm.js

Cargo.toml

@@ -12,7 +12,7 @@ members = [
 [package]
 authors = ["Devon Govett <devongovett@gmail.com>"]
 name = "lightningcss"
-version = "1.0.0-alpha.62"
+version = "1.0.0-alpha.63"
 description = "A CSS parser, transformer, and minifier"
 license = "MPL-2.0"
 edition = "2021"

napi/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Devon Govett <devongovett@gmail.com>"]
 name = "lightningcss-napi"
-version = "0.4.2"
+version = "0.4.3"
 description = "Node-API bindings for Lightning CSS"
 license = "MPL-2.0"
 repository = "https://github.com/parcel-bundler/lightningcss"
@@ -16,7 +16,7 @@ bundler = ["dep:crossbeam-channel", "dep:rayon"]
 serde = { version = "1.0.201", features = ["derive"] }
 serde_bytes = "0.11.5"
 cssparser = "0.33.0"
-lightningcss = { version = "1.0.0-alpha.62", path = "../", features = [
+lightningcss = { version = "1.0.0-alpha.63", path = "../", features = [
   "nodejs",
   "serde",
 ] }

node/Cargo.toml

@@ -9,7 +9,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-lightningcss-napi = { version = "0.4.2", path = "../napi", features = [
+lightningcss-napi = { version = "0.4.3", path = "../napi", features = [
   "bundler",
   "visitor",
 ] }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lightningcss",
-  "version": "1.29.0",
+  "version": "1.29.1",
   "license": "MPL-2.0",
   "description": "A CSS parser, transformer, and minifier written in Rust",
   "main": "node/index.js",

src/lib.rs

@@ -16652,6 +16652,17 @@ mod tests {
       ".foo { list-style: \"★\" url(ellipse.png) outside; }",
       ".foo{list-style:url(ellipse.png) \"★\"}",
     );
+    minify_test(".foo { list-style: none; }", ".foo{list-style:none}");
+    minify_test(".foo { list-style: none none outside; }", ".foo{list-style:none}");
+    minify_test(".foo { list-style: none none inside; }", ".foo{list-style:inside none}");
+    minify_test(".foo { list-style: none inside; }", ".foo{list-style:inside none}");
+    minify_test(".foo { list-style: none disc; }", ".foo{list-style:outside}");
+    minify_test(".foo { list-style: none inside disc; }", ".foo{list-style:inside}");
+    minify_test(".foo { list-style: none \"★\"; }", ".foo{list-style:\"★\"}");
+    minify_test(
+      ".foo { list-style: none url(foo.png); }",
+      ".foo{list-style:url(foo.png) none}",
+    );
 
     test(
       r#"

src/properties/list.rs

@@ -4,7 +4,7 @@ use super::{Property, PropertyId};
 use crate::context::PropertyHandlerContext;
 use crate::declaration::{DeclarationBlock, DeclarationList};
 use crate::error::{ParserError, PrinterError};
-use crate::macros::{define_shorthand, enum_property, shorthand_handler, shorthand_property};
+use crate::macros::{define_shorthand, enum_property, shorthand_handler};
 use crate::printer::Printer;
 use crate::targets::{Browsers, Targets};
 use crate::traits::{FallbackValues, IsCompatible, Parse, PropertyHandler, Shorthand, ToCss};
@@ -329,7 +329,7 @@ enum_property! {
   }
 }
 
-shorthand_property! {
+define_shorthand! {
   /// A value for the [list-style](https://www.w3.org/TR/2020/WD-css-lists-3-20201117/#list-style-property) shorthand property.
   pub struct ListStyle<'i> {
     /// The position of the list marker.
@@ -342,6 +342,110 @@ shorthand_property! {
   }
 }
 
+impl<'i> Parse<'i> for ListStyle<'i> {
+  fn parse<'t>(input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i, ParserError<'i>>> {
+    let mut position = None;
+    let mut image = None;
+    let mut list_style_type = None;
+    let mut nones = 0;
+
+    loop {
+      // `none` is ambiguous - both list-style-image and list-style-type support it.
+      if input.try_parse(|input| input.expect_ident_matching("none")).is_ok() {
+        nones += 1;
+        if nones > 2 {
+          return Err(input.new_custom_error(ParserError::InvalidValue));
+        }
+        continue;
+      }
+
+      if image.is_none() {
+        if let Ok(val) = input.try_parse(Image::parse) {
+          image = Some(val);
+          continue;
+        }
+      }
+
+      if position.is_none() {
+        if let Ok(val) = input.try_parse(ListStylePosition::parse) {
+          position = Some(val);
+          continue;
+        }
+      }
+
+      if list_style_type.is_none() {
+        if let Ok(val) = input.try_parse(ListStyleType::parse) {
+          list_style_type = Some(val);
+          continue;
+        }
+      }
+
+      break;
+    }
+
+    // Assign the `none` to the opposite property from the one we have a value for,
+    // or both in case neither list-style-image or list-style-type have a value.
+    match (nones, image, list_style_type) {
+      (2, None, None) | (1, None, None) => Ok(ListStyle {
+        position: position.unwrap_or_default(),
+        image: Image::None,
+        list_style_type: ListStyleType::None,
+      }),
+      (1, Some(image), None) => Ok(ListStyle {
+        position: position.unwrap_or_default(),
+        image,
+        list_style_type: ListStyleType::None,
+      }),
+      (1, None, Some(list_style_type)) => Ok(ListStyle {
+        position: position.unwrap_or_default(),
+        image: Image::None,
+        list_style_type,
+      }),
+      (0, image, list_style_type) => Ok(ListStyle {
+        position: position.unwrap_or_default(),
+        image: image.unwrap_or_default(),
+        list_style_type: list_style_type.unwrap_or_default(),
+      }),
+      _ => Err(input.new_custom_error(ParserError::InvalidValue)),
+    }
+  }
+}
+
+impl<'i> ToCss for ListStyle<'i> {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> Result<(), PrinterError>
+  where
+    W: std::fmt::Write,
+  {
+    let mut needs_space = false;
+    if self.position != ListStylePosition::default() {
+      self.position.to_css(dest)?;
+      needs_space = true;
+    }
+
+    if self.image != Image::default() {
+      if needs_space {
+        dest.write_char(' ')?;
+      }
+      self.image.to_css(dest)?;
+      needs_space = true;
+    }
+
+    if self.list_style_type != ListStyleType::default() {
+      if needs_space {
+        dest.write_char(' ')?;
+      }
+      self.list_style_type.to_css(dest)?;
+      needs_space = true;
+    }
+
+    if !needs_space {
+      self.position.to_css(dest)?;
+    }
+
+    Ok(())
+  }
+}
+
 impl<'i> FallbackValues for ListStyle<'i> {
   fn get_fallbacks(&mut self, targets: Targets) -> Vec<Self> {
     self