From e200f2544bcb8efb0bf5bb976b89229e40ca487d Mon Sep 17 00:00:00 2001
From: Tom J Nowell <contact@tomjn.com>
Date: Wed, 15 Jun 2022 15:16:12 +0100
Subject: [PATCH 1/2] ensure npm and nvm are available in site provisioners

---
 provision/provision-site.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/provision/provision-site.sh b/provision/provision-site.sh
index 22ba95a48..778bd0d03 100755
--- a/provision/provision-site.sh
+++ b/provision/provision-site.sh
@@ -490,6 +490,14 @@ if [[ true == "${SKIP_PROVISIONING}" ]]; then
   exit 0
 fi
 
+# Ensure npm is available
+if ! command -v nvm &> /dev/null; then
+  if [ -f /home/vagrant/.nvm/nvm.sh ]; then
+    source /home/vagrant/.nvm/nvm.sh
+  fi
+fi
+nvm use default
+
 vvv_provision_site_repo
 
 if [[ ! -d "${VM_DIR}" ]]; then

From fc3eb1afbc5aa55ecee2e67615ca10a930140a77 Mon Sep 17 00:00:00 2001
From: Tom J Nowell <contact@tomjn.com>
Date: Wed, 15 Jun 2022 15:16:50 +0100
Subject: [PATCH 2/2] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c74a01161..7ca48daae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ permalink: /docs/en-US/changelog/
 * Fixed an edge case updating NVM via git ( #2604 )
 * Disable hardware support for gcrypt to avoid bad VirtualBox implementations ( #2609 )
 * Fix unbound variable in `db_backup` ( #2617 )
+* Ensured npm and nvm are always available in site provisioners
 
 ## 3.9.1 ( 2022 April 13th )