From 5c9d52da0ea646e1f11025f7b67497d3fd9c42dc Mon Sep 17 00:00:00 2001
From: Ruy Adorno <ruyadorno@hotmail.com>
Date: Thu, 4 Mar 2021 18:19:28 -0500
Subject: [PATCH] tools: use bundled npm in update scripts

The scripts `./tools/update-babel-eslint.sh` and
`./tools/update-eslint.sh` are relying on the version of `npm` found in
the local-defined `$PATH` env.

This changeset proposes to modify these scripts to run the version of
npm bundled in the current branch (found at `./deps/npm`) - in order to:

a) Standardize the version of npm that should be use to install these
deps, avoids the pitfall of having an inadverted user run these
scripts with an unsupported/incompatible npm version.
b) Given that npm7 has a different install algorithm than npm6 that
takes into account and install peer dependencies, it might be a safer
choice to ensure what version of npm should be use during this
transitional period in which users might still have npm6 by default in
their local system.
c) Avoids the possible extra churn of having different resulting files
being shuffled around between installs due to usage of a disparate
version of the npm cli.
---
 tools/update-babel-eslint.sh | 15 +++++++++------
 tools/update-eslint.sh       | 18 +++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/tools/update-babel-eslint.sh b/tools/update-babel-eslint.sh
index b64b8f25d32f7c..36bfd918916ebd 100755
--- a/tools/update-babel-eslint.sh
+++ b/tools/update-babel-eslint.sh
@@ -2,8 +2,6 @@
 
 # Shell script to update babel-eslint in the source tree to the latest release.
 
-# Depends on npm, npx, and node being in $PATH.
-
 # This script must be be in the tools directory when it runs because it uses
 # $0 to determine directories to work in.
 
@@ -11,15 +9,20 @@ cd "$( dirname "${0}" )" || exit
 rm -rf node_modules/@babel
 mkdir babel-eslint-tmp
 cd babel-eslint-tmp || exit
-npm init --yes
 
-npm install --global-style --no-bin-links --production --no-package-lock @babel/core @babel/eslint-parser@latest @babel/plugin-syntax-class-properties@latest @babel/plugin-syntax-top-level-await@latest
+ROOT="$PWD/../.."
+[ -z "$NODE" ] && NODE="$ROOT/out/Release/node"
+[ -x "$NODE" ] || NODE=`command -v node`
+NPM="$ROOT/deps/npm"
+
+"$NODE" "$NPM" init --yes
+"$NODE" "$NPM" install --global-style --no-bin-links --production --no-package-lock @babel/core @babel/eslint-parser@latest @babel/plugin-syntax-class-properties@latest @babel/plugin-syntax-top-level-await@latest
 
 # Use dmn to remove some unneeded files.
-npx dmn@2.2.2 -f clean
+"$NODE" "$NPM" exec -- dmn@2.2.2 -f clean
 # Use removeNPMAbsolutePaths to remove unused data in package.json.
 # This avoids churn as absolute paths can change from one dev to another.
-npx removeNPMAbsolutePaths@1.0.4 .
+"$NODE" "$NPM" exec -- removeNPMAbsolutePaths@1.0.4 .
 
 cd ..
 mv babel-eslint-tmp/node_modules/@babel node_modules/@babel
diff --git a/tools/update-eslint.sh b/tools/update-eslint.sh
index 109390d2b27baf..eb1045267f70fc 100755
--- a/tools/update-eslint.sh
+++ b/tools/update-eslint.sh
@@ -2,8 +2,6 @@
 
 # Shell script to update ESLint in the source tree to the latest release.
 
-# Depends on npm, npx, and node being in $PATH.
-
 # This script must be in the tools directory when it runs because it uses the
 # script source file path to determine directories to work in.
 
@@ -12,16 +10,22 @@ rm -rf node_modules/eslint node_modules/eslint-plugin-markdown
 (
     mkdir eslint-tmp
     cd eslint-tmp || exit
-    npm init --yes
 
-    npm install --global-style --no-bin-links --production --no-package-lock eslint@latest
-    npm install --global-style --no-bin-links --production --no-package-lock eslint-plugin-markdown@latest
+    ROOT="$PWD/../.."
+    [ -z "$NODE" ] && NODE="$ROOT/out/Release/node"
+    [ -x "$NODE" ] || NODE=`command -v node`
+    NPM="$ROOT/deps/npm"
+
+    "$NODE" "$NPM" init --yes
+
+    "$NODE" "$NPM" install --global-style --no-bin-links --production --no-package-lock eslint@latest
+    "$NODE" "$NPM" install --global-style --no-bin-links --production --no-package-lock eslint-plugin-markdown@latest
 
     # Use dmn to remove some unneeded files.
-    npx dmn@2.2.2 -f clean
+    "$NODE" "$NPM" exec -- dmn@2.2.2 -f clean
     # Use removeNPMAbsolutePaths to remove unused data in package.json.
     # This avoids churn as absolute paths can change from one dev to another.
-    npx removeNPMAbsolutePaths@1.0.4 .
+    "$NODE" "$NPM" exec -- removeNPMAbsolutePaths@1.0.4 .
 )
 
 mv eslint-tmp/node_modules/eslint node_modules/eslint