Fix mongodb-compass build, update mongodb-compass to 1.37.0

6 files changed, 62 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29873a50f511..fa951175d8be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = mongodb-compass-isolated-beta
 	pkgdesc = The official GUI for MongoDB - Isolated Edition - beta version
 	pkgver = 1.37.0.beta.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mongodb.com/products/compass
 	arch = x86_64
 	arch = armv7h
 	arch = aarch64
 	license = custom:SSPL
 	makedepends = git
-	makedepends = nodejs>=16.0.0
-	makedepends = npm>=8.0.0
+	makedepends = nodejs>=16.15.1
+	makedepends = npm>=8.19.2
 	makedepends = python
 	makedepends = unzip
 	depends = electron>=22.0.0
@@ -17,11 +17,13 @@ pkgbase = mongodb-compass-isolated-beta
 	depends = libsecret
 	depends = lsb-release
 	optdepends = org.freedesktop.secrets
-	source = mongodb-compass-isolated-beta-1.37.0.beta.3-1.tar.gz::https://github.com/mongodb-js/compass/archive/v1.37.0-beta.3.tar.gz
-	source = hadron-build.diff
+	source = mongodb-compass-isolated-beta-1.37.0.beta.3-2.tar.gz::https://github.com/mongodb-js/compass/archive/v1.37.0-beta.3.tar.gz
+	source = hadron-build-ffmpeg.diff
+	source = hadron-build-os-dns-native.diff
 	source = fix-argv.diff
 	sha512sums = 8ca7ce361f4ef8be3a7404f37889844d047ff5fe02f86c91555699728ddabd095e0fb81697e96c179f9cb9fb5e8a7fbd11938ecca03ece332eeccbc4e646f4f9
-	sha512sums = 18029ff1479cbacb413f7154d5ca7589855273c559ee15bb5b5006eed65b8edcb58fac64cc8deabd20c36e06f298dc4b7152f61391975d2a3ecb6351b787fae7
-	sha512sums = 1a2345b90196d3c856d0288d9406cfd667d0ebcce400e6886c7eba2825fa52d7813d45f2c375fcaf4e28d116b68107219e6f662b5bdbb12bf0e402ca61194cf7
+	sha512sums = 54faea6c77fc7ac6ffcd81667d85103d0dcbe51b2358480e3e47fa4b0db70cdd87578da412d101d1d6b5f85039c4f3119caad9dc327fe6da1510d145bafb476b
+	sha512sums = e1082fd804ba72ccf3e53576077562f8b159b76e6aa07fa2324e31dd45c0d863d844fbb8be139be427e2cdd0401a2c4b8e6279ee9305c5507fbd73c5bc0df65d
+	sha512sums = 105c55cc9449b999e9ce1542dc50e88d314b9e71e58ffaa3376fbd641a18b7975196420bf8a4ced51e56e9299a9551868ec6942129efe0333e758cabd5c5b468
 
 pkgname = mongodb-compass-isolated-beta
diff --git a/PKGBUILD b/PKGBUILD
index 664b39d21d1f..7e27cf91bd21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _edition=' Isolated Edition Beta'
 pkgname="mongodb-$_target"
 _pkgver='1.37.0-beta.3'
 pkgver="$(printf '%s' "$_pkgver" | tr '-' '.')"
-pkgrel='1'
+pkgrel='2'
 pkgdesc='The official GUI for MongoDB - Isolated Edition - beta version'
 # If you're running on armv7h or aarch64, use the electron22-bin package from the AUR for the electron dependency
 # If you're running on armv7h, you have to add it to the arch and source arrays of the electron22-bin AUR dependency
@@ -13,16 +13,18 @@ url='https://www.mongodb.com/products/compass'
 license=('custom:SSPL')
 _electronpkg='electron'
 depends=("$_electronpkg>=22.0.0" 'krb5' 'libsecret' 'lsb-release')
