Merge branch 'main' into feat-endpoint-style-structure

Dockerfile

@@ -18,7 +18,7 @@ RUN npm ci
 # Copy the current directory contents into the container at /api
 COPY /api/ /api/
 # Copy the client side code
-COPY --from=react-client /client/public /client/public
+COPY --from=react-client /client/dist /client/dist
 # Make port 3080 available to the world outside this container
 EXPOSE 3080
 # Expose the server to 0.0.0.0

client/package.json

@@ -70,6 +70,7 @@
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-react": "^7.18.6",
     "@babel/runtime": "^7.20.13",
+    "@vitejs/plugin-react": "^3.1.0",
     "autoprefixer": "^10.4.13",
     "babel-loader": "^9.1.2",
     "babel-plugin-root-import": "^6.6.0",
@@ -92,6 +93,8 @@
     "tailwindcss": "^3.2.6",
     "ts-loader": "^9.4.2",
     "typescript": "^4.9.5",
+    "vite": "^4.2.1",
+    "vite-plugin-html": "^3.2.0",
     "webpack": "^5.77.0",
     "webpack-cli": "^5.0.1",
     "webpack-dev-server": "^4.11.1"

package.json

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {
-    "@vitejs/plugin-react": "^3.1.0",
-    "vite": "^4.2.1",
-    "vite-plugin-html": "^3.2.0"
-  }
-}