Fix various mongodb-compass bugs

3 files changed, 27 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a662f156779..cd5f5ee8c053 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mongodb-compass-git
 	pkgdesc = The official GUI for MongoDB - git version
-	pkgver = r13639.ga1d52e9af
+	pkgver = r13831.g33955ced0
 	pkgrel = 1
 	epoch = 1
 	url = https://www.mongodb.com/products/compass
@@ -10,7 +10,8 @@ pkgbase = mongodb-compass-git
 	arch = aarch64
 	license = custom:SSPL
 	makedepends = git
-	makedepends = npm
+	makedepends = nodejs-lts-erbium
+	makedepends = npm>=7.0.0
 	makedepends = python
 	makedepends = unzip
 	depends = electron6-bin
@@ -22,7 +23,7 @@ pkgbase = mongodb-compass-git
 	conflicts = mongodb-compass
 	source = mongodb-compass-git::git+https://github.com/mongodb-js/compass
 	source = hadron-build.diff
-	sha256sums = SKIP
-	sha256sums = 62eea772fce3eb086b59fc5509b8afab6346da9c4c65f28880bb334104c02104
+	sha512sums = SKIP
+	sha512sums = 9c93c8aa513c9238e04bb860626d09f1e83643cbfd1b8cd66add35cd41e6a7172fedff42f9f9eeedb0e8a3d6b852e1671a8b5a1fa3066d7dd5a543052392946d
 
 pkgname = mongodb-compass-git
diff --git a/PKGBUILD b/PKGBUILD
index 05fb52829123..547ba3608842 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ _target='compass'
 _edition=''
 _pkgname="mongodb-$_target"
 pkgname="$_pkgname-git"
-pkgver='r13639.ga1d52e9af'
+pkgver='r13831.g33955ced0'
 pkgrel='1'
 epoch='1'
 pkgdesc='The official GUI for MongoDB - git version'
@@ -11,7 +11,7 @@ arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url='https://www.mongodb.com/products/compass'
 license=('custom:SSPL')
 depends=('electron6-bin' 'krb5' 'libsecret' 'lsb-release')
-makedepends=('git' 'npm' 'python' 'unzip')
+makedepends=('git' 'nodejs-lts-erbium' 'npm>=7.0.0' 'python' 'unzip')
 optdepends=('org.freedesktop.secrets')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
@@ -19,10 +19,10 @@ source=(
 	"$pkgname::git+https://github.com/mongodb-js/compass"
 	'hadron-build.diff'
 )
-sha256sums=('SKIP'
-            '62eea772fce3eb086b59fc5509b8afab6346da9c4c65f28880bb334104c02104')
+sha512sums=('SKIP'
+            '9c93c8aa513c9238e04bb860626d09f1e83643cbfd1b8cd66add35cd41e6a7172fedff42f9f9eeedb0e8a3d6b852e1671a8b5a1fa3066d7dd5a543052392946d')
 
