fix: Fix berry latest alias.

moonrepo · Apr 8, 2024 · 1407e44 · 1407e44
1 parent 53a203b
commit 1407e44
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.10.3
+
+#### 🐞 Fixes
+
+- Fixed yarn "latest" alias pointing to the v1 latest, instead of v4 (berry) latest.
+
 ## 0.10.2
 
 #### 🚀 Updates

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/node-depman/Cargo.toml b/crates/node-depman/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node_depman_plugin"
-version = "0.10.2"
+version = "0.10.3"
 edition = "2021"
 license = "MIT"
 publish = false

diff --git a/crates/node-depman/src/npm_registry.rs b/crates/node-depman/src/npm_registry.rs
@@ -11,6 +11,7 @@ pub struct RegistryVersion {
 
 #[derive(Deserialize)]
 pub struct RegistryResponse {
+    pub name: String,
     #[serde(rename = "dist-tags")]
     pub dist_tags: HashMap<String, String>,
     pub versions: HashMap<String, RegistryVersion>,

diff --git a/crates/node-depman/src/proto.rs b/crates/node-depman/src/proto.rs
@@ -112,8 +112,14 @@ pub fn load_versions(Json(input): Json<LoadVersionsInput>) -> FnResult<Json<Load
         for (alias, version) in res.dist_tags {
             let version = Version::parse(&version)?;
 
-            if alias == "latest" && output.latest.is_none() {
+            if alias == "latest" {
                 output.latest = Some(version.clone());
+
+                // The berry alias only exists in the `yarn` package,
+                // but not `@yarnpkg/cli-dist`, so update it here
+                if is_yarn && res.name == "@yarnpkg/cli-dist" {
+                    output.aliases.insert("berry".into(), version.clone());
+                }
             }
 
             output.aliases.entry(alias).or_insert(version);

diff --git a/crates/node/Cargo.toml b/crates/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node_plugin"
-version = "0.10.2"
+version = "0.10.3"
 edition = "2021"
 license = "MIT"
 publish = false