From 7b28f1657ba59ce8a48fb9970dd638d250cc3e4b Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Tue, 28 Sep 2021 09:29:23 -0700
Subject: [PATCH 1/3] Deal with computed assets

---
 ...spNetCore.Components.CustomElements.csproj |  2 ++
 .../js/WebpackBuild.targets                   | 35 ++++++++-----------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/Microsoft.AspNetCore.Components.CustomElements.csproj b/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/Microsoft.AspNetCore.Components.CustomElements.csproj
index c078114ef..2963f2b9d 100644
--- a/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/Microsoft.AspNetCore.Components.CustomElements.csproj
+++ b/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/Microsoft.AspNetCore.Components.CustomElements.csproj
@@ -3,6 +3,8 @@
   <Import Project="js\WebpackBuild.targets" />
 
   <PropertyGroup>
+    <NpmFolder>js\</NpmFolder>
+    <NpmCommand>npm run build:$(Configuration)</NpmCommand>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>true</IsPackable>
diff --git a/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/js/WebpackBuild.targets b/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/js/WebpackBuild.targets
index db4abab0c..acf313ba8 100644
--- a/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/js/WebpackBuild.targets
+++ b/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/js/WebpackBuild.targets
@@ -1,38 +1,33 @@
 <Project>
 
   <PropertyGroup>
-    <WebpackOutputFile>wwwroot\BlazorCustomElements.js</WebpackOutputFile>
+    <DefaultItemExcludes>**\dist\**;**\*.targets;$(DefaultItemExcludes)</DefaultItemExcludes>
   </PropertyGroup>
-
+  
   <ItemGroup>
-    <WebpackBuildInputs Include="$(MSBuildThisFileDirectory)**" Exclude="$(MSBuildThisFileDirectory)node_modules\**" />
-    <WebpackBuildInputs Include="$(BaseIntermediateOutputPath)webpackconfig.txt" />
-    <UpToDateCheckInput Include="@(WebpackBuildInputs)" />
+    <NpmBuildInputs Include="$(NpmFolder)**" Exclude="$(DefaultItemExcludes)" />
   </ItemGroup>
 
   <!-- If package-lock.json has changed, perform an NPM install -->
-  <Target Name="NpmInstall"
-          Inputs="$(MSBuildThisFileDirectory)package-lock.json"
-          Outputs="$(BaseIntermediateOutputPath)package-lock.json">
+  <Target Name="NpmInstall" Inputs="$(NpmFolder)package-lock.json" Outputs="$(NpmFolder)node_modules\.package-lock.json">
     <Message Importance="high" Text="Running npm install..." />
-    <Exec Command="npm install" WorkingDirectory="$(MSBuildThisFileDirectory)" />
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)package-lock.json"
-          DestinationFolder="$(BaseIntermediateOutputPath)" />
+    <Exec Command="npm install" WorkingDirectory="$(NpmFolder)" />
   </Target>
 
-  <!-- If any source file in this dir or below has changed, perform a Webpack build -->
-  <Target Name="TrackWebpackBuildConfig">
-    <WriteLinesToFile File="$(BaseIntermediateOutputPath)webpackconfig.txt" Lines="$(Configuration)" Overwrite="true" WriteOnlyWhenDifferent="true" />
+  <Target Name="NpmRunBuild" DependsOnTargets="NpmInstall" Inputs="@(NpmBuildInputs)" Outputs="$(IntermediateOutputPath)npmbuild.complete.txt">
+    <Exec Command="$(NpmCommand) -- -o $(IntermediateOutputPath)\npm" WorkingDirectory="$(NpmFolder)" />
   </Target>
 
-  <Target Name="WebpackBuild" DependsOnTargets="NpmInstall; TrackWebpackBuildConfig" BeforeTargets="AssignTargetPaths"
-          Inputs="@(WebpackBuildInputs)"
-          Outputs="$(WebpackOutputFile)">
-    <Exec Command="npm run build:$(Configuration)" WorkingDirectory="$(MSBuildThisFileDirectory)" />
+  <Target Name="IncludeNpmBuildOuputs" DependsOnTargets="NpmRunBuild" BeforeTargets="AssignTargetPaths">
     <ItemGroup>
