From 32a141c7d35f95f3a6cc91610224dd8c1ab6a93c Mon Sep 17 00:00:00 2001
From: martin <me@martials.no>
Date: Wed, 2 Aug 2023 22:22:18 +0200
Subject: [PATCH] Changed npm commands to pnpm, updated node version in docker
 to LTS

---
 .idea/.idea.pac-man-board-game/.idea/compiler.xml |  6 ------
 pac-man-board-game/Dockerfile                     |  3 +--
 pac-man-board-game/pac-man-board-game.csproj      | 10 +++++-----
 3 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 .idea/.idea.pac-man-board-game/.idea/compiler.xml

diff --git a/.idea/.idea.pac-man-board-game/.idea/compiler.xml b/.idea/.idea.pac-man-board-game/.idea/compiler.xml
deleted file mode 100644
index 9014410..0000000
--- a/.idea/.idea.pac-man-board-game/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="TypeScriptCompiler">
-    <option name="showAllErrors" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/pac-man-board-game/Dockerfile b/pac-man-board-game/Dockerfile
index f508d39..cf33e21 100644
--- a/pac-man-board-game/Dockerfile
+++ b/pac-man-board-game/Dockerfile
@@ -5,8 +5,7 @@ EXPOSE 443
 
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 
-# Install Node.js TODO use node 18?
-RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
     && apt-get install -y \
         nodejs \
     && rm -rf /var/lib/apt/lists/*
diff --git a/pac-man-board-game/pac-man-board-game.csproj b/pac-man-board-game/pac-man-board-game.csproj
index a6a781e..5f2e404 100644
--- a/pac-man-board-game/pac-man-board-game.csproj
+++ b/pac-man-board-game/pac-man-board-game.csproj
@@ -9,7 +9,7 @@
         <SpaRoot>ClientApp\</SpaRoot>
         <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
         <SpaProxyServerUrl>https://localhost:3000</SpaProxyServerUrl>
-        <SpaProxyLaunchCommand>npm run dev</SpaProxyLaunchCommand>
+        <SpaProxyLaunchCommand>pnpm dev</SpaProxyLaunchCommand>
         <RootNamespace>pacMan</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -65,14 +65,14 @@
             <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" />
+        <Message Importance="high" Text="Restoring dependencies using 'pnpm'. This may take several minutes..." />
+        <Exec WorkingDirectory="$(SpaRoot)" Command="pnpm install" />
     </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 run build" />
+        <Exec WorkingDirectory="$(SpaRoot)" Command="pnpm install" />
+        <Exec WorkingDirectory="$(SpaRoot)" Command="pnpm build" />
 
         <!-- Include the newly-built files in the publish output -->
         <ItemGroup>