From c5a532c02bb44c9bdac9bdd97220c57b27d4d201 Mon Sep 17 00:00:00 2001
From: David Boreham <david@bozemanpass.com>
Date: Wed, 29 Mar 2023 22:46:58 -0600
Subject: [PATCH] Handle semver spec in package.json local dependencies

---
 .../cerc-builder-js/yarn-local-registry-fixup.sh             | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/data/container-build/cerc-builder-js/yarn-local-registry-fixup.sh b/app/data/container-build/cerc-builder-js/yarn-local-registry-fixup.sh
index 3f4f095a..ad11ce80 100755
--- a/app/data/container-build/cerc-builder-js/yarn-local-registry-fixup.sh
+++ b/app/data/container-build/cerc-builder-js/yarn-local-registry-fixup.sh
@@ -18,8 +18,9 @@ fi
 set -e
 target_package=$1
 local_npm_registry_url=$2
-# TODO: use jq rather than sed here:
-versioned_target_package=$(grep ${target_package} package.json | sed -e 's#[[:space:]]\{1,\}\"\('${target_package}'\)\":[[:space:]]\{1,\}\"\(.*\)\",#\1@\2#' )
+# Extract the actual version pinned in yarn.lock
+# See: https://stackoverflow.com/questions/60454251/how-to-know-the-version-of-currently-installed-package-from-yarn-lock
+versioned_target_package=$(yarn list --pattern ${target_package} --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name')
 # Use yarn info to get URL checksums etc from the new registry
 yarn_info_output=$(yarn info --json $versioned_target_package 2>/dev/null)
 # First check if the target version actually exists.