feat(preset-env): Let browserslist-rs handle default config path

swc-project · May 6, 2024 · 45ece22 · 45ece22
1 parent 75d2ff4
commit 45ece22
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 24 deletions.
diff --git a/crates/preset_env_base/src/query.rs b/crates/preset_env_base/src/query.rs
@@ -96,22 +96,24 @@ impl Query {
     }
 }
 
-pub fn targets_to_versions(v: Option<Targets>, path: PathBuf) -> Result<Versions, Error> {
+pub fn targets_to_versions(v: Option<Targets>, path: Option<PathBuf>) -> Result<Versions, Error> {
     match v {
         #[cfg(not(target_arch = "wasm32"))]
         None => {
-            let distribs = browserslist::execute(
-                browserslist::Opts::new()
-                    .mobile_to_desktop(true)
-                    .ignore_unknown_versions(true)
-                    .path(
-                        path.clone()
-                            .into_os_string()
-                            .to_str()
-                            .unwrap_or_else(|| panic!("Invalid path \"{:?}\"", path)),
-                    ),
-            )
-            .with_context(|| "failed to resolve browserslist query from browserslist config")?;
+            let mut browserslist_opts = browserslist::Opts::new()
+                .mobile_to_desktop(true)
+                .ignore_unknown_versions(true)
+                .to_owned();
+            if let Some(path) = path {
+                browserslist_opts.path(
+                    path.clone()
+                        .into_os_string()
+                        .to_str()
+                        .unwrap_or_else(|| panic!("Invalid path \"{:?}\"", path)),
+                );
+            }
+            let distribs = browserslist::execute(&browserslist_opts)
+                .with_context(|| "failed to resolve browserslist query from browserslist config")?;
 
             let versions =
                 BrowserData::parse_versions(distribs).expect("failed to parse browser version");

diff --git a/crates/swc_ecma_preset_env/src/lib.rs b/crates/swc_ecma_preset_env/src/lib.rs
@@ -603,8 +603,8 @@ pub struct Config {
     #[serde(default)]
     pub targets: Option<Targets>,
 
-    #[serde(default = "default_path")]
-    pub path: PathBuf,
+    #[serde(default)]
+    pub path: Option<PathBuf>,
 
     #[serde(default)]
     pub shipped_proposals: bool,
@@ -616,14 +616,6 @@ pub struct Config {
     pub bugfixes: bool,
 }
 
-fn default_path() -> PathBuf {
-    if cfg!(target_arch = "wasm32") {
-        Default::default()
-    } else {
-        std::env::current_dir().unwrap()
-    }
-}
-
 #[derive(Debug, Clone, Deserialize, FromVariant)]
 #[serde(untagged)]
 pub enum FeatureOrModule {

diff --git a/crates/swc_ecma_preset_env/tests/test.rs b/crates/swc_ecma_preset_env/tests/test.rs
@@ -147,7 +147,7 @@ fn exec(c: PresetConfig, dir: PathBuf) -> Result<(), Error> {
                         force_all_transforms: c.force_all_transforms,
                         shipped_proposals: c.shipped_proposals,
                         targets: c.targets,
-                        path: std::env::current_dir().unwrap(),
+                        path: std::env::current_dir().ok(),
                     },
                     Default::default(),
                     &mut Default::default(),