From 546806c40c11bbfc5fd5ae9cfa5c4780cde32e53 Mon Sep 17 00:00:00 2001
From: Aditya Toshniwal <aditya.toshniwal@enterprisedb.com>
Date: Thu, 1 Aug 2024 16:03:05 +0530
Subject: [PATCH] Always use latest version of Electron in package.json and in
 builds

---
 Make.bat                     |  2 +-
 pkg/linux/build-functions.sh |  2 +-
 pkg/mac/build-functions.sh   |  2 +-
 runtime/package.json         |  2 +-
 runtime/yarn.lock            | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Make.bat b/Make.bat
index 724ba5561..10ff1ab37 100644
--- a/Make.bat
+++ b/Make.bat
@@ -278,7 +278,7 @@ REM Main build sequence Ends
     REM Get a fresh copy of electron.
 
     REM WGET
-    FOR /f "tokens=2 delims='" %%i IN ('yarn info electron ^| findstr "latest: "') DO SET "ELECTRON_VERSION=%%i"
+    FOR /f "tokens=*" %%i IN ('npm info electron version') DO SET "ELECTRON_VERSION=%%i"
     :GET_NW
         wget https://github.com/electron/electron/releases/download/v%ELECTRON_VERSION%/electron-v%ELECTRON_VERSION%-win32-x64.zip -O "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64.zip"
         IF %ERRORLEVEL% NEQ 0 GOTO GET_NW
diff --git a/pkg/linux/build-functions.sh b/pkg/linux/build-functions.sh
index fbc4215d7..e679d3af6 100644
--- a/pkg/linux/build-functions.sh
+++ b/pkg/linux/build-functions.sh
@@ -140,7 +140,7 @@ _build_runtime() {
       ELECTRON_ARCH="arm64"
     fi
 
-    ELECTRON_VERSION=$(yarn info electron | grep latest | awk -F "'" '{ print $2}')
+    ELECTRON_VERSION="$(npm info electron version)"
 
     pushd "${BUILDROOT}" > /dev/null || exit
         while true;do
diff --git a/pkg/mac/build-functions.sh b/pkg/mac/build-functions.sh
index c2fb6ad95..5cca43a0f 100644
--- a/pkg/mac/build-functions.sh
+++ b/pkg/mac/build-functions.sh
@@ -33,7 +33,7 @@ _build_runtime() {
       ELECTRON_ARCH="arm64"
     fi
 
-    ELECTRON_VERSION=$(yarn info electron | grep latest | awk -F "'" '{ print $2}')
+    ELECTRON_VERSION="$(npm info electron version)"
 
     pushd "${BUILD_ROOT}" > /dev/null || exit
         while true;do
diff --git a/runtime/package.json b/runtime/package.json
index 66ad7c8b9..4c53bb6c8 100644
--- a/runtime/package.json
+++ b/runtime/package.json
@@ -13,7 +13,7 @@
   "packageManager": "yarn@3.8.2",
   "devDependencies": {
     "@eslint/js": "^9.8.0",
-    "electron": "^31.3.0",
+    "electron": "latest",
     "eslint": "^9.8.0"
   },
   "dependencies": {
diff --git a/runtime/yarn.lock b/runtime/yarn.lock
index 118e1d3de..309381e07 100644
--- a/runtime/yarn.lock
+++ b/runtime/yarn.lock
@@ -613,16 +613,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron@npm:^31.3.0":
-  version: 31.3.0
-  resolution: "electron@npm:31.3.0"
+"electron@npm:latest":
+  version: 31.3.1
+  resolution: "electron@npm:31.3.1"
   dependencies:
     "@electron/get": ^2.0.0
     "@types/node": ^20.9.0
     extract-zip: ^2.0.1
   bin:
     electron: cli.js
-  checksum: 1a41a6e977d1b35c8de175e5a6f601e4339caed1c5901fc38b6469aaf5953c17f650f551190279dd99ae8e75af5099a109acddd23f0a2a4718cb5e6ca538deec
+  checksum: 35e720fced273557a7a5dcab4b4511aa2c01b5b2bbaeffd2a1bdeba86c3aec046bff06def69f83c324e28aca48c953d556a576d4bdea3a1218c54cbd62ca8b18
   languageName: node
   linkType: hard
 
@@ -1485,7 +1485,7 @@ __metadata:
     "@eslint/js": ^9.8.0
     axios: ^1.7.2
     bootstrap: ^4.5.3
-    electron: ^31.3.0
+    electron: latest
     electron-context-menu: ^4.0.1
     electron-store: ^10.0.0
     eslint: ^9.8.0