Skip to content
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.

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

chore(preset-env): Update browserslist-rs #8614

Merged
merged 8 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion crates/preset_env_base/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bench = false
[dependencies]
ahash = "0.8.5"
anyhow = "1"
browserslist-rs = "0.14.0"
browserslist-rs = "0.15.0"
dashmap = "5.4.0"
once_cell = "1.18.0"
semver = { version = "1.0.17", features = ["serde"] }
Expand Down
15 changes: 15 additions & 0 deletions crates/preset_env_base/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,21 @@ pub struct BrowserData<T: Default> {
pub bun: T,
}

impl<T> BrowserData<T>
where
T: Default,
{
pub fn insert(&mut self, k: &str, v: T) -> T {
for (key, value) in self.iter_mut() {
if k == key {
return std::mem::replace(value, v);
}
}

panic!("unknown key: {}", k)
}
}

/// A map of browser names to data for feature support in browser.
///
/// This type mainly stores `minimum version for each browsers with support for
Expand Down
16 changes: 16 additions & 0 deletions crates/preset_env_base/src/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,22 @@ pub fn targets_to_versions(v: Option<Targets>) -> Result<Versions, Error> {
}
}

let mut result = Versions::default();
for (k, v) in map.iter() {
match v {
QueryOrVersion::Query(q) => {
let v = q.exec().context("failed to run query")?;

for (k, v) in v {
result.insert(k, v);
}
}
QueryOrVersion::Version(v) => {
result.insert(k, Some(*v));
}
}
}

unimplemented!("Targets: {:?}", map)
}
_ => unimplemented!("Option<Targets>: {:?}", v),
Expand Down
23 changes: 23 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8492/input/.swcrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"jsc": {
"parser": {
"syntax": "ecmascript",
"jsx": false
},
"loose": false,
"minify": {
"compress": false,
"mangle": false
}
},
"module": {
"type": "es6"
},
"minify": false,
"isModule": true,
"env": {
"targets": "ios_saf 14",
"coreJs": "3.21",
"mode": "usage"
}
}
3 changes: 3 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8492/input/1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Doesn't matter
console.log(Promise.resolve)
console.log(globalThis)
2 changes: 2 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8492/output/1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
console.log(Promise.resolve);
console.log(globalThis);
Loading