-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Write import map to html files #46233
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.
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
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
e882406
Copy code from prototype
maraf ef4843e
Don't generate the manifest to temp file, compute it on the fly
maraf 3550dc0
Build logic
maraf fcf527f
Remove CSS fingerprinting
maraf a4582e2
Remove wasm from msbuild property name
maraf ca1578d
Remove JS fingerprinting
maraf ea7f7fd
Use empty script type=importmap as a placeholder
maraf 1d8d137
Operate directly on endpoints
maraf fab6429
Operate directly on endpoints
maraf 9709397
Use fingerprint pattern
maraf 45bf5d7
Publish integration
maraf b212724
Fix getting publish HTML files
maraf 79e5fb7
Publish test
maraf ebd6e55
Build test
maraf c31496e
Enable dotnet.js fingerprinting when targeting .NET 10 or newer
maraf 25a271f
Refactor targets based on JSModule pattern
maraf 961c36e
Swap order of dependencies
maraf f0d4ea4
Revert changes to GenerateStaticWebAssetEndpointsManifest
maraf 1221414
Merge branch 'main' into maraf/HtmlImportMap
maraf b5ee5a5
Don't set WasmFingerprintDotnetJs for .NET 10+
maraf b75bdc9
Feedback on file write & intermediate path
maraf fb1e38a
Fix build test intermediate path
maraf 06f82a6
Make compression publish dependant HtmlImportMap
maraf ead64d1
Add service worker dependency
maraf 60b51ff
Remove endpoints for removed html assets
maraf 65fbbab
Merge remote-tracking branch 'upstream/main' into maraf/HtmlImportMap
maraf 33e661a
Run the tests for blazor wasm as well. Remove explicit WasmFingerprin…
maraf 8af2378
Fix reading project name
maraf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
212 changes: 212 additions & 0 deletions
212
src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.HtmlImportMap.targets
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,212 @@ | ||
<!-- | ||
*********************************************************************************************** | ||
Microsoft.NET.Sdk.StaticWebAssets.HtmlImportMap.targets | ||
|
||
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have | ||
created a backup copy. Incorrect changes to this file will make it | ||
impossible to load or build your projects from the command-line or the IDE. | ||
|
||
Copyright (c) .NET Foundation. All rights reserved. | ||
*********************************************************************************************** | ||
--> | ||
|
||
<Project ToolsVersion="14.0"> | ||
|
||
<UsingTask TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.WriteImportMapToHtml" AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)" /> | ||
|
||
<PropertyGroup> | ||
|
||
<!-- | ||
ResolveBuildRelatedStaticWebAssets | ||
ResolveHtmlImportMapBuildStaticWebAssets | ||
GenerateHtmlImportMapBuildStaticWebAssets | ||
ResolveHtmlImportMapBuildConfiguration | ||
--> | ||
<ResolveBuildRelatedStaticWebAssetsDependsOn> | ||
$(ResolveBuildRelatedStaticWebAssetsDependsOn); | ||
ResolveHtmlImportMapBuildStaticWebAssets; | ||
</ResolveBuildRelatedStaticWebAssetsDependsOn> | ||
<ResolveCompressedFilesDependsOn> | ||
$(ResolveCompressedFilesDependsOn); | ||
ResolveHtmlImportMapBuildStaticWebAssets | ||
</ResolveCompressedFilesDependsOn> | ||
<ResolveBuildServiceWorkerStaticWebAssetsDependsOn> | ||
$(ResolveBuildServiceWorkerStaticWebAssetsDependsOn); | ||
ResolveHtmlImportMapBuildStaticWebAssets | ||
</ResolveBuildServiceWorkerStaticWebAssetsDependsOn> | ||
<ResolveHtmlImportMapBuildStaticWebAssetsDependsOn> | ||
GenerateHtmlImportMapBuildStaticWebAssets; | ||
$(ResolveHtmlImportMapBuildStaticWebAssetsDependsOn) | ||
</ResolveHtmlImportMapBuildStaticWebAssetsDependsOn> | ||
<GenerateHtmlImportMapBuildStaticWebAssetsDependsOn> | ||
ResolveHtmlImportMapBuildConfiguration; | ||
$(GenerateHtmlImportMapBuildStaticWebAssetsDependsOn) | ||
</GenerateHtmlImportMapBuildStaticWebAssetsDependsOn> | ||
|
||
<!-- | ||
ResolvePublishRelatedStaticWebAssets | ||
ResolveHtmlImportMapPublishStaticWebAssets | ||
GenerateHtmlImportMapPublishStaticWebAssets | ||
ResolveHtmlImportMapPublishConfiguration | ||
--> | ||
<ResolvePublishRelatedStaticWebAssetsDependsOn> | ||
$(ResolvePublishRelatedStaticWebAssetsDependsOn); | ||
ResolveHtmlImportMapPublishStaticWebAssets | ||
</ResolvePublishRelatedStaticWebAssetsDependsOn> | ||
<ResolvePublishCompressedStaticWebAssetsDependsOn> | ||
$(ResolvePublishCompressedStaticWebAssetsDependsOn); | ||
ResolveHtmlImportMapPublishStaticWebAssets | ||
</ResolvePublishCompressedStaticWebAssetsDependsOn> | ||
<ResolvePublishServiceWorkerStaticWebAssetsDependsOn> | ||
$(ResolvePublishServiceWorkerStaticWebAssetsDependsOn); | ||
ResolveHtmlImportMapPublishStaticWebAssets | ||
</ResolvePublishServiceWorkerStaticWebAssetsDependsOn> | ||
<ResolveHtmlImportMapPublishStaticWebAssetsDependsOn> | ||
GenerateHtmlImportMapPublishStaticWebAssets; | ||
$(ResolveHtmlImportMapPublishStaticWebAssetsDependsOn) | ||
</ResolveHtmlImportMapPublishStaticWebAssetsDependsOn> | ||
<GenerateHtmlImportMapPublishStaticWebAssetsDependsOn> | ||
ResolveHtmlImportMapPublishConfiguration; | ||
$(GenerateHtmlImportMapPublishStaticWebAssetsDependsOn) | ||
</GenerateHtmlImportMapPublishStaticWebAssetsDependsOn> | ||
|
||
</PropertyGroup> | ||
|
||
<!-- Build --> | ||
|
||
<Target Name="ResolveHtmlImportMapBuildConfiguration"> | ||
<PropertyGroup> | ||
<_BuildImportMapHtmlPath>$([MSBuild]::NormalizeDirectory($(_StaticWebAssetsIntermediateOutputPath), 'importmaphtml', 'build'))</_BuildImportMapHtmlPath> | ||
</PropertyGroup> | ||
|
||
<MakeDir Directories="$(_BuildImportMapHtmlPath)"/> | ||
|
||
<ItemGroup> | ||
<_HtmlStaticWebAssets Include="@(StaticWebAsset)" Condition="'%(AssetKind)' != 'Publish' and '%(Extension)' == '.html'" /> | ||
maraf marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<_EsModuleCandidate Include="@(StaticWebAsset)" Condition="'%(AssetKind)' != 'Publish'" /> | ||
</ItemGroup> | ||
|
||
<FilterStaticWebAssetEndpoints Condition="'@(_EsModuleCandidate)' != ''" | ||
Endpoints="@(StaticWebAssetEndpoint)" | ||
Assets="@(_EsModuleCandidate)" | ||
Filters="" | ||
> | ||
<Output TaskParameter="FilteredEndpoints" ItemName="_EsModuleCandidateEndpoints" /> | ||
</FilterStaticWebAssetEndpoints> | ||
</Target> | ||
|
||
<Target Name="GenerateHtmlImportMapBuildStaticWebAssets" DependsOnTargets="$(GenerateHtmlImportMapBuildStaticWebAssetsDependsOn)"> | ||
<WriteImportMapToHtml | ||
Endpoints="@(_EsModuleCandidateEndpoints)" | ||
HtmlFiles="@(_HtmlStaticWebAssets)" | ||
OutputPath="$(_BuildImportMapHtmlPath)"> | ||
<Output TaskParameter="HtmlCandidates" ItemName="_HtmlCandidates" /> | ||
<Output TaskParameter="HtmlFilesToRemove" ItemName="_HtmlFilesToRemove" /> | ||
<Output TaskParameter="FileWrites" ItemName="FileWrites" /> | ||
maraf marked this conversation as resolved.
Show resolved
Hide resolved
|
||
</WriteImportMapToHtml> | ||
</Target> | ||
|
||
<Target Name="ResolveHtmlImportMapBuildStaticWebAssets" DependsOnTargets="$(ResolveHtmlImportMapBuildStaticWebAssetsDependsOn)"> | ||
<ItemGroup> | ||
<_HtmlCandidatesNoMetadata | ||
Include="@(_HtmlCandidates)" | ||
RemoveMetadata="SourceType;AssetKind;Integrity;Fingerprint" /> | ||
<_HtmlCandidatesNoMetadata ContentRoot="$(_BuildImportMapHtmlPath)" /> | ||
</ItemGroup> | ||
<DefineStaticWebAssets CandidateAssets="@(_HtmlCandidatesNoMetadata)" | ||
SourceType="Computed" | ||
AssetKind="Build" | ||
> | ||
<Output TaskParameter="Assets" ItemName="_UpdatedHtmlStaticWebAssets" /> | ||
</DefineStaticWebAssets> | ||
<DefineStaticWebAssetEndpoints | ||
CandidateAssets="@(_UpdatedHtmlStaticWebAssets)" | ||
ExistingEndpoints="@(StaticWebAssetEndpoint)" | ||
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)" | ||
> | ||
<Output TaskParameter="Endpoints" ItemName="_UpdatedHtmlStaticWebAssetsEndpoint" /> | ||
</DefineStaticWebAssetEndpoints> | ||
<FilterStaticWebAssetEndpoints Condition="'@(_HtmlFilesToRemove)' != ''" | ||
Endpoints="@(StaticWebAssetEndpoint)" | ||
Assets="@(_HtmlFilesToRemove)" | ||
Filters="" | ||
> | ||
<Output TaskParameter="FilteredEndpoints" ItemName="_HtmlFileEndpointsToRemove" /> | ||
</FilterStaticWebAssetEndpoints> | ||
<ItemGroup> | ||
<StaticWebAsset Remove="@(_HtmlFilesToRemove)" /> | ||
<StaticWebAsset Include="@(_UpdatedHtmlStaticWebAssets)" /> | ||
<StaticWebAssetEndpoint Remove="@(_HtmlFileEndpointsToRemove)" /> | ||
<StaticWebAssetEndpoint Include="@(_UpdatedHtmlStaticWebAssetsEndpoint)" /> | ||
maraf marked this conversation as resolved.
Show resolved
Hide resolved
|
||
</ItemGroup> | ||
</Target> | ||
|
||
<!-- Publish --> | ||
|
||
<Target Name="ResolveHtmlImportMapPublishConfiguration"> | ||
<PropertyGroup> | ||
<_PublishImportMapHtmlPath>$([MSBuild]::NormalizeDirectory($(_StaticWebAssetsIntermediateOutputPath), 'importmaphtml', 'publish'))</_PublishImportMapHtmlPath> | ||
</PropertyGroup> | ||
|
||
<MakeDir Directories="$(_PublishImportMapHtmlPath)"/> | ||
|
||
<ItemGroup> | ||
<_EsModuleCandidateForPublish Include="@(StaticWebAsset)" Condition="'%(AssetKind)' != 'Build'" /> | ||
</ItemGroup> | ||
|
||
<FilterStaticWebAssetEndpoints Condition="'@(_EsModuleCandidateForPublish)' != ''" | ||
Endpoints="@(StaticWebAssetEndpoint)" | ||
Assets="@(_EsModuleCandidateForPublish)" | ||
Filters="" | ||
> | ||
<Output TaskParameter="FilteredEndpoints" ItemName="_EsModuleCandidateForPublishEndpoints" /> | ||
</FilterStaticWebAssetEndpoints> | ||
</Target> | ||
|
||
<Target Name="GenerateHtmlImportMapPublishStaticWebAssets" DependsOnTargets="$(GenerateHtmlImportMapPublishStaticWebAssetsDependsOn)"> | ||
<WriteImportMapToHtml | ||
Endpoints="@(_EsModuleCandidateForPublishEndpoints)" | ||
HtmlFiles="@(_HtmlStaticWebAssets)" | ||
OutputPath="$(_PublishImportMapHtmlPath)"> | ||
<Output TaskParameter="HtmlCandidates" ItemName="_HtmlPublishCandidates" /> | ||
<Output TaskParameter="HtmlFilesToRemove" ItemName="_HtmlPublishFilesToRemove" /> | ||
<Output TaskParameter="FileWrites" ItemName="FileWrites" /> | ||
</WriteImportMapToHtml> | ||
</Target> | ||
|
||
<Target Name="ResolveHtmlImportMapPublishStaticWebAssets" DependsOnTargets="$(ResolveHtmlImportMapPublishStaticWebAssetsDependsOn)"> | ||
<ItemGroup> | ||
<_HtmlPublishCandidatesNoMetadata | ||
Include="@(_HtmlPublishCandidates)" | ||
RemoveMetadata="SourceType;AssetKind;Integrity;Fingerprint" /> | ||
<_HtmlPublishCandidatesNoMetadata ContentRoot="$(_PublishImportMapHtmlPath)" /> | ||
</ItemGroup> | ||
<DefineStaticWebAssets CandidateAssets="@(_HtmlPublishCandidatesNoMetadata)" | ||
SourceType="Computed" | ||
AssetKind="Publish" | ||
> | ||
<Output TaskParameter="Assets" ItemName="_UpdatedHtmlPublishStaticWebAssets" /> | ||
</DefineStaticWebAssets> | ||
<DefineStaticWebAssetEndpoints | ||
CandidateAssets="@(_UpdatedHtmlPublishStaticWebAssets)" | ||
ExistingEndpoints="@(StaticWebAssetEndpoint)" | ||
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)" | ||
> | ||
<Output TaskParameter="Endpoints" ItemName="_UpdatedHtmlPublishStaticWebAssetsEndpoint" /> | ||
</DefineStaticWebAssetEndpoints> | ||
<FilterStaticWebAssetEndpoints Condition="'@(_HtmlPublishFilesToRemove)' != ''" | ||
Endpoints="@(StaticWebAssetEndpoint)" | ||
Assets="@(_HtmlPublishFilesToRemove)" | ||
Filters="" | ||
> | ||
<Output TaskParameter="FilteredEndpoints" ItemName="_HtmlPublishFileEndpointsToRemove" /> | ||
</FilterStaticWebAssetEndpoints> | ||
<ItemGroup> | ||
<StaticWebAsset Remove="@(_HtmlPublishFilesToRemove)" /> | ||
<StaticWebAsset Include="@(_UpdatedHtmlPublishStaticWebAssets)" /> | ||
<StaticWebAssetEndpoint Remove="@(_HtmlPublishFileEndpointsToRemove)" /> | ||
<StaticWebAssetEndpoint Include="@(_UpdatedHtmlPublishStaticWebAssetsEndpoint)" /> | ||
</ItemGroup> | ||
</Target> | ||
|
||
</Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.