From c04b71b2c79bdc5b1612ef0e98f351d1193bdec9 Mon Sep 17 00:00:00 2001
From: Balaji Vijayakumar <kuttibalaji.v6@gmail.com>
Date: Fri, 25 Nov 2022 05:31:46 +0530
Subject: Switch npm to pnpm (#714)

---
 scripts/build-unix.sh | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

(limited to 'scripts/build-unix.sh')

diff --git a/scripts/build-unix.sh b/scripts/build-unix.sh
index 15e9f26c8..42de96a1a 100755
--- a/scripts/build-unix.sh
+++ b/scripts/build-unix.sh
@@ -83,38 +83,33 @@ fi
 command_exists asdf && asdf reshim nodejs
 
 # Ensure that the system dependencies are at the correct version
-# Check npm version
-EXPECTED_NPM_VERSION=$(node -p 'require("./package.json").engines.npm')
-ACTUAL_NPM_VERSION=$(npm --version)
-if [[ "$ACTUAL_NPM_VERSION" != "$EXPECTED_NPM_VERSION" ]]; then
-  npm i -gf npm@$EXPECTED_NPM_VERSION
-fi
-
 # Check pnpm version
-EXPECTED_PNPM_VERSION=$(node -p 'require("./recipes/package.json").engines.pnpm')
+EXPECTED_PNPM_VERSION=$(node -p 'require("./package.json").engines.pnpm')
 ACTUAL_PNPM_VERSION=$(pnpm --version || true) # in case the pnpm executable itself is not present
 if [[ "$ACTUAL_PNPM_VERSION" != "$EXPECTED_PNPM_VERSION" ]]; then
   npm i -gf pnpm@$EXPECTED_PNPM_VERSION
 fi
 
+# Check pnpm version of the recipes submodule
+EXPECTED_RECIPES_PNPM_VERSION=$(node -p 'require("./recipes/package.json").engines.pnpm')
+if [[ "$EXPECTED_PNPM_VERSION" != "$EXPECTED_RECIPES_PNPM_VERSION" ]]; then
+  fail_with_docs "The expected versions of pnpm are not the same in the main repo and in the recipes submodule, please sync them.
+    expected in recipes  : [$EXPECTED_RECIPES_PNPM_VERSION]
+    expected in main repo: [$EXPECTED_PNPM_VERSION]
+    actual               : [$EXPECTED_PNPM_VERSION]"
+fi
+
 # If 'asdf' is installed, reshim for new nodejs if necessary
 command_exists asdf && asdf reshim nodejs
 
 # -----------------------------------------------------------------------------
-# This is useful if we move from 'npm' to 'pnpm' for the main repo as well
-if [[ -s 'pnpm-lock.yaml' ]]; then
-  BASE_CMD=pnpm
-else
-  BASE_CMD=npm
-fi
-
 # Now the meat.....
-$BASE_CMD i
-$BASE_CMD run prepare-code
+pnpm i
+pnpm prepare-code
+pnpm test
 
 # -----------------------------------------------------------------------------
 printf "\n*************** Building recipes ***************\n"
-# Note: 'recipes' is already using only pnpm - can switch to $BASE_CMD AFTER both repos are using pnpm
 pushd recipes
 pnpm i && pnpm lint && pnpm reformat-files && pnpm package
 popd
@@ -133,7 +128,7 @@ else
   TARGET_OS="linux"
 fi
 
-$BASE_CMD run build -- --$TARGET_ARCH --$TARGET_OS --dir
+pnpm build --$TARGET_ARCH --$TARGET_OS --dir
 
 printf "\n*************** App successfully built! ***************\n"
 
-- 
cgit v1.2.3-70-g09d2