From 87f05d33b4c4c3256c239c66658ecd0e2edf9836 Mon Sep 17 00:00:00 2001
From: Raboneko <119771935+raboneko@users.noreply.github.com>
Date: Sat, 22 Nov 2025 03:20:52 -0800
Subject: [PATCH] fix(yarnpkg-berry): Include all build and runtime files,
 patch package for system installation) (#7565) (#7570)

* fix(yarnpkg-berry): Include all build and runtime files, patch package for system installation)

* fix: What happened to noarch

(cherry picked from commit 07b486e4c3b74543b71feacd1262a1ab63e6dc8b)

Co-authored-by: Gilver <rockgrub@disroot.org>
---
 anda/devs/yarn-berry/setup-ts-cache.patch | 21 +++++++++++++++++++++
 anda/devs/yarn-berry/yarnpkg-berry.spec   |  7 ++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 anda/devs/yarn-berry/setup-ts-cache.patch

diff --git a/anda/devs/yarn-berry/setup-ts-cache.patch b/anda/devs/yarn-berry/setup-ts-cache.patch
new file mode 100644
index 0000000000..009069aac7
--- /dev/null
+++ b/anda/devs/yarn-berry/setup-ts-cache.patch
@@ -0,0 +1,21 @@
+# Quick and dirty patch to make Yarn Berry's build cache system work when installed as a system package.
+# This patch is created for and maintained solely for Terra.
+--- a/scripts/setup-ts-cache.js	2025-11-22 00:36:54.889317752 -0600
++++ b/scripts/setup-ts-cache.js	2025-11-22 00:44:29.823498920 -0600
+@@ -1,6 +1,7 @@
+ const crypto = require(`crypto`);
+ const esbuild = require(`esbuild`);
+ const fs = require(`fs`);
++const os = require('os');
+ const path = require(`path`);
+ const v8 = require(`v8`);
+ const zlib = require(`zlib`);
+@@ -25,7 +26,7 @@
+   isDirty: false,
+ };
+ 
+-const cachePath = path.join(__dirname, `../node_modules/.cache/yarn/esbuild-transpile-cache.bin`);
++const cachePath = path.join(os.homedir(), `.cache/yarn/esbuild-transpile-cache.bin`);
+ try {
+   const cacheData = v8.deserialize(zlib.brotliDecompressSync(fs.readFileSync(cachePath)));
+   if (cacheData.version === cache.version) {
diff --git a/anda/devs/yarn-berry/yarnpkg-berry.spec b/anda/devs/yarn-berry/yarnpkg-berry.spec
index 186c2758be..e75efca979 100644
--- a/anda/devs/yarn-berry/yarnpkg-berry.spec
+++ b/anda/devs/yarn-berry/yarnpkg-berry.spec
@@ -3,11 +3,12 @@
 
 Name:          yarnpkg-berry
 Version:       4.11.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Active development version of Yarn
 License:       BSD-2-Clause
 URL:           https://yarnpkg.com
 Source0:       https://github.com/yarnpkg/berry/archive/refs/tags/@yarnpkg/cli/%{version}.tar.gz
+Patch0:        setup-ts-cache.patch
 BuildRequires: anda-srpm-macros
 BuildRequires: nodejs
 BuildRequires: nodejs-packaging
@@ -32,14 +33,14 @@ Summary:       Extra documentation and contributor guides for Yarn Berry.
 This package contains extra doc files as well as contributor material for Yarn Berry.
 
 %prep
-%autosetup -n berry--yarnpkg-cli-%{version}
+%autosetup -p1 -n berry--yarnpkg-cli-%{version}
 
 %build
 %{__yarn} build:cli
 
 %install
 mkdir -p {%{buildroot}%{nodejs_sitelib}/yarn-berry,%{buildroot}%{_bindir}}
-cp -pr {scripts,node_modules,packages} -t %{buildroot}%{nodejs_sitelib}/yarn-berry
+cp -pr {scripts,packages,.pnp.cjs,.pnp.loader.mjs,.yarn} -t %{buildroot}%{nodejs_sitelib}/yarn-berry
 
 for bin in yarn yarnpkg; do
    ln -sfr %{buildroot}%{nodejs_sitelib}/yarn-berry/scripts/bin/$bin %{buildroot}%{_bindir}/$bin