Merge pull request #2915 from bluewave-labs/develop

develop->master
Merge branch 'master' into develop
2025-09-01 10:33:09 -07:00 · 2025-09-01 10:32:59 -07:00 · 2025-09-01 10:30:51 -07:00 · 2025-09-01 10:28:41 -07:00 · 2025-09-01 10:14:57 -07:00 · 2025-09-01 09:27:03 -07:00
15 changed files with 39 additions and 80 deletions
@@ -21,7 +21,7 @@
 				"dayjs": "1.11.13",
 				"flag-icons": "7.3.2",
 				"html2canvas": "^1.4.1",
-				"i18next": "^24.2.2",
+				"i18next": "25.4.2",
 				"joi": "17.13.3",
 				"mui-color-input": "^6.0.0",
 				"react": "18.3.1",
@@ -46,9 +46,6 @@
 				"eslint-plugin-react-refresh": "^0.4.6",
 				"prettier": "^3.3.3",
 				"vite": "6.3.5"
-			},
-			"optionalDependencies": {
-				"@rollup/rollup-linux-arm64-musl": "4.41.0"
 			}
 		},
 		"node_modules/@ampproject/remapping": {
@@ -283,9 +280,9 @@
 			}
 		},
 		"node_modules/@babel/runtime": {
-			"version": "7.27.1",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz",
-			"integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==",
+			"version": "7.28.3",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.3.tgz",
+			"integrity": "sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
@@ -4072,9 +4069,9 @@
 			}
 		},
 		"node_modules/i18next": {
-			"version": "24.2.3",
-			"resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.3.tgz",
-			"integrity": "sha512-lfbf80OzkocvX7nmZtu7nSTNbrTYR52sLWxPtlXX1zAhVw8WEnFk4puUkCR4B1dNQwbSpEHHHemcZu//7EcB7A==",
+			"version": "25.4.2",
+			"resolved": "https://registry.npmjs.org/i18next/-/i18next-25.4.2.tgz",
+			"integrity": "sha512-gD4T25a6ovNXsfXY1TwHXXXLnD/K2t99jyYMCSimSCBnBRJVQr5j+VAaU83RJCPzrTGhVQ6dqIga66xO2rtd5g==",
 			"funding": [
 				{
 					"type": "individual",
@@ -4091,7 +4088,7 @@
 			],
 			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.26.10"
+				"@babel/runtime": "^7.27.6"
 			},
 			"peerDependencies": {
 				"typescript": "^5"
@@ -26,7 +26,7 @@
 		"dayjs": "1.11.13",
 		"flag-icons": "7.3.2",
 		"html2canvas": "^1.4.1",
-		"i18next": "^24.2.2",
+		"i18next": "25.4.2",
 		"joi": "17.13.3",
 		"mui-color-input": "^6.0.0",
 		"react": "18.3.1",
@@ -59,8 +59,5 @@
 		"eslint-plugin-react-refresh": "^0.4.6",
 		"prettier": "^3.3.3",
 		"vite": "6.3.5"
-	},
-	"optionalDependencies": {
-		"@rollup/rollup-linux-arm64-musl": "4.41.0"
 	}
 }
