Upgrade electron-builder

Co-authored-by: Jamie Kyle <113370520+jamiebuilds-signal@users.noreply.github.com>

Author: automated-signal

package-lock.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "./package.schema.json",
   "name": "signal-desktop",
   "productName": "Signal",
   "description": "Private messaging from your desktop",
@@ -283,7 +284,7 @@
     "danger": "12.3.3",
     "debug": "4.3.7",
     "electron": "33.2.1",
-    "electron-builder": "24.13.3",
+    "electron-builder": "26.0.0-alpha.8",
     "electron-mocha": "13.0.1",
     "endanger": "7.0.4",
     "enquirer": "2.4.1",
@@ -303,8 +304,8 @@
     "log-symbols": "4.1.0",
     "mini-css-extract-plugin": "2.9.2",
     "mocha": "10.8.2",
-    "node-gyp": "10.2.0",
-    "node-gyp-build": "4.8.3",
+    "node-gyp": "11.0.0",
+    "node-gyp-build": "4.8.4",
     "npm-run-all": "4.1.5",
     "p-limit": "3.1.0",
     "patch-package": "8.0.0",
@@ -441,9 +442,6 @@
     },
     "linux": {
       "category": "Network;InstantMessaging;Chat",
-      "desktop": {
-        "StartupWMClass": "Signal"
-      },
       "target": [
         "deb"
       ],

package.json

@@ -0,0 +1,15 @@
+{
+  "allOf": [
+    {
+      "$ref": "https://json.schemastore.org/package.json"
+    },
+    {
+      "type": "object",
+      "properties": {
+        "build": {
+          "$ref": "./node_modules/app-builder-lib/scheme.json"
+        }
+      }
+    }
+  ]
+}

package.schema.json

@@ -0,0 +1,63 @@
+diff --git a/node_modules/app-builder-lib/templates/nsis/include/installer.nsh b/node_modules/app-builder-lib/templates/nsis/include/installer.nsh
+index 34e91df..73bfffc 100644
+--- a/node_modules/app-builder-lib/templates/nsis/include/installer.nsh
++++ b/node_modules/app-builder-lib/templates/nsis/include/installer.nsh
+@@ -90,7 +90,13 @@
+       ${if} $installMode == "all"
+         SetShellVarContext current
+       ${endif}
+-      !insertmacro copyFile "$EXEPATH" "$LOCALAPPDATA\${APP_INSTALLER_STORE_FILE}"
++      # SIGNAL CHANGE START
++      # This file is needed for electron-builder's native incremental updates,
++      # but we have our own system so no need to place it. Clean it up instead.
++      #
++      # !insertmacro copyFile "$EXEPATH" "$LOCALAPPDATA\${APP_INSTALLER_STORE_FILE}"
++      RMDir /r /REBOOTOK "$LOCALAPPDATA\signal-desktop-updater"
++      # SIGNAL CHANGE END
+       ${if} $installMode == "all"
+         SetShellVarContext all
+       ${endif}
+diff --git a/node_modules/app-builder-lib/templates/nsis/installSection.nsh b/node_modules/app-builder-lib/templates/nsis/installSection.nsh
+index 053772f..a58ea8c 100644
+--- a/node_modules/app-builder-lib/templates/nsis/installSection.nsh
++++ b/node_modules/app-builder-lib/templates/nsis/installSection.nsh
+@@ -22,11 +22,37 @@ StrCpy $appExe "$INSTDIR\${APP_EXECUTABLE_FILENAME}"
+       SpiderBanner::Show /MODERN
+     !endif
+ 
++    # Set text (1000 is the id of text element of SpiderBanner)
+     FindWindow $0 "#32770" "" $hwndparent
+     FindWindow $0 "#32770" "" $hwndparent $0
+-    GetDlgItem $0 $0 1000
+-    SendMessage $0 ${WM_SETTEXT} 0 "STR:$(installing)"
+ 
++    GetDlgItem $1 $0 1000
++    SendMessage $1 ${WM_SETTEXT} 0 "STR:$(installing)"
++
++    # Set header image compatible with "ManifestDPIAware" mode.
++    !ifdef HEADER_ICO
++      # Convert 24 Dialog Units to pixels:
++      # See https://github.com/mozilla/gecko-dev/blob/8de0e699002872d969aebf1bc8407e5c839a4472/toolkit/mozapps/installer/windows/nsis/common.nsh#L8801
++
++      # rect = LPRect { .left = 0, .top = 0, .right = 24, .bottom = 0 }
++      # See https://nsis.sourceforge.io/Docs/System/System.html#faq
++      System::Call "*(i 0, i 0, i 24, i 0) p.r1"
++
++      # Call `MapDialogRect(window, &rect)`
++      System::Call `user32::MapDialogRect(p $0, p r1)`
++
++      # rect.right now contains the converted value (24du => ?px).
++      # Place `rect.right` into `r2`
++      System::Call "*$1(i, i, i.r2, i)"
++      System::Free $1
++
++      # Load image and pass `r2` as both width and height, get the image handle
++      # back to `r2` register.
++      System::Call `user32::LoadImage(i 0, t "$PLUGINSDIR\installerHeaderico.ico", i ${IMAGE_ICON}, i r2, i r2, i ${LR_LOADFROMFILE}) i.r2`
++      # 1025 is the id of the icon of SpiderBanner.
++      GetDlgItem $1 $0 1025
++      SendMessage $1 ${STM_SETIMAGE} ${IMAGE_ICON} $2
++    !endif
+     StrCpy $1 $hwndparent
+ 		System::Call 'user32::ShutdownBlockReasonCreate(${SYSTYPE_PTR}r1, w "$(installing)")'
+   ${endif}

patches/app-builder-lib+24.13.3.patch

@@ -1,5 +1,5 @@
 diff --git a/node_modules/dmg-builder/out/dmgLicense.js b/node_modules/dmg-builder/out/dmgLicense.js
-index b91be7d..dad9ceb 100644
+index 9263c2b..40706e5 100644
 --- a/node_modules/dmg-builder/out/dmgLicense.js
 +++ b/node_modules/dmg-builder/out/dmgLicense.js
 @@ -6,7 +6,7 @@ const js_yaml_1 = require("js-yaml");

patches/app-builder-lib+26.0.0-alpha.8.patch

@@ -36,10 +36,6 @@ const APP_ID_PATH = 'build.appId';
 const PRODUCTION_APP_ID = 'org.whispersystems.signal-desktop';
 const ALPHA_APP_ID = 'org.whispersystems.signal-desktop-alpha';
 
-const STARTUP_WM_CLASS_PATH = 'build.linux.desktop.StartupWMClass';
-const PRODUCTION_STARTUP_WM_CLASS = 'Signal';
-const ALPHA_STARTUP_WM_CLASS = 'Signal Alpha';
-
 const DESKTOP_NAME_PATH = 'desktopName';
 
 // Note: we're avoiding dashes in our .desktop name due to xdg-settings behavior
@@ -61,15 +57,13 @@ function checkValue(object, objectPath, expected) {
 checkValue(packageJson, NAME_PATH, PRODUCTION_NAME);
 checkValue(packageJson, PRODUCT_NAME_PATH, PRODUCTION_PRODUCT_NAME);
 checkValue(packageJson, APP_ID_PATH, PRODUCTION_APP_ID);
-checkValue(packageJson, STARTUP_WM_CLASS_PATH, PRODUCTION_STARTUP_WM_CLASS);
 checkValue(packageJson, DESKTOP_NAME_PATH, PRODUCTION_DESKTOP_NAME);
 
 // -------
 
 _.set(packageJson, NAME_PATH, ALPHA_NAME);
 _.set(packageJson, PRODUCT_NAME_PATH, ALPHA_PRODUCT_NAME);
 _.set(packageJson, APP_ID_PATH, ALPHA_APP_ID);
-_.set(packageJson, STARTUP_WM_CLASS_PATH, ALPHA_STARTUP_WM_CLASS);
 _.set(packageJson, DESKTOP_NAME_PATH, ALPHA_DESKTOP_NAME);
 
 // -------