Move to includes.min files

NickCraver · NickCraver · commit 4ad522ee57ec · 2018-05-22T21:52:36.000-04:00
And remove the non-minified from the package (this halves the size of .Shared)
diff --git a/src/MiniProfiler.AspNetCore/MiniProfilerMiddleware.cs b/src/MiniProfiler.AspNetCore/MiniProfilerMiddleware.cs
@@ -170,7 +170,7 @@ private async Task HandleRequest(HttpContext context, PathString subPath)
             string result = null;
 
             // File embed
-            if (subPath.Value.StartsWith("/includes", StringComparison.Ordinal))
+            if (subPath.Value.StartsWith("/includes.min", StringComparison.Ordinal))
             {
                 result = Embedded.GetFile(context, subPath);
             }
diff --git a/src/MiniProfiler.AspNetCore/MiniProfilerOptions.cs b/src/MiniProfiler.AspNetCore/MiniProfilerOptions.cs
@@ -11,7 +11,7 @@ public class MiniProfilerOptions : MiniProfilerBaseOptions
     {
         /// <summary>
         /// The path under which ALL routes are registered in, defaults to the application root.  For example, "/myDirectory/" would yield
-        /// "/myDirectory/includes.js" rather than "/mini-profiler-resources/includes.js"
+        /// "/myDirectory/includes.min.js" rather than "/mini-profiler-resources/includes.min.js"
         /// Any setting here should be absolute for the application, e.g. "/myDirectory/"
         /// </summary>
         public PathString RouteBasePath { get; set; } = "/mini-profiler-resources";
diff --git a/src/MiniProfiler.Shared/Internal/Render.cs b/src/MiniProfiler.Shared/Internal/Render.cs
@@ -40,7 +40,7 @@ public static string Includes(
 
             sb.Append("<script async=\"async\" id=\"mini-profiler\" src=\"");
             sb.Append(path);
-            sb.Append("includes.js?v=");
+            sb.Append("includes.min.js?v=");
             sb.Append(options.VersionHash);
             sb.Append("\" data-version=\"");
             sb.Append(options.VersionHash);
@@ -151,8 +151,8 @@ public static string ResultListHtml(MiniProfilerBaseOptions options, string path
             return $@"<html>
   <head>
     <title>List of profiling sessions</title>
-    <script id=""mini-profiler"" data-ids="""" src=""{path}includes.js?v={version}""></script>
-    <link href=""{path}includes.css?v={version}"" rel=""stylesheet"" />
+    <script id=""mini-profiler"" data-ids="""" src=""{path}includes.min.js?v={version}""></script>
+    <link href=""{path}includes.min.css?v={version}"" rel=""stylesheet"" />
     <script>MiniProfiler.listInit({{path: '{path}', version: '{version}'}});</script>
   </head>
   <body>
diff --git a/src/MiniProfiler.Shared/MiniProfiler.Shared.csproj b/src/MiniProfiler.Shared/MiniProfiler.Shared.csproj
@@ -41,13 +41,13 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="ui\includes.less" />
-    <EmbeddedResource Include="ui\includes.css" DependentUpon="includes.less" />
+    <None Include="ui\includes.css" DependentUpon="includes.less" />
     <EmbeddedResource Include="ui\includes.min.css" DependentUpon="includes.css" />
     
     <Include Include="ui\lib\MiniProfiler.js" DependentUpon="MiniProfiler.ts" />
     <Include Include="ui\lib\MiniProfiler.js.map" DependentUpon="MiniProfiler.js" />
 
-    <EmbeddedResource Include="ui\includes.js" />
+    <None Include="ui\includes.js" />
     <EmbeddedResource Include="ui\includes.min.js" DependentUpon="includes.js" />
   </ItemGroup>
 </Project>
diff --git a/src/MiniProfiler.Shared/ui/lib/MiniProfiler.ts b/src/MiniProfiler.Shared/ui/lib/MiniProfiler.ts
@@ -345,7 +345,7 @@ namespace StackExchange.Profiling {
                     } else {
                         alreadyDone = true;
                         if (mp.options.authorized) {
-                            $('head').append(`<link rel="stylesheet" type="text/css" href="${mp.options.path}includes.css?v=${mp.options.version}" />`);
+                            $('head').append(`<link rel="stylesheet" type="text/css" href="${mp.options.path}includes.min.css?v=${mp.options.version}" />`);
                         }
                         doInit();
                     }
diff --git a/src/MiniProfiler/MiniProfilerHandler.cs b/src/MiniProfiler/MiniProfilerHandler.cs
@@ -89,7 +89,7 @@ public void ProcessRequest(HttpContext context)
 
             switch (Path.GetFileNameWithoutExtension(path).ToLowerInvariant())
             {
-                case "includes":
+                case "includes.min":
                     output = Includes(context, path);
                     break;
 
diff --git a/tests/MiniProfiler.Tests.AspNet/MiniProfileHandlerTests.cs b/tests/MiniProfiler.Tests.AspNet/MiniProfileHandlerTests.cs
@@ -14,8 +14,8 @@ public class MiniProfilerHandlerTests
         [InlineData("BRILLANT", 404)]
         [InlineData("underscore.js", 404)]
         [InlineData("results-list", 200)]
-        [InlineData("includes.js", 200)]
-        [InlineData("includes.css", 200)]
+        [InlineData("includes.min.js", 200)]
+        [InlineData("includes.min.css", 200)]
         public void GivenContext_WhenAResourceIsRequested_ThenTheCorrectHttpStatusCodeIsReturned(string resourceName, int expectedHttpStatus)
         {
             var sut = new MiniProfilerHandler(new MiniProfilerOptions()
@@ -52,7 +52,7 @@ public void GivenContext_WhenIndexIsRequested_ThenTheCorrectHttpStatusCodeIsRetu
 			var sut = new MiniProfilerHandler(new MiniProfilerOptions());
 
 			// Act
-			var res = GetRequestResponseEncoding(sut, "includes.js", acceptEncoding);
+			var res = GetRequestResponseEncoding(sut, "includes.min.js", acceptEncoding);
 
 			// Assert
 			// due the limitations of the HttpSimulator, we can't access the header values because it needs iis integrated pipeline mode.

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ private async Task HandleRequest(HttpContext context, PathString subPath)`
`170`	`170`	`string result = null;`
`171`	`171`
`172`	`172`	`// File embed`
`173`		`- if (subPath.Value.StartsWith("/includes", StringComparison.Ordinal))`
	`173`	`+ if (subPath.Value.StartsWith("/includes.min", StringComparison.Ordinal))`
`174`	`174`	`{`
`175`	`175`	`result = Embedded.GetFile(context, subPath);`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class MiniProfilerOptions : MiniProfilerBaseOptions`
`11`	`11`	`{`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// The path under which ALL routes are registered in, defaults to the application root. For example, "/myDirectory/" would yield`
`14`		`- /// "/myDirectory/includes.js" rather than "/mini-profiler-resources/includes.js"`
	`14`	`+ /// "/myDirectory/includes.min.js" rather than "/mini-profiler-resources/includes.min.js"`
`15`	`15`	`/// Any setting here should be absolute for the application, e.g. "/myDirectory/"`
`16`	`16`	`/// </summary>`
`17`	`17`	`public PathString RouteBasePath { get; set; } = "/mini-profiler-resources";`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ namespace StackExchange.Profiling {`
`345`	`345`	`} else {`
`346`	`346`	`alreadyDone = true;`
`347`	`347`	`if (mp.options.authorized) {`
`348`		- $('head').append(`<link rel="stylesheet" type="text/css" href="${mp.options.path}includes.css?v=${mp.options.version}" />`);
	`348`	+ $('head').append(`<link rel="stylesheet" type="text/css" href="${mp.options.path}includes.min.css?v=${mp.options.version}" />`);
`349`	`349`	`}`
`350`	`350`	`doInit();`
`351`	`351`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public void ProcessRequest(HttpContext context)`
`89`	`89`
`90`	`90`	`switch (Path.GetFileNameWithoutExtension(path).ToLowerInvariant())`
`91`	`91`	`{`
`92`		`- case "includes":`
	`92`	`+ case "includes.min":`
`93`	`93`	`output = Includes(context, path);`
`94`	`94`	`break;`
`95`	`95`