chore: fixing merge conflicts Refs: PL-240

Author: mikkojamG

.env

@@ -1,4 +1,4 @@
-PORT=8080
+PORT=3000
 # In milliseconds
 SSR_FETCH_TIMEOUT=2500
 

compose.yml

@@ -10,6 +10,6 @@ services:
       - .env
       - .env.local
     volumes:
-      - ".:/servicemap-ui"
-      - "/servicemap-ui/node_modules"
+      - ".:/app"
+      - "/app/node_modules"
     container_name: servicemap-ui

package.json

@@ -63,7 +63,7 @@
     "vitest": "^3.2.4"
   },
   "scripts": {
-    "build": "rm -rf dist && pnpm update-runtime-env && pnpm build:client && pnpm build:server && && cp public/env-config.js dist/",
+    "build": "rm -rf dist && pnpm update-runtime-env && pnpm build:client && pnpm build:server",
     "build:client": "vite build --outDir dist/client --ssrManifest",
     "build:server": "vite build --ssr server/server-entry.js --outDir dist/server",
     "dev": "pnpm update-runtime-env && node server.mjs",