From a335851da6964bcd711767a105b792cef535ddf7 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Wed, 3 Aug 2022 07:29:08 +0000
Subject: [PATCH] Bug 1782523 - Update NodeJS to latest versions for the
 branches. r=firefox-build-system-reviewers,glandium

Differential Revision: https://phabricator.services.mozilla.com/D153445
---
 python/mozbuild/mozbuild/nodeutil.py       |  4 +-
 taskcluster/ci/fetch/toolchains.yml        | 54 +++++++++++-----------
 taskcluster/docker/recipes/install-node.sh |  4 +-
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/python/mozbuild/mozbuild/nodeutil.py b/python/mozbuild/mozbuild/nodeutil.py
index abb408cc904f..bdab303b67b6 100644
--- a/python/mozbuild/mozbuild/nodeutil.py
+++ b/python/mozbuild/mozbuild/nodeutil.py
@@ -13,8 +13,8 @@ from mozboot.util import get_tools_dir
 from mozfile import which
 from six import PY3
 
-NODE_MIN_VERSION = StrictVersion("12.22.1")
-NPM_MIN_VERSION = StrictVersion("6.14.12")
+NODE_MIN_VERSION = StrictVersion("12.22.12")
+NPM_MIN_VERSION = StrictVersion("6.14.16")
 
 
 def find_node_paths():
diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml
index 1dde21a80225..38025a3449cb 100644
--- a/taskcluster/ci/fetch/toolchains.yml
+++ b/taskcluster/ci/fetch/toolchains.yml
@@ -471,9 +471,9 @@ nodejs-12-linux64:
     description: nodejs 12 for x64 linux
     fetch:
         type: static-url
-        url: https://nodejs.org/dist/v12.22.1/node-v12.22.1-linux-x64.tar.xz
-        sha256: 8b537282c222ae4a40e019a52f769ca27b6640699bdde1510375e8d72da7d041
-        size: 14594952
+        url: https://nodejs.org/dist/v12.22.12/node-v12.22.12-linux-x64.tar.xz
+        sha256: e6d052364bfa2c17da92cf31794100cfd709ba147415ddaeed2222eec9ca1469
+        size: 14584388
         artifact-name: nodejs.tar.zst
         strip-components: 1
         add-prefix: node/
@@ -482,9 +482,9 @@ nodejs-16-linux64:
     description: nodejs 16 for x64 linux
     fetch:
         type: static-url
-        url: https://nodejs.org/dist/v16.0.0/node-v16.0.0-linux-x64.tar.xz
-        sha256: 1736446bb102e19942addce29f6a12b157ca71f38b9159d0446f51ba69618b8d
-        size: 22206588
+        url: https://nodejs.org/dist/v16.16.0/node-v16.16.0-linux-x64.tar.xz
+        sha256: edcb6e9bb049ae365611aa209fc03c4bfc7e0295dbcc5b2f1e710ac70384a8ec
+        size: 22051952
         artifact-name: nodejs.tar.zst
         strip-components: 1
         add-prefix: node/
@@ -493,9 +493,9 @@ nodejs-12-macosx64:
     description: nodejs 12 for x64 macOS
     fetch:
         type: static-url
-        url: https://nodejs.org/dist/v12.22.1/node-v12.22.1-darwin-x64.tar.xz
-        sha256: de5e317580732530961d83b0fb9b2c370d222bd0c5a1b331900e9ddc0fdfe086
-        size: 13670384
+        url: https://nodejs.org/dist/v12.22.12/node-v12.22.12-darwin-x64.tar.xz
+        sha256: 95799e1276d65b599635f839248d3b3f7d3986873da8f01902a541b9588a6c71
+        size: 13678092
         artifact-name: nodejs.tar.zst
         strip-components: 1
         add-prefix: node/
@@ -504,9 +504,9 @@ nodejs-16-macosx64:
     description: nodejs 16 for x64 macOS
     fetch:
         type: static-url
-        url: https://nodejs.org/dist/v16.0.0/node-v16.0.0-darwin-x64.tar.xz
-        sha256: 66ecffa48b98cf1ca4d038b42b74f05bfc4d31681e2aa43a1ba50919ea23823b
-        size: 20650712
+        url: https://nodejs.org/dist/v16.16.0/node-v16.16.0-darwin-x64.tar.xz
+        sha256: a65b2b92ede6be9004eae1ca9da26da2178bc696f35e8cca1840c33b777a5421
+        size: 20498416
         artifact-name: nodejs.tar.zst
         strip-components: 1
         add-prefix: node/
@@ -515,9 +515,9 @@ nodejs-16-macosx64-arm64:
     description: nodejs 16 for arm64 macOS
     fetch:
         type: static-url
