8000 Allow to fingerprint Blazor.js by maraf · Pull Request #46988 · dotnet/sdk · GitHub
[go: up one dir, main page]
Skip to content

Allow to fingerprint Blazor.js #46988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 3, 2025
Merged

Allow to fingerprint Blazor.js #46988

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e29ba35
Allow to fingerprint Blazor.js
maraf Feb 20, 2025
6899891
Merge remote-tracking branch 'upstream/main' into BlazorJsFingerprint
maraf Feb 21, 2025
5bf13db
Fix relative path for publish fingerprinted asset
maraf Feb 21, 2025
fa1f556
Update test to assert fingerprinted blazor.js
maraf Feb 21, 2025
c481361
Fix testasset used by other tests
maraf Feb 21, 2025
ca8be03
Merge branch 'main' into BlazorJsFingerprint
maraf Feb 26, 2025
2d73722
Merge remote-tracking branch 'upstream/main' into BlazorJsFingerprint
maraf Feb 28, 2025
c1f17ed
Merge remote-tracking branch 'upstream/main' into BlazorJsFingerprint
maraf Mar 3, 2025
4dcb1b7
Use BlazorFingerprintBlazorJs to switch FingerprintCandidates instead…
maraf Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix testasset used by other tests
  • Loading branch information
@maraf
maraf committed Feb 21, 2025
commit c481361251f2ff7239d82f689b62e901b017ca96
30 changes: 23 additions & 7 deletions test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsFingerprintingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,18 @@ public void Build_FingerprintsContent_WhenEnabled()
AssertBuildAssets(manifest1, outputPath, intermediateOutputPath);
}

public static TheoryData<string, string> WriteImportMapToHtmlData => new TheoryData<string, string>
public static TheoryData<string, string, string> WriteImportMapToHtmlData => new TheoryData<string, string, string>
{
{ "VanillaWasm", "main.js" },
{ "BlazorWasmMinimal", "_framework/blazor.webassembly.js" }
{ "VanillaWasm", "main.js", null },
{ "BlazorWasmMinimal", "_framework/blazor.webassembly.js", "_framework/blazor.webassembly#[.{fingerprint}].js" }
};

[Theory]
[MemberData(nameof(WriteImportMapToHtmlData))]
public void Build_WriteImportMapToHtml(string testAsset, string scriptPath)
public void Build_WriteImportMapToHtml(string testAsset, string scriptPath, string scriptPathWithFingerprintPattern)
{
ProjectDirectory = CreateAspNetSdkTestAsset(testAsset);
ReplaceStringInIndexHtml(ProjectDirectory, scriptPath, scriptPathWithFingerprintPattern);

var build = CreateBuildCommand(ProjectDirectory);
ExecuteCommand(build, "-p:WriteImportMapToHtml=true").Should().Pass();
Expand All @@ -70,20 +71,35 @@ public void Build_WriteImportMapToHtml(string testAsset, string scriptPath)

[Theory]
[MemberData(nameof(WriteImportMapToHtmlData))]
public void Publish_WriteImportMapToHtml(string testAsset, string scriptPath)
public void Publish_WriteImportMapToHtml(string testAsset, string scriptPath, string scriptPathWithFingerprintPattern)
{
ProjectDirectory = CreateAspNetSdkTestAsset(testAsset);
ReplaceStringInIndexHtml(ProjectDirectory, scriptPath, scriptPathWithFingerprintPattern);

var projectName = Path.GetFileNameWithoutExtension(Directory.EnumerateFiles(ProjectDirectory.TestRoot, "*.csproj").Single());

var publish = CreatePublishCommand(ProjectDirectory);
ExecuteCommand(publish, "-p:WriteImportMapToHtml=true").Should().Pass();

var outputPath = publish.GetOutputDirectory(DefaultTfm, "Debug").ToString();
var indexHtmlPath = Path.Combine(outputPath, "wwwroot", "index.html");
var indexHtmlOutputPath = Path.Combine(outputPath, "wwwroot", "index.html");
var endpointsManifestPath = Path.Combine(outputPath, $"{projectName}.staticwebassets.endpoints.json");

AssertImportMapInHtml(indexHtmlPath, endpointsManifestPath, scriptPath);
AssertImportMapInHtml(indexHtmlOutputPath, endpointsManifestPath, scriptPath);
}

private void ReplaceStringInIndexHtml(TestAsset testAsset, string scriptPath, string scriptPathWithFingerprintPattern)
{
if (scriptPathWithFingerprintPattern != null)
{
var indexHtmlPath = Path.Combine(testAsset.TestRoot, "wwwroot", "index.html");
var indexHtmlContent = File.ReadAllText(indexHtmlPath);
var newIndexHtmlContent = indexHtmlContent.Replace(scriptPath, scriptPathWithFingerprintPattern);
if (indexHtmlContent == newIndexHtmlContent)
throw new Exception($"Script replacement '{scriptPath}' for '{scriptPathWithFingerprintPattern}' didn't produce any change in '{indexHtmlPath}'");

File.WriteAllText(indexHtmlPath, newIndexHtmlContent);
}
}

private void AssertImportMapInHtml(string indexHtmlPath, string endpointsManifestPath, string scriptPath)
Expand Down
2 changes: 1 addition & 1 deletion test/TestAssets/TestProjects/BlazorWasmMinimal/wwwroot/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
</div>
<script src="_framework/blazor.webassembly#[.{fingerprint}].js"></script>
<script src="_framework/blazor.webassembly.js"></script>
</body>

</html>
Loading
0