unrs
diff --git a/‎fixtures/prefer-file-over-pkg/.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎fixtures/prefer-file-over-pkg/.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎fixtures/prefer-file-over-pkg/node_modules/bar.js‎ b/‎fixtures/prefer-file-over-pkg/node_modules/bar.js‎
diff --git a/‎fixtures/prefer-file-over-pkg/node_modules/bar/index.js‎ b/‎fixtures/prefer-file-over-pkg/node_modules/bar/index.js‎
diff --git a/‎fixtures/prefer-file-over-pkg/node_modules/bar/package.json‎
Lines changed: 3 additions & 0 deletions b/‎fixtures/prefer-file-over-pkg/node_modules/bar/package.json‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎fixtures/prefer-file-over-pkg/package.json‎
Lines changed: 3 additions & 0 deletions b/‎fixtures/prefer-file-over-pkg/package.json‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/lib.rs‎
Lines changed: 7 additions & 0 deletions b/‎src/lib.rs‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎src/tests/resolve.rs‎
Lines changed: 11 additions & 2 deletions b/‎src/tests/resolve.rs‎
Lines changed: 11 additions & 2 deletions
@@ -0,0 +1 @@
+!node_modules
@@ -0,0 +1,3 @@
+{
+  "name": "prefer-file-over-pkg"
+}
@@ -781,6 +781,13 @@ impl<C: Cache<Cp = FsCachedPath>> ResolverGeneric<C> {
                 //    may have a @scope/ prefix and the subpath begins with a slash (`/`).
                 if !package_name.is_empty() {
                     let cached_path = cached_path.normalize_with(package_name, self.cache.as_ref());
+                    // file is preferred over directory when specifier doesn't contains a slash which indicates a dir
+                    // node_modules/bar.js vs node_modules/bar/index.js
+                    if !specifier.contains('/') {
+                        if let Some(path) = self.load_as_file(&cached_path, ctx)? {
+                            return Ok(Some(path));
+                        }
+                    }
                     // Try foo/node_modules/package_name
                     if self.cache.is_dir(&cached_path, ctx) {
                         // a. LOAD_PACKAGE_EXPORTS(X, DIR)
 
@@ -113,11 +113,20 @@ fn resolve_to_context() {
 #[test]
 fn resolve_hash_as_module() {
     let f = super::fixture();
-    let resolver = Resolver::new(ResolveOptions::default());
+    let resolver = Resolver::default();
     let resolution = resolver.resolve(f, "#a");
     assert_eq!(resolution, Err(ResolveError::NotFound("#a".into())));
 }
 
+#[test]
+fn prefer_file_over_pkg() {
+    let f = super::fixture_root();
+    let fixture = f.join("prefer-file-over-pkg");
+    let resolver = Resolver::default();
+    let resolved_path = resolver.resolve(fixture.clone(), "bar").map(|r| r.full_path());
+    assert_eq!(resolved_path, Ok(fixture.join("node_modules/bar.js")));
+}
+
 #[cfg(windows)]
 #[test]
 fn resolve_normalized_on_windows() {
@@ -127,7 +136,7 @@ fn resolve_normalized_on_windows() {
     let absolute = f.join("./foo/index.js").normalize();
     let absolute_str = absolute.to_string_lossy();
     let normalized_absolute = absolute_str.replace('\\', "/");
-    let resolver = Resolver::new(ResolveOptions::default());
+    let resolver = Resolver::default();
 
     let resolution = resolver.resolve(&f, &normalized_absolute).map(|r| r.full_path());
     assert_eq!(
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "name": "prefer-file-over-pkg"`
	`3`	`+}`