Merge branch 'master' of github.com:parcel-bundler/parcel-css into cssom3

# Conflicts:
#	src/rules/keyframes.rs
#	src/rules/style.rs

Author: devongovett

.github/workflows/test.yml

@@ -18,4 +18,4 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v1
       - run: cargo fmt
-      - run: cargo test
+      - run: cargo test --all-features

Cargo.lock

@@ -7,7 +7,7 @@ members = [
 [package]
 authors = ["Devon Govett <devongovett@gmail.com>"]
 name = "parcel_css"
-version = "1.0.0-alpha.24"
+version = "1.0.0-alpha.25"
 description = "A CSS parser, transformer, and minifier"
 license = "MPL-2.0"
 edition = "2021"
@@ -52,11 +52,13 @@ indoc = "1.0.3"
 assert_cmd = "2.0"
 assert_fs = "1.0"
 predicates = "2.1"
+serde_json = "1.0.78"
 
 [features]
 default = ["grid"]
 cli = ["clap", "serde_json", "pathdiff", "browserslist-rs", "jemallocator"]
 grid = []
+serde = ["smallvec/serde", "cssparser/serde"]
 
 [[test]]
 name = "cli_integration_tests"

Cargo.toml

@@ -0,0 +1,20 @@
+fn main() {
+  parse();
+}
+
+#[cfg(feature = "serde")]
+fn parse() {
+  use parcel_css::stylesheet::{ParserOptions, StyleSheet};
+  use std::{env, fs};
+
+  let args: Vec<String> = env::args().collect();
+  let contents = fs::read_to_string(&args[1]).unwrap();
+  let stylesheet = StyleSheet::parse(&args[1], &contents, ParserOptions::default()).unwrap();
+  let json = serde_json::to_string(&stylesheet).unwrap();
+  println!("{}", json);
+}
+
+#[cfg(not(feature = "serde"))]
+fn parse() {
+  panic!("serde feature is not enabled")
+}

examples/serialize.rs

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

package.json

@@ -212,9 +212,12 @@ let mdnFeatures = {
   mediaRangeSyntax: mdn.css['at-rules'].media.range_syntax.__compat.support,
   mediaIntervalSyntax: {}, // currently no browsers
   logicalBorders: mdn.css.properties['border-inline-start'].__compat.support,
+  logicalBorderShorthand: mdn.css.properties['border-inline'].__compat.support,
   logicalBorderRadius: mdn.css.properties['border-start-start-radius'].__compat.support,
   logicalMargin: mdn.css.properties['margin-inline-start'].__compat.support,
+  logicalMarginShorthand: mdn.css.properties['margin-inline'].__compat.support,
   logicalPadding: mdn.css.properties['padding-inline-start'].__compat.support,
+  logicalPaddingShorthand: mdn.css.properties['padding-inline'].__compat.support,
   logicalInset: mdn.css.properties['inset-inline-start'].__compat.support,
   logicalSize: mdn.css.properties['inline-size'].__compat.support,
   logicalTextAlign: mdn.css.properties['text-align']['flow_relative_values_start_and_end'].__compat.support,

scripts/build-prefixes.js

@@ -41,10 +41,13 @@ pub enum Feature {
   LabColors,
   LangList,
   LogicalBorderRadius,
+  LogicalBorderShorthand,
   LogicalBorders,
   LogicalInset,
   LogicalMargin,
+  LogicalMarginShorthand,
   LogicalPadding,
+  LogicalPaddingShorthand,
   LogicalSize,
   LogicalTextAlign,
   MediaIntervalSyntax,
@@ -1547,6 +1550,51 @@ impl Feature {
           return false;
         }
       }
+      Feature::LogicalBorderShorthand | Feature::LogicalMarginShorthand | Feature::LogicalPaddingShorthand => {
+        if let Some(version) = browsers.chrome {
+          if version < 5701632 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.edge {
+          if version < 5701632 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.firefox {
+          if version < 4325376 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.opera {
+          if version < 3145728 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.safari {
+          if version < 917760 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.ios_saf {
+          if version < 918784 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.samsung {
+          if version < 917504 {
+            return false;
+          }
+        }
+        if let Some(version) = browsers.android {
+          if version < 5701632 {
+            return false;
+          }
+        }
+        if browsers.ie.is_some() {
+          return false;
+        }
+      }
       Feature::LogicalBorderRadius => {
         if let Some(version) = browsers.chrome {
           if version < 5832704 {