feat: use oxc_resolver (#32)

rolldown · Oct 7, 2023 · 79de1ad · 79de1ad
1 parent 6f6dacc
commit 79de1ad
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 66 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rolldown_resolver/Cargo.toml b/crates/rolldown_resolver/Cargo.toml
@@ -8,7 +8,7 @@ version     = "0.0.1"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nodejs-resolver = "0.0.69"
+oxc_resolver    = "0.2.0"
 sugar_path      = { workspace = true }
 anyhow          = { workspace = true }
 rolldown_error  = { path = "../rolldown_error" }

diff --git a/crates/rolldown_resolver/src/lib.rs b/crates/rolldown_resolver/src/lib.rs
@@ -5,19 +5,19 @@ use std::{
   path::{Path, PathBuf},
 };
 
-use nodejs_resolver::{Options, Resolver as EnhancedResolver};
+use oxc_resolver::{ResolveOptions, Resolver as OxcResolver};
 
 #[derive(Debug)]
 pub struct Resolver {
   cwd: PathBuf,
-  inner: EnhancedResolver,
+  inner: OxcResolver,
 }
 
 impl Resolver {
   pub fn with_cwd(cwd: PathBuf, preserve_symlinks: bool) -> Self {
     Self {
       cwd,
-      inner: EnhancedResolver::new(Options {
+      inner: OxcResolver::new(ResolveOptions {
         symlinks: !preserve_symlinks,
         extensions: vec![
           ".js".to_string(),
@@ -72,12 +72,9 @@ impl Resolver {
     let resolved = self.inner.resolve(context, &specifier.to_string_lossy());
 
     match resolved {
-      Ok(resolved) => match resolved {
-        nodejs_resolver::ResolveResult::Info(info) => Ok(ResolveRet {
-          resolved: info.path().to_string_lossy().to_string().into(),
-        }),
-        nodejs_resolver::ResolveResult::Ignored => unreachable!(),
-      },
+      Ok(info) => Ok(ResolveRet {
+        resolved: info.path().to_string_lossy().to_string().into(),
+      }),
       Err(_err) => {
         if let Some(importer) = importer {
           Err(Box::new(RError::unresolved_import(