-_sourcedirectory="$pkgname/packages/compass"
+_sourcedirectory="$pkgname"
 _homedirectory="$pkgname-home"
 
 prepare() {
@@ -30,16 +30,16 @@ prepare() {
 
 	# Replace version in package.json
 	_compassversion="99.99.$(git rev-list --count HEAD)"
-	sed -E -i 's|"version": ".*",|"version": "'"$_compassversion"'",|' 'package.json'
+	sed -E -i 's|"version": ".*",|"version": "'"$_compassversion"'",|' 'packages/compass/package.json'
 
 	# Loosen node version restriction
-	sed -E -i 's|("node": ").*"|\1'"$(node -v | sed 's/^v//')"'"|' 'package.json'
+	sed -E -i 's|("node": ").*"|\1'"$(node -v | sed 's/^v//')"'"|' 'packages/compass/package.json'
 
 	# Set system Electron version for ABI compatibility
-	sed -E -i 's|("electron": ").*"|\1'"$(cat '/usr/lib/electron6/version')"'"|' 'package.json'
+	sed -E -i 's|("electron": ").*"|\1'"$(cat '/usr/lib/electron6/version')"'"|' 'packages/compass/package.json'
 
 	# Prepare dependencies
-	HOME="$srcdir/$_homedirectory" npm install
+	HOME="$srcdir/$_homedirectory" npm run bootstrap
 
 	# Apply hadron-build fixes
 	patch -d 'node_modules/hadron-build/' --forward -p1 < "$srcdir/hadron-build.diff"
@@ -58,11 +58,11 @@ build() {
 	# and let electron-packager use it for building
 	# https://github.com/electron/electron-packager/issues/187
 
-	NODE_ENV='production' HOME="$srcdir/$_homedirectory" npm run release-evergreen "$_target"
+	NODE_ENV='production' HOME="$srcdir/$_homedirectory" npm run package-compass "$_target"
 }
 
 package() {
-	local _distFolder="$srcdir/$_sourcedirectory/dist/MongoDB Compass$_edition-linux"
+	local _distFolder="$srcdir/$_sourcedirectory/packages/compass/dist/MongoDB Compass$_edition-linux"
 	case "$CARCH" in
 		i686)
 			_distFolder="$_distFolder-ia32"
@@ -101,7 +101,7 @@ StartupNotify=true
 Categories=Office;Database;Building;Debugger;IDE;GUIDesigner;Profiling;
 EOF
 
-	install -Dm644 "$srcdir/$_sourcedirectory/src/app/images/linux/mongodb-compass.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+	install -Dm644 "$srcdir/$_sourcedirectory/packages/compass/src/app/images/linux/mongodb-compass.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
 
 	install -dm755 "$pkgdir/usr/share/licenses/$pkgname/"
 	for _license in 'LICENSE' 'LICENSES.chromium.html'; do
diff --git a/hadron-build.diff b/hadron-build.diff
index b4fa1bb2b8cb..d035d410e1a0 100644
--- a/hadron-build.diff
+++ b/hadron-build.diff
@@ -1,19 +1,20 @@
 diff --git a/commands/release.js b/commands/release.js
-index 174fd8cc4..cf39a5d4a 100644
+index 4405eaa1d..979269fdb 100644
 --- a/commands/release.js
 +++ b/commands/release.js
-@@ -574,9 +574,7 @@ exports.run = (argv, done) => {
+@@ -616,10 +616,7 @@ exports.run = (argv, done) => {
      task('create module cache', createModuleCache),
      task('create packaged styles', createPackagedStyles),
      task('remove development files', removeDevelopmentFiles),
--    task('create application asar', createApplicationAsar),
--    task('create branded installer', createBrandedInstaller),
--    task('create application zip', createApplicationZip)
-+    task('create application asar', createApplicationAsar)
-   ]);
+-    !noAsar && task('create application asar', createApplicationAsar),
+-    !skipInstaller && task('create branded installer', createBrandedInstaller),
+-    task('create application zip', createApplicationZip),
+-    task('store build configuration as json', writeConfigToJson)
++    !noAsar && task('create application asar', createApplicationAsar)
+   ].filter(Boolean));
  
    return async.series(tasks, (_err) => {
-@@ -590,9 +588,5 @@ exports.run = (argv, done) => {
+@@ -633,9 +630,5 @@ exports.run = (argv, done) => {
  exports.handler = (argv) => {
    exports.run(argv, (_err, CONFIG) => {
      cli.abortIfError(_err);
@@ -24,7 +25,7 @@ index 174fd8cc4..cf39a5d4a 100644
    });
  };
 diff --git a/lib/target.js b/lib/target.js
-index 73a0056b7..ade573f8b 100644
+index 062285659..668e2e57b 100644
 --- a/lib/target.js
 +++ b/lib/target.js
 @@ -4,8 +4,6 @@ const semver = require('semver');