@@ -5,7 +5,7 @@ import { execSync } from "child_process";

 export default defineConfig(({ mode }) => {
 	const env = loadEnv(mode, process.cwd(), "");
-	let version = "3.1.4";
+	let version = "3.1.5";

 	return {
 		base: "/",
@@ -1,18 +1,9 @@
-FROM node:20-alpine AS build
+FROM node:20-slim AS build

 ENV NODE_OPTIONS="--max-old-space-size=4096"

 WORKDIR /app

-RUN apk add --no-cache \
-    python3 \
-    make g++  \
-    gcc \
-    libc-dev \
-    linux-headers \
-    libusb-dev \
-    eudev-dev
-
 COPY ./client/package*.json ./

 RUN npm install
@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:20-slim

 WORKDIR /app

@@ -1,19 +1,9 @@
-FROM node:20-alpine AS build
+FROM node:20-slim AS build

 ENV NODE_OPTIONS="--max-old-space-size=4096"

 WORKDIR /app

-RUN apk add --no-cache \
-    python3 \
-    make g++  \
-    gcc \
-    libc-dev \
-    linux-headers \
-    libusb-dev \
-    eudev-dev
-
-
 COPY ./client/package*.json ./

 RUN npm install
@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:20-slim

 WORKDIR /app

@@ -1,25 +1,37 @@
-FROM node:20-alpine AS frontend-build
+# ---------------------
+# Frontend build stage
+# ---------------------
+FROM --platform=$BUILDPLATFORM node:24-slim AS frontend-build

 WORKDIR /app/client

 COPY client/package*.json ./
+
 RUN npm ci

 COPY client ./
+
+RUN npm rebuild esbuild
+
 RUN npm run build

-FROM node:20-alpine AS backend
+# ---------------------
+# Backend stage
+# ---------------------
+FROM --platform=$BUILDPLATFORM node:24-slim AS backend

 WORKDIR /app/server

+COPY server/package*.json ./
+
+RUN npm ci
+
 COPY server ./

 COPY --from=frontend-build /app/client/dist ./public

-RUN npm ci
-
 RUN chmod +x ./scripts/inject-vars.sh

 EXPOSE 52345

-CMD ./scripts/inject-vars.sh && node ./src/index.js
+CMD ["sh", "-c", "./scripts/inject-vars.sh && node ./src/index.js"]
@@ -1,4 +1,4 @@
-FROM node:20-alpine AS frontend-build
+FROM node:20-slim AS frontend-build

 WORKDIR /app/client

@@ -8,7 +8,7 @@ RUN npm install
 COPY client ./
 RUN npm run build

-FROM node:20-alpine AS app
+FROM node:20-slim AS app

 WORKDIR /app/server

@@ -1,18 +1,9 @@
-FROM node:20-alpine AS build
+FROM node:20-slim AS build

 ENV NODE_OPTIONS="--max-old-space-size=4096"

 WORKDIR /app

-RUN apk add --no-cache \
-    python3 \
-    make g++  \
-    gcc \
-    libc-dev \
-    linux-headers \
-    libusb-dev \
-    eudev-dev
-
 COPY ./client/package*.json ./

 RUN npm install
@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:20-slim

 WORKDIR /app

@@ -1,18 +1,9 @@
-FROM node:20-alpine AS build
+FROM node:20-slim AS build

 ENV NODE_OPTIONS="--max-old-space-size=4096"

 WORKDIR /app

-RUN apk add --no-cache \
-    python3 \
-    make g++  \
-    gcc \
-    libc-dev \
-    linux-headers \
-    libusb-dev \
-    eudev-dev
-
 COPY ./client/package*.json ./

 RUN npm install
@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:20-slim

 ENV NODE_OPTIONS="--max-old-space-size=2048"

@@ -1,19 +1,9 @@
-FROM node:20-alpine AS build
+FROM node:20-slim AS build

 ENV NODE_OPTIONS="--max-old-space-size=4096"

 WORKDIR /app

-RUN apk add --no-cache \
-    python3 \
-    make g++  \
-    gcc \
-    libc-dev \
-    linux-headers \
-    libusb-dev \
-    eudev-dev
-
-
 COPY ./client/package*.json ./

 RUN npm install
@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:20-slim

 ENV NODE_OPTIONS="--max-old-space-size=2048"
Author	SHA1	Message	Date
Alexander Holliday	7a90a6f9f4	Merge pull request #2915 from bluewave-labs/develop develop->master	2025-09-01 10:33:09 -07:00
Alexander Holliday	b6bebe33fe	Merge branch 'master' into develop	2025-09-01 10:32:59 -07:00
Alexander Holliday	9cf8072c1e	Merge pull request #2914 from bluewave-labs/fix/bump-multiarch-node Fix/bump multiarch node	2025-09-01 10:30:51 -07:00
Alex Holliday	0ca00ca6a1	esbuild	2025-09-01 10:28:41 -07:00
Alex Holliday	619c5242db	bump versions	2025-09-01 10:14:57 -07:00
Alexander Holliday	ff07854590	Merge pull request #2913 from bluewave-labs/revert-2910-fix/alpine-to-slim Revert "pin dependency"	2025-09-01 09:27:03 -07:00
Alexander Holliday	ba99989c66	Revert "pin dependency"	2025-09-01 09:26:51 -07:00
Alexander Holliday	3c75933cf2	Merge pull request #2912 from bluewave-labs/revert-2911-develop Revert "develop->master"	2025-09-01 09:26:35 -07:00
Alexander Holliday	ea9ef7afd3	Revert "develop->master"	2025-09-01 09:26:23 -07:00
Alexander Holliday	f5e633a781	Merge pull request #2911 from bluewave-labs/develop develop->master	2025-09-01 09:23:01 -07:00
Alexander Holliday	90b94816dd	Merge pull request #2910 from bluewave-labs/fix/alpine-to-slim pin dependency	2025-09-01 09:22:26 -07:00
Alex Holliday	11dcaef3ff	pin	2025-09-01 09:21:56 -07:00
Alex Holliday	3f3e7f71ec	pin dependency	2025-09-01 09:21:11 -07:00
Alexander Holliday	b6070572cf	Merge pull request #2909 from bluewave-labs/develop develop->master	2025-09-01 09:15:48 -07:00
Alexander Holliday	e818a02a2a	Merge pull request #2908 from bluewave-labs/fix/alpine-to-slim fix build	2025-09-01 09:15:17 -07:00
Alex Holliday	d8c8e222c8	fix build	2025-09-01 09:14:35 -07:00
Alexander Holliday	f12b9715bc	Merge pull request #2907 from bluewave-labs/develop develop -> master	2025-09-01 09:07:57 -07:00
Alexander Holliday	31c65d3e0b	Merge pull request #2906 from bluewave-labs/fix/alpine-to-slim add omit optional flag	2025-09-01 09:07:21 -07:00
Alex Holliday	fcd6741cf9	add omit optional flag	2025-09-01 09:06:42 -07:00
Alexander Holliday	d663b9230f	Merge pull request #2905 from bluewave-labs/develop Develop -> Master	2025-09-01 09:00:25 -07:00
Alexander Holliday	5f2d61ad7a	Merge pull request #2904 from bluewave-labs/fix/alpine-to-slim remove alpine fix	2025-09-01 08:58:42 -07:00
Alex Holliday	ec80a2dc0b	remove alpine fix	2025-09-01 08:57:55 -07:00
Alexander Holliday	2cece3de59	Merge pull request #2902 from bluewave-labs/develop develop -> master	2025-09-01 08:54:38 -07:00
Alexander Holliday	79eb580802	Merge pull request #2901 from bluewave-labs/fix/alpine-to-slim alpine -> slim	2025-09-01 08:54:10 -07:00
Alex Holliday	b93e3327a7	alpine -> slim	2025-09-01 08:53:03 -07:00