[MacOS] Rework NodeJS install (#4380)

images/macos/provision/core/node.sh

@@ -10,9 +10,12 @@ if is_Less_Catalina; then
   rm -rf "${TMP_FILE}"
   sudo chown -R $USER "/usr/local/lib/node_modules"
 else
-  # Install Node.js 14 for macOS >= 10.15
+  # Install default Node.js for macOS >= 10.15
-  brew_smart_install "node@14"
+  defaultVersion=$(get_toolset_value '.node.default')
-  brew link node@14 --force
+
+  echo "Installing Node.js $defaultVersion"
+  brew_smart_install "node@$defaultVersion"
+  brew link node@$defaultVersion --force
 fi
 
 echo Installing yarn...

images/macos/provision/core/nvm.sh

@@ -11,10 +11,10 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash
 if [ $? -eq 0 ]; then
         . ~/.bashrc
         nvm --version
-        nodeVersions=("v10" "v12" "v14")
+        nodeVersions=$(get_toolset_value '.node.nvm_versions[]')
         for version in ${nodeVersions[@]}
         do
-                nvm install $version
+                nvm install v${version}
         done
 
         # set system node as default

images/macos/tests/Node.Tests.ps1

@@ -13,6 +13,10 @@ Describe "Node.js" {
         "node --version" | Should -ReturnZeroExitCode
     }
 
+    It "Node.js version should correspond to the version in the toolset" {
+        node --version | Should -BeLike "v$(Get-ToolsetValue 'node.default')*"
+    }
+
     It "Node.js $expectedNodeVersion is default" {
         (Get-CommandResult "node --version").Output | Should -BeLike $expectedNodeVersion
     }

images/macos/toolsets/toolset-10.14.json

@@ -375,5 +375,13 @@
     },
     "go": {
         "default": "1.15"
+    },
+    "node": {
+        "default": "8",
+        "nvm_versions": [
+            "10",
+            "12",
+            "14"
+        ]
     }
 }

images/macos/toolsets/toolset-10.15.json

@@ -331,5 +331,13 @@
     },
     "go": {
         "default": "1.15"
+    },
+    "node": {
+        "default": "14",
+        "nvm_versions": [
+            "10",
+            "12",
+            "14"
+        ]
     }
 }

images/macos/toolsets/toolset-11.json

@@ -284,5 +284,13 @@
     },
     "go": {
         "default": "1.15"
+    },
+    "node": {
+        "default": "14",
+        "nvm_versions": [
+            "10",
+            "12",
+            "14"
+        ]
     }
 }

images/macos/toolsets/toolset-12.json

@@ -184,5 +184,13 @@
     },
     "go": {
         "default": "1.17"
+    },
+    "node": {
+        "default": "14",
+        "nvm_versions": [
+            "10",
+            "12",
+            "14"
+        ]
     }
 }