Switch npm to pnpm (#714)

3 files changed, 31 insertions, 50 deletions

diff --git a/scripts/add-crowdin-contributors.ts b/scripts/add-crowdin-contributors.ts
index d6f36b06d..eadedbcc4 100644
--- a/scripts/add-crowdin-contributors.ts
+++ b/scripts/add-crowdin-contributors.ts
@@ -49,7 +49,7 @@ console.clear();
 console.log(JSON.stringify(members));
 
  * 3. Paste the output of the script (JSON Array) below to set 'list' to that value
- * 4. Execute this script using 'npm run add-crowdin-contributors'
+ * 4. Execute this script using 'pnpm add-crowdin-contributors'
  * 5. Regenerate the README table using the CLI ('all-contributors generate')
  * Please check if the generated data is ok and no data is lost.
 */
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"
 
diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1
index d0c394647..1c2b175b2 100644
--- a/scripts/build-windows.ps1
+++ b/scripts/build-windows.ps1
@@ -131,44 +131,30 @@ if((-not $NPM_CONFIG_MSVS_VERSION) -or -not ($EXPECTED_MSVST_VERSION -contains $
 
 # -----------------------------------------------------------------------------
 # 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
+$EXPECTED_PNPM_VERSION = (Get-Content package.json | ConvertFrom-Json).engines.pnpm
+$ACTUAL_PNPM_VERSION = pnpm --version -ErrorAction SilentlyContinue  # in case the pnpm executable itself is not present
 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"
-  $env:EXEC_CMD="pnpm dlx"
-}
-else
-{
-  $BASE_CMD="npm"
-  $env:EXEC_CMD="npx"
+# Check pnpm version of the recipes submodule
+$EXPECTED_RECIPES_PNPM_VERSION = (Get-Content .\recipes\package.json | ConvertFrom-Json).engines.pnpm
+if ($ACTUAL_PNPM_VERSION -ne $EXPECTED_RECIPES_PNPM_VERSION) {
+ 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_RECIPES_PNPM_VERSION]
+    actual               : [$EXPECTED_PNPM_VERSION]"
 }
 
+# -----------------------------------------------------------------------------
 # Now the meat.....
-& $BASE_CMD i
-& $BASE_CMD run prepare-code
+& pnpm i
+& pnpm prepare-code
+& pnpm test
 
 # -----------------------------------------------------------------------------
 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 lint && pnpm reformat-files && pnpm package
 Pop-Location
@@ -176,13 +162,13 @@ Pop-Location
 # -----------------------------------------------------------------------------
 Write-Host "*************** Building app ***************"
 if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") {
-    $TARGET_ARCH="arm64"
+  $TARGET_ARCH="arm64"
 }
 else
 {
-    $TARGET_ARCH="x64"
+  $TARGET_ARCH="x64"
 }
-& $BASE_CMD run build -- --$TARGET_ARCH --dir
+& pnpm build -- --$TARGET_ARCH --dir
 
 Write-Host "*************** App successfully built! ***************"