From de91e6bec1eb23daaf331a81a5872a348cf95acd Mon Sep 17 00:00:00 2001
From: Tagada <36127788+Tagadda@users.noreply.github.com>
Date: Tue, 26 Dec 2023 16:56:42 +0100
Subject: [PATCH] use yarn 4

---
 scripts/install | 3 ++-
 scripts/restore | 1 -
 scripts/upgrade | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index b56b309..fa76613 100644
--- a/scripts/install
+++ b/scripts/install
@@ -97,7 +97,6 @@ ynh_script_progression --message="Installing dependencies..." --weight=10
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
-ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
 ynh_exec_warn_less ynh_install_ruby --ruby_version=$RUBY_VERSION
 
 #=================================================
@@ -228,6 +227,8 @@ pushd "$final_path/live"
 	ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test'
 	ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
 	ynh_use_nodejs
+	ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH corepack enable
+	ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH corepack prepare yarn@stable --activate
 	ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH yarn install --pure-lockfile
 	echo "SAFETY_ASSURED=1">> $config
 	ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:setup --quiet
diff --git a/scripts/restore b/scripts/restore
index 766d553..2379108 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -80,7 +80,6 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=10
 # Define and install dependencies
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
-ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
 ynh_install_ruby --ruby_version=$RUBY_VERSION
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 6083778..ac5093d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -275,7 +275,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=10
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
-ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
 ynh_exec_warn_less ynh_install_ruby --ruby_version=$RUBY_VERSION
 
 #=================================================
@@ -341,6 +340,8 @@ then
 		ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test'
 		ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
 		ynh_use_nodejs
+		ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH corepack enable
+	    ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH corepack prepare yarn@stable --activate
 		ynh_exec_as $app $ynh_node_load_PATH yarn install --pure-lockfile
 		ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:clean
 		ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:precompile