diff --git a/fixtures/symlink-with-nested-node_modules/.gitignore b/fixtures/symlink-with-nested-node_modules/.gitignore deleted file mode 100644 index cf4bab9d..00000000 --- a/fixtures/symlink-with-nested-node_modules/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!node_modules diff --git a/fixtures/symlink-with-nested-node_modules/bar/node_modules/foo b/fixtures/symlink-with-nested-node_modules/bar/node_modules/foo deleted file mode 120000 index 99d688a4..00000000 --- a/fixtures/symlink-with-nested-node_modules/bar/node_modules/foo +++ /dev/null @@ -1 +0,0 @@ -../../foo/node_modules/foo \ No newline at end of file diff --git a/fixtures/symlink-with-nested-node_modules/foo/node_modules/dep/index.js b/fixtures/symlink-with-nested-node_modules/foo/node_modules/dep/index.js deleted file mode 100644 index e69de29b..00000000 diff --git a/fixtures/symlink-with-nested-node_modules/foo/node_modules/foo/index.js b/fixtures/symlink-with-nested-node_modules/foo/node_modules/foo/index.js deleted file mode 100644 index e69de29b..00000000 diff --git a/src/lib.rs b/src/lib.rs index 7f937e6c..5dcbae85 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -260,20 +260,9 @@ impl ResolverGeneric { ) -> Result { ctx.with_fully_specified(self.options.fully_specified); - 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.cache.value(path); let cached_path = self.require(&cached_path, specifier, ctx)?; - - let path = if self.options.symlinks { - self.load_realpath(&cached_path)? - } else { - cached_path.to_path_buf() - }; + let path = self.load_realpath(&cached_path)?; let package_json = self.find_package_json_for_a_package(&cached_path, ctx)?; if let Some(package_json) = &package_json { diff --git a/src/tests/package_json.rs b/src/tests/package_json.rs index 45643475..4b58e34f 100644 --- a/src/tests/package_json.rs +++ b/src/tests/package_json.rs @@ -1,6 +1,6 @@ //! Tests for `Resolution::package_json`. -use crate::{ResolveError, Resolver}; +use crate::Resolver; #[test] fn test() { @@ -68,8 +68,9 @@ fn package_json_with_symlinks_true() { fn test_corrupted_package_json() { use std::path::Path; + use crate::{ResolveError, ResolveOptions, ResolverGeneric}; + use super::memory_fs::MemoryFS; - use crate::{ResolveOptions, ResolverGeneric}; // Test scenarios for various corrupted package.json files let scenarios = [ diff --git a/src/tests/resolve.rs b/src/tests/resolve.rs index 5c630b71..8ea336af 100644 --- a/src/tests/resolve.rs +++ b/src/tests/resolve.rs @@ -165,22 +165,6 @@ 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())) - ); -} - #[test] fn abnormal_relative() { let f = super::fixture_root().join("abnormal-relative-with-node_modules"); diff --git a/src/tests/symlink.rs b/src/tests/symlink.rs index f15e0084..24738fc7 100644 --- a/src/tests/symlink.rs +++ b/src/tests/symlink.rs @@ -174,7 +174,7 @@ fn test() { fn test_unsupported_targets() { use crate::ResolveError; - let Some(SymlinkFixturePaths { root: _, temp_path }) = + let Some(SymlinkFixturePaths { root, temp_path }) = prepare_symlinks("temp.test_unsupported_targets").unwrap() else { return; @@ -200,9 +200,10 @@ fn test_unsupported_targets() { // from `FsCachedPath::find_package_json` when trying to canonicalize the full path of `package.json`. // * Otherwise, a `ResolveError::NotFound` will be returned. let dos_device_temp_path = get_dos_device_path(&temp_path).unwrap(); + let dos_device_root = get_dos_device_path(&root).unwrap(); assert_eq!( resolver_with_symlinks.resolve(&dos_device_temp_path, "./index.js"), - Err(ResolveError::PathNotSupported(dos_device_temp_path)) + Err(ResolveError::PathNotSupported(dos_device_root)) ); }