From 64905995f7e1712cf18b798ca9018c89248c9ec8 Mon Sep 17 00:00:00 2001
From: Victor Bayas <victorsbayas@gmail.com>
Date: Thu, 8 Aug 2024 13:27:20 -0500
Subject: [PATCH 1/2] Fix Web App workflows

---
 web-app/Makefile                            | 4 ++--
 web-app/check-warnings-istanbul-coverage.sh | 2 +-
 web-app/check-warnings.sh                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web-app/Makefile b/web-app/Makefile
index 34c051c3bb..6229f0a9d1 100644
--- a/web-app/Makefile
+++ b/web-app/Makefile
@@ -3,12 +3,12 @@ default: build-static
 build-static:
 	@echo "Building frontend static assets to 'build'"
 	@if [ -f "${NVM_DIR}/nvm.sh" ]; then \. "${NVM_DIR}/nvm.sh" && nvm install && nvm use; fi && \
-	  NODE_OPTIONS=--openssl-legacy-provider yarn build
+	  yarn build
 
 build-static-istanbul-coverage:
 	@echo "Building frontend static assets to 'build'"
 	@if [ -f "${NVM_DIR}/nvm.sh" ]; then \. "${NVM_DIR}/nvm.sh" && nvm install && nvm use; fi && \
-	  NODE_OPTIONS=--openssl-legacy-provider yarn buildistanbulcoverage
+	  yarn buildistanbulcoverage
 
 test-warnings:
 	./check-warnings.sh
diff --git a/web-app/check-warnings-istanbul-coverage.sh b/web-app/check-warnings-istanbul-coverage.sh
index d47243fb42..776c0a19a6 100755
--- a/web-app/check-warnings-istanbul-coverage.sh
+++ b/web-app/check-warnings-istanbul-coverage.sh
@@ -11,7 +11,7 @@ die() {
 try() { "$@" &> yarn.log || die "cannot $*"; }
 
 rm -f yarn.log
-try make build-static-istanbul-coverage
+try yarn buildistanbulcoverage
 
 if cat yarn.log | grep "Compiled with warnings"; then
   echo "There are warnings in the code"
diff --git a/web-app/check-warnings.sh b/web-app/check-warnings.sh
index 2c6e7121a3..223d07651d 100755
--- a/web-app/check-warnings.sh
+++ b/web-app/check-warnings.sh
@@ -11,7 +11,7 @@ die() {
 try() { "$@" &> yarn.log || die "cannot $*"; }
 
 rm -f yarn.log
-try make build-static
+try yarn build
 
 if cat yarn.log | grep "Compiled with warnings"; then
   echo "There are warnings in the code"

From 67ac0c4c54b5d3adf4aefbc277be0244fa88d876 Mon Sep 17 00:00:00 2001
From: Victor Bayas <victorsbayas@gmail.com>
Date: Thu, 8 Aug 2024 13:30:15 -0500
Subject: [PATCH 2/2] Update Yarn to 4.4.0

---
 web-app/package.json | 2 +-
 web-app/yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web-app/package.json b/web-app/package.json
index 2f56c2add6..5508fd46fe 100644
--- a/web-app/package.json
+++ b/web-app/package.json
@@ -93,5 +93,5 @@
     "semver": "^7.5.2"
   },
   "main": "index.js",
-  "packageManager": "yarn@4.3.0"
+  "packageManager": "yarn@4.4.0"
 }
diff --git a/web-app/yarn.lock b/web-app/yarn.lock
index 9b1319a150..e5e5e4ec5a 100644
--- a/web-app/yarn.lock
+++ b/web-app/yarn.lock
@@ -17244,11 +17244,11 @@ __metadata:
 
 "typescript@patch:typescript@npm%3A^5.5.3#optional!builtin<compat/typescript>":
   version: 5.5.3
-  resolution: "typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=b45daf"
+  resolution: "typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=379a07"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/5a437c416251334deeaf29897157032311f3f126547cfdc4b133768b606cb0e62bcee733bb97cf74c42fe7268801aea1392d8e40988cdef112e9546eba4c03c5
+  checksum: 10c0/911c7811d61f57f07df79c4a35f56a0f426a65426a020e5fcd792f66559f399017205f5f10255329ab5a3d8c2d1f1d19530aeceffda70758a521fae1d469432e
   languageName: node
   linkType: hard