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

3 files changed, 37 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 349e87f7b7de..8693a5d336b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mongodb-compass-beta
 	pkgdesc = The official GUI for MongoDB - beta version
-	pkgver = 1.32.6.beta.4
+	pkgver = 1.33.0.beta.2
 	pkgrel = 1
 	url = https://www.mongodb.com/products/compass
 	arch = x86_64
@@ -9,20 +9,20 @@ pkgbase = mongodb-compass-beta
 	arch = aarch64
 	license = custom:SSPL
 	makedepends = git
-	makedepends = nodejs
-	makedepends = npm>=7.0.0
 	makedepends = python
 	makedepends = unzip
-	depends = electron13
+	makedepends = nodejs>=16.0.0
+	makedepends = npm>=8.0.0
 	depends = krb5
 	depends = libsecret
 	depends = lsb-release
+	depends = electron15
 	optdepends = org.freedesktop.secrets
-	source = mongodb-compass-beta-1.32.6.beta.4-1.tar.gz::https://github.com/mongodb-js/compass/archive/v1.32.6-beta.4.tar.gz
+	source = mongodb-compass-beta-1.33.0.beta.2-1.tar.gz::https://github.com/mongodb-js/compass/archive/v1.33.0-beta.2.tar.gz
 	source = hadron-build.diff
 	source = browserslist.diff
-	sha512sums = daabc4c9e6e715286efa74d8e68ce7ec33a8c9f2e7d0172f115316eaf0fb2101835fdbfde1ae18bb58e1ef7b8d1054101eea02128e87e897392dbd09af4fe64e
-	sha512sums = 1b9bf0ba93cc979953dae1ee2b7e872ef2f8649a033aac5862f650a018b9450ac7a89a20e61718bb41203a206e2e4f193e7853539106fc2d491736645203c3fd
+	sha512sums = 6b78d6f2dd9b853e77cd36f59f771a37508d8b46720df7f8f5948802b98474a9d02ef94e5f864fa99ac076e1835729b7afccb88ce36c3e1b1b6b7ebe96c38432
+	sha512sums = 8d26820139d918c4e9da05b062a86865664218bfbf32b9f002995c30fa22b64e088f59263bee5f8fb4797565fe88b7daf48c383a572c0ced657dab0639e57b94
 	sha512sums = c7ed26d911cea41cea65ede61d41c22c24296c88c4a21532d81b3092844cd65a866fe8e390570362eb7f0200a897a86e97387e8afb4e1ad8e8398c7265d529d2
 
 pkgname = mongodb-compass-beta
diff --git a/PKGBUILD b/PKGBUILD
index d1217e35b030..a98ac218170a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,40 +2,54 @@
 _target='compass-beta'
 _edition=' Beta'
 pkgname="mongodb-$_target"
-_pkgver='1.32.6-beta.4'
+_pkgver='1.33.0-beta.2'
 pkgver="$(printf '%s' "$_pkgver" | tr '-' '.')"
 pkgrel='1'
 pkgdesc='The official GUI for MongoDB - beta version'
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url='https://www.mongodb.com/products/compass'
 license=('custom:SSPL')
-_electronpkg='electron13'
-depends=("$_electronpkg" 'krb5' 'libsecret' 'lsb-release')
-makedepends=('git' 'nodejs' 'npm>=7.0.0' 'python' 'unzip')
+depends=('krb5' 'libsecret' 'lsb-release')
+makedepends=('git' 'python' 'unzip')
 optdepends=('org.freedesktop.secrets')
 source=(
 	"$pkgname-$pkgver-$pkgrel.tar.gz::https://github.com/mongodb-js/compass/archive/v$_pkgver.tar.gz"
 	'hadron-build.diff'
 	'browserslist.diff'
 )
-sha512sums=('daabc4c9e6e715286efa74d8e68ce7ec33a8c9f2e7d0172f115316eaf0fb2101835fdbfde1ae18bb58e1ef7b8d1054101eea02128e87e897392dbd09af4fe64e'
-            '1b9bf0ba93cc979953dae1ee2b7e872ef2f8649a033aac5862f650a018b9450ac7a89a20e61718bb41203a206e2e4f193e7853539106fc2d491736645203c3fd'
+sha512sums=('6b78d6f2dd9b853e77cd36f59f771a37508d8b46720df7f8f5948802b98474a9d02ef94e5f864fa99ac076e1835729b7afccb88ce36c3e1b1b6b7ebe96c38432'
+            '8d26820139d918c4e9da05b062a86865664218bfbf32b9f002995c30fa22b64e088f59263bee5f8fb4797565fe88b7daf48c383a572c0ced657dab0639e57b94'
             'c7ed26d911cea41cea65ede61d41c22c24296c88c4a21532d81b3092844cd65a866fe8e390570362eb7f0200a897a86e97387e8afb4e1ad8e8398c7265d529d2')
 
+# Set up dependencies based on if we're working with a beta release
+if [[ $_target =~ .*-beta ]]; then
+	_electronpkg='electron15'
+	makedepends+=('nodejs>=16.0.0')
+	makedepends+=('npm>=8.0.0')
+else
+	_electronpkg='electron13'
+	makedepends+=('nodejs')
+	makedepends+=('npm>=7.0.0')
+fi
+
+depends+=("$_electronpkg")
+
 _sourcedirectory="compass-$_pkgver"
 
 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'
+	# Loosen node version restriction on non-beta releases
+	if [[ ! $_target =~ .*-beta ]]; then
+		sed -E -i 's|"node": "\^14.|"node": ">=14.|' 'packages/compass/package.json' 'package-lock.json'
+	fi
 
 	# 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,