From 8b1de34bd922377ce05cee5a1d9f85eb70dfcad5 Mon Sep 17 00:00:00 2001
From: SuperShowwei <supershowwei@gmail.com>
Date: Wed, 8 Jul 2020 00:57:10 +0800
Subject: [PATCH] Upgrade NUglify 1.6.4 and add SupportNewSyntax() test case.
 (#501)

Co-authored-by: johnny <johnny@wantgoo.com>
---
 src/BundlerMinifier.Core/BundlerMinifier.Core.csproj |  2 +-
 src/BundlerMinifier/BundlerMinifier.csproj           |  2 +-
 src/BundlerMinifierTest/BundlerTest.cs               | 11 +++++++++++
 src/BundlerMinifierTest/artifacts/file4.js           |  6 ++++++
 src/BundlerMinifierTest/artifacts/test8.json         |  8 ++++++++
 src/BundlerMinifierVsix/BundlerMinifierVsix.csproj   |  4 ++--
 src/BundlerMinifierVsix/packages.config              |  2 +-
 7 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 src/BundlerMinifierTest/artifacts/file4.js
 create mode 100644 src/BundlerMinifierTest/artifacts/test8.json

diff --git a/src/BundlerMinifier.Core/BundlerMinifier.Core.csproj b/src/BundlerMinifier.Core/BundlerMinifier.Core.csproj
index 789e1a18..bb723c06 100644
--- a/src/BundlerMinifier.Core/BundlerMinifier.Core.csproj
+++ b/src/BundlerMinifier.Core/BundlerMinifier.Core.csproj
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUglify" Version="1.5.14" />
+    <PackageReference Include="NUglify" Version="1.6.4" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
   </ItemGroup>
 
diff --git a/src/BundlerMinifier/BundlerMinifier.csproj b/src/BundlerMinifier/BundlerMinifier.csproj
index 719eac2d..949526c9 100644
--- a/src/BundlerMinifier/BundlerMinifier.csproj
+++ b/src/BundlerMinifier/BundlerMinifier.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.Build.Framework" Version="15.1.0-*" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.0-*" PrivateAssets="All" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" PrivateAssets="All" />
-    <PackageReference Include="NUglify" Version="1.5.14" PrivateAssets="All" />
+    <PackageReference Include="NUglify" Version="1.6.4" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
diff --git a/src/BundlerMinifierTest/BundlerTest.cs b/src/BundlerMinifierTest/BundlerTest.cs
index adfab851..79acd2f8 100644
--- a/src/BundlerMinifierTest/BundlerTest.cs
+++ b/src/BundlerMinifierTest/BundlerTest.cs
@@ -40,6 +40,7 @@ public void Cleanup()
             File.Delete("../../../artifacts/file3.min.js");
             File.Delete("../../../artifacts/file4.min.html");
             File.Delete("../../../artifacts/test7.min.js");
+            File.Delete("../../../artifacts/test8.min.js");
         }
 
         [TestMethod]
@@ -200,5 +201,15 @@ public void PreventDoubleProcessing()
             var secondFileTime = File.GetLastWriteTimeUtc(filePath);
             Assert.AreEqual(firstFileTime, secondFileTime);
         }
+
+        [TestMethod]
+        public void SupportNewSyntax()
+        {
+            _processor.Process(TEST_BUNDLE.Replace("test1", "test8"));
+
+            string jsResult = File.ReadAllText("../../../artifacts/test8.min.js");
+
+            Assert.AreEqual("function test(n){for(const t of n)console.log(t)}test([1,2,3,4]);", jsResult);
+        }
     }
 }
diff --git a/src/BundlerMinifierTest/artifacts/file4.js b/src/BundlerMinifierTest/artifacts/file4.js
new file mode 100644
index 00000000..eb893f6d
--- /dev/null
+++ b/src/BundlerMinifierTest/artifacts/file4.js
@@ -0,0 +1,6 @@
+function test(arr) {
+    for (const abc of arr) {
+        console.log(abc);
+    }
+}
+test([1, 2, 3, 4]);
\ No newline at end of file
diff --git a/src/BundlerMinifierTest/artifacts/test8.json b/src/BundlerMinifierTest/artifacts/test8.json
new file mode 100644
index 00000000..4a58fe79
--- /dev/null
+++ b/src/BundlerMinifierTest/artifacts/test8.json
@@ -0,0 +1,8 @@
+[
+  {
+    "outputFileName": "test8.min.js",
+    "inputFiles": [
+      "file4.js"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/src/BundlerMinifierVsix/BundlerMinifierVsix.csproj b/src/BundlerMinifierVsix/BundlerMinifierVsix.csproj
index 5faf1ef4..7dd0a825 100644
--- a/src/BundlerMinifierVsix/BundlerMinifierVsix.csproj
+++ b/src/BundlerMinifierVsix/BundlerMinifierVsix.csproj
@@ -258,8 +258,8 @@
       <HintPath>..\..\packages\NuGet.VisualStudio.3.5.0\lib\net45\NuGet.VisualStudio.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="NUglify, Version=1.5.14.0, Culture=neutral, PublicKeyToken=15bc7810aec21b5e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUglify.1.5.14\lib\net40\NUglify.dll</HintPath>
+    <Reference Include="NUglify, Version=1.6.4.0, Culture=neutral, PublicKeyToken=15bc7810aec21b5e, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUglify.1.6.4\lib\net40\NUglify.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
diff --git a/src/BundlerMinifierVsix/packages.config b/src/BundlerMinifierVsix/packages.config
index 6df6cec8..503993f4 100644
--- a/src/BundlerMinifierVsix/packages.config
+++ b/src/BundlerMinifierVsix/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
   <package id="NuGet.VisualStudio" version="3.5.0" targetFramework="net46" />
-  <package id="NUglify" version="1.5.14" targetFramework="net46" />
+  <package id="NUglify" version="1.6.4" targetFramework="net46" />
 </packages>
\ No newline at end of file