From 4f2790f6d38f892343dfde56cfe8c435c5ba6ce2 Mon Sep 17 00:00:00 2001
From: Joseph Garrone <joseph.garrone.gj@gmail.com>
Date: Sun, 22 Dec 2024 21:57:52 +0100
Subject: [PATCH] Fixes on the admin initialization cmd

---
 src/bin/initialize-admin-theme.ts | 9 ++++++---
 src/bin/tools/npmInstall.ts       | 8 ++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/bin/initialize-admin-theme.ts b/src/bin/initialize-admin-theme.ts
index 0fb73bea..a1eb46cc 100644
--- a/src/bin/initialize-admin-theme.ts
+++ b/src/bin/initialize-admin-theme.ts
@@ -109,9 +109,12 @@ export async function command(params: { buildContext: BuildContext }) {
                 .toString("utf8")
                 .trim()
         ) as string[]
-    ).find(version =>
-        uiSharedMajor === undefined ? true : version.startsWith(`${uiSharedMajor}.`)
-    );
+    )
+        .reverse()
+        .filter(version => !version.includes("-"))
+        .find(version =>
+            uiSharedMajor === undefined ? true : version.startsWith(`${uiSharedMajor}.`)
+        );
 
     assert(version !== undefined);
 
diff --git a/src/bin/tools/npmInstall.ts b/src/bin/tools/npmInstall.ts
index 63c15468..7a85d6d1 100644
--- a/src/bin/tools/npmInstall.ts
+++ b/src/bin/tools/npmInstall.ts
@@ -105,16 +105,16 @@ async function runPackageManagerInstall(params: {
         shell: true
     });
 
-    child.stdout.on("data", data => {
+    child.stdout.on("data", data => process.stdout.write(data));
+
+    child.stderr.on("data", data => {
         if (data.toString("utf8").includes("has unmet peer dependency")) {
             return;
         }
 
-        process.stdout.write(data);
+        process.stderr.write(data);
     });
 
-    child.stderr.on("data", data => process.stderr.write(data));
-
     child.on("exit", code => {
         if (code !== 0) {
             dCompleted.reject(new Error(`Failed with code ${code}`));