Revert "fix: custom condition_names should take higher priority than target in package.json (#115)"

pnpm-workspace.yaml

@@ -1,7 +1,6 @@
 packages:
   - npm
   - napi
-  - fixtures/dual-condition-names
   - fixtures/pnpm
   - fixtures/pnpm-workspace/**
 

src/lib.rs

@@ -1803,16 +1803,11 @@ impl<C: Cache<Cp = FsCachedPath>> ResolverGeneric<C> {
         }
         // 2. Otherwise, if target is a non-null Object, then
         else if let Some(target) = target.as_map() {
-            let mut conditions_with_default = conditions.to_vec();
-            // `default` condition should always be present as fallback.
-            if !conditions_with_default.iter().any(|condition| condition == "default") {
-                conditions_with_default.push("default".into());
-            }
             // 1. If exports contains any index property keys, as defined in ECMA-262 6.1.7 Array Index, throw an Invalid Package Configuration error.
-            // 2. For each property p of conditions, in object insertion order as,
-            for condition in conditions_with_default {
+            // 2. For each property p of target, in object insertion order as,
+            for (key, target_value) in target.iter() {
                 // 1. If p equals "default" or conditions contains an entry for p, then
-                if let Some((_, target_value)) = target.iter().find(|(key, _)| condition == *key) {
+                if key == "default" || conditions.iter().any(|condition| condition == key) {
                     // 1. Let targetValue be the value of the p property in target.
                     // 2. Let resolved be the result of PACKAGE_TARGET_RESOLVE( packageURL, targetValue, patternMatch, isImports, conditions).
                     let resolved = self.package_target_resolve(

src/tests/exports_field.rs

@@ -822,7 +822,7 @@ fn test_cases() {
         },
         TestCase {
             name: "Direct mapping #7",
-            expect: Some(vec!["./index.js"]), // `enhanced_resolve` is `None`
+            expect: Some(vec!["./src/index.js"]), // `enhanced_resolve` is `None`
             exports_field: exports_field(json!({
                 ".": {
                     "default": "./src/index.js",
@@ -1344,7 +1344,7 @@ fn test_cases() {
                 }
             })),
             request: "./utils/index.mjs",
-            condition_names: vec!["webpack", "browser"],
+            condition_names: vec!["browser", "webpack"],
         },
         TestCase {
             name: "conditional mapping folder #3 (wildcard)",
@@ -1362,7 +1362,7 @@ fn test_cases() {
                 }
             })),
             request: "./utils/index.mjs",
-            condition_names: vec!["webpack", "browser"],
+            condition_names: vec!["browser", "webpack"],
         },
         TestCase {
             name: "incorrect exports field #1",

src/tests/imports_field.rs

@@ -517,7 +517,7 @@ fn test_cases() {
         },
         TestCase {
             name: "Direct mapping #7",
-            expect: Some(vec!["./index.js"]), // `enhanced_resolve` is `None`
+            expect: Some(vec!["./src/index.js"]), // `enhanced_resolve` is `None`
             imports_field: imports_field(json!({
               "#a": {
                 "default": "./src/index.js",
@@ -905,7 +905,7 @@ fn test_cases() {
               }
             })),
             request: "#a/index.mjs",
-            condition_names: vec!["webpack", "browser"],
+            condition_names: vec!["browser", "webpack"],
         },
         TestCase {
             name: "incorrect exports field #1",

tests/resolve_test.rs

@@ -248,17 +248,3 @@ fn package_json_with_bom() {
         Ok(dir.join("package-json-with-bom/index.js"))
     );
 }
-
-#[test]
-fn dual_condition_names() {
-    let dir: PathBuf = dir();
-    let path = dir.join("fixtures/dual-condition-names");
-    let resolver = Resolver::new(ResolveOptions {
-        condition_names: vec!["import".into(), "require".into()],
-        ..ResolveOptions::default()
-    });
-    assert_eq!(
-        resolver.resolve(path, "zod").map(|r| r.full_path()),
-        Ok(dir.join("node_modules/.pnpm/[email protected]/node_modules/zod/lib/index.mjs"))
-    );
-}