-makedepends=('git' 'nodejs>=16.0.0' 'npm>=8.0.0' 'python' 'unzip')
+makedepends=('git' 'nodejs>=16.15.1' 'npm>=8.19.2' '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'
+	'hadron-build-ffmpeg.diff'
+	'hadron-build-os-dns-native.diff'
 	'fix-argv.diff'
 )
 sha512sums=('8ca7ce361f4ef8be3a7404f37889844d047ff5fe02f86c91555699728ddabd095e0fb81697e96c179f9cb9fb5e8a7fbd11938ecca03ece332eeccbc4e646f4f9'
-            '18029ff1479cbacb413f7154d5ca7589855273c559ee15bb5b5006eed65b8edcb58fac64cc8deabd20c36e06f298dc4b7152f61391975d2a3ecb6351b787fae7'
-            '1a2345b90196d3c856d0288d9406cfd667d0ebcce400e6886c7eba2825fa52d7813d45f2c375fcaf4e28d116b68107219e6f662b5bdbb12bf0e402ca61194cf7')
+            '54faea6c77fc7ac6ffcd81667d85103d0dcbe51b2358480e3e47fa4b0db70cdd87578da412d101d1d6b5f85039c4f3119caad9dc327fe6da1510d145bafb476b'
+            'e1082fd804ba72ccf3e53576077562f8b159b76e6aa07fa2324e31dd45c0d863d844fbb8be139be427e2cdd0401a2c4b8e6279ee9305c5507fbd73c5bc0df65d'
+            '105c55cc9449b999e9ce1542dc50e88d314b9e71e58ffaa3376fbd641a18b7975196420bf8a4ced51e56e9299a9551868ec6942129efe0333e758cabd5c5b468')
 
 _sourcedirectory="compass-$_pkgver"
 
