migrate npm to pnpm for build

2 files changed, 6 insertions, 54 deletions

diff --git a/scripts/build-unix.sh b/scripts/build-unix.sh
index 24ab0f7..28d0e7c 100755
--- a/scripts/build-unix.sh
+++ b/scripts/build-unix.sh
@@ -60,14 +60,8 @@ if [ "$CLEAN" != "true" ]; then
 else
   printf "\n*************** Cleaning!!!!!! ***************\n"
 
-  if [[ -s 'pnpm-lock.yaml' ]]; then
-    pnpm store prune || true # in case the pnpm executable itself is not present
-    rm -rf ~/.pnpm-store ~/.pnpm-state
-  fi
-
-  npm cache clean --force
-  rm -rf ~/.npm ~/.node-gyp ~/.asdf/installs/nodejs/*/.npm/
-
+  pnpm store prune || true # in case the pnpm executable itself is not present
+  rm -rf ~/.pnpm-store ~/.pnpm-state
   git -C recipes clean -fxd # Clean recipes folder/submodule
   git clean -fxd            # Note: This will blast away the 'recipes' folder if you have symlinked it
 fi
@@ -88,14 +82,6 @@ fi
 # If 'asdf' is installed, reshim for new nodejs if necessary
 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')
 ACTUAL_PNPM_VERSION=$(pnpm --version || true) # in case the pnpm executable itself is not present
@@ -106,14 +92,6 @@ 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
-
 ENV_FILE=".env"
 if [[ ! -s $ENV_FILE ]]; then
   APP_KEY=`cat /dev/urandom | LC_ALL=C tr -dc "[:alnum:]" | fold -w ${1:-32} | head -n 1`
@@ -125,18 +103,17 @@ mkdir -p data
 
 # -----------------------------------------------------------------------------
 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 package
 popd
 
 # Now the meat.....
-$BASE_CMD i
+pnpm i
 node ace migration:refresh
 
 # -----------------------------------------------------------------------------
 printf "\n*************** Building app ***************\n"
-$BASE_CMD start --dev
+pnpm start --dev
 
 printf "\n*************** App successfully stopped! ***************\n"
diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1
index 4026aa5..5af7392 100644
--- a/scripts/build-windows.ps1
+++ b/scripts/build-windows.ps1
@@ -132,19 +132,6 @@ if((-not $NPM_CONFIG_MSVS_VERSION) -or -not ($EXPECTED_MSVST_VERSION -contains $
   npm config set msvs_version $ACTUAL_MSVST_VERSION
 }
 
-# -----------------------------------------------------------------------------
-# Ensure that the system dependencies are at the correct version - recover if not
-# Check npm version
-$EXPECTED_NPM_VERSION = (Get-Content package.json | ConvertFrom-Json).engines.npm
-$ACTUAL_NPM_VERSION = (npm -v)
-if ($EXPECTED_NPM_VERSION -ne $ACTUAL_NPM_VERSION) {
-  Write-Host "You are not running the expected version of npm!
-    expected: [$EXPECTED_NPM_VERSION]
-    actual  : [$ACTUAL_NPM_VERSION]"
-  Write-Host "Changing version of npm to [$EXPECTED_NPM_VERSION]"
-  npm i -gf npm@$EXPECTED_NPM_VERSION
-}
-
 # Check pnpm version
 $EXPECTED_PNPM_VERSION = (Get-Content .\recipes\package.json | ConvertFrom-Json).engines.pnpm
 $ACTUAL_PNPM_VERSION = Get-Command pnpm --version -ErrorAction SilentlyContinue  # in case the pnpm executable itself is not present
@@ -152,17 +139,6 @@ if ($ACTUAL_PNPM_VERSION -ne $EXPECTED_PNPM_VERSION) {
   npm i -gf pnpm@$EXPECTED_PNPM_VERSION
 }
 
-# -----------------------------------------------------------------------------
-# This is useful if we move from 'npm' to 'pnpm' for the main repo as well
-if ((Test-Path -Path ".\pnpm-lock.yaml") -and (Get-Command -ErrorAction Ignore -Type Application pnpm))
-{
-  $BASE_CMD="pnpm"
-}
-else
-{
-  $BASE_CMD="npm"
-}
-
 $ENV_FILE = ".env"
 if (-not (Test-Path -Path $ENV_FILE)) {
   Copy-Item .env.example -Destination $ENV_FILE
@@ -177,18 +153,17 @@ if (-not (Test-Path -Path "data")) {
 
 # -----------------------------------------------------------------------------
 Write-Host "*************** Building recipes ***************"
-# Note: 'recipes' is already using only pnpm - can switch to $BASE_CMD AFTER both repos are using pnpm
 Push-Location recipes
 pnpm i
 pnpm package
 Pop-Location
 
 # Now the meat.....
-& $BASE_CMD i
+& pnpm i
 & node ace migration:refresh
 
 # -----------------------------------------------------------------------------
 Write-Host "*************** Starting app ***************"
-& $BASE_CMD start --dev
+& pnpm start --dev
 
 Write-Host "*************** App successfully stopped! ***************"