From 13b345bc39d282a6e6041dc022ea4092eedd8324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Szyma=C5=84ski?=
 <mateusz.szymanski@windowslive.com>
Date: Tue, 16 Apr 2024 22:39:15 +0200
Subject: [PATCH] Use yarn 4.x

---
 manifest.toml      |  3 ---
 scripts/_common.sh |  4 ++--
 scripts/install    | 10 +++++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index ceb7a0e..1362c1a 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -132,9 +132,6 @@ ram.runtime = "50M"
         "python3-tabulate",
         "fontforge"
     ]
-    extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main"
-    extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg"
-    extras.yarn.packages = "yarn"
 
     [resources.database]
     type = "postgresql"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 3189b68..3963cfd 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,8 +5,8 @@
 #=================================================
 
 nodejs_version=20
-current_hash="1eaf7b2b4"
-version="1.19.3-10698-g1eaf7b2b4"
+current_hash="41cdd245"
+version="2.0.0-10698-g41cdd245"
 build_date="Mon, 18 Sep 2023 09:14:03 +0000"
 
 #=================================================
diff --git a/scripts/install b/scripts/install
index fe45893..bf7b974 100644
--- a/scripts/install
+++ b/scripts/install
@@ -64,18 +64,18 @@ chmod -R o-rwx "$install_dir"
 ynh_script_progression --message="Building frontend..." --weight=5
 
 pushd $install_dir/build/frontend
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack enable
+    ynh_exec_warn_less ynh_exec_as "$app" env $ynh_node_load_PATH corepack prepare --activate
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --pure-lockfile
     
     # ynh_exec_warn_less 
     ynh_exec_warn_less ynh_exec_as $app env PATH=$PATH JAVA_HOME=$JAVA_HOME clojure -J-Xms100M -J-Xmx800M -J-XX:+UseSerialGC -M:dev:shadow-cljs release main --config-merge "{:release-version \"${current_hash}\"}"
-    ynh_exec_as $app $ynh_node_load_PATH $ynh_npm exec gulp build:assets
-    ynh_exec_as $app $ynh_node_load_PATH $ynh_npm exec gulp build:styles
-    ynh_exec_as $app $ynh_node_load_PATH $ynh_npm exec gulp clean:dist
-    ynh_exec_as $app $ynh_node_load_PATH $ynh_npm exec gulp build:copy
+
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run compile
 
     ynh_replace_string --match_string="%version%" --replace_string="$version" --target_file="$install_dir/build/frontend/target/dist/index.html"
     ynh_replace_string --match_string="%buildDate%" --replace_string="$build_date" --target_file="$install_dir/build/frontend/target/dist/index.html"
-    echo "$version" > target/version.txt;
+    #echo "$version" > target/version.txt;
 popd
 
 mkdir -p $install_dir/frontend