-        url: https://nodejs.org/dist/v16.0.0/node-v16.0.0-darwin-arm64.tar.xz
-        sha256: f8710a83738b4408da82fe81b7934373e4d2f84d40c8c1217676119fd3c77c7e
-        size: 19028900
+        url: https://nodejs.org/dist/v16.16.0/node-v16.16.0-darwin-arm64.tar.xz
+        sha256: e4468368bf25ee1c504f08ecfd0d9fec17a9e72ef27c4495406b958cd7b4bafd
+        size: 18889796
         artifact-name: nodejs.tar.zst
         strip-components: 1
         add-prefix: node/
@@ -526,9 +526,9 @@ nodejs-12-win32:
     description: nodejs 12 for x86 Windows
     fetch:
         type: static-url
-        url: https://nodejs.org/dist/v12.22.1/node-v12.22.1-win-x86.zip
-        sha256: 832bd047d3709e4229d1cc95d04391aceb991a5c957b8efd395e01f51832a774
-        size: 17132424
+        url: https://nodejs.org/dist/v12.22.12/node-v12.22.12-win-x86.zip
+        sha256: 2f7fa563c9477d5e9fddc5c22451b21b8a963c9b5004c80dd0140c3a3675a4e8
+        size: 17134607
         artifact-name: nodejs.tar.zst
         strip-components: 1
         add-prefix: node/
@@ -537,9 +537,9 @@ nodejs-16-win32:
     description: nodejs 16 for x86 Windows
     fetch:
         type: static-url
-        url: https://nodejs.org/dist/v16.0.0/node-v16.0.0-win-x86.zip
-        sha256: 0600dffb5331b6f49e6ff4fa97770811746e0e2ecaf53de6deaafff277a644b4
-        size: 25092862
+        url: https://nodejs.org/dist/v16.16.0/node-v16.16.0-win-x86.zip
+        sha256: 957783527844fcd7da1d0b6dd311b64f92e2c5185112ada2d92e52c1a71fb373
+        size: 24587144
         artifact-name: nodejs.tar.zst
         strip-components: 1
         add-prefix: node/
@@ -548,9 +548,9 @@ nodejs-12-win64:
     description: nodejs 12 for x64 Windows
     fetch:
         type: static-url
-        url: https://nodejs.org/dist/v12.22.1/node-v12.22.1-win-x64.zip
-        sha256: 0cf3545c1ff9717bf3196eed6a423d878709ed4560125fdc29b42bd80ee661c3
-        size: 18677788
+        url: https://nodejs.org/dist/v12.22.12/node-v12.22.12-win-x64.zip
+        sha256: 09639bac66d4dc4dd52179968209413ad4b7360e917dcbe8834052a4b936a087
+        size: 18681823
         artifact-name: nodejs.tar.zst
         strip-components: 1
         add-prefix: node/
@@ -559,9 +559,9 @@ nodejs-16-win64:
     description: nodejs 16 for x64 Windows
     fetch:
         type: static-url
-        url: https://nodejs.org/dist/v16.0.0/node-v16.0.0-win-x64.zip
-        sha256: 99c2b01afb8d966fc876ec30ac7dfdbd9da9b17a3daeda92c19ce657ab9bea61
-        size: 26841308
+        url: https://nodejs.org/dist/v16.16.0/node-v16.16.0-win-x64.zip
+        sha256: c657acc98af55018c8fd6113c7e08d67c8083af75ba0306f9561b0117abc39d4
+        size: 26245926
         artifact-name: nodejs.tar.zst
         strip-components: 1
         add-prefix: node/
diff --git a/taskcluster/docker/recipes/install-node.sh b/taskcluster/docker/recipes/install-node.sh
index 073f6b70c72c..9581e4425501 100644
--- a/taskcluster/docker/recipes/install-node.sh
+++ b/taskcluster/docker/recipes/install-node.sh
@@ -8,8 +8,8 @@
 # taskcluster/scripts/misc/repack-node.sh. Later we'll get the ESLint builder
 # to use the linux64-node toolchain directly.
 
-wget -O node.xz --progress=dot:mega https://nodejs.org/download/release/v16.14.2/node-v16.14.2-linux-x64.tar.xz
-echo 'e40c6f81bfd078976d85296b5e657be19e06862497741ad82902d0704b34bb1b' node.xz | sha256sum -c
+wget -O node.xz --progress=dot:mega https://nodejs.org/dist/v16.16.0/node-v16.16.0-linux-x64.tar.xz
+echo 'edcb6e9bb049ae365611aa209fc03c4bfc7e0295dbcc5b2f1e710ac70384a8ec' node.xz | sha256sum -c
 tar -C /usr/local -xJ --strip-components 1 < node.xz
 node -v  # verify
 npm -v