Resolve merge conflicts: package.json + regen package-lock

Author: PhilipeSousa

Dockerfile

@@ -1,8 +1,9 @@
+ARG PORT
 FROM node:22-alpine as base
 RUN apk add --no-cache g++ make py3-pip libc6-compat
-WORKDIR /app
+WORKDIR /frontend
 COPY package*.json ./
-EXPOSE ${FRONTEND_PORT}
+EXPOSE ${PORT}
 
 FROM base as builder
 WORKDIR /app
@@ -28,6 +29,7 @@ CMD ["npm", "start"]
 
 FROM base as dev
 ENV NODE_ENV=development
+ENV PORT=${PORT}
 RUN npm install
 COPY . .
-CMD ["npm", "run", "dev"]
+CMD ["npm", "run", "dev", "-p ${PORT}"]