From 683fdd60810ab4bd3572f3659e6571634aa338c4 Mon Sep 17 00:00:00 2001
From: i343759 <teodora.nikolova@sap.com>
Date: Thu, 24 Sep 2026 11:28:38 +0300
Subject: [PATCH] Add Yarn Berry (2.x/3.x/4.x) support

Detects Yarn Berry via the presence of .yarnrc.yml (the marker file
Yarn Berry itself uses to identify a project - Yarn Classic projects
never have this file). When detected, InstallYarnBerry() installs the
new yarn-berry dependency (a single bundled CLI script, not a
tarball - see https://repo.yarnpkg.com) instead of classic yarn, and
shims a wrapper script on PATH so 'yarn' still resolves to a working
executable via 'node <script> "$@"'.

Unlike nodejs-buildpack, ruby-buildpack never itself invokes 'yarn
install' with hardcoded flags - it only makes the yarn binary
available on PATH for Rails asset-pipeline tooling (webpacker,
jsbundling-rails, etc.) to invoke on its own via rake tasks. So no
Build()-equivalent branching is needed here; installing the right
binary is sufficient.

Classic Yarn (yarn.lock without .yarnrc.yml) behavior is completely
unchanged.

Depends on the yarn-berry dependency added to the ruby buildpack
manifest via the dependency-builds pipeline
(cloudfoundry/buildpacks-ci#675).
---
 src/ruby/supply/supply.go      | 51 ++++++++++++++++++++++++++++++++++
 src/ruby/supply/supply_test.go | 27 ++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/src/ruby/supply/supply.go b/src/ruby/supply/supply.go
index 10e590c82..04d8242e4 100644
--- a/src/ruby/supply/supply.go
+++ b/src/ruby/supply/supply.go
@@ -298,6 +298,18 @@ func (s *Supplier) InstallYarn() error {
 		return nil
 	}
 
+	// .yarnrc.yml is the marker file Yarn Berry (2.x/3.x/4.x) itself uses to
+	// identify a project as using the "modern" (non-Classic) CLI/protocol -
+	// Yarn Classic (1.x) projects never have this file. See
+	// https://yarnpkg.com/configuration/yarnrc.
+	usesBerry, err := libbuildpack.FileExists(filepath.Join(s.Stager.BuildDir(), ".yarnrc.yml"))
+	if err != nil {
+		return err
+	}
+	if usesBerry {
+		return s.InstallYarnBerry()
+	}
+
 	yarnInstallDir := filepath.Join(s.Stager.DepDir(), "yarn")
 	if err != nil {
 		return err
@@ -309,6 +321,45 @@ func (s *Supplier) InstallYarn() error {
 	return s.Stager.LinkDirectoryInDepDir(filepath.Join(yarnInstallDir, "bin"), "bin")
 }
 
+// InstallYarnBerry installs the "yarn-berry" dependency (Yarn 2.x/3.x/4.x)
+// for projects whose .yarnrc.yml marks them as using the modern Yarn CLI.
+//
+// Unlike Yarn Classic, Yarn Berry is not distributed as a self-contained
+// installable tarball with a bin/ directory - it ships as a single bundled
+// CLI script (see https://repo.yarnpkg.com). InstallOnlyVersion therefore
+// just copies that file as-is into the install dir (libbuildpack falls back
+// to a plain copy for any dependency URI it doesn't recognize as an
+// archive), so a small wrapper script is created here to expose it on PATH
+// as a normal "yarn" executable via `node <script> "$@"`.
+func (s *Supplier) InstallYarnBerry() error {
+	yarnBerryInstallDir := filepath.Join(s.Stager.DepDir(), "yarn-berry")
+
+	if err := s.Installer.InstallOnlyVersion("yarn-berry", yarnBerryInstallDir); err != nil {
+		return err
+	}
+
+	matches, err := filepath.Glob(filepath.Join(yarnBerryInstallDir, "*.js"))
+	if err != nil {
+		return err
+	}
+	if len(matches) == 0 {
+		return fmt.Errorf("could not locate yarn-berry CLI script in %s", yarnBerryInstallDir)
+	}
+	yarnBerryScript := matches[0]
+
+	binDir := filepath.Join(yarnBerryInstallDir, "bin")
+	if err := os.MkdirAll(binDir, 0755); err != nil {
+		return err
+	}
+
+	shim := fmt.Sprintf("#!/usr/bin/env bash\nexec node \"%s\" \"$@\"\n", yarnBerryScript)
+	if err := os.WriteFile(filepath.Join(binDir, "yarn"), []byte(shim), 0755); err != nil {
+		return err
+	}
+
+	return s.Stager.LinkDirectoryInDepDir(binDir, "bin")
+}
+
 func (s *Supplier) InstallBundler() error {
 	contents, err := os.ReadFile(fmt.Sprintf("%s.lock", s.Versions.Gemfile()))
 	if err != nil {
diff --git a/src/ruby/supply/supply_test.go b/src/ruby/supply/supply_test.go
index 189bd65fe..c13351d05 100644
--- a/src/ruby/supply/supply_test.go
+++ b/src/ruby/supply/supply_test.go
@@ -1062,6 +1062,33 @@ var _ = Describe("Supply", func() {
 				Expect(filepath.Join(depsDir, depsIdx, "bin", "yarn")).ToNot(BeAnExistingFile())
 			})
 		})
+		Context("app has yarn.lock and .yarnrc.yml files (Yarn Berry)", func() {
+			BeforeEach(func() {
+				Expect(os.WriteFile(filepath.Join(buildDir, "yarn.lock"), []byte("contents"), 0644)).To(Succeed())
+				Expect(os.WriteFile(filepath.Join(buildDir, ".yarnrc.yml"), []byte("yarnPath: .yarn/releases/yarn-4.18.0.cjs\n"), 0644)).To(Succeed())
+			})
+			It("installs yarn-berry instead of yarn, and shims a yarn wrapper script", func() {
+				mockInstaller.EXPECT().InstallOnlyVersion("yarn-berry", gomock.Any()).Do(func(_, installDir string) error {
+					Expect(os.MkdirAll(installDir, 0755)).To(Succeed())
+					Expect(os.WriteFile(filepath.Join(installDir, "yarn-berry-4.18.0.js"), []byte("#!/usr/bin/env node\n"), 0644)).To(Succeed())
+					return nil
+				})
+				Expect(supplier.InstallYarn()).To(Succeed())
+
+				yarnBerryInstallDir := filepath.Join(depsDir, depsIdx, "yarn-berry")
+				link, err := os.Readlink(filepath.Join(depsDir, depsIdx, "bin", "yarn"))
+				Expect(err).ToNot(HaveOccurred())
+				Expect(link).To(Equal("../yarn-berry/bin/yarn"))
+
+				shimContents, err := os.ReadFile(filepath.Join(yarnBerryInstallDir, "bin", "yarn"))
+				Expect(err).ToNot(HaveOccurred())
+				Expect(string(shimContents)).To(ContainSubstring(`exec node "` + filepath.Join(yarnBerryInstallDir, "yarn-berry-4.18.0.js") + `" "$@"`))
+
+				info, err := os.Stat(filepath.Join(yarnBerryInstallDir, "bin", "yarn"))
+				Expect(err).ToNot(HaveOccurred())
+				Expect(info.Mode().Perm()&0111).ToNot(BeZero(), "shim script should be executable")
+			})
+		})
 	})
 
 	Describe("NeedsNode", func() {