Fix BackgroundWorker imports generation

mingyaulee · Jan 25, 2025 · 477f42a · 477f42a
1 parent b3ddcfd
commit 477f42a
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 2 deletions.
diff --git a/src/Blazor.BrowserExtension.Build/Blazor.BrowserExtension.Build.csproj b/src/Blazor.BrowserExtension.Build/Blazor.BrowserExtension.Build.csproj
@@ -61,4 +61,8 @@
     <ProjectReference Include="..\Blazor.BrowserExtension.Analyzer\Blazor.BrowserExtension.Analyzer.csproj" PrivateAssets="all" />
   </ItemGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Blazor.BrowserExtension.Build.Test" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Blazor.BrowserExtension.Build/Tasks/BlazorToBrowserExtensionWriteBackgroundWorkerFile.cs b/src/Blazor.BrowserExtension.Build/Tasks/BlazorToBrowserExtensionWriteBackgroundWorkerFile.cs
@@ -1,4 +1,5 @@
-using Microsoft.Build.Framework;
+using Blazor.BrowserExtension.Build.Tasks.Helpers;
+using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 using System;
 using System.Collections.Generic;
@@ -104,7 +105,7 @@ private static List<string> GetImports(ITaskItem[] jsAssets, string[] includeCon
         private static string GetRelativePath(ITaskItem item)
         {
             var basePath = item.GetMetadata("BasePath");
-            var relativePath = item.GetMetadata("RelativePath");
+            var relativePath = FingerprintHelper.RemoveFingerprintSegment(item.GetMetadata("RelativePath"));
             return string.Join("/", Path.Combine(basePath, relativePath).Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries).Select(part => part.TrimStart('_')));
         }
 

diff --git a/src/Blazor.BrowserExtension.Build/Tasks/Helpers/FingerprintHelper.cs b/src/Blazor.BrowserExtension.Build/Tasks/Helpers/FingerprintHelper.cs
@@ -0,0 +1,20 @@
+using System.Text.RegularExpressions;
+
+namespace Blazor.BrowserExtension.Build.Tasks.Helpers
+{
+    internal static partial class FingerprintHelper
+    {
+
+#if NET7_0_OR_GREATER
+        [GeneratedRegex(@"#\[.+\][!\?]?")]
+        private static partial Regex GetFingerprintRegex();
+#else
+        private static Regex GetFingerprintRegex() => new(@"#\[.+\][!\?]?");
+#endif
+
+        public static string RemoveFingerprintSegment(string path)
+        {
+            return GetFingerprintRegex().Replace(path, string.Empty);
+        }
+    }
+}
diff --git a/src/Blazor.BrowserExtension/build/Blazor.BrowserExtension.BackgroundWorker.targets b/src/Blazor.BrowserExtension/build/Blazor.BrowserExtension.BackgroundWorker.targets
@@ -36,6 +36,7 @@
 
     <ItemGroup>
       <_StaticWebAsset_Build_JsAssets Include="@(StaticWebAsset)" Condition="$([System.String]::new('%(RelativePath)').EndsWith('.js'))" />
+      <_StaticWebAsset_Build_JsAssets Include="@(WasmStaticWebAsset)" Condition="$([System.String]::new('%(RelativePath)').EndsWith('.js'))" />
     </ItemGroup>
 
     <Message Importance="normal" Text="Generating background worker file '$(_BrowserExtension_Project_IntermediateOutput_BackgroundWorkerFile_FilePath)'" />

diff --git a/test/Blazor.BrowserExtension.Build.Test/Tasks/Helpers/FingerprintHelperTest.cs b/test/Blazor.BrowserExtension.Build.Test/Tasks/Helpers/FingerprintHelperTest.cs
@@ -0,0 +1,20 @@
+using Blazor.BrowserExtension.Build.Tasks.Helpers;
+using FluentAssertions;
+using Xunit;
+
+namespace Blazor.BrowserExtension.Build.Test.Tasks.Helpers
+{
+    public class FingerprintHelperTest
+    {
+        [Theory]
+        [InlineData("app#[.{fingerprint}]?.js", "app.js")]
+        public void TestRemoveFingerprintSegment(string input, string expected)
+        {
+            // Act
+            var actual = FingerprintHelper.RemoveFingerprintSegment(input);
+
+            // Assert
+            actual.Should().Be(expected);
+        }
+    }
+}