From f407d9823d534d496ce8ddafd7bf8da237bd9192 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 20 Jan 2025 13:06:01 +0700
Subject: [PATCH 1/2] fix(developer): include developer-utils deps in server
 build

Fixes: #12950
---
 developer/src/server/build.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/developer/src/server/build.sh b/developer/src/server/build.sh
index c73ed853f7..65f38dd8df 100755
--- a/developer/src/server/build.sh
+++ b/developer/src/server/build.sh
@@ -113,7 +113,17 @@ function installer_server() {
   # monorepo context
   cat package.json | "$JQ" \
     '. | del(.devDependencies."@keymanapp/resources-gosh") | del(.devDependencies."@keymanapp/keyman-version") | del(.dependencies."@keymanapp/developer-utils")' \
+    > "$PRODBUILDTEMP/package0.json"
+
+  # #12950: Merge dependencies from @keymanapp/developer-utils and Server; this
+  # is a bit messy but will mean we don't lose the needed dependencies.
+  jq -s '.[0] + { dependencies: (.[1].dependencies * .[0].dependencies) }' "$PRODBUILDTEMP/package0.json" \
+   "$KEYMAN_ROOT/developer/src/common/web/utils/package.json" > "$PRODBUILDTEMP/package1.json"
+  cat $PRODBUILDTEMP/package1.json | "$JQ" \
+    '. | del(.dependencies."@keymanapp/common-types")' \
     > "$PRODBUILDTEMP/package.json"
+  rm "$PRODBUILDTEMP/package0.json"
+  rm "$PRODBUILDTEMP/package1.json"
 
   pushd "$PRODBUILDTEMP"
   npm install --omit=dev --omit=optional

From 357d1961819bf8d725f484e39cefe744d776d71e Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 20 Jan 2025 14:11:42 +0700
Subject: [PATCH 2/2] chore(developer): use JQ variable in script

---
 developer/src/server/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/developer/src/server/build.sh b/developer/src/server/build.sh
index 65f38dd8df..e0e82e3617 100755
--- a/developer/src/server/build.sh
+++ b/developer/src/server/build.sh
@@ -117,7 +117,7 @@ function installer_server() {
 
   # #12950: Merge dependencies from @keymanapp/developer-utils and Server; this
   # is a bit messy but will mean we don't lose the needed dependencies.
-  jq -s '.[0] + { dependencies: (.[1].dependencies * .[0].dependencies) }' "$PRODBUILDTEMP/package0.json" \
+  "$JQ" -s '.[0] + { dependencies: (.[1].dependencies * .[0].dependencies) }' "$PRODBUILDTEMP/package0.json" \
    "$KEYMAN_ROOT/developer/src/common/web/utils/package.json" > "$PRODBUILDTEMP/package1.json"
   cat $PRODBUILDTEMP/package1.json | "$JQ" \
     '. | del(.dependencies."@keymanapp/common-types")' \