Fix mongodb-compass build

4 files changed, 16 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 845dec35f044..6510db38d334 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = mongodb-compass-isolated-beta
 	pkgdesc = The official GUI for MongoDB - Isolated Edition - beta version
 	pkgver = 1.39.3.beta.1
-	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.15.1
 	makedepends = npm>=8.19.4
 	makedepends = python
 	makedepends = unzip
@@ -16,14 +15,15 @@ pkgbase = mongodb-compass-isolated-beta
 	depends = krb5
 	depends = libsecret
 	depends = lsb-release
+	depends = nodejs>=16.15.1
 	optdepends = org.freedesktop.secrets
 	source = mongodb-compass-isolated-beta-1.39.3.beta.1.tar.gz::https://github.com/mongodb-js/compass/archive/v1.39.3-beta.1.tar.gz
 	source = hadron-build-ffmpeg.diff
 	source = hadron-build-os-dns-native.diff
 	source = fix-argv.diff
 	sha512sums = 977099bebe162e5218f4f00238ee50fc20e6e8ffd6dddc4db753b63e2584069a54e2cf7d92b1796fd1e5df79ba7efc4de772158635e353eb3683f797a2085f03
-	sha512sums = 54faea6c77fc7ac6ffcd81667d85103d0dcbe51b2358480e3e47fa4b0db70cdd87578da412d101d1d6b5f85039c4f3119caad9dc327fe6da1510d145bafb476b
+	sha512sums = ec052448ea2a375941944026b7b5419d48c67c324af5b75647376737a8f0f98f544cb335c948625c2e06f779a52c58ff2996561e1db977146faef4793d41d3e5
 	sha512sums = e1082fd804ba72ccf3e53576077562f8b159b76e6aa07fa2324e31dd45c0d863d844fbb8be139be427e2cdd0401a2c4b8e6279ee9305c5507fbd73c5bc0df65d
-	sha512sums = 105c55cc9449b999e9ce1542dc50e88d314b9e71e58ffaa3376fbd641a18b7975196420bf8a4ced51e56e9299a9551868ec6942129efe0333e758cabd5c5b468
+	sha512sums = 6621d214ac692f57e0802b7b4ac0c6a5aedf871896d084afb3939abe3b921ca0b4d9895d4fd0d14574e910681e6d17ecbd0ff321ed9f9a18e963d23da6778d0e
 
 pkgname = mongodb-compass-isolated-beta
diff --git a/PKGBUILD b/PKGBUILD
index fcabb579c50f..a20110e0b3a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _edition=' Isolated Edition Beta'
 pkgname="mongodb-$_target"
 _pkgver='1.39.3-beta.1'
 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 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
@@ -12,8 +12,8 @@ arch=('x86_64' 'armv7h' 'aarch64')
 url='https://www.mongodb.com/products/compass'
 license=('custom:SSPL')
 _electronpkg='electron23'
-depends=("$_electronpkg" 'krb5' 'libsecret' 'lsb-release')
-makedepends=('git' 'nodejs>=16.15.1' 'npm>=8.19.4' 'python' 'unzip')
+depends=("$_electronpkg" 'krb5' 'libsecret' 'lsb-release' 'nodejs>=16.15.1')
+makedepends=('git' 'npm>=8.19.4' 'python' 'unzip')
 optdepends=('org.freedesktop.secrets')
 source=(
 	"$pkgname-$pkgver.tar.gz::https://github.com/mongodb-js/compass/archive/v$_pkgver.tar.gz"
@@ -22,9 +22,9 @@ source=(
 	'fix-argv.diff'
 )
 sha512sums=('977099bebe162e5218f4f00238ee50fc20e6e8ffd6dddc4db753b63e2584069a54e2cf7d92b1796fd1e5df79ba7efc4de772158635e353eb3683f797a2085f03'
-            '54faea6c77fc7ac6ffcd81667d85103d0dcbe51b2358480e3e47fa4b0db70cdd87578da412d101d1d6b5f85039c4f3119caad9dc327fe6da1510d145bafb476b'
+            'ec052448ea2a375941944026b7b5419d48c67c324af5b75647376737a8f0f98f544cb335c948625c2e06f779a52c58ff2996561e1db977146faef4793d41d3e5'
             'e1082fd804ba72ccf3e53576077562f8b159b76e6aa07fa2324e31dd45c0d863d844fbb8be139be427e2cdd0401a2c4b8e6279ee9305c5507fbd73c5bc0df65d'
-            '105c55cc9449b999e9ce1542dc50e88d314b9e71e58ffaa3376fbd641a18b7975196420bf8a4ced51e56e9299a9551868ec6942129efe0333e758cabd5c5b468')
+            '6621d214ac692f57e0802b7b4ac0c6a5aedf871896d084afb3939abe3b921ca0b4d9895d4fd0d14574e910681e6d17ecbd0ff321ed9f9a18e963d23da6778d0e')
 
 _sourcedirectory="compass-$_pkgver"
 
