Update mongodb-compass-beta to 1.33.0-beta.2

3 files changed, 17 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d69e0abe6c4..2dfecf4db345 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mongodb-compass-readonly-git
 	pkgdesc = The official GUI for MongoDB - Readonly Edition - git version
-	pkgver = r14634.g67cb8e1e9
+	pkgver = r14824.gd08bbc6b9
 	pkgrel = 1
 	epoch = 1
 	url = https://www.mongodb.com/products/compass
@@ -10,11 +10,11 @@ pkgbase = mongodb-compass-readonly-git
 	arch = aarch64
 	license = custom:SSPL
 	makedepends = git
-	makedepends = nodejs
-	makedepends = npm>=7.0.0
+	makedepends = nodejs>=16.0.0
+	makedepends = npm>=8.0.0
 	makedepends = python
 	makedepends = unzip
-	depends = electron13
+	depends = electron15
 	depends = krb5
 	depends = libsecret
 	depends = lsb-release
@@ -25,7 +25,7 @@ pkgbase = mongodb-compass-readonly-git
 	source = hadron-build.diff
 	source = browserslist.diff
 	sha512sums = SKIP
-	sha512sums = 1b9bf0ba93cc979953dae1ee2b7e872ef2f8649a033aac5862f650a018b9450ac7a89a20e61718bb41203a206e2e4f193e7853539106fc2d491736645203c3fd
+	sha512sums = 8d26820139d918c4e9da05b062a86865664218bfbf32b9f002995c30fa22b64e088f59263bee5f8fb4797565fe88b7daf48c383a572c0ced657dab0639e57b94
 	sha512sums = c7ed26d911cea41cea65ede61d41c22c24296c88c4a21532d81b3092844cd65a866fe8e390570362eb7f0200a897a86e97387e8afb4e1ad8e8398c7265d529d2
 
 pkgname = mongodb-compass-readonly-git
diff --git a/PKGBUILD b/PKGBUILD
index 654d20d2147a..bf78f986a13a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,16 @@ _target='compass-readonly'
 _edition=' Readonly'
 _pkgname="mongodb-$_target"
 pkgname="$_pkgname-git"
-pkgver='r14634.g67cb8e1e9'
+pkgver='r14824.gd08bbc6b9'
 pkgrel='1'
 epoch='1'
 pkgdesc='The official GUI for MongoDB - Readonly Edition - git version'
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url='https://www.mongodb.com/products/compass'
 license=('custom:SSPL')
-_electronpkg='electron13'
+_electronpkg='electron15'
 depends=("$_electronpkg" 'krb5' 'libsecret' 'lsb-release')
-makedepends=('git' 'nodejs' 'npm>=7.0.0' 'python' 'unzip')
+makedepends=('git' 'nodejs>=16.0.0' 'npm>=8.0.0' 'python' 'unzip')
 optdepends=('org.freedesktop.secrets')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
@@ -23,7 +23,7 @@ source=(
 
 )
 sha512sums=('SKIP'
-            '1b9bf0ba93cc979953dae1ee2b7e872ef2f8649a033aac5862f650a018b9450ac7a89a20e61718bb41203a206e2e4f193e7853539106fc2d491736645203c3fd'
+            '8d26820139d918c4e9da05b062a86865664218bfbf32b9f002995c30fa22b64e088f59263bee5f8fb4797565fe88b7daf48c383a572c0ced657dab0639e57b94'
             'c7ed26d911cea41cea65ede61d41c22c24296c88c4a21532d81b3092844cd65a866fe8e390570362eb7f0200a897a86e97387e8afb4e1ad8e8398c7265d529d2')
 
 _sourcedirectory="$pkgname"
@@ -31,15 +31,12 @@ _sourcedirectory="$pkgname"
 prepare() {
 	cd "$srcdir/$_sourcedirectory/"
 
-	# Force the newest version of electron-to-chromium
-	sed -E -i 's|(.*)("electron": ")|\1"electron-to-chromium": "'"$(npm view 'electron-to-chromium@latest' version)"'",\n\1\2|' 'packages/compass/package.json'
-
-	# Loosen node version restriction
-	sed -E -i 's|"node": "\^14.|"node": ">=14.|' 'packages/compass/package.json' 'package-lock.json'
-
 	# Set system Electron version for ABI compatibility
 	sed -E -i 's|("electron": ").*"|\1'"$(cat "/usr/lib/$_electronpkg/version")"'"|' {'configs','packages'}'/'*'/package.json'
 
+	# Force the newest version of electron-to-chromium
+	sed -E -i 's|(.*)("electron": ")|\1"electron-to-chromium": "'"$(npm view 'electron-to-chromium@latest' version)"'",\n\1\2|' 'packages/compass/package.json'
+
 	# Apply hadron-build fixes
 	patch --forward -p1 < "$srcdir/hadron-build.diff"
 
diff --git a/hadron-build.diff b/hadron-build.diff
index 49a1a6109c49..bf34794cdd6f 100644
--- a/hadron-build.diff
+++ b/hadron-build.diff
@@ -1,8 +1,8 @@
 diff --git a/packages/hadron-build/commands/release.js b/packages/hadron-build/commands/release.js
-index e84733eaa..f016360bc 100644
+index 117444603..6d7fbd336 100644
 --- a/packages/hadron-build/commands/release.js
 +++ b/packages/hadron-build/commands/release.js
-@@ -480,9 +480,6 @@ exports.run = (argv, done) => {
+@@ -491,9 +491,6 @@ exports.run = (argv, done) => {
      task('write license file', writeLicenseFile),
      task('remove development files', removeDevelopmentFiles),
      !noAsar && task('create application asar', createApplicationAsar),
@@ -12,7 +12,7 @@ index e84733eaa..f016360bc 100644
    ].filter(Boolean));
  
    return async.series(tasks, (_err) => {
-@@ -496,9 +493,5 @@ exports.run = (argv, done) => {
+@@ -507,9 +504,5 @@ exports.run = (argv, done) => {
  exports.handler = (argv) => {
    exports.run(argv, (_err, CONFIG) => {
      cli.abortIfError(_err);
@@ -23,7 +23,7 @@ index e84733eaa..f016360bc 100644
    });
  };
 diff --git a/packages/hadron-build/lib/target.js b/packages/hadron-build/lib/target.js
-index 8911ff4ed..2b60b1865 100644
+index 16a1ec4e3..2a61c3850 100644
 --- a/packages/hadron-build/lib/target.js
 +++ b/packages/hadron-build/lib/target.js
 @@ -10,7 +10,6 @@ const path = require('path');
@@ -34,7 +34,7 @@ index 8911ff4ed..2b60b1865 100644
  const windowsInstallerVersion = require('./windows-installer-version');
  const debug = require('debug')('hadron-build:target');
  const execFile = promisify(childProcess.execFile);
-@@ -213,7 +212,6 @@ class Target {
+@@ -241,7 +240,6 @@ class Target {
        arch: this.arch,
        electronVersion: this.electronVersion,
        sign: null,