@@ -32,14 +34,21 @@ prepare() {
 	# Disable husky command
 	sed -i '/husky install/d' 'package.json'
 
+	# Loosen npm version restriction until the version of npm in repos is updated to >= 8.19.4
+	sed -E -i "s|\"npm\": \">=8.19.4\"|\"npm\": \">=$(npm -v)\"|" '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"
+	# Use a fork of os-dns-native (as there are issues with the path not being in the main node_modules directory, a local copy is not used)
+	sed -E -i "s|(.*)\"os-dns-native\": \".*\",|\1\"os-dns-native\": \"dpeukert/os-dns-native\",|" 'packages/'{'compass','connection-model'}'/package.json'
+	patch --forward -p1 < "$srcdir/hadron-build-os-dns-native.diff"
+
+	# Don't use the bundled ffmpeg
+	patch --forward -p1 < "$srcdir/hadron-build-ffmpeg.diff"
 
 	# Apply argv fixes
 	patch --forward -p1 < "$srcdir/fix-argv.diff"
@@ -59,7 +68,7 @@ build() {
 	# and let electron-packager use it for building
 	# https://github.com/electron/electron-packager/issues/187
 
-	HADRON_DISTRIBUTION="${_target%-beta}" NODE_OPTIONS='--openssl-legacy-provider' npm run package-compass --openssl_fips=''
+	HADRON_DISTRIBUTION="${_target%-beta}" HADRON_SKIP_INSTALLER='true' NODE_OPTIONS='--openssl-legacy-provider' npm run package-compass
 }
 
 package() {
diff --git a/fix-argv.diff b/fix-argv.diff
index 4a048d1ea8e3..b6c1311f6710 100644
--- a/fix-argv.diff
+++ b/fix-argv.diff
@@ -1,5 +1,5 @@
 diff --git a/packages/compass-preferences-model/src/global-config.ts b/packages/compass-preferences-model/src/global-config.ts
-index ed438e40f..10d2a5aba 100644
+index 2a95d477a..8418c3e34 100644
 --- a/packages/compass-preferences-model/src/global-config.ts
 +++ b/packages/compass-preferences-model/src/global-config.ts
 @@ -210,8 +210,6 @@ export interface ParsedGlobalPreferencesResult {
diff --git a/hadron-build-ffmpeg.diff b/hadron-build-ffmpeg.diff
new file mode 100644
index 000000000000..539b05087515
--- /dev/null
+++ b/hadron-build-ffmpeg.diff
@@ -0,0 +1,20 @@
+diff --git a/packages/hadron-build/lib/target.js b/packages/hadron-build/lib/target.js
+index 39ed422ab..959ce16c9 100644
+--- a/packages/hadron-build/lib/target.js
++++ b/packages/hadron-build/lib/target.js
+@@ -10,7 +10,6 @@ const path = require('path');
+ const { promisify } = require('util');
+ const normalizePkg = require('normalize-package-data');
+ const parseGitHubRepoURL = require('parse-github-repo-url');
+-const ffmpegAfterExtract = require('electron-packager-plugin-non-proprietary-codecs-ffmpeg').default;
+ const windowsInstallerVersion = require('./windows-installer-version');
+ const debug = require('debug')('hadron-build:target');
+ const execFile = promisify(childProcess.execFile);
+@@ -227,7 +226,6 @@ class Target {
+       arch: this.arch,
+       electronVersion: this.electronVersion,
+       sign: null,
+-      afterExtract: [ffmpegAfterExtract]
+     };
+ 
+     if (this.platform === 'win32') {
diff --git a/hadron-build-os-dns-native.diff b/hadron-build-os-dns-native.diff
new file mode 100644
index 000000000000..b38c4c82fa4d
--- /dev/null
+++ b/hadron-build-os-dns-native.diff
@@ -0,0 +1,15 @@
+diff --git a/packages/hadron-build/commands/release.js b/packages/hadron-build/commands/release.js
+index 465cfce4d..db8ef181f 100644
+--- a/packages/hadron-build/commands/release.js
++++ b/packages/hadron-build/commands/release.js
+@@ -268,6 +268,10 @@ const transformPackageJson = async(CONFIG, done) => {
+     'optionalDependencies'
+   ]) {
+     for (const depName of Object.keys(contents[depType] || {})) {
++      if (depName === 'os-dns-native') {
++        contents[depType][depName] = 'dpeukert/os-dns-native';
++        continue;
++      }
+       const depEdge = packageNode.edgesOut.get(depName);
+       if (!depEdge.to && !depEdge.optional) {
+         throw new Error(
diff --git a/hadron-build.diff b/hadron-build.diff
deleted file mode 100644
index 57e050fb3b95..000000000000
--- a/hadron-build.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/packages/hadron-build/commands/release.js b/packages/hadron-build/commands/release.js
-index 1b4611457..9295a2a3a 100644
---- a/packages/hadron-build/commands/release.js
-+++ b/packages/hadron-build/commands/release.js
-@@ -543,9 +543,6 @@ exports.run = (argv, done) => {
-     task('write license file', writeLicenseFile),
-     task('remove development files', removeDevelopmentFiles),
-     !noAsar && task('create application asar', createApplicationAsar),
--    !skipInstaller && task('create branded installer', createBrandedInstaller),
--    task('create application zip', createApplicationZip),
--    task('store build configuration as json', writeConfigToJson)
-   ].filter(Boolean));
- 
-   return async.series(tasks, (_err) => {
-@@ -568,9 +565,5 @@ exports.run = (argv, done) => {
- exports.handler = (argv) => {
-   exports.run(argv, (_err, CONFIG) => {
-     cli.abortIfError(_err);
--    cli.ok(`${CONFIG.assets.length} assets successfully built`);
--    CONFIG.assets.map(function(asset) {
--      cli.info(asset.path);
--    });
-   });
- };
-diff --git a/packages/hadron-build/lib/target.js b/packages/hadron-build/lib/target.js
-index 39ed422ab..959ce16c9 100644
---- a/packages/hadron-build/lib/target.js
-+++ b/packages/hadron-build/lib/target.js
-@@ -10,7 +10,6 @@ const path = require('path');
- const { promisify } = require('util');
- const normalizePkg = require('normalize-package-data');
- const parseGitHubRepoURL = require('parse-github-repo-url');
--const ffmpegAfterExtract = require('electron-packager-plugin-non-proprietary-codecs-ffmpeg').default;
- const windowsInstallerVersion = require('./windows-installer-version');
- const debug = require('debug')('hadron-build:target');
- const execFile = promisify(childProcess.execFile);
-@@ -227,7 +226,6 @@ class Target {
-       arch: this.arch,
-       electronVersion: this.electronVersion,
-       sign: null,
--      afterExtract: [ffmpegAfterExtract]
-     };
- 
-     if (this.platform === 'win32') {