From b4699a0df3d6e7da9493cc9b18bbc572f9654a42 Mon Sep 17 00:00:00 2001 From: josselinonduty Date: Sun, 19 Jan 2025 21:37:17 +0100 Subject: [PATCH] fix: update electron version --- Makefile | 5 ++--- package-append.json | 9 ++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 97bbb93..bb24431 100644 --- a/Makefile +++ b/Makefile @@ -41,9 +41,8 @@ prepare: clean install_build_deps # $(foreach p, $(wildcard ./patches/*), patch -p1 -dapp < $(p);) @echo "Append `package-append.json` to the `package.json` of the app" - @echo "Adds electron, elecron-builder dependencies, and build directives" - @head -n -1 app/package.json > tmp.txt && mv tmp.txt app/package.json - @cat package-append.json | tee -a app/package.json + @echo "Adds electron, elecron-builder dependencies, prod and build directives" + @jq -s '.[0] * .[1]' app/package.json package-append.json > app/tmp.json && mv app/tmp.json app/package.json @echo "Download new packages" @npm i diff --git a/package-append.json b/package-append.json index 6bdbeca..4b7e59e 100644 --- a/package-append.json +++ b/package-append.json @@ -1,4 +1,5 @@ - ,"scripts": { +{ + "scripts": { "copy-resources": "mkdir -p resources/linux && cp ../extra/linux/* ./resources/linux", "start": "yarn run copy-resources && electron .", "prepare-flatpak": "electron-builder --linux --dir", @@ -15,13 +16,11 @@ "build-appimage-arm64": "electron-builder --arm64 --linux AppImage" }, "devDependencies": { - "electron": "^13.6.9", + "electron": "^33.2.0", "electron-builder": "^23.0.3" }, "build": { - "files": [ - "**" - ], + "files": ["**"], "directories": { "buildResources": "build", "output": "../artifacts/${arch}"