fix: resolve symlink with nested node_modules (#125)

Author: JounQin

examples/resolver.rs

@@ -8,7 +8,7 @@ fn main() {
     let path = PathBuf::from(env::args().nth(1).expect("path"));
 
     assert!(path.is_dir(), "{path:?} must be a directory that will be resolved against.");
-    assert!(path.is_absolute(), "{path:?} must be an absolute path.",);
+    assert!(path.is_absolute(), "{path:?} must be an absolute path.");
 
     let specifier = env::args().nth(2).expect("specifier");
 

fixtures/symlink-with-nested-node_modules/.gitignore

@@ -278,9 +278,22 @@ impl<C: Cache<Cp = FsCachedPath>> ResolverGeneric<C> {
         ctx: &mut Ctx,
     ) -> Result<Resolution<C>, ResolveError> {
         ctx.with_fully_specified(self.options.fully_specified);
-        let cached_path = self.cache.value(path);
+
+        let cached_path = if self.options.symlinks {
+            self.load_realpath(&self.cache.value(path))?
+        } else {
+            path.to_path_buf()
+        };
+
+        let cached_path = self.cache.value(&cached_path);
         let cached_path = self.require(&cached_path, specifier, ctx)?;
-        let path = self.load_realpath(&cached_path)?;
+
+        let path = if self.options.symlinks {
+            self.load_realpath(&cached_path)?
+        } else {
+            cached_path.to_path_buf()
+        };
+
         // enhanced-resolve: restrictions
         self.check_restrictions(&path)?;
         let package_json =

fixtures/symlink-with-nested-node_modules/bar/node_modules/foo

@@ -254,7 +254,7 @@ fn all_alias_values_are_not_found() {
     let resolution = resolver.resolve(&f, "m1/a.js");
     assert_eq!(
         resolution,
-        Err(ResolveError::MatchedAliasNotFound("m1/a.js".to_string(), "m1".to_string(),))
+        Err(ResolveError::MatchedAliasNotFound("m1/a.js".to_string(), "m1".to_string()))
     );
 }
 

fixtures/symlink-with-nested-node_modules/foo/node_modules/dep/index.js

@@ -68,7 +68,7 @@ fn issue238_resolve() {
     });
     let resolved_path =
         resolver.resolve(f.join("src/common"), "config/myObjectFile").map(|r| r.full_path());
-    assert_eq!(resolved_path, Ok(f.join("src/common/config/myObjectFile.js")),);
+    assert_eq!(resolved_path, Ok(f.join("src/common/config/myObjectFile.js")));
 }
 
 #[test]
@@ -151,6 +151,22 @@ fn resolve_dot() {
     }
 }
 
+#[test]
+fn symlink_with_nested_node_modules() {
+    let f = super::fixture_root().join("symlink-with-nested-node_modules");
+
+    let resolver = Resolver::default();
+    let resolved_path =
+        resolver.resolve(f.join("bar/node_modules/foo"), "dep").map(|r| r.full_path());
+    assert_eq!(resolved_path, Ok(f.join("foo/node_modules/dep/index.js")));
+
+    let resolver = Resolver::new(ResolveOptions { symlinks: false, ..ResolveOptions::default() });
+    assert_eq!(
+        resolver.resolve(f.join("bar/node_modules/foo"), "dep"),
+        Err(ResolveError::NotFound("dep".into()))
+    );
+}
+
 #[cfg(windows)]
 #[test]
 fn resolve_normalized_on_windows() {

fixtures/symlink-with-nested-node_modules/foo/node_modules/foo/index.js

@@ -196,9 +196,6 @@ fn test_unsupported_targets() {
     let dos_device_temp_path = get_dos_device_path(&temp_path).unwrap();
     assert_eq!(
         resolver_with_symlinks.resolve(&dos_device_temp_path, "./index.js"),
-        // There is `package.json` under fixtures/enhanced_resolve, so in practice the Error will be thrown there.
-        Err(ResolveError::PathNotSupported(
-            dos_device_temp_path.parent().unwrap().parent().unwrap().to_path_buf()
-        ))
+        Err(ResolveError::PathNotSupported(dos_device_temp_path))
     );
 }

src/lib.rs

@@ -96,6 +96,7 @@ fn postcss() {
     let module_path = path.join("node_modules/postcss");
     let resolver = Resolver::new(ResolveOptions {
         alias_fields: vec![vec!["browser".into()]],
+        symlinks: false,
         ..ResolveOptions::default()
     });