>,
#[cfg_attr(feature = "serde", serde(skip))]
/// The options the style sheet was originally parsed with.
options: ParserOptions<'o, 'i>,
@@ -135,6 +139,7 @@ where
sources,
source_map_urls: Vec::new(),
license_comments: Vec::new(),
+ content_hashes: None,
rules,
options,
}
@@ -150,6 +155,16 @@ where
let mut parser = Parser::new(&mut input);
let mut license_comments = Vec::new();
+ let mut content_hashes = None;
+ if let Some(config) = &options.css_modules {
+ if config.pattern.has_content_hash() {
+ content_hashes = Some(vec![hash(
+ &code,
+ matches!(config.pattern.segments[0], crate::css_modules::Segment::ContentHash),
+ )]);
+ }
+ }
+
let mut state = parser.state();
while let Ok(token) = parser.next_including_whitespace_and_comments() {
match token {
@@ -185,6 +200,7 @@ where
Ok(StyleSheet {
sources: vec![options.filename.clone()],
source_map_urls: vec![parser.current_source_map_url().map(|s| s.to_owned())],
+ content_hashes,
rules,
license_comments,
options,
@@ -271,7 +287,13 @@ where
if let Some(config) = &self.options.css_modules {
let mut references = HashMap::new();
- printer.css_module = Some(CssModule::new(config, &self.sources, project_root, &mut references));
+ printer.css_module = Some(CssModule::new(
+ config,
+ &self.sources,
+ project_root,
+ &mut references,
+ &self.content_hashes,
+ ));
self.rules.to_css(&mut printer)?;
printer.newline()?;
diff --git a/website/pages/css-modules.md b/website/pages/css-modules.md
index 732f83cf..4ba646bf 100644
--- a/website/pages/css-modules.md
+++ b/website/pages/css-modules.md
@@ -219,6 +219,7 @@ The following placeholders are currently supported:
- `[name]` - The base name of the file, without the extension.
- `[hash]` - A hash of the full file path.
+- `[content-hash]` - A hash of the file contents.
- `[local]` - The original class name or identifier.
From 186435f929a177770d7ba73e3027c7abbfe6c377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?=
Date: Wed, 28 Aug 2024 09:34:02 +0900
Subject: [PATCH 008/133] feat: Improve error message for pseudo elements
followed by selectors (#797)
---
selectors/parser.rs | 22 +++++++++++++++++++---
src/error.rs | 14 ++++++++++++++
src/lib.rs | 39 +++++++++++++++++++++++++++++++++++++++
3 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/selectors/parser.rs b/selectors/parser.rs
index c0e27a9a..5eaecb58 100644
--- a/selectors/parser.rs
+++ b/selectors/parser.rs
@@ -206,6 +206,7 @@ pub enum SelectorParseErrorKind<'i> {
InvalidQualNameInAttr(Token<'i>),
ExplicitNamespaceUnexpectedToken(Token<'i>),
ClassNeedsIdent(Token<'i>),
+ UnexpectedSelectorAfterPseudoElement(Token<'i>),
}
macro_rules! with_all_bounds {
@@ -2141,6 +2142,14 @@ where
}
if state.intersects(SelectorParsingState::AFTER_PSEUDO) {
+ // Input should be exhausted here.
+ let source_location = input.current_source_location();
+ if let Ok(next) = input.next() {
+ let next = next.clone();
+ return Err(
+ source_location.new_custom_error(SelectorParseErrorKind::UnexpectedSelectorAfterPseudoElement(next)),
+ );
+ }
break;
}
@@ -2956,6 +2965,7 @@ where
Impl: SelectorImpl<'i>,
{
let start = input.state();
+ let token_location = input.current_source_location();
let token = match input.next_including_whitespace().map(|t| t.clone()) {
Ok(t) => t,
Err(..) => {
@@ -2967,14 +2977,18 @@ where
Ok(Some(match token {
Token::IDHash(id) => {
if state.intersects(SelectorParsingState::AFTER_PSEUDO) {
- return Err(input.new_custom_error(SelectorParseErrorKind::InvalidState));
+ return Err(token_location.new_custom_error(
+ SelectorParseErrorKind::UnexpectedSelectorAfterPseudoElement(Token::IDHash(id)),
+ ));
}
let id = Component::ID(id.into());
SimpleSelectorParseResult::SimpleSelector(id)
}
Token::Delim('.') => {
if state.intersects(SelectorParsingState::AFTER_PSEUDO) {
- return Err(input.new_custom_error(SelectorParseErrorKind::InvalidState));
+ return Err(token_location.new_custom_error(
+ SelectorParseErrorKind::UnexpectedSelectorAfterPseudoElement(Token::Delim('.')),
+ ));
}
let location = input.current_source_location();
let class = match *input.next_including_whitespace()? {
@@ -2989,7 +3003,9 @@ where
}
Token::SquareBracketBlock => {
if state.intersects(SelectorParsingState::AFTER_PSEUDO) {
- return Err(input.new_custom_error(SelectorParseErrorKind::InvalidState));
+ return Err(token_location.new_custom_error(
+ SelectorParseErrorKind::UnexpectedSelectorAfterPseudoElement(Token::SquareBracketBlock),
+ ));
}
let attr = input.parse_nested_block(|input| parse_attribute_selector(parser, input))?;
SimpleSelectorParseResult::SimpleSelector(attr)
diff --git a/src/error.rs b/src/error.rs
index c7f62e4f..872de438 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -235,6 +235,11 @@ pub enum SelectorError<'i> {
/// Ambiguous CSS module class.
AmbiguousCssModuleClass(CowArcStr<'i>),
+
+ /// An unexpected token was encountered after a pseudo element.
+ UnexpectedSelectorAfterPseudoElement(
+ #[cfg_attr(any(feature = "serde", feature = "nodejs"), serde(skip))] Token<'i>,
+ ),
}
impl<'i> fmt::Display for SelectorError<'i> {
@@ -261,6 +266,12 @@ impl<'i> fmt::Display for SelectorError<'i> {
UnexpectedTokenInAttributeSelector(token) => write!(f, "Unexpected token in attribute selector: {:?}", token),
UnsupportedPseudoClassOrElement(name) => write!(f, "Unsupported pseudo class or element: {}", name),
AmbiguousCssModuleClass(_) => write!(f, "Ambiguous CSS module class not supported"),
+ UnexpectedSelectorAfterPseudoElement(token) => {
+ write!(
+ f,
+ "Pseudo-elements like '::before' or '::after' can't be followed by selectors like '{token:?}'"
+ )
+ },
}
}
}
@@ -302,6 +313,9 @@ impl<'i> From<'i>> for SelectorError<'i> {
}
SelectorParseErrorKind::ClassNeedsIdent(t) => SelectorError::ClassNeedsIdent(t.into()),
SelectorParseErrorKind::AmbiguousCssModuleClass(name) => SelectorError::AmbiguousCssModuleClass(name.into()),
+ SelectorParseErrorKind::UnexpectedSelectorAfterPseudoElement(t) => {
+ SelectorError::UnexpectedSelectorAfterPseudoElement(t.into())
+ }
}
}
}
diff --git a/src/lib.rs b/src/lib.rs
index e30dad5b..fbe37702 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6900,6 +6900,45 @@ mod tests {
".foo /deep/ .bar{width:20px}",
deep_options.clone(),
);
+
+ error_test(
+ "input.defaultCheckbox::before h1 {width: 20px}",
+ ParserError::SelectorError(SelectorError::UnexpectedSelectorAfterPseudoElement(Token::Ident(
+ "h1".into(),
+ ))),
+ );
+ error_test(
+ "input.defaultCheckbox::before .my-class {width: 20px}",
+ ParserError::SelectorError(SelectorError::UnexpectedSelectorAfterPseudoElement(Token::Delim('.'))),
+ );
+ error_test(
+ "input.defaultCheckbox::before.my-class {width: 20px}",
+ ParserError::SelectorError(SelectorError::UnexpectedSelectorAfterPseudoElement(Token::Delim('.'))),
+ );
+ error_test(
+ "input.defaultCheckbox::before #id {width: 20px}",
+ ParserError::SelectorError(SelectorError::UnexpectedSelectorAfterPseudoElement(Token::IDHash(
+ "id".into(),
+ ))),
+ );
+ error_test(
+ "input.defaultCheckbox::before#id {width: 20px}",
+ ParserError::SelectorError(SelectorError::UnexpectedSelectorAfterPseudoElement(Token::IDHash(
+ "id".into(),
+ ))),
+ );
+ error_test(
+ "input.defaultCheckbox::before [attr] {width: 20px}",
+ ParserError::SelectorError(SelectorError::UnexpectedSelectorAfterPseudoElement(
+ Token::SquareBracketBlock,
+ )),
+ );
+ error_test(
+ "input.defaultCheckbox::before[attr] {width: 20px}",
+ ParserError::SelectorError(SelectorError::UnexpectedSelectorAfterPseudoElement(
+ Token::SquareBracketBlock,
+ )),
+ );
}
#[test]
From 22ef6649c630325c970b1f1f67eb5e21bca06864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?=
Date: Sat, 31 Aug 2024 23:48:39 +0900
Subject: [PATCH 009/133] feat: Implement pure mode lints for CSS Modules
(#796)
---
napi/src/lib.rs | 3 +
src/css_modules.rs | 3 +
src/error.rs | 6 ++
src/lib.rs | 117 +++++++++++++++++++++++++++++++++++
src/rules/mod.rs | 1 +
src/rules/scope.rs | 22 ++++++-
src/rules/style.rs | 18 +++++-
src/selector.rs | 19 ++++++
src/stylesheet.rs | 1 +
website/pages/css-modules.md | 20 ++++++
10 files changed, 208 insertions(+), 2 deletions(-)
diff --git a/napi/src/lib.rs b/napi/src/lib.rs
index 9edfb1ce..18bbd7e4 100644
--- a/napi/src/lib.rs
+++ b/napi/src/lib.rs
@@ -608,6 +608,7 @@ struct CssModulesConfig {
animation: Option,
grid: Option,
custom_idents: Option,
+ pure: Option,
}
#[cfg(feature = "bundler")]
@@ -719,6 +720,7 @@ fn compile<'i>(
animation: c.animation.unwrap_or(true),
grid: c.grid.unwrap_or(true),
custom_idents: c.custom_idents.unwrap_or(true),
+ pure: c.pure.unwrap_or_default(),
}),
}
} else {
@@ -849,6 +851,7 @@ fn compile_bundle<
animation: c.animation.unwrap_or(true),
grid: c.grid.unwrap_or(true),
custom_idents: c.custom_idents.unwrap_or(true),
+ pure: c.pure.unwrap_or_default(),
}),
}
} else {
diff --git a/src/css_modules.rs b/src/css_modules.rs
index 07327315..65e8543a 100644
--- a/src/css_modules.rs
+++ b/src/css_modules.rs
@@ -41,6 +41,8 @@ pub struct Config<'i> {
/// Whether to scope custom identifiers
/// Default is `true`.
pub custom_idents: bool,
+ /// Whether to check for pure CSS modules.
+ pub pure: bool,
}
impl<'i> Default for Config<'i> {
@@ -51,6 +53,7 @@ impl<'i> Default for Config<'i> {
animation: true,
grid: true,
custom_idents: true,
+ pure: false,
}
}
}
diff --git a/src/error.rs b/src/error.rs
index 872de438..96421fed 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -356,6 +356,8 @@ pub enum MinifyErrorKind {
/// The source location of the `@custom-media` rule with unsupported boolean logic.
custom_media_loc: Location,
},
+ /// A CSS module selector did not contain at least one class or id selector.
+ ImpureCSSModuleSelector,
}
impl fmt::Display for MinifyErrorKind {
@@ -368,6 +370,10 @@ impl fmt::Display for MinifyErrorKind {
f,
"Boolean logic with media types in @custom-media rules is not supported by Lightning CSS"
),
+ ImpureCSSModuleSelector => write!(
+ f,
+ "A selector in CSS modules should contain at least one class or ID selector"
+ ),
}
}
}
diff --git a/src/lib.rs b/src/lib.rs
index fbe37702..f2b7c969 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -82,6 +82,7 @@ mod tests {
minify_test_with_options(source, expected, ParserOptions::default())
}
+ #[track_caller]
fn minify_test_with_options<'i, 'o>(source: &'i str, expected: &'i str, options: ParserOptions<'o, 'i>) {
let mut stylesheet = StyleSheet::parse(&source, options.clone()).unwrap();
stylesheet.minify(MinifyOptions::default()).unwrap();
@@ -94,6 +95,18 @@ mod tests {
assert_eq!(res.code, expected);
}
+ fn minify_error_test_with_options<'i, 'o>(
+ source: &'i str,
+ error: MinifyErrorKind,
+ options: ParserOptions<'o, 'i>,
+ ) {
+ let mut stylesheet = StyleSheet::parse(&source, options.clone()).unwrap();
+ match stylesheet.minify(MinifyOptions::default()) {
+ Err(e) => assert_eq!(e.kind, error),
+ _ => unreachable!(),
+ }
+ }
+
fn prefix_test(source: &str, expected: &str, targets: Browsers) {
let mut stylesheet = StyleSheet::parse(&source, ParserOptions::default()).unwrap();
stylesheet
@@ -6901,6 +6914,110 @@ mod tests {
deep_options.clone(),
);
+ let pure_css_module_options = ParserOptions {
+ css_modules: Some(crate::css_modules::Config {
+ pure: true,
+ ..Default::default()
+ }),
+ ..ParserOptions::default()
+ };
+
+ minify_error_test_with_options(
+ "div {width: 20px}",
+ MinifyErrorKind::ImpureCSSModuleSelector,
+ pure_css_module_options.clone(),
+ );
+ minify_error_test_with_options(
+ ":global(.foo) {width: 20px}",
+ MinifyErrorKind::ImpureCSSModuleSelector,
+ pure_css_module_options.clone(),
+ );
+ minify_error_test_with_options(
+ "[foo=bar] {width: 20px}",
+ MinifyErrorKind::ImpureCSSModuleSelector,
+ pure_css_module_options.clone(),
+ );
+ minify_error_test_with_options(
+ "div, .foo {width: 20px}",
+ MinifyErrorKind::ImpureCSSModuleSelector,
+ pure_css_module_options.clone(),
+ );
+ minify_test_with_options(
+ ":local(.foo) {width: 20px}",
+ "._8Z4fiW_foo{width:20px}",
+ pure_css_module_options.clone(),
+ );
+ minify_test_with_options(
+ "div.my-class {color: red;}",
+ "div._8Z4fiW_my-class{color:red}",
+ pure_css_module_options.clone(),
+ );
+ minify_test_with_options(
+ "#id {color: red;}",
+ "#_8Z4fiW_id{color:red}",
+ pure_css_module_options.clone(),
+ );
+ minify_test_with_options(
+ "a .my-class{color: red;}",
+ "a ._8Z4fiW_my-class{color:red}",
+ pure_css_module_options.clone(),
+ );
+ minify_test_with_options(
+ ".my-class a {color: red;}",
+ "._8Z4fiW_my-class a{color:red}",
+ pure_css_module_options.clone(),
+ );
+ minify_test_with_options(
+ ".my-class:is(a) {color: red;}",
+ "._8Z4fiW_my-class:is(a){color:red}",
+ pure_css_module_options.clone(),
+ );
+ minify_test_with_options(
+ "div:has(.my-class) {color: red;}",
+ "div:has(._8Z4fiW_my-class){color:red}",
+ pure_css_module_options.clone(),
+ );
+ minify_test_with_options(
+ ".foo { html &:hover { a_value: some-value; } }",
+ "._8Z4fiW_foo{html &:hover{a_value:some-value}}",
+ pure_css_module_options.clone(),
+ );
+ minify_test_with_options(
+ ".foo { span { color: red; } }",
+ "._8Z4fiW_foo{& span{color:red}}",
+ pure_css_module_options.clone(),
+ );
+ minify_error_test_with_options(
+ "html { .foo { span { color: red; } } }",
+ MinifyErrorKind::ImpureCSSModuleSelector,
+ pure_css_module_options.clone(),
+ );
+ minify_test_with_options(
+ ".foo { div { span { color: red; } } }",
+ "._8Z4fiW_foo{& div{& span{color:red}}}",
+ pure_css_module_options.clone(),
+ );
+ minify_error_test_with_options(
+ "@scope (div) { .foo { color: red } }",
+ MinifyErrorKind::ImpureCSSModuleSelector,
+ pure_css_module_options.clone(),
+ );
+ minify_error_test_with_options(
+ "@scope (.a) to (div) { .foo { color: red } }",
+ MinifyErrorKind::ImpureCSSModuleSelector,
+ pure_css_module_options.clone(),
+ );
+ minify_error_test_with_options(
+ "@scope (.a) to (.b) { div { color: red } }",
+ MinifyErrorKind::ImpureCSSModuleSelector,
+ pure_css_module_options.clone(),
+ );
+ minify_test_with_options(
+ "@scope (.a) to (.b) { .foo { color: red } }",
+ "@scope(._8Z4fiW_a) to (._8Z4fiW_b){._8Z4fiW_foo{color:red}}",
+ pure_css_module_options.clone(),
+ );
+
error_test(
"input.defaultCheckbox::before h1 {width: 20px}",
ParserError::SelectorError(SelectorError::UnexpectedSelectorAfterPseudoElement(Token::Ident(
diff --git a/src/rules/mod.rs b/src/rules/mod.rs
index 89ac3087..4655a6e6 100644
--- a/src/rules/mod.rs
+++ b/src/rules/mod.rs
@@ -488,6 +488,7 @@ pub(crate) struct MinifyContext<'a, 'i> {
pub unused_symbols: &'a HashSet,
pub custom_media: Option<'i>, CustomMediaRule<'i>>>,
pub css_modules: bool,
+ pub pure_css_modules: bool,
}
impl<'i, T: Clone> CssRuleList<'i, T> {
diff --git a/src/rules/scope.rs b/src/rules/scope.rs
index e8a8d53b..ab7d1004 100644
--- a/src/rules/scope.rs
+++ b/src/rules/scope.rs
@@ -5,7 +5,7 @@ use super::{CssRuleList, MinifyContext};
use crate::error::{MinifyError, PrinterError};
use crate::parser::DefaultAtRule;
use crate::printer::Printer;
-use crate::selector::SelectorList;
+use crate::selector::{is_pure_css_modules_selector, SelectorList};
use crate::traits::ToCss;
#[cfg(feature = "visitor")]
use crate::visitor::Visit;
@@ -39,6 +39,26 @@ pub struct ScopeRule<'i, R = DefaultAtRule> {
impl<'i, T: Clone> ScopeRule<'i, T> {
pub(crate) fn minify(&mut self, context: &mut MinifyContext<'_, 'i>) -> Result<(), MinifyError> {
+ if context.pure_css_modules {
+ if let Some(scope_start) = &self.scope_start {
+ if !scope_start.0.iter().all(is_pure_css_modules_selector) {
+ return Err(MinifyError {
+ kind: crate::error::MinifyErrorKind::ImpureCSSModuleSelector,
+ loc: self.loc,
+ });
+ }
+ }
+
+ if let Some(scope_end) = &self.scope_end {
+ if !scope_end.0.iter().all(is_pure_css_modules_selector) {
+ return Err(MinifyError {
+ kind: crate::error::MinifyErrorKind::ImpureCSSModuleSelector,
+ loc: self.loc,
+ });
+ }
+ }
+ }
+
self.rules.minify(context, false)
}
}
diff --git a/src/rules/style.rs b/src/rules/style.rs
index 63d8ed7d..d18ec4f9 100644
--- a/src/rules/style.rs
+++ b/src/rules/style.rs
@@ -12,7 +12,9 @@ use crate::error::{MinifyError, PrinterError, PrinterErrorKind};
use crate::parser::DefaultAtRule;
use crate::printer::Printer;
use crate::rules::CssRuleList;
-use crate::selector::{downlevel_selectors, get_prefix, is_compatible, is_unused, SelectorList};
+use crate::selector::{
+ downlevel_selectors, get_prefix, is_compatible, is_pure_css_modules_selector, is_unused, SelectorList,
+};
use crate::targets::{should_compile, Targets};
use crate::traits::ToCss;
use crate::vendor_prefix::VendorPrefix;
@@ -69,6 +71,19 @@ impl<'i, T: Clone> StyleRule<'i, T> {
}
}
+ let pure_css_modules = context.pure_css_modules;
+ if context.pure_css_modules {
+ if !self.selectors.0.iter().all(is_pure_css_modules_selector) {
+ return Err(MinifyError {
+ kind: crate::error::MinifyErrorKind::ImpureCSSModuleSelector,
+ loc: self.loc,
+ });
+ }
+
+ // Parent rule contained id or class, so child rules don't need to.
+ context.pure_css_modules = false;
+ }
+
context.handler_context.context = DeclarationContext::StyleRule;
self
.declarations
@@ -85,6 +100,7 @@ impl<'i, T: Clone> StyleRule<'i, T> {
}
}
+ context.pure_css_modules = pure_css_modules;
Ok(false)
}
}
diff --git a/src/selector.rs b/src/selector.rs
index 2c7d4340..dfec516d 100644
--- a/src/selector.rs
+++ b/src/selector.rs
@@ -2093,6 +2093,25 @@ pub(crate) fn is_unused(
})
}
+/// Returns whether the selector has any class or id components.
+pub(crate) fn is_pure_css_modules_selector(selector: &Selector) -> bool {
+ use parcel_selectors::parser::Component;
+ selector.iter_raw_match_order().any(|c| match c {
+ Component::Class(_) | Component::ID(_) => true,
+ Component::Is(s) | Component::Where(s) | Component::Has(s) | Component::Any(_, s) | Component::Negation(s) => {
+ s.iter().any(is_pure_css_modules_selector)
+ }
+ Component::NthOf(nth) => nth.selectors().iter().any(is_pure_css_modules_selector),
+ Component::Slotted(s) => is_pure_css_modules_selector(&s),
+ Component::Host(s) => s.as_ref().map(is_pure_css_modules_selector).unwrap_or(false),
+ Component::NonTSPseudoClass(pc) => match pc {
+ PseudoClass::Local { selector } => is_pure_css_modules_selector(&*selector),
+ _ => false,
+ },
+ _ => false,
+ })
+}
+
#[cfg(feature = "visitor")]
#[cfg_attr(docsrs, doc(cfg(feature = "visitor")))]
impl<'i, T: Visit<'i, T, V>, V: ?Sized + Visitor<'i, T>> Visit<'i, T, V> for SelectorList<'i> {
diff --git a/src/stylesheet.rs b/src/stylesheet.rs
index 7c332b77..bb5a704f 100644
--- a/src/stylesheet.rs
+++ b/src/stylesheet.rs
@@ -249,6 +249,7 @@ where
unused_symbols: &options.unused_symbols,
custom_media,
css_modules: self.options.css_modules.is_some(),
+ pure_css_modules: self.options.css_modules.as_ref().map(|c| c.pure).unwrap_or_default(),
};
self.rules.minify(&mut ctx, false).map_err(|e| Error {
diff --git a/website/pages/css-modules.md b/website/pages/css-modules.md
index 4ba646bf..a977e616 100644
--- a/website/pages/css-modules.md
+++ b/website/pages/css-modules.md
@@ -253,6 +253,26 @@ let { code, map, exports } = transform({
+
+### Pure mode
+
+Just like the `pure` option of the `css-loader` for webpack, Lightning CSS also has a `pure` option that enforces usage of one or more id or class selectors for each rule.
+
+
+```js
+let {code, map, exports} = transform({
+ // ...
+ cssModules: {
+ pure: true,
+ },
+});
+```
+
+If you enable this option, Lightning CSS will throw an error for CSS rules that don't have at least one id or class selector, like `div`.
+This is useful because selectors like `div` are not scoped and affects all elements on the page.
+
+
+
## Turning off feature scoping
Scoping of grid, animations, and custom identifiers can be turned off. By default all of these are scoped.
From 7f59c0070e75f3eaffb69b586b7eb8be5f186fd1 Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa
Date: Sun, 1 Sep 2024 00:50:47 +0900
Subject: [PATCH 010/133] fix: fix `box-shadow` combination of `oklch` and
`currentColor` (#801)
---
src/lib.rs | 19 +++++++++++++++++++
src/properties/box_shadow.rs | 2 +-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/lib.rs b/src/lib.rs
index f2b7c969..77d904d2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -28019,6 +28019,25 @@ mod tests {
..Browsers::default()
},
);
+ prefix_test(
+ r#"
+ .foo {
+ box-shadow:
+ oklch(100% 0 0deg / 50%) 0 0.63rem 0.94rem -0.19rem,
+ currentColor 0 0.44rem 0.8rem -0.58rem;
+ }
+ "#,
+ indoc! { r#"
+ .foo {
+ box-shadow: 0 .63rem .94rem -.19rem color(display-p3 1 1 1 / .5), 0 .44rem .8rem -.58rem;
+ box-shadow: 0 .63rem .94rem -.19rem lab(100% 0 0 / .5), 0 .44rem .8rem -.58rem;
+ }
+ "#},
+ Browsers {
+ safari: Some(14 << 16),
+ ..Browsers::default()
+ },
+ );
prefix_test(
".foo { color: light-dark(var(--light), var(--dark)); }",
diff --git a/src/properties/box_shadow.rs b/src/properties/box_shadow.rs
index de60f4d3..66376165 100644
--- a/src/properties/box_shadow.rs
+++ b/src/properties/box_shadow.rs
@@ -225,7 +225,7 @@ impl BoxShadowHandler {
let p3 = box_shadows
.iter()
.map(|shadow| BoxShadow {
- color: shadow.color.to_p3().unwrap(),
+ color: shadow.color.to_p3().unwrap_or_else(|_| shadow.color.clone()),
..shadow.clone()
})
.collect();
From 3e066d478ab05a8996a536d778a0bc2eb6ba8867 Mon Sep 17 00:00:00 2001
From: John Carlo Austria
Date: Sat, 31 Aug 2024 23:51:13 +0800
Subject: [PATCH 011/133] Add missing browserslist import in docs.md (#798)
---
website/pages/docs.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/website/pages/docs.md b/website/pages/docs.md
index 64496e6f..035de1a8 100644
--- a/website/pages/docs.md
+++ b/website/pages/docs.md
@@ -125,6 +125,7 @@ Then, set `'lightningcss'` as CSS [transformer](https://vitejs.dev/config/shared
```js
// vite.config.ts
+import browserslist from 'browserslist';
import {browserslistToTargets} from 'lightningcss';
export default {
From ab15b57d2ecd7469365074daa562c0082ad43689 Mon Sep 17 00:00:00 2001
From: Jacob Asper <78604367+20jasper@users.noreply.github.com>
Date: Sat, 31 Aug 2024 11:51:35 -0400
Subject: [PATCH 012/133] update broken selectors link (#750)
---
website/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/index.html b/website/index.html
index 4d5822ee..799777f7 100644
--- a/website/index.html
+++ b/website/index.html
@@ -170,7 +170,7 @@ CSS modules
Browser grade
-
Lightning CSS is written in Rust, using the cssparser and selectors crates created by Mozilla and used by Firefox. These provide a solid CSS-parsing foundation on top of which Lightning CSS implements support for all specific CSS rules and properties.
+
Lightning CSS is written in Rust, using the cssparser and selectors crates created by Mozilla and used by Firefox. These provide a solid CSS-parsing foundation on top of which Lightning CSS implements support for all specific CSS rules and properties.
Lightning CSS fully parses every CSS rule, property, and value just as a browser would. This reduces duplicate work for transformers, leading to improved performance and minification.
Custom transforms →
From 9a20b5843e7604ed4d8b31d38498fb9b8ca81dee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Wei=C3=9Fenfels?=
<10491533+tim-we@users.noreply.github.com>
Date: Sat, 31 Aug 2024 17:52:10 +0200
Subject: [PATCH 013/133] Make CLI example work with windows (update docs.md)
(#726)
Using single quotes in the CLI command will cause a panic in the main thread.
---
website/pages/docs.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/pages/docs.md b/website/pages/docs.md
index 035de1a8..5e28095b 100644
--- a/website/pages/docs.md
+++ b/website/pages/docs.md
@@ -156,7 +156,7 @@ Then, you can run the `lightningcss` command via `npx`, `yarn`, or by setting up
```json
{
"scripts": {
- "build": "lightningcss --minify --bundle --targets '>= 0.25%' input.css -o output.css"
+ "build": "lightningcss --minify --bundle --targets \">= 0.25%\" input.css -o output.css"
}
}
```
From 8f45fe11fcdada63fdf2241a7a09412c4e694ce8 Mon Sep 17 00:00:00 2001
From: Furkan Erdem <50502021+log101@users.noreply.github.com>
Date: Sat, 31 Aug 2024 18:53:02 +0300
Subject: [PATCH 014/133] Update copyright year on main page (#790)
---
website/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/index.html b/website/index.html
index 799777f7..1198b2c1 100644
--- a/website/index.html
+++ b/website/index.html
@@ -196,7 +196,7 @@ Browser grade
html {
From ad2ec9f10309ac27261a996210023b8e8ad3c793 Mon Sep 17 00:00:00 2001
From: Devon Govett
Date: Sat, 31 Aug 2024 11:53:24 -0400
Subject: [PATCH 015/133] Fix another copyright
---
website/include/layout.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/include/layout.html b/website/include/layout.html
index 8172c877..772a152a 100644
--- a/website/include/layout.html
+++ b/website/include/layout.html
@@ -44,7 +44,7 @@ Docs