Skip to content

fix: revert "fix: remove serde feature of lightningcss (#11706)" #11796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenjiahan merged 1 commit into from
Sep 30, 2025
Merged

fix: revert "fix: remove serde feature of lightningcss (#11706)" #11796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 32 additions & 10 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ itertools = { version = "0.14.0", default-features = false, features =
itoa = { version = "1.0.14", default-features = false }
json = { version = "0.12.4", default-features = false }
jsonc-parser = { version = "0.26.2", default-features = false, features = ["serde"] }
lightningcss = { version = "1.0.0-alpha.67", default-features = false }
lightningcss = { version = "1.0.0-alpha.68", default-features = false, features = ["serde"] }
linked_hash_set = { version = "0.1.5", default-features = false }
md4 = { version = "0.10.2", default-features = false }
memchr = { version = "2.7.5", default-features = false }
Expand Down
60 changes: 4 additions & 56 deletions crates/rspack_cacheable/src/with/as_preset/lightningcss.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,60 +15,6 @@ pub struct BrowsersResolver {
value: String,
}

// Helper functions for custom serialization without serde
fn browsers_to_string(browsers: &Browsers) -> String {
let parts = vec![
browsers.android.map(|v| format!("android:{}", v)),
browsers.chrome.map(|v| format!("chrome:{}", v)),
browsers.edge.map(|v| format!("edge:{}", v)),
browsers.firefox.map(|v| format!("firefox:{}", v)),
browsers.ie.map(|v| format!("ie:{}", v)),
browsers.ios_saf.map(|v| format!("ios_saf:{}", v)),
browsers.opera.map(|v| format!("opera:{}", v)),
browsers.safari.map(|v| format!("safari:{}", v)),
browsers.samsung.map(|v| format!("samsung:{}", v)),
];

parts.into_iter().flatten().collect::<Vec<_>>().join(",")
}

fn string_to_browsers(s: &str) -> Result<Browsers, DeserializeError> {
let mut browsers = Browsers::default();

if s.is_empty() {
return Ok(browsers);
}

for part in s.split(',') {
let mut split = part.split(':');
let browser = split
.next()
.ok_or_else(|| DeserializeError::MessageError("invalid browser format"))?;
let version_str = split
.next()
.ok_or_else(|| DeserializeError::MessageError("invalid browser format"))?;

let version = version_str
.parse::<u32>()
.map_err(|_| DeserializeError::MessageError("invalid version format"))?;

match browser {
"android" => browsers.android = Some(version),
"chrome" => browsers.chrome = Some(version),
"edge" => browsers.edge = Some(version),
"firefox" => browsers.firefox = Some(version),
"ie" => browsers.ie = Some(version),
"ios_saf" => browsers.ios_saf = Some(version),
"opera" => browsers.opera = Some(version),
"safari" => browsers.safari = Some(version),
"samsung" => browsers.samsung = Some(version),
_ => return Err(DeserializeError::MessageError("unknown browser")),
}
}

Ok(browsers)
}

impl ArchiveWith<Browsers> for AsPreset {
type Archived = ArchivedString;
type Resolver = BrowsersResolver;
Expand All @@ -89,7 +35,8 @@ where
field: &Browsers,
serializer: &mut S,
) -> Result<Self::Resolver, SerializeError> {
let value = browsers_to_string(field);
let value = serde_json::to_string(field)
.map_err(|_| SerializeError::MessageError("serialize serde_json value failed"))?;
let inner = ArchivedString::serialize_from_str(&value, serializer)?;
Ok(BrowsersResolver { value, inner })
}
Expand All @@ -103,6 +50,7 @@ where
field: &ArchivedString,
_deserializer: &mut D,
) -> Result<Browsers, DeserializeError> {
string_to_browsers(field.as_str())
serde_json::from_str(field.as_str())
.map_err(|_| DeserializeError::MessageError("deserialize serde_json value failed"))
}
}
Loading