Merge pull request #211 from Shazwazza/add-bundle-lock

Add bundle lock
Shazwazza · Oct 21, 2024 · d5930c9 · d5930c9
2 parents deb1406 + 4e88f3b
commit d5930c9
Show file tree

Hide file tree

Showing 25 changed files with 222 additions and 167 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -89,7 +89,3 @@ jobs:
       with:
         name: smidge-nuget-${{ env.GitVersion_SemVer }}
         path:  ${{ github.workspace }}/_NugetOutput/*.*
-
-    - name: Publish to GitHub Packages
-      if: ${{ success() && github.event_name == 'pull_request' }}
-      run: dotnet nuget push "${{ github.workspace }}/_NugetOutput/*.nupkg"  --api-key ${{ secrets.GITHUB_TOKEN }} --source "https://nuget.pkg.github.com/shazwazza/index.json"
diff --git a/Nuget.config b/Nuget.config
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="AspNetCiDev" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
-    <add key="XUnitDev" value="https://www.myget.org/F/xunit/api/v3/index.json" />
   </packageSources>  
-</configuration>
+</configuration>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -9,7 +9,7 @@
     <LangVersion>9.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
   <PropertyGroup>
     <PackageProjectUrl>https://github.com/Shazwazza/Smidge</PackageProjectUrl>
@@ -23,6 +23,6 @@
     <VersionPrefix>4.0.0</VersionPrefix>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/Smidge.Core/BundleManager.cs b/src/Smidge.Core/BundleManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using Microsoft.Extensions.Options;
 using Smidge.Models;
@@ -202,10 +202,12 @@ public void AddToBundle(string bundleName, JavaScriptFile file)
         /// <returns></returns>
         public Bundle GetBundle(string bundleName)
         {
-            Bundle collection;
-            if (!TryGetValue(bundleName, out collection))
+            if (!TryGetValue(bundleName, out Bundle collection))
+            {
                 return null;
+            }
+
             return collection;
         }
     }
-}
+}
diff --git a/src/Smidge.Core/CompositeFiles/DefaultUrlManager.cs b/src/Smidge.Core/CompositeFiles/DefaultUrlManager.cs
@@ -45,7 +45,7 @@ public string GetUrl(string bundleName, string fileExtension, bool debug, string
             var handler = _keepFileExtensions ? "~/{0}/{1}.{3}{4}{2}" : "~/{0}/{1}{2}.{3}{4}";
             return _requestHelper.Content(string.Format(handler,
                                                         _options.BundleFilePath,
-                                                        Uri.EscapeUriString(bundleName),
+                                                        Uri.EscapeDataString(bundleName),
                                                         fileExtension,
                                                         debug ? 'd' : 'v',
                                                         cacheBusterValue));
@@ -167,9 +167,9 @@ private string GetCompositeUrl(string fileKey, string fileExtension, string cach
                 string.Format(
                     handler,
                     _options.CompositeFilePath,
-                    Uri.EscapeUriString(fileKey),
+                    Uri.EscapeDataString(fileKey),
                     fileExtension,
                     cacheBusterValue));
         }
     }
-}
+}
diff --git a/src/Smidge.Core/Smidge.Core.csproj b/src/Smidge.Core/Smidge.Core.csproj
@@ -14,12 +14,11 @@
     <Content Include="..\..\assets\logo-nuget.png" Link="logo-nuget.png" Pack="true" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
   </ItemGroup>
 </Project>
diff --git a/src/Smidge.InMemory/Smidge.InMemory.csproj b/src/Smidge.InMemory/Smidge.InMemory.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
     <!-- Due to a security issue we need an explicit ref https://github.com/dotnet/announcements/issues/178 -->
-    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\..\assets\logo-nuget.png" Link="logo-nuget.png" Pack="true" PackagePath="" />

diff --git a/src/Smidge.Nuglify/NuglifySourceMapController.cs b/src/Smidge.Nuglify/NuglifySourceMapController.cs
@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
 using Smidge.Cache;
 using Smidge.Models;
 using Smidge.Options;
@@ -19,12 +20,11 @@ public NuglifySourceMapController(ISmidgeFileSystem fileSystem, IBundleManager b
             _bundleManager = bundleManager;
         }
 
-        public FileResult SourceMap([FromServices] BundleRequestModel bundle)
+        public ActionResult SourceMap([FromServices] BundleRequestModel bundle)
         {
-            if (!_bundleManager.TryGetValue(bundle.FileKey, out _))
+            if (!bundle.IsBundleFound)
             {
-                //TODO: Throw an exception, this will result in an exception anyways
-                return null;
+                return NotFound();
             }
 
             var sourceMapFile = _fileSystem.CacheFileSystem.GetRequiredFileInfo(bundle.GetSourceMapFilePath());
@@ -43,10 +43,9 @@ public FileResult SourceMap([FromServices] BundleRequestModel bundle)
                 }
             }
 
-            //TODO: Throw an exception, this will result in an exception anyways
-            return null;
+            return NotFound();
         }
 
 
     }
-}
+}
diff --git a/src/Smidge.Nuglify/Smidge.Nuglify.csproj b/src/Smidge.Nuglify/Smidge.Nuglify.csproj
@@ -10,7 +10,7 @@
     <IsPackable>true</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Nuglify" Version="1.20.2" />
+    <PackageReference Include="Nuglify" Version="1.21.4" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

diff --git a/src/Smidge.Web/Startup.cs b/src/Smidge.Web/Startup.cs
@@ -198,6 +198,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 {
                     RequestPath = "/smidge-static"
                 });
+
+                bundles
+             .CreateCss("notfound-map-css-bundle",
+             "~/Css/notFoundMap.min.css"
+             );
             });
 
             app.UseSmidgeNuglify();

diff --git a/src/Smidge.Web/Views/Home/Index.cshtml b/src/Smidge.Web/Views/Home/Index.cshtml
@@ -34,6 +34,7 @@
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/foundation/5.5.2/css/foundation.min.css" />
     <link rel="stylesheet" href="inline-css-bundle" />
     <link rel="stylesheet" href="test-bundle-4" onload="window.alert('hello')" />
+    @await SmidgeHelper.CssHereAsync("notfound-map-css-bundle", debug: false)
 </head>
 <body>
 

diff --git a/src/Smidge.Web/wwwroot/Css/notFoundMap.min.css b/src/Smidge.Web/wwwroot/Css/notFoundMap.min.css
@@ -0,0 +1,2 @@
+@charset "UTF-8";
+ /*# sourceMappingURL=notFound.min.css.map */
diff --git a/src/Smidge/Controllers/AddCompressionHeaderAttribute.cs b/src/Smidge/Controllers/AddCompressionHeaderAttribute.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.DependencyInjection;
@@ -55,7 +55,7 @@ public void OnActionExecuted(ActionExecutedContext context)
                 if (context.Exception != null) return;
 
                 //get the model from the items
