Skip to content

Commit a1d1567

Browse files
marafpavelsavaraCopilot
authored
[StaticWebAsset] Exclude source maps from updating fingerprinted blazor.js (#49178)
Co-authored-by: Pavel Savara <[email protected]> Co-authored-by: Copilot <[email protected]>
1 parent 7a7cb3e commit a1d1567

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ Copyright (c) .NET Foundation. All rights reserved.
115115
<_BlazorJsFile>
116116
<RelativePath>_framework/%(Filename)%(Extension)</RelativePath>
117117
</_BlazorJsFile>
118+
<!-- Fingerprint only javascript files -->
118119
<_BlazorJSFingerprintPattern Include="Js" Pattern="*.js" Expression="#[.{fingerprint}]!" />
119120

120121
<!-- A missing blazor.webassembly.js is our packaging error. Produce an error so it's discovered early. -->
@@ -158,9 +159,13 @@ Copyright (c) .NET Foundation. All rights reserved.
158159
</Target>
159160

160161
<Target Name="_ReplaceFingerprintedBlazorJsForPublish" DependsOnTargets="ProcessPublishFilesForWasm" Condition="'$(WasmBuildingForNestedPublish)' != 'true' and '$(BlazorFingerprintBlazorJs)' == 'true'">
162+
<PropertyGroup>
163+
<_BlazorJSFileNames>;@(_BlazorJSFile->'%(FileName)');</_BlazorJSFileNames>
164+
</PropertyGroup>
161165
<ItemGroup>
162-
<_BlazorJSStaticWebAsset Include="@(StaticWebAsset)" Condition="'%(FileName)' == '%(_BlazorJSFile.FileName)'" />
163-
<_BlazorJSPublishCandidate Include="%(_BlazorJSStaticWebAsset.RelativeDir)%(_BlazorJSStaticWebAsset.FileName).%(_BlazorJSStaticWebAsset.Fingerprint)%(_BlazorJSStaticWebAsset.Extension)" />
166+
<_BlazorJSJSStaticWebAsset Include="@(StaticWebAsset)" Condition="$(_BlazorJSFileNames.Contains(';%(FileName);')) and '%(Extension)' == '.js'" />
167+
<_BlazorJSPublishCandidate Include="%(_BlazorJSJSStaticWebAsset.RelativeDir)%(_BlazorJSJSStaticWebAsset.FileName).%(_BlazorJSJSStaticWebAsset.Fingerprint)%(_BlazorJSJSStaticWebAsset.Extension)" />
168+
<_BlazorJSPublishCandidate Remove="@(_BlazorJSPublishCandidate)" Condition="'%(Extension)' == '.map'" />
164169
<_BlazorJSPublishCandidate>
165170
<RelativePath>_framework/$([System.IO.Path]::GetFileNameWithoutExtension('%(Filename)'))%(Extension)</RelativePath>
166171
</_BlazorJSPublishCandidate>
@@ -179,36 +184,36 @@ Copyright (c) .NET Foundation. All rights reserved.
179184
AssetTraitValue="boot"
180185
CopyToOutputDirectory="Never"
181186
CopyToPublishDirectory="PreserveNewest"
182-
ContentRoot="%(_BlazorJSStaticWebAsset.ContentRoot)"
183-
BasePath="%(_BlazorJSStaticWebAsset.BasePath)"
187+
ContentRoot="%(_BlazorJSJSStaticWebAsset.ContentRoot)"
188+
BasePath="%(_BlazorJSJSStaticWebAsset.BasePath)"
184189
>
185-
<Output TaskParameter="Assets" ItemName="_BlazorJSPublishStaticWebAssets" />
190+
<Output TaskParameter="Assets" ItemName="_BlazorJSJSPublishStaticWebAssets" />
186191
</DefineStaticWebAssets>
187192
<DefineStaticWebAssetEndpoints
188-
CandidateAssets="@(_BlazorJSPublishStaticWebAssets)"
193+
CandidateAssets="@(_BlazorJSJSPublishStaticWebAssets)"
189194
ExistingEndpoints="@(StaticWebAssetEndpoint)"
190195
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
191196
>
192-
<Output TaskParameter="Endpoints" ItemName="_BlazorJSPublishStaticWebAssetsEndpoint" />
197+
<Output TaskParameter="Endpoints" ItemName="_BlazorJSJSPublishStaticWebAssetsEndpoint" />
193198
</DefineStaticWebAssetEndpoints>
194199
<PropertyGroup>
195-
<_BlazorJSStaticWebAssetFullPath>@(_BlazorJSStaticWebAsset->'%(FullPath)')</_BlazorJSStaticWebAssetFullPath>
200+
<_BlazorJSJSStaticWebAssetFullPath>@(_BlazorJSJSStaticWebAsset->'%(FullPath)')</_BlazorJSJSStaticWebAssetFullPath>
196201
</PropertyGroup>
197202
<ItemGroup>
198-
<_BlazorJSStaticWebAsset Include="@(StaticWebAsset)" Condition="'%(AssetTraitName)' == 'Content-Encoding' and '%(RelatedAsset)' == '$(_BlazorJSStaticWebAssetFullPath)'" />
203+
<_BlazorJSJSStaticWebAsset Include="@(StaticWebAsset)" Condition="'%(AssetTraitName)' == 'Content-Encoding' and '%(RelatedAsset)' == '$(_BlazorJSJSStaticWebAssetFullPath)'" />
199204
</ItemGroup>
200-
<FilterStaticWebAssetEndpoints Condition="'@(_BlazorJSStaticWebAsset)' != ''"
205+
<FilterStaticWebAssetEndpoints Condition="'@(_BlazorJSJSStaticWebAsset)' != ''"
201206
Endpoints="@(StaticWebAssetEndpoint)"
202-
Assets="@(_BlazorJSStaticWebAsset)"
207+
Assets="@(_BlazorJSJSStaticWebAsset)"
203208
Filters=""
204209
>
205210
<Output TaskParameter="FilteredEndpoints" ItemName="_BlazorJSEndpointsToRemove" />
206211
</FilterStaticWebAssetEndpoints>
207212
<ItemGroup>
208-
<StaticWebAsset Remove="@(_BlazorJSStaticWebAsset)" />
209-
<StaticWebAsset Include="@(_BlazorJSPublishStaticWebAssets)" />
213+
<StaticWebAsset Remove="@(_BlazorJSJSStaticWebAsset)" />
214+
<StaticWebAsset Include="@(_BlazorJSJSPublishStaticWebAssets)" />
210215
<StaticWebAssetEndpoint Remove="@(_BlazorJSEndpointsToRemove)" />
211-
<StaticWebAssetEndpoint Include="@(_BlazorJSPublishStaticWebAssetsEndpoint)" />
216+
<StaticWebAssetEndpoint Include="@(_BlazorJSJSPublishStaticWebAssetsEndpoint)" />
212217
</ItemGroup>
213218
</Target>
214219

0 commit comments

Comments
 (0)