Apply electron-updater patch

dainst · Feb 12, 2025 · 75543e5 · 75543e5
1 parent 44863b6
commit 75543e5
Show file tree

Hide file tree

Showing 3 changed files with 298 additions and 1 deletion.
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
diff --git a/desktop/package.json b/desktop/package.json
@@ -24,7 +24,7 @@
     "build": "npm run copy-core && node --max_old_space_size=16000 node_modules/@angular/cli/bin/ng build --base-href ./ --localize --configuration production",
     "build:scripts": "rimraf src/config/Scripts/dist && tsc -p src/config/Scripts/tsconfig.json",
     "preinstall": "export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 || set PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1",
-    "postinstall": "npm run update-version-info && gulp copy-fonts && gulp copy-gdal",
+    "postinstall": "npm run update-version-info && gulp copy-fonts && gulp copy-gdal && patch-package",
     "lint": "ng lint",
     "test": "jest --config=./test/unit/jest.config.ts --runInBand",
     "e2e": "npm-run-all -p -r ng:serve:no-reload e2e:run",
@@ -200,6 +200,7 @@
     "node-gyp": "^10.1.0",
     "npm-run-all": "4.1.5",
     "parameterize": "^1.0.0",
+    "patch-package": "^8.0.0",
     "pouchdb-adapter-memory": "8.0.1",
     "pouchdb-node": "9.0.0",
     "replace-in-file": "^6.1.0",

diff --git a/desktop/patches/electron-updater+6.5.0.patch b/desktop/patches/electron-updater+6.5.0.patch
@@ -0,0 +1,18 @@
+diff --git a/node_modules/electron-updater/out/BaseUpdater.js b/node_modules/electron-updater/out/BaseUpdater.js
+index f441eaa..b4e8f0a 100644
+--- a/node_modules/electron-updater/out/BaseUpdater.js
++++ b/node_modules/electron-updater/out/BaseUpdater.js
+@@ -14,11 +14,11 @@ class BaseUpdater extends AppUpdater_1.AppUpdater {
+         // If NOT in silent mode use `autoRunAppAfterInstall` to determine whether to force run the app
+         const isInstalled = this.install(isSilent, isSilent ? isForceRunAfter : this.autoRunAppAfterInstall);
+         if (isInstalled) {
+-            setImmediate(() => {
++            setTimeout(() => {
+                 // this event is normally emitted when calling quitAndInstall, this emulates that
+                 require("electron").autoUpdater.emit("before-quit-for-update");
+                 this.app.quit();
+-            });
++            }, 1000);
+         }
+         else {
+             this.quitAndInstallCalled = false;