-                if (context.HttpContext.Items.TryGetValue(nameof(AddCompressionHeaderAttribute), out var requestModel) && requestModel is RequestModel file)
+                if (context.HttpContext.Items.TryGetValue(nameof(AddCompressionHeaderAttribute), out var requestModel) && requestModel is RequestModel file && file.IsBundleFound)
                 {
                     var enableCompression = true;
 
@@ -72,4 +72,4 @@ public void OnActionExecuted(ActionExecutedContext context)
             }
         }
     }
-}
+}
diff --git a/src/Smidge/Controllers/AddExpiryHeadersAttribute.cs b/src/Smidge/Controllers/AddExpiryHeadersAttribute.cs
@@ -50,7 +50,7 @@ public void OnActionExecuted(ActionExecutedContext context)
                     return;
 
                 //get the model from the items
-                if (!context.HttpContext.Items.TryGetValue(nameof(AddExpiryHeadersAttribute), out object fileObject) || fileObject is not RequestModel file)
+                if (!context.HttpContext.Items.TryGetValue(nameof(AddExpiryHeadersAttribute), out object fileObject) || fileObject is not RequestModel file || !file.IsBundleFound)
                     return;
 
                 var enableETag = true;

diff --git a/src/Smidge/Controllers/CheckNotModifiedAttribute.cs b/src/Smidge/Controllers/CheckNotModifiedAttribute.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Smidge.Models;
 using System;
@@ -51,7 +51,7 @@ public void OnActionExecuted(ActionExecutedContext context)
                 if (context.Exception != null) return;
 
                 //get the model from the items
-                if (context.HttpContext.Items.TryGetValue(nameof(CheckNotModifiedAttribute), out var requestModel) && requestModel is RequestModel file)
+                if (context.HttpContext.Items.TryGetValue(nameof(CheckNotModifiedAttribute), out var requestModel) && requestModel is RequestModel file && file.IsBundleFound)
                 {
                     //Don't execute when the request is in Debug
                     if (file.Debug)
@@ -74,4 +74,4 @@ private static void ReturnNotModified(ActionExecutedContext context)
             }
         }
     }
-}
+}
diff --git a/src/Smidge/Controllers/CompositeFileCacheFilterAttribute.cs b/src/Smidge/Controllers/CompositeFileCacheFilterAttribute.cs
@@ -68,7 +68,7 @@ public void OnActionExecuting(ActionExecutingContext context)
                 if (context.ActionArguments.Count == 0) return;
 
                 var firstArg = context.ActionArguments.First().Value;
-                if (firstArg is RequestModel file)
+                if (firstArg is RequestModel file && file.IsBundleFound)
                 {
                     var cacheBusterValue = file.ParsedPath.CacheBusterValue;