From e957aa462330ee388449a249f46d0edbfa2c4aaa Mon Sep 17 00:00:00 2001
From: Xiaoji Chen <Pessimistress@users.noreply.github.com>
Date: Sat, 27 Apr 2024 10:25:00 -0700
Subject: [PATCH] Refresh lock file on publish (#463)

---
 modules/dev-tools/scripts/publish.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/dev-tools/scripts/publish.sh b/modules/dev-tools/scripts/publish.sh
index 729d2b39..465181e8 100755
--- a/modules/dev-tools/scripts/publish.sh
+++ b/modules/dev-tools/scripts/publish.sh
@@ -52,7 +52,12 @@ if [[ $MODE != "version-only-"* && $MODE != "help" ]]; then
   ocular-bootstrap
   ocular-test
   ocular-test dist
+else
+  # When a dependency change is cherry-picked between branches the lock file may not merge correctly
+  # Refresh the lock file so that a release can be built from a clean state
+  yarn
 fi
+git add yarn.lock
 
 case $MODE in
   "help")