-      <Content Remove="$(WebpackOutputFile)" />
-      <Content Include="$(WebpackOutputFile)" />
+      <_NpmOutput Include="$(IntermediateOutputPath)\npm\**"></_NpmOutput>
+      <Content Include="@(_NpmOutput)" Link="wwwroot\%(_NpmOutput.RecursiveDir)\%(_NpmOutput.FileName)%(_NpmOutput.Extension)" />
+      <FileWrites Include="$(IntermediateOutputPath)npmbuild.complete.txt" />
     </ItemGroup>
+    <GetFileHash Files="@(_NpmOutput)">
+      <Output TaskParameter="Items" ItemName="_NpmOutputWithHash" />
+    </GetFileHash>
+    <WriteLinesToFile File="$(IntermediateOutputPath)npmbuild.complete.txt" Lines="@(_NpmOutputWithHash->'%(Identity): %(FileHash)')" WriteOnlyWhenDifferent="true" />
   </Target>
 
 </Project>

From 1725929b45b9838ef371f97a6687b3e2953db617 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Tue, 28 Sep 2021 09:53:52 -0700
Subject: [PATCH 2/3] Merge targets

---
 .../js/WebpackBuild.targets                                  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/js/WebpackBuild.targets b/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/js/WebpackBuild.targets
index acf313ba8..ee358b868 100644
--- a/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/js/WebpackBuild.targets
+++ b/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/js/WebpackBuild.targets
@@ -14,16 +14,15 @@
     <Exec Command="npm install" WorkingDirectory="$(NpmFolder)" />
   </Target>
 
-  <Target Name="NpmRunBuild" DependsOnTargets="NpmInstall" Inputs="@(NpmBuildInputs)" Outputs="$(IntermediateOutputPath)npmbuild.complete.txt">
+  <Target Name="NpmRunBuild" DependsOnTargets="NpmInstall" BeforeTargets="AssignTargetPaths" Inputs="@(NpmBuildInputs)" Outputs="$(IntermediateOutputPath)npmbuild.complete.txt">
     <Exec Command="$(NpmCommand) -- -o $(IntermediateOutputPath)\npm" WorkingDirectory="$(NpmFolder)" />
-  </Target>
 
-  <Target Name="IncludeNpmBuildOuputs" DependsOnTargets="NpmRunBuild" BeforeTargets="AssignTargetPaths">
     <ItemGroup>
       <_NpmOutput Include="$(IntermediateOutputPath)\npm\**"></_NpmOutput>
       <Content Include="@(_NpmOutput)" Link="wwwroot\%(_NpmOutput.RecursiveDir)\%(_NpmOutput.FileName)%(_NpmOutput.Extension)" />
       <FileWrites Include="$(IntermediateOutputPath)npmbuild.complete.txt" />
     </ItemGroup>
+
     <GetFileHash Files="@(_NpmOutput)">
       <Output TaskParameter="Items" ItemName="_NpmOutputWithHash" />
     </GetFileHash>

From b66126c318199dcdb1980ae7fef7f3d113e38ff5 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Tue, 28 Sep 2021 10:19:27 -0700
Subject: [PATCH 3/3] Further simplify targets

---
 .../js/WebpackBuild.targets                                  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/js/WebpackBuild.targets b/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/js/WebpackBuild.targets
index ee358b868..bca03e59e 100644
--- a/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/js/WebpackBuild.targets
+++ b/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/js/WebpackBuild.targets
@@ -23,10 +23,7 @@
       <FileWrites Include="$(IntermediateOutputPath)npmbuild.complete.txt" />
     </ItemGroup>
 
-    <GetFileHash Files="@(_NpmOutput)">
-      <Output TaskParameter="Items" ItemName="_NpmOutputWithHash" />
-    </GetFileHash>
-    <WriteLinesToFile File="$(IntermediateOutputPath)npmbuild.complete.txt" Lines="@(_NpmOutputWithHash->'%(Identity): %(FileHash)')" WriteOnlyWhenDifferent="true" />
+    <WriteLinesToFile File="$(IntermediateOutputPath)npmbuild.complete.txt" Lines="@(_NpmOutput)" />
   </Target>
 
 </Project>