From 30861de4bbace7fa729da7c663d9c9e72790c6e8 Mon Sep 17 00:00:00 2001
From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com>
Date: Thu, 16 Dec 2021 12:07:15 +0300
Subject: [PATCH] [Ubuntu] Update npm parcel package to v2 (#4743)

* [Ubuntu] Update npm parcel package to v2

* [Ubuntu] Add the parcel to the software report

* [Ubuntu] Move the parcel on tools to the software report
---
 .../linux/scripts/SoftwareReport/SoftwareReport.Common.psm1  | 5 +++++
 .../scripts/SoftwareReport/SoftwareReport.Generator.ps1      | 3 ++-
 images/linux/toolsets/toolset-1804.json                      | 2 +-
 images/linux/toolsets/toolset-2004.json                      | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
index b1fb23e9..87673c7e 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
@@ -174,6 +174,11 @@ function Get-YarnVersion {
     return "Yarn $yarnVersion"
 }
 
+function Get-ParcelVersion {
+    $parcelVersion = parcel --version
+    return "Parcel $parcelVersion"
+}
+
 function Get-PipVersion {
     $result = Get-CommandResult "pip --version"
     $result.Output -match "pip (?<version>\d+\.\d+\.\d+)" | Out-Null
diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 9c6c32dd..405604b3 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -130,6 +130,7 @@ $toolsList = @(
     (Get-NvmVersion),
     (Get-OpensslVersion),
     (Get-PackerVersion),
+    (Get-ParcelVersion),
     (Get-PhantomJSVersion),
     (Get-PodManVersion),
     (Get-PulumiVersion),
@@ -213,7 +214,7 @@ $browsersAndDriversList = @(
     (Get-ChromeDriverVersion),
     (Get-FirefoxVersion),
     (Get-GeckodriverVersion),
-    (Get-ChromiumVersion),    
+    (Get-ChromiumVersion),
     (Get-SeleniumVersion)
 )
 
diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index 760dc231..865c30a4 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -297,7 +297,7 @@
             "command": "n"
         },
         {
-            "name": "parcel-bundler",
+            "name": "parcel",
             "command": "parcel"
         },
         {
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index 66a105e8..3a74f737 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -298,7 +298,7 @@
             "command": "n"
         },
         {
-            "name": "parcel-bundler",
+            "name": "parcel",
             "command": "parcel"
         },
         {