@@ -46,17 +46,18 @@ public void Build_FingerprintsContent_WhenEnabled()
4646 AssertBuildAssets ( manifest1 , outputPath , intermediateOutputPath ) ;
4747 }
4848
49- public static TheoryData < string , bool > WriteImportMapToHtmlData => new TheoryData < string , bool >
49+ public static TheoryData < string , string , string > WriteImportMapToHtmlData => new TheoryData < string , string , string >
5050 {
51- { "VanillaWasm" , true } ,
52- { "BlazorWasmMinimal" , false }
51+ { "VanillaWasm" , "main.js" , null } ,
52+ { "BlazorWasmMinimal" , "_framework/blazor.webassembly.js" , "_framework/blazor.webassembly#[.{fingerprint}].js" }
5353 } ;
5454
5555 [ Theory ]
5656 [ MemberData ( nameof ( WriteImportMapToHtmlData ) ) ]
57- public void Build_WriteImportMapToHtml ( string testAsset , bool assetMainJs )
57+ public void Build_WriteImportMapToHtml ( string testAsset , string scriptPath , string scriptPathWithFingerprintPattern )
5858 {
5959 ProjectDirectory = CreateAspNetSdkTestAsset ( testAsset ) ;
60+ ReplaceStringInIndexHtml ( ProjectDirectory , scriptPath , scriptPathWithFingerprintPattern ) ;
6061
6162 var build = CreateBuildCommand ( ProjectDirectory ) ;
6263 ExecuteCommand ( build , "-p:WriteImportMapToHtml=true" ) . Should ( ) . Pass ( ) ;
@@ -65,44 +66,56 @@ public void Build_WriteImportMapToHtml(string testAsset, bool assetMainJs)
6566 var indexHtmlPath = Directory . EnumerateFiles ( Path . Combine ( intermediateOutputPath , "staticwebassets" , "importmaphtml" , "build" ) , "*.html" ) . Single ( ) ;
6667 var endpointsManifestPath = Path . Combine ( intermediateOutputPath , $ "staticwebassets.build.endpoints.json") ;
6768
68- AssertImportMapInHtml ( indexHtmlPath , endpointsManifestPath , assetMainJs ) ;
69+ AssertImportMapInHtml ( indexHtmlPath , endpointsManifestPath , scriptPath ) ;
6970 }
7071
7172 [ Theory ]
7273 [ MemberData ( nameof ( WriteImportMapToHtmlData ) ) ]
73- public void Publish_WriteImportMapToHtml ( string testAsset , bool assetMainJs )
74+ public void Publish_WriteImportMapToHtml ( string testAsset , string scriptPath , string scriptPathWithFingerprintPattern )
7475 {
7576 ProjectDirectory = CreateAspNetSdkTestAsset ( testAsset ) ;
77+ ReplaceStringInIndexHtml ( ProjectDirectory , scriptPath , scriptPathWithFingerprintPattern ) ;
7678
7779 var projectName = Path . GetFileNameWithoutExtension ( Directory . EnumerateFiles ( ProjectDirectory . TestRoot , "*.csproj" ) . Single ( ) ) ;
7880
7981 var publish = CreatePublishCommand ( ProjectDirectory ) ;
8082 ExecuteCommand ( publish , "-p:WriteImportMapToHtml=true" ) . Should ( ) . Pass ( ) ;
8183
8284 var outputPath = publish . GetOutputDirectory ( DefaultTfm , "Debug" ) . ToString ( ) ;
83- var indexHtmlPath = Path . Combine ( outputPath , "wwwroot" , "index.html" ) ;
85+ var indexHtmlOutputPath = Path . Combine ( outputPath , "wwwroot" , "index.html" ) ;
8486 var endpointsManifestPath = Path . Combine ( outputPath , $ "{ projectName } .staticwebassets.endpoints.json") ;
8587
86- AssertImportMapInHtml ( indexHtmlPath , endpointsManifestPath , assetMainJs ) ;
88+ AssertImportMapInHtml ( indexHtmlOutputPath , endpointsManifestPath , scriptPath ) ;
8789 }
8890
89- private void AssertImportMapInHtml ( string indexHtmlPath , string endpointsManifestPath , bool assetMainJs )
91+ private void ReplaceStringInIndexHtml ( TestAsset testAsset , string scriptPath , string scriptPathWithFingerprintPattern )
92+ {
93+ if ( scriptPathWithFingerprintPattern != null )
94+ {
95+ var indexHtmlPath = Path . Combine ( testAsset . TestRoot , "wwwroot" , "index.html" ) ;
96+ var indexHtmlContent = File . ReadAllText ( indexHtmlPath ) ;
97+ var newIndexHtmlContent = indexHtmlContent . Replace ( scriptPath , scriptPathWithFingerprintPattern ) ;
98+ if ( indexHtmlContent == newIndexHtmlContent )
99+ throw new Exception ( $ "Script replacement '{ scriptPath } ' for '{ scriptPathWithFingerprintPattern } ' didn't produce any change in '{ indexHtmlPath } '") ;
100+
101+ File . WriteAllText ( indexHtmlPath , newIndexHtmlContent ) ;
102+ }
103+ }
104+
105+ private void AssertImportMapInHtml ( string indexHtmlPath , string endpointsManifestPath , string scriptPath )
90106 {
91107 var indexHtmlContent = File . ReadAllText ( indexHtmlPath ) ;
92108 var endpoints = JsonSerializer . Deserialize < StaticWebAssetEndpointsManifest > ( File . ReadAllText ( endpointsManifestPath ) ) ;
93109
94- if ( assetMainJs )
95- {
96- var mainJs = GetFingerprintedPath ( "main.js" ) ;
97- Assert . DoesNotContain ( "src=\" main.js\" " , indexHtmlContent ) ;
98- Assert . Contains ( $ "src=\" { mainJs } \" ", indexHtmlContent ) ;
99- }
110+ var fingerprintedScriptPath = GetFingerprintedPath ( scriptPath ) ;
111+ Assert . DoesNotContain ( $ "src=\" { scriptPath } \" ", indexHtmlContent ) ;
112+ Assert . Contains ( $ "src=\" { fingerprintedScriptPath } \" ", indexHtmlContent ) ;
100113
101114 Assert . Contains ( GetFingerprintedPath ( "_framework/dotnet.js" ) , indexHtmlContent ) ;
102115 Assert . Contains ( GetFingerprintedPath ( "_framework/dotnet.native.js" ) , indexHtmlContent ) ;
103116 Assert . Contains ( GetFingerprintedPath ( "_framework/dotnet.runtime.js" ) , indexHtmlContent ) ;
104117
105118 string GetFingerprintedPath ( string route )
106- => endpoints . Endpoints . FirstOrDefault ( e => e . Route == route && e . Selectors . Length == 0 ) ? . AssetFile ?? throw new Exception ( $ "Missing endpoint for file '{ route } '") ;
119+ => endpoints . Endpoints . FirstOrDefault ( e => e . Route == route && e . Selectors . Length == 0 ) ? . AssetFile ?? throw new Exception ( $ "Missing endpoint for file '{ route } ' in ' { endpointsManifestPath } ' ") ;
107120 }
108121}
0 commit comments