Plug-in PWA support through static web assets

Author: javiercn

src/Components/Blazor/Build/src/targets/ServiceWorkerAssetsManifest.targets

@@ -1,44 +1,26 @@
 <Project>
-  
+
   <PropertyGroup>
     <_BlazorCopyFilesToOutputDirectoryDependsOn>
       $(_BlazorCopyFilesToOutputDirectoryDependsOn);
-      _ComputeServiceWorkerAssetsManifestInputs;
       _WriteServiceWorkerAssetsManifest;
+      ResolveStaticWebAssetsInputs;
     </_BlazorCopyFilesToOutputDirectoryDependsOn>
   </PropertyGroup>
 
+
   <Target Name="_ComputeServiceWorkerAssetsManifestInputs"
           Condition="'$(ServiceWorkerAssetsManifest)' != ''"
-          DependsOnTargets="PrepareBlazorOutputs">
+          BeforeTargets="_ResolveBlazorOutputs">
 
     <PropertyGroup>
       <_ServiceWorkerAssetsManifestIntermediateOutputPath>$(BlazorIntermediateOutputPath)serviceworkerassets.js</_ServiceWorkerAssetsManifestIntermediateOutputPath>
     </PropertyGroup>
 
     <ItemGroup>
-      <!-- Include _framework/* content -->
-      <ServiceWorkerAssetsManifestItem
-        Include="@(BlazorOutputWithTargetPath)"
-        Condition="$([System.String]::Copy('%(BlazorOutputWithTargetPath.TargetOutputPath)').Replace('\','/').StartsWith('dist/'))">
-        <AssetUrl>$([System.String]::Copy('%(BlazorOutputWithTargetPath.TargetOutputPath)').Replace('\','/').Substring(5))</AssetUrl>
-      </ServiceWorkerAssetsManifestItem>
-
-      <!-- Include content from wwwroot -->
-      <ServiceWorkerAssetsManifestItem
-        Include="@(ContentWithTargetPath)"
-        Condition="
-          ('%(ContentWithTargetPath.CopyToPublishDirectory)' == 'Always' OR '%(ContentWithTargetPath.CopyToPublishDirectory)' == 'PreserveNewest')
-          AND $([System.String]::Copy('%(ContentWithTargetPath.TargetPath)').Replace('\','/').StartsWith('wwwroot/'))">
-        <AssetUrl>$([System.String]::Copy('%(ContentWithTargetPath.TargetPath)').Replace('\','/').Substring(8))</AssetUrl>
-      </ServiceWorkerAssetsManifestItem>
-
-      <!-- Include SWA from references -->
-      <ServiceWorkerAssetsManifestItem
-        Include="@(StaticWebAsset)"
-        Condition="'%(StaticWebAsset.SourceType)' != ''">
-        <AssetUrl>%(StaticWebAsset.BasePath)/%(StaticWebAsset.RelativePath)</AssetUrl>
-      </ServiceWorkerAssetsManifestItem>
+      <BlazorOutputWithTargetPath Condition="'$(ServiceWorkerAssetsManifest)' != ''"
+        Include="$(_ServiceWorkerAssetsManifestIntermediateOutputPath)"
+        TargetOutputPath="$(BaseBlazorDistPath)$(ServiceWorkerAssetsManifest)" />
     </ItemGroup>
 
   </Target>
@@ -56,16 +38,19 @@
       OutputPath="$(_ServiceWorkerAssetsManifestIntermediateOutputPath)" />
 
     <ItemGroup>
-      <BlazorOutputWithTargetPath
-        Include="$(_ServiceWorkerAssetsManifestIntermediateOutputPath)"
-        TargetOutputPath="$(BaseBlazorDistPath)$(ServiceWorkerAssetsManifest)" />
-      
       <FileWrites Include="$(_ServiceWorkerAssetsManifestIntermediateOutputPath)" />
     </ItemGroup>
 
   </Target>
 
   <Target Name="_ComputeServiceWorkerAssetsManifestFileHashes">
+
+    <ItemGroup>
+      <ServiceWorkerAssetsManifestItem Include="%(StaticWebAsset.Identity)" Condition="'%(RelativePath)' != '$(ServiceWorkerAssetsManifest)'">
+        <AssetUrl>$([System.String]::Copy('$([System.String]::Copy('%(StaticWebAsset.BasePath)').TrimEnd('/'))/%(StaticWebAsset.RelativePath)').Replace('\','/').TrimStart('/'))</AssetUrl>
+      </ServiceWorkerAssetsManifestItem>
+    </ItemGroup>
+
     <GetFileHash Files="@(ServiceWorkerAssetsManifestItem)" Algorithm="SHA256" HashEncoding="base64">
       <Output TaskParameter="Items" ItemName="_ServiceWorkerAssetsManifestItemWithHash" />
     </GetFileHash>
@@ -94,5 +79,5 @@
       <ServiceWorkerAssetsManifestVersion>$([System.String]::Copy('%(_ServiceWorkerAssetsManifestCombinedHash.FileHash)').Substring(0, 8))</ServiceWorkerAssetsManifestVersion>
     </PropertyGroup>
   </Target>
-  
+
 </Project>

src/Components/Blazor/Build/src/targets/StaticWebAssets.targets

@@ -2,7 +2,7 @@
 
   <Target Name="_ResolveBlazorGeneratedAssets" DependsOnTargets="PrepareBlazorOutputs">
     <ItemGroup>
-      <StaticWebAsset Include="@(BlazorOutputWithTargetPath->'$(TargetDir)%(TargetOutputPath)')" RemoveMetadata="TargetOutputPath">
+      <StaticWebAsset Include="@(BlazorOutputWithTargetPath->'%(FullPath)')" RemoveMetadata="TargetOutputPath">
         <SourceType></SourceType>
         <SourceId>$(PackageId)</SourceId>
         <ContentRoot>$([MSBuild]::NormalizeDirectory('$(TargetDir)dist\'))</ContentRoot>
@@ -14,7 +14,7 @@
            These files are not "external" in the "traditional" sense but it is fine for now as this is an implementation detail.
            We only need to do this for the standalone case, for hosted scenarios this works just fine as the assets are considered
            external. -->
-      <_ExternalStaticWebAsset Include="@(BlazorOutputWithTargetPath->'$(TargetDir)%(TargetOutputPath)')">
+      <_ExternalStaticWebAsset Include="@(BlazorOutputWithTargetPath->'%(FullPath)')">
         <SourceId>$(PackageId)</SourceId>
         <!-- We just do this to keep the existing implementation happy. We will update this in the next release. -->
         <SourceType>Generated</SourceType>
@@ -100,7 +100,7 @@
         <RelativePath>$([MSBuild]::MakeRelative('$(MSBuildProjectDirectory)', '$([MSBuild]::NormalizePath('$([System.Text.RegularExpressions.Regex]::Replace('%(RelativePath)','^wwwroot\\?\/?(.*)','$(BlazorPublishDistDir)$1'))'))'))</RelativePath>
       </_StandaloneExternalPublishStaticWebAsset>
 
-      <_CurrentProjectWwwrootStaticWebAsset Include="@(StaticWebAsset)" Exclude="@(BlazorOutputWithTargetPath->'$(TargetDir)%(TargetOutputPath)')" Condition="'%(StaticWebAsset.SourceType)' == ''" />
+      <_CurrentProjectWwwrootStaticWebAsset Include="@(StaticWebAsset)" Exclude="@(BlazorOutputWithTargetPath->'%(FullPath)')" Condition="'%(StaticWebAsset.SourceType)' == ''" />
 
       <_StandaloneWwwrootCurrentProjectPublishStaticWebAsset Include="%(_CurrentProjectWwwrootStaticWebAsset.Identity)">
         <RelativePath>$(BlazorPublishDistDir)%(RelativePath)</RelativePath>

src/ProjectTemplates/BlazorWasm.ProjectTemplates/BlazorWasm-CSharp.Client.csproj.in

@@ -20,14 +20,10 @@
 
   <!--#endif -->
   <!--#if PWA -->
-  <ItemGroup>
-    <!-- When publishing, swap service-worker.published.js in place of service-worker.js -->
-    <Content Update="wwwroot\service-worker*.js" CopyToPublishDirectory="false" />
-    <ContentWithTargetPath Include="wwwroot\service-worker.published.js">
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <TargetPath>wwwroot\service-worker.js</TargetPath>
-    </ContentWithTargetPath>
+  <!-- When publishing, swap service-worker.published.js in place of service-worker.js -->
+  <ItemGroup Condition="'$(DesignTimeBuild)' != 'true'">
+    <Content Remove="wwwroot\service-worker.js" />
+    <Content Update="wwwroot\service-worker.published.js" Link="wwwroot\service-worker.js" />
   </ItemGroup>
-
   <!--#endif -->
 </Project>