From d9b2265e5876c1f0f9060ef7aa6b3b0ec0cfe8ca Mon Sep 17 00:00:00 2001
From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com>
Date: Thu, 16 Dec 2021 18:37:45 +0300
Subject: [PATCH] [Windows] Update npm parcel package to v2 (#4742)

* [Windows] Update npm parcel package to v2

* [Windows] Add the parcel to the software report

* [Windows] Add the parcel in tests

* [Windows] Move the function Get-ParcelVersion
---
 .../win/scripts/SoftwareReport/SoftwareReport.Generator.ps1  | 1 +
 images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1  | 5 +++++
 images/win/toolsets/toolset-2016.json                        | 2 +-
 images/win/toolsets/toolset-2019.json                        | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 4f7fd01e3..7101fea62 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -121,6 +121,7 @@ $toolsList = @(
 if ((Test-IsWin16) -or (Test-IsWin19)) {
     $toolsList += @(
         (Get-GoogleCloudSDKVersion),
+        (Get-ParcelVersion),
         (Get-ServiceFabricSDKVersion)
     )
 }
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
index 515acb322..f69aee1d1 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
@@ -135,6 +135,11 @@ function Get-PackerVersion {
     return "Packer $packerVersion"
 }
 
+function Get-ParcelVersion {
+    $parcelVersion = parcel --version
+    return "Parcel $parcelVersion"
+}
+
 function Get-PulumiVersion {
     return "Pulumi $(pulumi version)"
 }
diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json
index 83259ed94..dcd8e39ae 100644
--- a/images/win/toolsets/toolset-2016.json
+++ b/images/win/toolsets/toolset-2016.json
@@ -374,7 +374,7 @@
             { "name": "cordova" },
             { "name": "grunt-cli", "test": "grunt --version" },
             { "name": "gulp-cli", "test": "gulp --version" },
-            { "name": "parcel-bundler" },
+            { "name": "parcel", "test": "parcel --version" },
             { "name": "webpack" },
             { "name": "webpack-cli" },
             { "name": "node-sass" }
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index c7d19fe1a..6051c0b5b 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -406,7 +406,7 @@
             { "name": "cordova" },
             { "name": "grunt-cli", "test": "grunt --version" },
             { "name": "gulp-cli", "test": "gulp --version" },
-            { "name": "parcel-bundler" },
+            { "name": "parcel", "test": "parcel --version"},
             { "name": "webpack" },
             { "name": "webpack-cli" },
             { "name": "node-sass" }