Upgrade 'sqlite3'

Add missing dev dependency '@babel/core'

[prep for pnpm] Combine 'prebuild' into 'build' script since pre-scripts automagic is not supported by pnpm
[cleanup] Use 'pnpm' instead of 'pnpm run'
[cleanup] Clean npm cache after cleaning pnpm since pnpm is also managed within npm
[cleanup] Delete '~/.electron-gyp' while cleaning

2 files changed, 14 insertions, 9 deletions

diff --git a/scripts/build-unix.sh b/scripts/build-unix.sh
index 872219a8f..07f9f2f81 100755
--- a/scripts/build-unix.sh
+++ b/scripts/build-unix.sh
@@ -63,13 +63,15 @@ if [ "$CLEAN" != "true" ]; then
   printf "\n*************** SKIPPING Cleaning ***************\n"
 else
   printf "\n*************** Cleaning!!!!!! ***************\n"
-  npm cache clean --force
-  rm -rf ~/.npm ~/.node-gyp ~/.asdf/installs/nodejs/*/.npm/
+
   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 ~/.electron-gyp ~/.asdf/installs/nodejs/*/.npm/
+
   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
@@ -125,7 +127,7 @@ 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 run package
+pnpm package
 popd
 
 # -----------------------------------------------------------------------------
diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1
index 3904c1bf9..9d4830059 100644
--- a/scripts/build-windows.ps1
+++ b/scripts/build-windows.ps1
@@ -67,11 +67,9 @@ if ($env:CLEAN -eq "true")
 {
   $NPM_PATH = "$USERHOME\.npm"
   $NODE_GYP = "$USERHOME\.node-gyp"
+  $ELECTRON_GYP = "$USERHOME\.electron-gyp"
 
   Write-Host "Cleaning!"
-  npm cache clean --force
-  Remove-Item -Path $NPM_PATH -Recurse -ErrorAction SilentlyContinue
-  Remove-Item -Path $NODE_GYP -Recurse -ErrorAction SilentlyContinue
 
   if ( (Test-Path -Path ".\pnpm-lock.yaml") -and (Get-Command -ErrorAction Ignore -Type Application pnpm) )
   {
@@ -80,10 +78,15 @@ if ($env:CLEAN -eq "true")
 
     pnpm store prune
 
-    Remove-Item -Path $PNPM_STORE -Recurse
-    Remove-Item -Path $PNPM_STATE -Recurse
+    Remove-Item -Path $PNPM_STORE -Recurse -ErrorAction SilentlyContinue
+    Remove-Item -Path $PNPM_STATE -Recurse -ErrorAction SilentlyContinue
   }
 
+  npm cache clean --force
+  Remove-Item -Path $NPM_PATH -Recurse -ErrorAction SilentlyContinue
+  Remove-Item -Path $NODE_GYP -Recurse -ErrorAction SilentlyContinue
+  Remove-Item -Path $ELECTRON_GYP -Recurse -ErrorAction SilentlyContinue
+
   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
 }
@@ -151,7 +154,7 @@ Write-Host "\n*************** Building recipes ***************\n"
 # Note: 'recipes' is already using only pnpm - can switch to $BASE_CMD AFTER both repos are using pnpm
 Push-Location recipes
 pnpm i
-pnpm run package
+pnpm package
 Pop-Location
 
 # -----------------------------------------------------------------------------