Merge branch 'pr889-fixes' into electron-app

# Conflicts:
#	server/index.js
This commit is contained in:
Simos Mikelatos
2026-06-17 15:45:07 +00:00
25 changed files with 1563 additions and 60 deletions

View File

@@ -33,7 +33,7 @@
"server:dev-watch": "tsx watch --tsconfig server/tsconfig.json server/index.js",
"client": "vite",
"desktop": "electron electron/main.js",
"desktop:dev": "ELECTRON_DEV_URL=http://127.0.0.1:5173 electron electron/main.js",
"desktop:dev": "cross-env ELECTRON_DEV_URL=http://127.0.0.1:5173 electron electron/main.js",
"desktop:pack": "npm run build && electron-builder --dir",
"desktop:dist:mac": "npm run build && electron-builder --mac dmg zip",
"desktop:icon:mac": "node electron/scripts/generate-macos-icon.js",
@@ -198,6 +198,7 @@
"auto-changelog": "^2.5.0",
"autoprefixer": "^10.4.16",
"concurrently": "^8.2.2",
"cross-env": "^10.1.0",
"electron": "^38.0.0",
"electron-builder": "^26.15.3",
"eslint": "^9.39.3",