Make it work correctly even when used with “BlazorWasmBrotliLoader.Bu…

…ild” NuGet package.
jsakamoto · Sep 21, 2024 · 4e21496 · 4e21496
1 parent 5835c17
commit 4e21496
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 8 deletions.
diff --git a/BlazorWasmPreRendering.Build.Test/ProgramE2ETest.cs b/BlazorWasmPreRendering.Build.Test/ProgramE2ETest.cs
@@ -354,11 +354,40 @@ public async Task Publish_Test()
  serviceWorkerAssetsJs = Regex.Replace(serviceWorkerAssetsJs, ";\\s*$", "");
  var assetsManifestFile = JsonSerializer.Deserialize<AssetsManifestFile>(serviceWorkerAssetsJs);
  var assetManifestEntry = assetsManifestFile?.assets?.First(a => a.url == "index.html");
- assetManifestEntry.IsNotNull();
- assetManifestEntry!.hash.Is(hash);
+ assetManifestEntry.IsNotNull().hash.Is(hash);
  }
  }
 
+ [Test]
+ public async Task Publish_with_Compression_Test()
+ {
+ // Given
+ using var sampleAppWorkDir = SampleSite.CreateSampleAppsWorkDir();
+ var projectDir = Path.Combine(sampleAppWorkDir, "BlazorWasmApp0");
+
+ // When
+ var dotnetCLI = await Start("dotnet", "publish -c:Release -o:bin/publish", projectDir).WaitForExitAsync();
+ dotnetCLI.ExitCode.Is(0, message: dotnetCLI.Output);
+
+ // Then
+
+ // Validate prerendered contents.
+ var wwwrootDir = Path.Combine(projectDir, "bin", "publish", "wwwroot");
+ ValidatePrerenderedContentsOfApp0(wwwrootDir);
+
+ // Validate PWA assets manifest.
+ var indexHtmlBytes = File.ReadAllBytes(Path.Combine(wwwrootDir, "index.html"));
+ using var sha256 = SHA256.Create();
+ var hash = "sha256-" + Convert.ToBase64String(sha256.ComputeHash(indexHtmlBytes));
+
+ var serviceWorkerAssetsJs = File.ReadAllText(Path.Combine(wwwrootDir, "my-assets.js"));
+ serviceWorkerAssetsJs = Regex.Replace(serviceWorkerAssetsJs, @"^self\.assetsManifest\s*=\s*", "");
+ serviceWorkerAssetsJs = Regex.Replace(serviceWorkerAssetsJs, ";\\s*$", "");
+ var assetsManifestFile = JsonSerializer.Deserialize<AssetsManifestFile>(serviceWorkerAssetsJs);
+ var assetManifestEntry = assetsManifestFile?.assets?.First(a => a.url == "index.html");
+ assetManifestEntry.IsNotNull().hash.Is(hash);
+ }
+
  [Test, Platform("Win")]
  public async Task Publish_by_native_msbuild_Test()
  {

diff --git a/BlazorWasmPreRendering.Build/build/BlazorWasmPreRendering.Build.props b/BlazorWasmPreRendering.Build/build/BlazorWasmPreRendering.Build.props
@@ -2,5 +2,6 @@
  <Import Project="Microsoft.AspNetCore.StaticWebAssets.props" />
  <PropertyGroup>
  <BeforePublishSPAforGHPages>$(BeforePublishSPAforGHPages);BlazorWasmPrerendering</BeforePublishSPAforGHPages>
+ <BeforeBlazorWasmBrotliLoader>$(BeforeBlazorWasmBrotliLoader);BlazorWasmPrerendering</BeforeBlazorWasmBrotliLoader>
  </PropertyGroup>
 </Project>
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,3 +1,6 @@
+v.4.0.1
+- Improve: Make it work correctly even when used with �gBlazorWasmBrotliLoader.Build�h NuGet package.
+
 v.4.0.0
 - This is the first official - not a preview - release.
 - Breaking Change: Drop the support for .NET 5.

diff --git a/SampleApps/BlazorWasmAVP/BlazorWasmAVP.csproj b/SampleApps/BlazorWasmAVP/BlazorWasmAVP.csproj
@@ -18,7 +18,7 @@
  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.18" />
  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.18" PrivateAssets="all" />
  <PackageReference Include="BlazorWasmAntivirusProtection" Version="2.4.5" />
- <PackageReference Include="BlazorWasmPreRendering.Build" Version="4.0.0" />
+ <PackageReference Include="BlazorWasmPreRendering.Build" Version="4.0.1-preview.1" />
  </ItemGroup>
 
 </Project>
diff --git a/SampleApps/BlazorWasmApp0/BlazorWasmApp0.csproj b/SampleApps/BlazorWasmApp0/BlazorWasmApp0.csproj
@@ -9,7 +9,8 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="BlazorWasmPreRendering.Build" Version="4.0.0" />
+ <PackageReference Include="BlazorWasmPreRendering.Build" Version="4.0.1-preview.1" />
+ <PackageReference Include="BlazorWasmBrotliLoader.Build" Version="1.0.0-preview.1" />
  <PackageReference Include="PublishSPAforGitHubPages.Build" Version="2.1.1" />
  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.4" PrivateAssets="all" />

diff --git a/SampleApps/BlazorWasmApp1/BlazorWasmApp1.csproj b/SampleApps/BlazorWasmApp1/BlazorWasmApp1.csproj
@@ -13,8 +13,8 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="BlazorWasmPreRendering.Build" Version="4.0.0" />
- <PackageReference Include="PublishSPAforGitHubPages.Build" Version="2.1.1" />
+ <PackageReference Include="BlazorWasmPreRendering.Build" Version="4.0.1-preview.1" />
+ <PackageReference Include="PublishSPAforGitHubPages.Build" Version="3.0.0-preview.1" />
  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.4" PrivateAssets="all" />
  <PackageReference Include="Toolbelt.Blazor.HeadElement" Version="7.3.1" />

diff --git a/SampleApps/BlazorWasmApp2/Client/BlazorWasmApp2.Client.csproj b/SampleApps/BlazorWasmApp2/Client/BlazorWasmApp2.Client.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
  <PropertyGroup>
  <TargetFramework>net6.0</TargetFramework>

diff --git a/SampleApps/SAMPLE-APPS-README.md b/SampleApps/SAMPLE-APPS-README.md
@@ -10,6 +10,7 @@
 |PWA | ✅ Yes | - | -
 |Has easter-egg | - | ✅ Yes | -
 |Deploy to GitHub Pages| - | ✅ Yes | -
+|Brotli Loader | ✅ Yes | - | -
 |Has AngleSharp dependency| ✅Yes | - | -
 |Localization | ✅ Yes | - | -
 |Lazy Load Assembly | ✅ Yes | ✅ Yes | -

diff --git a/VersionInfo.props b/VersionInfo.props
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
- <Version>4.0.0</Version>
+ <Version>4.0.1-preview.1</Version>
  <Authors>J.Sakamoto</Authors>
  <Copyright>Copyright © 2021-2024 J.Sakamoto, Mozilla Public License 2.0</Copyright>
  <Description>When you publish your Blazor Wasm app, this package pre-renders and saves the app as static HTML files in your public folder.</Description>