Skip to content

[StaticWebAssets] Fingerprint JS modules #47921

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 5 commits into from
Mar 27, 2025
Merged

[StaticWebAssets] Fingerprint JS modules #47921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
621b56f
Fingerprint JS modules
javiercn Mar 26, 2025
4331462
Fix regex
javiercn Mar 26, 2025
a7bb64c
Update baselines
javiercn Mar 27, 2025
fdc3c3b
Fix baselines
javiercn Mar 27, 2025
e78320f
Fix regex
javiercn Mar 27, 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
8 changes: 8 additions & 0 deletions src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,8 @@ Copyright (c) .NET Foundation. All rights reserved.
AssetMode="CurrentProject"
AssetRole="Primary"
AssetMergeSource="$(StaticWebAssetMergeTarget)"
FingerprintCandidates="$(StaticWebAssetsFingerprintContent)"
FingerprintPatterns="@(StaticWebAssetFingerprintPattern)"
AssetTraitName="JSModule"
AssetTraitValue="JSModuleManifest"
>
Expand Down Expand Up @@ -380,6 +382,8 @@ Copyright (c) .NET Foundation. All rights reserved.
AssetMergeSource="$(StaticWebAssetMergeTarget)"
AssetTraitName="JSModule"
AssetTraitValue="JSModuleManifest"
FingerprintCandidates="$(StaticWebAssetsFingerprintContent)"
FingerprintPatterns="@(StaticWebAssetFingerprintPattern)"
>
<Output TaskParameter="Assets" ItemName="_PublishJsModuleManifestStaticWebAsset" />
</DefineStaticWebAssets>
Expand Down Expand Up @@ -428,6 +432,8 @@ Copyright (c) .NET Foundation. All rights reserved.
SourceType="Discovered"
BasePath="$(StaticWebAssetBasePath)"
AssetMergeSource="$(StaticWebAssetMergeTarget)"
FingerprintCandidates="$(StaticWebAssetsFingerprintContent)"
FingerprintPatterns="@(StaticWebAssetFingerprintPattern)"
CacheManifestPath="$(_ResolveJSModuleStaticWebAssetsRazorCachePath)">
<Output TaskParameter="Assets" ItemName="_ComponentJSModule" />
</DefineStaticWebAssets>
Expand All @@ -441,6 +447,8 @@ Copyright (c) .NET Foundation. All rights reserved.
SourceType="Discovered"
BasePath="$(StaticWebAssetBasePath)"
AssetMergeSource="$(StaticWebAssetMergeTarget)"
FingerprintCandidates="$(StaticWebAssetsFingerprintContent)"
FingerprintPatterns="@(StaticWebAssetFingerprintPattern)"
CacheManifestPath="$(_ResolveJSModuleStaticWebAssetsCshtmlCachePath)">
<Output TaskParameter="Assets" ItemName="_MvcJSModule" />
</DefineStaticWebAssets>
Expand Down
4 changes: 2 additions & 2 deletions src/StaticWebAssetsSdk/Tasks/JSModules/ApplyJsModules.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public override bool Execute()
unmatchedJsModules,
jsModulesByRazorItem,
"RazorComponent",
"(.*)\\.razor\\.js$",
"(.*?)(?:#\\[.*?\\](?:\\?|!)?)?(\\.razor\\.js)$",
"$1.razor");
}

Expand All @@ -52,7 +52,7 @@ public override bool Execute()
unmatchedJsModules,
jsModulesByRazorItem,
"View",
"(.*)\\.cshtml\\.js$",
"(.*?)(?:#\\[.*?\\](?:\\?|!)?)?(\\.cshtml\\.js)$",
"$1.cshtml");
}

Expand Down
4 changes: 4 additions & 0 deletions test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselineFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,15 @@ public partial class StaticWebAssetsBaselineFactory
[GeneratedRegex("""(.*\.)([0123456789abcdefghijklmnopqrstuvwxyz]{10})(\.lib\.module\.js)((?:\.gz)|(?:\.br))?$""", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
private static partial Regex JSInitializerRegex();

[GeneratedRegex("""(.*\.)([0123456789abcdefghijklmnopqrstuvwxyz]{10})(\.modules\.json)((?:\.gz)|(?:\.br))?$""", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
private static partial Regex JSModuleManifestRegex();

private static readonly IList<(Regex expression, string replacement)> WellKnownFileNamePatternsAndReplacements =
[
(ScopedProjectBundleRegex(),"$1__fingerprint__$3$4"),
(ScopedAppBundleRegex(),"$1__fingerprint__$3$4"),
(JSInitializerRegex(), "$1__fingerprint__$3$4"),
(JSModuleManifestRegex(), "$1__fingerprint__$3$4"),
(EmbeddedFingerprintExpression(), "#[.{fingerprint=__fingerprint__}]$1"),
(FingerprintedSiteCssRegex(), "fingerprint-site$1__fingerprint__$3$4"),
];
Expand Down
10 changes: 5 additions & 5 deletions ...ssetsBaselines/Publish_PublishesJsModuleBundleBundleToTheRightLocation.Publish.files.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
"${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\ComponentApp\\ComponentApp#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\ComponentApp\\ComponentApp#[.{fingerprint=__fingerprint__}]?.styles.css.gz",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\ComponentApp\\ComponentApp#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.br",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\ComponentApp\\ComponentApp#[.{fingerprint=__fingerprint__}]?.modules.json.br",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\ComponentApp\\ComponentApp#[.{fingerprint=__fingerprint__}]?.modules.json.gz",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\ComponentApp\\ComponentApp#[.{fingerprint=__fingerprint__}]?.styles.css.br",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\ComponentApp\\ComponentApp.modules.json.br",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\ComponentApp\\ComponentApp.modules.json.gz",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\ComponentApp.styles.css",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\ComponentApp.bundle.scp.css",
"${OutputPath}\\wwwroot\\ComponentApp#[.{fingerprint=__fingerprint__}]!.lib.module.js.br",
"${OutputPath}\\wwwroot\\ComponentApp#[.{fingerprint=__fingerprint__}]!.lib.module.js.gz",
"${OutputPath}\\wwwroot\\ComponentApp#[.{fingerprint=__fingerprint__}]?.modules.json.br",
"${OutputPath}\\wwwroot\\ComponentApp#[.{fingerprint=__fingerprint__}]?.modules.json.gz",
"${OutputPath}\\wwwroot\\ComponentApp#[.{fingerprint=__fingerprint__}]?.styles.css.br",
"${OutputPath}\\wwwroot\\ComponentApp#[.{fingerprint=__fingerprint__}]?.styles.css.gz",
"${OutputPath}\\wwwroot\\ComponentApp#[.{fingerprint}]!.lib.module.js",
"${OutputPath}\\wwwroot\\ComponentApp#[.{fingerprint}]?.modules.json",
"${OutputPath}\\wwwroot\\ComponentApp#[.{fingerprint}]?.styles.css",
"${OutputPath}\\wwwroot\\ComponentApp.modules.json",
"${OutputPath}\\wwwroot\\ComponentApp.modules.json.br",
"${OutputPath}\\wwwroot\\ComponentApp.modules.json.gz",
"${OutputPath}\\wwwroot\\_framework\\blazor.server.js",
"${OutputPath}\\wwwroot\\_framework\\blazor.server.js.br",
"${OutputPath}\\wwwroot\\_framework\\blazor.server.js.gz",
Expand Down
Loading