From 5145ffe3444ed2052fb15a6f738e7fade7f9f075 Mon Sep 17 00:00:00 2001
From: Maciej Zonski <me@zonni.pl>
Date: Sat, 4 May 2024 20:11:52 +0200
Subject: [PATCH] Fix Nginx Proxy Manager LXC

---
 CHANGELOG.md                         |  7 +++++++
 ct/nginxproxymanager.sh              | 15 +++++++--------
 install/nginxproxymanager-install.sh | 13 ++++++-------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9837da10..1c7babe3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,13 @@
 - All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment.
 - 🚨 **The scripts in the repository will no longer provide support for Proxmox VE 7 starting from July 2024 (scripts will not execute on PVE7). Subsequent <a href='https://forum.proxmox.com/threads/proxmox-ve-support-lifecycle.35755/' target='_blank' rel='noopener noreferrer'>Proxmox VE - Support Lifecycle</a>**
 
+## 2024-05-04
+
+### Changed
+
+- **Nginx Proxy Manager LXC**
+  - Use `yarn` as default node package manager
+
 ## 2024-05-02
 
 ### Changed
diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh
index a65e8623..a833c4c6 100644
--- a/ct/nginxproxymanager.sh
+++ b/ct/nginxproxymanager.sh
@@ -59,11 +59,11 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  if ! command -v pnpm &> /dev/null; then  
-    msg_info "Installing pnpm"
+  if ! command -v yarn &> /dev/null; then  
+    msg_info "Installing yarn"
     export NODE_OPTIONS=--openssl-legacy-provider
-    npm install -g pnpm@8.15 &>/dev/null
-    msg_ok "Installed pnpm"
+    npm install -g yarn@1.22.19 &>/dev/null
+    msg_ok "Installed yarn"
   fi
   RELEASE=$(curl -s https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest |
     grep "tag_name" |
@@ -138,9 +138,8 @@ function update_script() {
 
   msg_info "Building Frontend"
   cd ./frontend
-  pnpm install &>/dev/null
-  pnpm upgrade &>/dev/null
-  pnpm run build &>/dev/null
+  yarn ci &>/dev/null
+  yarn run build &>/dev/null
   cp -r dist/* /app/frontend
   cp -r app-images/* /app/frontend/images
   msg_ok "Built Frontend"
@@ -163,7 +162,7 @@ function update_script() {
 EOF
   fi
   cd /app
-  pnpm install &>/dev/null
+  yarn ci &>/dev/null
   msg_ok "Initialized Backend"
 
   msg_info "Starting Services"
diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh
index ae267817..e66abc47 100644
--- a/install/nginxproxymanager-install.sh
+++ b/install/nginxproxymanager-install.sh
@@ -59,9 +59,9 @@ $STD nvm install 16.20.2
 ln -sf /root/.nvm/versions/node/v16.20.2/bin/node /usr/bin/node
 msg_ok "Installed Node.js"
 
-msg_info "Installing pnpm"
-$STD npm install -g pnpm@8.15
-msg_ok "Installed pnpm"
+msg_info "Installing yarn"
+$STD npm install -g yarn@1.22.19
+msg_ok "Installed yarn"
 
 RELEASE=$(curl -s https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest |
   grep "tag_name" |
@@ -140,9 +140,8 @@ msg_ok "Set up Enviroment"
 
 msg_info "Building Frontend"
 cd ./frontend
-$STD pnpm install
-$STD pnpm upgrade
-$STD pnpm run build
+$STD yarn ci
+$STD yarn run build
 cp -r dist/* /app/frontend
 cp -r app-images/* /app/frontend/images
 msg_ok "Built Frontend"
@@ -165,7 +164,7 @@ if [ ! -f /app/config/production.json ]; then
 EOF
 fi
 cd /app
-$STD pnpm install
+$STD yarn ci
 msg_ok "Initialized Backend"
 
 msg_info "Creating Service"