From 88f22d3bfa573d9509cbec4bc2e9915923ad446b Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Wed, 25 Aug 2021 16:09:31 +0200
Subject: [PATCH] Build: cleaning up the webapp publish step

---
 Kyoo.WebApp/Front              |  2 +-
 Kyoo.WebApp/Kyoo.WebApp.csproj | 36 ++++++++++++++++------------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/Kyoo.WebApp/Front b/Kyoo.WebApp/Front
index e2941691..71aab50c 160000
--- a/Kyoo.WebApp/Front
+++ b/Kyoo.WebApp/Front
@@ -1 +1 @@
-Subproject commit e2941691f3f57523f2094a036bf10017195f1b58
+Subproject commit 71aab50cdef2bb3d2013648f9b253e1becf4fc74
diff --git a/Kyoo.WebApp/Kyoo.WebApp.csproj b/Kyoo.WebApp/Kyoo.WebApp.csproj
index 5c99d8f0..7c1196eb 100644
--- a/Kyoo.WebApp/Kyoo.WebApp.csproj
+++ b/Kyoo.WebApp/Kyoo.WebApp.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
+	<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+	
 	<PropertyGroup>
 		<TargetFramework>net5.0</TargetFramework>
 		<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
@@ -33,22 +35,19 @@
 		</Content>
 	</ItemGroup>
 
-	<Target Name="PublishRunWebpack" BeforeTargets="BeforeBuild;PrepareForPublish;GetCopyToOutputDirectoryItems" 
-			Condition="'$(SkipWebApp)' != 'true' And '$(Configuration)' != 'Debug'">
+	<Target Name="RunWebpack" Condition="'$(SkipWebApp)' != 'true'">
 		<Exec Command="node --version" ContinueOnError="true">
 			<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
 		</Exec>
 		<Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
 		
 		<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
-		<Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
-		<Exec WorkingDirectory="$(SpaRoot)" Command="npm run build -- --prod" />
-		<Exec WorkingDirectory="$(SpaRoot)" Command="npm run build:ssr -- --prod" Condition="'$(BuildServerSideRenderer)' == 'true'" />
+		<Exec WorkingDirectory="$(SpaRoot)" Command="npm install" Condition="'$(Configuration)' != 'Debug' Or !Exists('$(SpaRoot)node_modules')" />
+		<Exec WorkingDirectory="$(SpaRoot)" Command="npm run build -- --prod" Condition="'$(Configuration)' != 'Debug'" />
+		<Exec WorkingDirectory="$(SpaRoot)" Command="npm run build:ssr -- --prod" Condition="'$(Configuration)' != 'Debug' And '$(BuildServerSideRenderer)' == 'true'" />
 	</Target>
 
-	<Target Name="CopyFrontEndFiles" 
-			AfterTargets="PublishRunWebpack" BeforeTargets="BeforeBuild;PrepareForPublish;GetCopyToOutputDirectoryItems"
-			Condition="'$(Configuration)' != 'Debug'">
+	<Target Name="CopyFrontEndFiles" AfterTargets="RunWebpack" BeforeTargets="GetCopyToOutputDirectoryItems" Condition="'$(Configuration)' != 'Debug'">
 		<ItemGroup>
 			<NewContent Include="$(SpaRoot)dist/**; $(SpaRoot)dist-server/**" Visible="false" />
 			<Content Include="@(NewContent)">
@@ -58,18 +57,17 @@
 		</ItemGroup>
 	</Target>
 
-	<Target Name="DebugEnsureNodeEnv" BeforeTargets="Build"
-			Condition="'$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') And '$(SkipWebApp)' != 'true'">
-		<Exec Command="node --version" ContinueOnError="true">
-			<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
-		</Exec>
-		<Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
-		<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
-		<Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
-	</Target>
-
 	<Target Name="SymlinkViews" AfterTargets="Build" Condition="'$(SkipWebApp)' != 'true' And $(Configuration) == 'Debug'">
 		<Exec WorkingDirectory="$(ProjectDir)../Kyoo" Command="ln -fs '$(ProjectDir)' $(OutDir)" Condition="$(OS) == 'Unix'" />
 		<Exec WorkingDirectory="$(ProjectDir)../Kyoo" Command="if not exist  %22$(OutDir)$(ProjectName)%22 mklink /D %22$(OutDir)$(ProjectName)%22 %22$(ProjectDir)%22" Condition="$(OS) != 'Unix'" />
 	</Target>
+
+	<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
+	<PropertyGroup>
+		<BuildDependsOn>
+			RunWebpack;
+			$(BuildDependsOn)
+		</BuildDependsOn>
+	</PropertyGroup>
 </Project>