fix: Fix yarn 2.4.3 version. (#38)

Author: milesj

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.11.2
+
+#### 🐞 Fixes
+
+- Fixed yarn "2.4.3" not resolving or downloading correctly (it was published to the wrong package).
+
 ## 0.11.1
 
 #### 🚀 Updates

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "node_depman_plugin"
-version = "0.11.1"
+version = "0.11.2"
 edition = "2021"
 license = "MIT"
 publish = false

crates/node-depman/Cargo.toml

@@ -25,11 +25,25 @@ impl PackageManager {
     }
 
     pub fn get_package_name(&self, version: impl AsRef<UnresolvedVersionSpec>) -> String {
-        if self.is_yarn_berry(version.as_ref()) {
-            "@yarnpkg/cli-dist".into()
-        } else {
-            self.to_string()
+        let version = version.as_ref();
+
+        if matches!(self, PackageManager::Yarn) {
+            if let UnresolvedVersionSpec::Version(inner) = &version {
+                // Version 2.4.3 was published to the wrong package. It should
+                // have been published to `@yarnpkg/cli-dist` but was published
+                // to `yarn`. So... we need to manually fix it.
+                // https://www.npmjs.com/package/yarn?activeTab=versions
+                if inner.major == 2 && inner.minor == 4 && inner.patch == 3 {
+                    return "yarn".into();
+                }
+            }
+
+            if self.is_yarn_berry(version) {
+                return "@yarnpkg/cli-dist".into();
+            }
         }
+
+        self.to_string()
     }
 
     pub fn is_yarn_classic(&self, version: impl AsRef<UnresolvedVersionSpec>) -> bool {

crates/node-depman/src/package_manager.rs

@@ -260,8 +260,8 @@ pub fn download_prebuilt(
 
     let package_name = manager.get_package_name(version.to_unresolved_spec());
 
-    let package_without_scope = if package_name.contains('/') {
-        package_name.split('/').nth(1).unwrap()
+    let package_without_scope = if let Some(index) = package_name.find('/') {
+        &package_name[index + 1..]
     } else {
         &package_name
     };

crates/node-depman/src/proto.rs

@@ -153,6 +153,13 @@ mod yarn {
     }
 }
 
+mod yarn2 {
+    use super::*;
+
+    // Special case
+    generate_download_install_tests!("yarn-test", "2.4.3");
+}
+
 mod yarn_berry {
     use super::*;
 

crates/node-depman/tests/download_test.rs

@@ -199,7 +199,7 @@ mod yarn {
         "1" => "1.22.22",
         "2" => "2.4.3",
         "3" => "3.8.2",
-        "berry" => "4.2.2",
+        "berry" => "4.3.0",
     });
 
     #[test]

crates/node-depman/tests/versions_test.rs

@@ -1,6 +1,6 @@
 [package]
 name = "node_plugin"
-version = "0.11.1"
+version = "0.11.2"
 edition = "2021"
 license = "MIT"
 publish = false

crates/node/Cargo.toml

@@ -6,7 +6,7 @@ generate_resolve_versions_tests!("node-test", {
     "lts-gallium" => "16.20.2",
     "lts/fermium" => "14.21.3",
     "stable" => "20.14.0",
-    "node" => "22.2.0",
+    "node" => "22.3.0",
 });
 
 #[test]