Cleanup interop build

Author: javiercn

src/Components/Blazor/WebAssembly.Authentication/src/wwwroot/.gitignore renamed to src/Components/Blazor/WebAssembly.Authentication/src/Interop/dist/.gitignore

@@ -4,8 +4,8 @@
   "description": "Interop layer for Microsoft.AspNetCore.Components.WebAssembly.Authentication",
   "scripts": {
     "build": "npm run build:release",
-    "build:release": "webpack --mode production --env.production",
-    "build:debug": "webpack --mode development",
+    "build:release": "webpack --mode production --env.production --env.configuration=Release",
+    "build:debug": "webpack --mode development --env.configuration=Debug",
     "watch": "webpack --watch --mode development"
   },
   "repository": {

src/Components/Blazor/WebAssembly.Authentication/src/Interop/package.json

@@ -19,7 +19,7 @@ module.exports = env => {
         },
         output: {
             filename: 'AuthenticationService.js',
-            path: path.resolve(__dirname, '..', 'wwwroot'),
+            path: path.resolve(__dirname, 'dist', env.configuration),
         },
     };
 };

src/Components/Blazor/WebAssembly.Authentication/src/Interop/webpack.config.js

@@ -8,28 +8,8 @@
     <IsShippingPackage>true</IsShippingPackage>
     <HasReferenceAssembly>false</HasReferenceAssembly>
     <RazorLangVersion>3.0</RazorLangVersion>
-    <YarnWorkingDir>$(MSBuildThisFileDirectory)Interop\</YarnWorkingDir>
-    <ResolveCurrentProjectStaticWebAssetsInputsDependsOn>
-      CompileInterop;
-      $(ResolveCurrentProjectStaticWebAssetsInputsDependsOn)
-    </ResolveCurrentProjectStaticWebAssetsInputsDependsOn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Remove="$(YarnWorkingDir)*" />
-    <Content Remove="wwwroot\.gitignore" />
-    <YarnInputs Include="$(YarnWorkingDir)**" Exclude="$(YarnWorkingDir)node_modules\**;$(YarnWorkingDir)*.d.ts" />
-    <YarnOutputs Include="wwwroot\AuthenticationService.js" />
-    <YarnOutputs Include="wwwroot\AuthenticationService.js.map" />
-    <Content Include="@(YarnOutputs)" />
-    <None Include="Interop\AuthenticationService.ts" />
-    <None Include="Interop\package.json" />
-    <None Include="Interop\tsconfig.json" />
-    <None Include="Interop\webpack.config.js" />
-    <None Include="Interop\yarn.lock" />
-    <None Include="wwwroot\.gitignore" />
-  </ItemGroup>
-
   <ItemGroup>
     <Reference Include="Mono.WebAssembly.Interop" />
     <Reference Include="Microsoft.AspNetCore.Blazor" />
@@ -42,13 +22,66 @@
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests" />
   </ItemGroup>
 
-  <Target Name="CompileInterop" Condition="'$(DesignTimeBuild)' != 'true'" Inputs="@(YarnInputs)" Outputs="@(YarnOutputs)">
+  <PropertyGroup>
+    <YarnWorkingDir>$(MSBuildThisFileDirectory)Interop\</YarnWorkingDir>
+    <ResolveCurrentProjectStaticWebAssetsInputsDependsOn>
+      CompileInterop;
+      $(ResolveCurrentProjectStaticWebAssetsInputsDependsOn)
+    </ResolveCurrentProjectStaticWebAssetsInputsDependsOn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <YarnInputs Include="$(YarnWorkingDir)**" Exclude="$(YarnWorkingDir)node_modules\**;$(YarnWorkingDir)*.d.ts;$(YarnWorkingDir)dist\**" />
+    <YarnOutputs Include="$(YarnWorkingDir)dist\$(Configuration)\AuthenticationService.js" />
+    <YarnOutputs Include="$(YarnWorkingDir)dist\$(Configuration)\AuthenticationService.js.map" Condition="'$(Configuration)' == 'Debug'" />
+
+    <Content Remove="$(YarnWorkingDir)**" />
+    <None Include="$(YarnWorkingDir)*" Exclude="$(YarnWorkingDir)node_modules\**" />
+  </ItemGroup>
+
+  <Target Name="_CreateInteropHash" BeforeTargets="CompileInterop" Condition="'$(DesignTimeBuild)' != 'true'">
+
+    <PropertyGroup>
+      <InteropCompilationCacheFile>$(IntermediateOutputPath)interop.cache</InteropCompilationCacheFile>
+    </PropertyGroup>
+
+    <Hash ItemsToHash="@(YarnInputs)">
+      <Output TaskParameter="HashResult" PropertyName="_YarnInputsHash" />
+    </Hash>
+
+     <WriteLinesToFile
+      Lines="$(_YarnInputsHash)"
+      File="$(InteropCompilationCacheFile)"
+      Overwrite="True"
+      WriteOnlyWhenDifferent="True" />
+
+    <ItemGroup>
+      <FileWrites Include="$(InteropCompilationCacheFile)" />
+    </ItemGroup>
+
+  </Target>
+
+  <Target Name="CompileInterop" Condition="'$(DesignTimeBuild)' != 'true'" Inputs="$(InteropCompilationCacheFile)" Outputs="@(YarnOutputs)">
     <Yarn Command="install --mutex network" WorkingDirectory="$(YarnWorkingDir)" />
     <Yarn Command="run build:release" WorkingDirectory="$(YarnWorkingDir)" Condition="'$(Configuration)' == 'Release'" />
     <Yarn Command="run build:debug" WorkingDirectory="$(YarnWorkingDir)" Condition="'$(Configuration)' == 'Debug'" />
+
     <ItemGroup>
-      <Content Include="$(YarnOutputPattern)" />
+      <_InteropBuildOutput Include="$(YarnWorkingDir)dist\$(Configuration)\**" Exclude="$(YarnWorkingDir)dist\.gitignore" />
+
+      <StaticWebAsset Include="@(_InteropBuildOutput->'%(FullPath)')">
+        <SourceType></SourceType>
+        <SourceId>$(PackageId)</SourceId>
+        <ContentRoot>$([MSBuild]::NormalizeDirectory('$(YarnWorkingDir)\dist\$(Configuration)'))</ContentRoot>
+        <BasePath>_content/$(PackageId)</BasePath>
+        <RelativePath>$([System.String]::Copy('%(RecursiveDir)%(FileName)%(Extension)').Replace('\','/'))</RelativePath>
+      </StaticWebAsset>
+
+      <FileWrites Include="$(_InteropBuildOutput)" />
     </ItemGroup>
+
+    <Message Importance="high" Text="@(_InteropBuildOutput->'Emitted %(FullPath)')" />
+
   </Target>
 
 </Project>