@@ -54,7 +54,7 @@ prepare() {
 	npm install
 
 	# Run the second part of npm run bootstrap
-	NODE_OPTIONS='--openssl-legacy-provider' npx lerna run bootstrap --stream
+	NODE_OPTIONS='--openssl-legacy-provider' npx lerna run bootstrap --stream --load-env-files=false
 }
 
 build() {
diff --git a/fix-argv.diff b/fix-argv.diff
index b6c1311f6710..fd76f34bfd56 100644
--- a/fix-argv.diff
+++ b/fix-argv.diff
@@ -1,8 +1,8 @@
 diff --git a/packages/compass-preferences-model/src/global-config.ts b/packages/compass-preferences-model/src/global-config.ts
-index 2a95d477a..8418c3e34 100644
+index e808198eb..f4443e6cd 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 {
+@@ -196,8 +196,6 @@ export interface ParsedGlobalPreferencesResult {
    preferenceParseErrors: string[];
  }
  
@@ -11,7 +11,7 @@ index 2a95d477a..8418c3e34 100644
  export async function parseAndValidateGlobalPreferences(
    sources: GlobalPreferenceSources = {}
  ): Promise<ParsedGlobalPreferencesResult> {
-@@ -220,6 +218,16 @@ export async function parseAndValidateGlobalPreferences(
+@@ -206,6 +204,16 @@ export async function parseAndValidateGlobalPreferences(
    );
    let argv = sources.argv;
    if (!argv) {
@@ -28,7 +28,7 @@ index 2a95d477a..8418c3e34 100644
      argv = process.argv.slice(argvStartIndex);
    }
    const cliPreferences = parseCliArgs(argv);
-@@ -309,11 +317,17 @@ export function getHelpText(): string {
+@@ -295,11 +303,17 @@ export function getHelpText(): string {
      text += `  ${path}\n`;
    }
    if (globalConfigPaths.length > 0) {
diff --git a/hadron-build-ffmpeg.diff b/hadron-build-ffmpeg.diff
index 539b05087515..823889259d6e 100644
--- a/hadron-build-ffmpeg.diff
+++ b/hadron-build-ffmpeg.diff
@@ -1,5 +1,5 @@
 diff --git a/packages/hadron-build/lib/target.js b/packages/hadron-build/lib/target.js
-index 39ed422ab..959ce16c9 100644
+index 7cdfc91c9..46bea1d13 100644
 --- a/packages/hadron-build/lib/target.js
 +++ b/packages/hadron-build/lib/target.js
 @@ -10,7 +10,6 @@ const path = require('path');
@@ -10,7 +10,7 @@ index 39ed422ab..959ce16c9 100644
  const windowsInstallerVersion = require('./windows-installer-version');
  const debug = require('debug')('hadron-build:target');
  const execFile = promisify(childProcess.execFile);
-@@ -227,7 +226,6 @@ class Target {
+@@ -213,7 +212,6 @@ class Target {
        arch: this.arch,
        electronVersion: this.electronVersion,
        sign: null,