Fix minification failures and delete unused assets (NuGet#7963)

Address NuGet/Engineering#3107
snyk123 · Apr 25, 2020 · 7322a06 · 7322a06
1 parent e927718
commit 7322a06
Show file tree

Hide file tree

Showing 98 changed files with 279 additions and 6,536 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,7 @@ tools/
 .nuget/.marker.v*
 nuget.exe
 AssemblyInfo.g.cs
+*.g.txt
 tests/Scripts/Config-*.json
 
 # MSTest test Results

diff --git a/sign.thirdparty.props b/sign.thirdparty.props
@@ -2,6 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ThirdPartyBinaries Include="AnglicanGeek.MarkdownMailer.dll" />
+    <ThirdPartyBinaries Include="Antlr3.Runtime.dll" />
     <ThirdPartyBinaries Include="Autofac.dll" />
     <ThirdPartyBinaries Include="Autofac.Extensions.DependencyInjection.dll" />
     <ThirdPartyBinaries Include="Autofac.Integration.Mvc.dll" />

diff --git a/src/NuGetGallery/App_Start/AppActivator.cs b/src/NuGetGallery/App_Start/AppActivator.cs
@@ -100,7 +100,7 @@ private static RazorViewEngine CreateViewEngine()
         private static void BundlingPostStart()
         {
             // Add primary style bundle
-            Bundle stylesBundle = new StyleBundle("~/Content/css");
+            Bundle stylesBundle = new StyleBundle("~/Content/css.min.css");
             foreach (string filename in new[] {
                     "Site.css",
                     "Layout.css",
@@ -145,6 +145,14 @@ private static void BundlingPostStart()
                 .Include("~/Scripts/gallery/common-multi-select-dropdown.js");
             BundleTable.Bundles.Add(multiSelectDropdownBundle);
 
+            var asyncFileUploadScriptBundle = new ScriptBundle("~/Scripts/gallery/async-file-upload.min.js")
+                .Include("~/Scripts/gallery/async-file-upload.js");
+            BundleTable.Bundles.Add(asyncFileUploadScriptBundle);
+
+            var certificatesScriptBundle = new ScriptBundle("~/Scripts/gallery/certificates.min.js")
+                .Include("~/Scripts/gallery/certificates.js");
+            BundleTable.Bundles.Add(certificatesScriptBundle);
+
             var homeScriptBundle = new ScriptBundle("~/Scripts/gallery/page-home.min.js")
                 .Include("~/Scripts/gallery/page-home.js");
             BundleTable.Bundles.Add(homeScriptBundle);
@@ -204,16 +212,13 @@ private static void BundlingPostStart()
                 new ScriptResourceDefinition { Path = scriptBundle.Path });
 
             // Add support requests bundles
-            var jQueryUiStylesBundle = new StyleBundle("~/Content/themes/custom/jqueryui")
-                .Include("~/Content/themes/custom/jquery-ui-1.10.3.custom.css");
-            BundleTable.Bundles.Add(jQueryUiStylesBundle);
-
-            var supportRequestStylesBundle = new StyleBundle("~/Content/page-support-requests")
+            var supportRequestStylesBundle = new StyleBundle("~/Content/themes/custom/page-support-requests.min.css")
+                .Include("~/Content/themes/custom/jquery-ui-1.10.3.custom.css")
                 .Include("~/Content/admin/SupportRequestStyles.css");
             BundleTable.Bundles.Add(supportRequestStylesBundle);
 
-            var supportRequestsBundle = new ScriptBundle("~/Scripts/page-support-requests")
-                .Include("~/Scripts/gallery/jquery-ui-{version}.js")
+            var supportRequestsBundle = new ScriptBundle("~/Scripts/page-support-requests.min.js")
+                .Include("~/Scripts/gallery/jquery-ui-1.10.3.js")
                 .Include("~/Scripts/gallery/knockout-projections.js")
                 .Include("~/Scripts/gallery/page-support-requests.js");
             BundleTable.Bundles.Add(supportRequestsBundle);

diff --git a/src/NuGetGallery/Areas/Admin/Views/SupportRequest/Admins.cshtml b/src/NuGetGallery/Areas/Admin/Views/SupportRequest/Admins.cshtml
@@ -6,8 +6,7 @@
 }
 
 @section TopScripts{
-    @Styles.Render("~/Content/themes/custom/jqueryui")
-    @Styles.Render("~/Content/page-support-requests")
+    @Styles.Render("~/Content/themes/custom/page-support-requests.min.css")
 }
 
 @ViewHelpers.AjaxAntiForgeryToken(Html)
@@ -87,7 +86,7 @@
 </section>
 
 @section BottomScripts{
-    @Scripts.Render("~/Scripts/page-support-requests")
+    @Scripts.Render("~/Scripts/page-support-requests.min.js")
 
     <script type="text/javascript">
         $(function () {

diff --git a/src/NuGetGallery/Areas/Admin/Views/SupportRequest/Index.cshtml b/src/NuGetGallery/Areas/Admin/Views/SupportRequest/Index.cshtml
@@ -6,8 +6,7 @@
 }
 
 @section TopStyles{
-    @Styles.Render("~/Content/themes/custom/jqueryui")
-    @Styles.Render("~/Content/page-support-requests")
+    @Styles.Render("~/Content/themes/custom/page-support-requests.min.css")
 }
 
 @ViewHelpers.AjaxAntiForgeryToken(Html)
@@ -177,7 +176,7 @@
 @section BottomScripts {
     @if (Model != null)
     {
-        @Scripts.Render("~/Scripts/page-support-requests")
+        @Scripts.Render("~/Scripts/page-support-requests.min.js")
 
         <script type="text/javascript">
             $(function () {

diff --git a/src/NuGetGallery/Content/SyntaxHighlighter/shCore.css b/src/NuGetGallery/Content/SyntaxHighlighter/shCore.css