Upgrade CRA and use MvcReact

ucdavis · Jun 16, 2023 · 0e43927 · 0e43927
1 parent cc9b849
commit 0e43927
Show file tree

Hide file tree

Showing 16 changed files with 15,578 additions and 14,403 deletions.
diff --git a/Anlab.Mvc/AnlabMvc.csproj b/Anlab.Mvc/AnlabMvc.csproj
@@ -26,7 +26,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.2" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.2" />
 		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.2" />
-		<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.2" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
 			<PrivateAssets>all</PrivateAssets>
@@ -36,6 +35,7 @@
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.2" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.2" />
+		<PackageReference Include="MvcReact" Version="1.0.1" />
 		<PackageReference Include="Serilog" Version="2.10.0" />
 		<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
 		<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="1.1.4" />
@@ -123,11 +123,11 @@
 		</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 install --legacy-peer-deps" />
 	</Target>
 	<Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
 		<!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
-		<Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
+		<Exec WorkingDirectory="$(SpaRoot)" Command="npm install --legacy-peer-deps" />
 		<Exec WorkingDirectory="$(SpaRoot)" Command="npm run build" />
 		<!-- Include the newly-built files in the publish output -->
 		<ItemGroup>

diff --git a/Anlab.Mvc/ClientApp/.env.development b/Anlab.Mvc/ClientApp/.env.development
@@ -0,0 +1 @@
+WDS_SOCKET_PORT=0
diff --git a/Anlab.Mvc/ClientApp/.npmrc b/Anlab.Mvc/ClientApp/.npmrc
@@ -0,0 +1,2 @@
+# .npmrc
+engine-strict=true