Update mongodb-compass to 1.39.4, mongodb-compass-beta to 1.39.4-beta.2

3 files changed, 11 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 814fc3624cca..de54bd7b7013 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mongodb-compass-isolated
 	pkgdesc = The official GUI for MongoDB - Isolated Edition
-	pkgver = 1.39.3
+	pkgver = 1.39.4
 	pkgrel = 1
 	url = https://www.mongodb.com/products/compass
 	arch = x86_64
@@ -11,21 +11,19 @@ pkgbase = mongodb-compass-isolated
 	makedepends = npm>=8.19.4
 	makedepends = python
 	makedepends = unzip
-	depends = electron23
+	depends = electron24
 	depends = krb5
 	depends = libsecret
 	depends = lsb-release
 	depends = nodejs>=16.15.1
 	optdepends = org.freedesktop.secrets
-	source = mongodb-compass-isolated-1.39.3.tar.gz::https://github.com/mongodb-js/compass/archive/v1.39.3.tar.gz
+	source = mongodb-compass-isolated-1.39.4.tar.gz::https://github.com/mongodb-js/compass/archive/v1.39.4.tar.gz
 	source = hadron-build-ffmpeg.diff
 	source = hadron-build-os-dns-native.diff
 	source = fix-argv.diff
-	source = lerna.diff
-	sha512sums = e91685eeb069736ff6ee2a9b21abdb48be8a0e135033224fd1eeeac00cb8c9cfa572c5482351a322ba8288b451bf75241371d6436f818f632928258a7e279c1d
+	sha512sums = 0c65d19412610e279d4d730782144553b6046e5c9cb70849b1757994077e48dd9ea37877bcbecd129676cb6d4706efd02684f3561383f328dea5cd35df459fa4
 	sha512sums = ec052448ea2a375941944026b7b5419d48c67c324af5b75647376737a8f0f98f544cb335c948625c2e06f779a52c58ff2996561e1db977146faef4793d41d3e5
 	sha512sums = e1082fd804ba72ccf3e53576077562f8b159b76e6aa07fa2324e31dd45c0d863d844fbb8be139be427e2cdd0401a2c4b8e6279ee9305c5507fbd73c5bc0df65d
 	sha512sums = 6621d214ac692f57e0802b7b4ac0c6a5aedf871896d084afb3939abe3b921ca0b4d9895d4fd0d14574e910681e6d17ecbd0ff321ed9f9a18e963d23da6778d0e
-	sha512sums = 2ced8f06e82a8ff5639fddb75a638bf9c1d06c8d891dd07c88dd1aa5fa00faf1d07f35f7a7d283abbac68c4ec74c750c9017c793644388c66b8027ab7acb23bd
 
 pkgname = mongodb-compass-isolated
diff --git a/PKGBUILD b/PKGBUILD
index 345a4c1d52cb..25432f056414 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,16 @@
 _target='compass-isolated'
 _edition=' Isolated Edition'
 pkgname="mongodb-$_target"
-_pkgver='1.39.3'
+_pkgver='1.39.4'
 pkgver="$(printf '%s' "$_pkgver" | tr '-' '.')"
 pkgrel='1'
 pkgdesc='The official GUI for MongoDB - Isolated Edition'
-# If you're running on armv7h or aarch64, use the electron23-bin package from the AUR for the electron23 dependency
-# If you're running on armv7h, you have to add it to the arch and source arrays of the electron23-bin AUR dependency
+# If you're running on armv7h or aarch64, use the electron24-bin package from the AUR for the electron24 dependency
+# If you're running on armv7h, you have to add it to the arch and source arrays of the electron24-bin AUR dependency
 arch=('x86_64' 'armv7h' 'aarch64')
 url='https://www.mongodb.com/products/compass'
 license=('custom:SSPL')
-_electronpkg='electron23'
+_electronpkg='electron24'
 depends=("$_electronpkg" 'krb5' 'libsecret' 'lsb-release' 'nodejs>=16.15.1')
 makedepends=('git' 'npm>=8.19.4' 'python' 'unzip')
 optdepends=('org.freedesktop.secrets')
@@ -20,13 +20,11 @@ source=(
 	'hadron-build-ffmpeg.diff'
 	'hadron-build-os-dns-native.diff'
 	'fix-argv.diff'
-	'lerna.diff'
 )
-sha512sums=('e91685eeb069736ff6ee2a9b21abdb48be8a0e135033224fd1eeeac00cb8c9cfa572c5482351a322ba8288b451bf75241371d6436f818f632928258a7e279c1d'
+sha512sums=('0c65d19412610e279d4d730782144553b6046e5c9cb70849b1757994077e48dd9ea37877bcbecd129676cb6d4706efd02684f3561383f328dea5cd35df459fa4'
             'ec052448ea2a375941944026b7b5419d48c67c324af5b75647376737a8f0f98f544cb335c948625c2e06f779a52c58ff2996561e1db977146faef4793d41d3e5'
             'e1082fd804ba72ccf3e53576077562f8b159b76e6aa07fa2324e31dd45c0d863d844fbb8be139be427e2cdd0401a2c4b8e6279ee9305c5507fbd73c5bc0df65d'
-            '6621d214ac692f57e0802b7b4ac0c6a5aedf871896d084afb3939abe3b921ca0b4d9895d4fd0d14574e910681e6d17ecbd0ff321ed9f9a18e963d23da6778d0e'
-            '2ced8f06e82a8ff5639fddb75a638bf9c1d06c8d891dd07c88dd1aa5fa00faf1d07f35f7a7d283abbac68c4ec74c750c9017c793644388c66b8027ab7acb23bd')
+            '6621d214ac692f57e0802b7b4ac0c6a5aedf871896d084afb3939abe3b921ca0b4d9895d4fd0d14574e910681e6d17ecbd0ff321ed9f9a18e963d23da6778d0e')
 
 _sourcedirectory="compass-$_pkgver"
 
@@ -52,14 +50,11 @@ prepare() {
 	# Apply argv fixes
 	patch --forward -p1 < "$srcdir/fix-argv.diff"
 
-	# Running lerna with the new Nx task runner enabled causes the build to fail when not running in a clean chroot
-	patch --forward -p1 < "$srcdir/lerna.diff"
-
 	# Run the first part of npm run bootstrap
 	npm install
 
 	# Run the second part of npm run bootstrap
-	NODE_OPTIONS='--openssl-legacy-provider' npx lerna run bootstrap --stream --load-env-files=false
+	NODE_OPTIONS='--openssl-legacy-provider' npx lerna run bootstrap --stream
 }
 
 build() {
diff --git a/lerna.diff b/lerna.diff
deleted file mode 100644
index b84a6c2869b6..000000000000
--- a/lerna.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/lerna.json b/lerna.json
-index 2e5924d12..05a4d9fe6 100644
---- a/lerna.json
-+++ b/lerna.json
-@@ -1,4 +1,5 @@
- {
-   "packages": ["packages/*", "configs/*", "scripts"],
--  "version": "independent"
-+  "version": "independent",
-+  "useNx": false
- }