From ea9ef7afd31ee0b80477d6d758d8c29a7dbce7a3 Mon Sep 17 00:00:00 2001
From: Alexander Holliday <ajhollid@gmail.com>
Date: Mon, 1 Sep 2025 09:26:23 -0700
Subject: [PATCH] Revert "develop->master"

---
 client/package.json                | 3 ---
 docker/dist-arm/server.Dockerfile  | 7 ++++---
 docker/dist-mono/server.Dockerfile | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/client/package.json b/client/package.json
index c0bd9314e..611ba5093 100644
--- a/client/package.json
+++ b/client/package.json
@@ -62,8 +62,5 @@
 	},
 	"optionalDependencies": {
 		"@rollup/rollup-linux-arm64-musl": "4.41.0"
-	},
-	"overrides": {
-		"rollup": "^3.29.4"
 	}
 }
diff --git a/docker/dist-arm/server.Dockerfile b/docker/dist-arm/server.Dockerfile
index 8ca7ead24..2b38e47d0 100644
--- a/docker/dist-arm/server.Dockerfile
+++ b/docker/dist-arm/server.Dockerfile
@@ -2,18 +2,19 @@ FROM node:20-slim AS frontend-build
 
 WORKDIR /app/client
 
-COPY client/package.json ./
-RUN npm ci 
+COPY client/package*.json ./
+RUN npm ci --omit=optional
 
 COPY client ./
 RUN npm run build
 
+
 FROM node:20-slim AS backend
 
 WORKDIR /app/server
 
 COPY server/package*.json ./
-RUN npm ci 
+RUN npm ci --omit=optional
 
 COPY server ./
 COPY --from=frontend-build /app/client/dist ./public
diff --git a/docker/dist-mono/server.Dockerfile b/docker/dist-mono/server.Dockerfile
index 4a627719c..778c822f6 100644
--- a/docker/dist-mono/server.Dockerfile
+++ b/docker/dist-mono/server.Dockerfile
@@ -2,7 +2,7 @@ FROM node:20-slim AS frontend-build
 
 WORKDIR /app/client
 
-COPY client/package.json ./
+COPY client/package*.json ./
 RUN npm install
 
 COPY client ./