Update electron-builder to 24.6.3

2023-08-18 18:34:02 +02:00 · 2023-08-18 18:34:02 +02:00 · d0cac2263e
commit d0cac2263e
parent 1b88e45a42
5 changed files with 294 additions and 539 deletions
--- a/package.json
+++ b/package.json
@ -270,7 +270,7 @@
    "danger": "11.1.2",
    "debug": "4.3.3",
    "electron": "25.4.0",
-    "electron-builder": "23.0.8",
+    "electron-builder": "24.6.3",
    "electron-mocha": "11.0.2",
    "electron-notarize": "1.2.1",
    "endanger": "7.0.4",
--- a/patches/app-builder-lib+24.6.3.patch
+++ b/patches/app-builder-lib+24.6.3.patch
@ -1,8 +1,8 @@
 diff --git a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
-index ffcc8bd..bafab0e 100644
+index fcb7f54..3f27bf3 100644
 --- a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
 +++ b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
-@@ -88,7 +88,7 @@ class LinuxTargetHelper {
+@@ -99,7 +99,7 @@ class LinuxTargetHelper {
             // https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables
             const execCodes = ["%f", "%u", "%F", "%U"];
             if (executableArgs == null || executableArgs.findIndex(arg => execCodes.includes(arg)) === -1) {
@ -11,28 +11,13 @@ index ffcc8bd..bafab0e 100644
             }
         }
         const desktopMeta = {
-diff --git a/node_modules/app-builder-lib/scheme.json b/node_modules/app-builder-lib/scheme.json
-index 4ce62d9..aea0e0b 100644
--- a/node_modules/app-builder-lib/scheme.json
-+++ b/node_modules/app-builder-lib/scheme.json
-@@ -4749,6 +4749,10 @@
-             "null",
-             "string"
-           ]
-+        },
-+        "vendor": {
-+          "description": "Vendor-specific informaton",
-+          "type": "object"
-         }
-       },
-       "type": "object"
 diff --git a/node_modules/app-builder-lib/templates/linux/after-install.tpl b/node_modules/app-builder-lib/templates/linux/after-install.tpl
-index 1536059..555f8f5 100644
+index 0f541f9..d1e77a0 100644
 --- a/node_modules/app-builder-lib/templates/linux/after-install.tpl
 +++ b/node_modules/app-builder-lib/templates/linux/after-install.tpl
-@@ -3,8 +3,5 @@
- # Link to the binary
- ln -sf '/opt/${sanitizedProductName}/${executable}' '/usr/bin/${executable}'
+@@ -10,8 +10,5 @@ else
+     ln -sf '/opt/${sanitizedProductName}/${executable}' '/usr/bin/${executable}'
+ fi
 
 -# SUID chrome-sandbox for Electron 5+
 -chmod 4755 '/opt/${sanitizedProductName}/chrome-sandbox' || true
@ -40,10 +25,10 @@ index 1536059..555f8f5 100644
 update-mime-database /usr/share/mime || true
 update-desktop-database /usr/share/applications || true
 diff --git a/node_modules/app-builder-lib/templates/nsis/installSection.nsh b/node_modules/app-builder-lib/templates/nsis/installSection.nsh
-index 96f913a..ee95419 100644
+index 053772f..7981a4e 100644
 --- a/node_modules/app-builder-lib/templates/nsis/installSection.nsh
 +++ b/node_modules/app-builder-lib/templates/nsis/installSection.nsh
-@@ -22,10 +22,37 @@ StrCpy $appExe "$INSTDIR\${APP_EXECUTABLE_FILENAME}"
+@@ -22,11 +22,38 @@ StrCpy $appExe "$INSTDIR\${APP_EXECUTABLE_FILENAME}"
       SpiderBanner::Show /MODERN
     !endif
 
@ -52,6 +37,7 @@ index 96f913a..ee95419 100644
     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)"
 +
@ -80,19 +66,6 @@ index 96f913a..ee95419 100644
 +      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}
-   !insertmacro CHECK_APP_RUNNING
- !else
-diff --git a/node_modules/app-builder-lib/templates/nsis/messages.yml b/node_modules/app-builder-lib/templates/nsis/messages.yml
-index 87fa6b5..ad560bd 100644
--- a/node_modules/app-builder-lib/templates/nsis/messages.yml
-+++ b/node_modules/app-builder-lib/templates/nsis/messages.yml
-@@ -45,7 +45,7 @@ x64WinRequired:
-   es: Windows de 64 bits es requerido
-   da: 64-bit Windows er påkrævet
- appRunning:
-  en: "${PRODUCT_NAME} is running.\nClick OK to close it."
-+  en: "${PRODUCT_NAME} is running.\nClick OK to close it.\nIf it doesn't close, try closing it manually."
-   de: "${PRODUCT_NAME} ist geöffnet. \nKlicken Sie zum Schliessen auf «OK»."
-   it: "${PRODUCT_NAME} è in esecuzione. \nPremi OK per chiudere."
-   fr: "${PRODUCT_NAME} est en cours d’utilisation. \nCliquez sur «OK» pour fermer ce programme."
--- a/ts/scripts/prune-macos-release.ts
+++ b/ts/scripts/prune-macos-release.ts
@ -2,6 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only

 import fs from 'fs/promises';
+import { pathExists } from 'fs-extra';
 import path from 'path';
 import rimraf from 'rimraf';
 import type { AfterPackContext } from 'electron-builder';
@ -28,7 +29,13 @@ export async function afterPack({
  const versionsDir = path.join(frameworkDir, 'Versions');
  const currentVersion = path.join(versionsDir, 'Current');

-  const subFolders = await fs.readdir(currentVersion);
+  let subFolders: Array<string>;
+  if (await pathExists(currentVersion)) {
+    subFolders = await fs.readdir(currentVersion);
+  } else {
+    console.error(`${currentVersion} not found`);
+    subFolders = [];
+  }
  for (const folder of subFolders) {
    const sourcePath = path.join(currentVersion, folder);
    const targetPath = path.join(frameworkDir, folder);
--- a/ts/util/lint/exceptions.json
+++ b/ts/util/lint/exceptions.json
@ -758,13 +758,6 @@
    "updated": "2020-08-26T00:10:28.628Z",
    "reasonDetail": "isn't react"
  },
-  {
-    "rule": "thenify-multiArgs",
-    "path": "node_modules/find-cache-dir/node_modules/pify/index.js",
-    "line": "\t\tif (options.multiArgs) {",
-    "reasonCategory": "falseMatch",
-    "updated": "2020-08-25T00:30:50.619Z"
-  },
  {
    "rule": "React-findDOMNode",
    "path": "node_modules/focus-trap-react/dist/focus-trap-react.js",
@ -1133,6 +1126,13 @@
    "reasonCategory": "notExercisedByOurApp",
    "updated": "2023-06-29T17:01:25.145Z"
  },
+  {
+    "rule": "thenify-multiArgs",
+    "path": "node_modules/make-dir/node_modules/pify/index.js",
+    "line": "\t\tif (options.multiArgs) {",
+    "reasonCategory": "falseMatch",
+    "updated": "2023-08-17T21:23:20.930Z"
+  },
  {
    "rule": "DOM-innerHTML",
    "path": "node_modules/min-document/serialize.js",
@ -1206,13 +1206,6 @@
    "reasonCategory": "usageTrusted",
    "updated": "2022-12-13T00:55:48.389Z"
  },
-  {
-    "rule": "DOM-innerHTML",
-    "path": "node_modules/package-json/node_modules/@sindresorhus/is/dist/index.js",
-    "line": "        'innerHTML',",
-    "reasonCategory": "usageTrusted",
-    "updated": "2021-11-13T01:24:25.496Z"
-  },
  {
    "rule": "DOM-innerHTML",
    "path": "node_modules/parse-entities/decode-entity.browser.js",
@ -2106,6 +2099,30 @@
    "reasonCategory": "usageTrusted",
    "updated": "2021-07-30T16:57:33.618Z"
  },
+  {
+    "rule": "React-useRef",
+    "path": "ts/components/CallsList.tsx",
+    "line": "  const infiniteLoaderRef = useRef<InfiniteLoader>(null);",
+    "reasonCategory": "usageTrusted",
+    "updated": "2023-08-02T00:21:37.858Z",
+    "reasonDetail": "<optional>"
+  },
+  {
+    "rule": "React-useRef",
+    "path": "ts/components/CallsList.tsx",
+    "line": "  const listRef = useRef<List>(null);",
+    "reasonCategory": "usageTrusted",
+    "updated": "2023-08-02T00:21:37.858Z",
+    "reasonDetail": "<optional>"
+  },
+  {
+    "rule": "React-useRef",
+    "path": "ts/components/CallsList.tsx",
+    "line": "  const prevOptionsRef = useRef<CallHistoryFilterOptions | null>(null);",
+    "reasonCategory": "usageTrusted",
+    "updated": "2023-08-17T00:07:01.015Z",
+    "reasonDetail": "<optional>"
+  },
  {
    "rule": "React-useRef",
    "path": "ts/components/CaptchaDialog.tsx",
@ -2399,6 +2416,13 @@
    "updated": "2022-06-14T22:04:43.988Z",
    "reasonDetail": "Handling outside click"
  },
+  {
+    "rule": "React-useRef",
+    "path": "ts/components/Modal.tsx",
+    "line": "  const modalRef = useRef<HTMLDivElement | null>(null);",
+    "reasonCategory": "usageTrusted",
+    "updated": "2021-08-05T00:22:31.660Z"
+  },
  {
    "rule": "React-useRef",
    "path": "ts/components/Modal.tsx",
@ -2415,13 +2439,6 @@
    "updated": "2023-07-25T21:55:26.191Z",
    "reasonDetail": "<optional>"
  },
-  {
-    "rule": "React-useRef",
-    "path": "ts/components/Modal.tsx",
-    "line": "  const modalRef = useRef<HTMLDivElement | null>(null);",
-    "reasonCategory": "usageTrusted",
-    "updated": "2021-08-05T00:22:31.660Z"
-  },
  {
    "rule": "React-useRef",
    "path": "ts/components/ModalContainer.tsx",
@ -2560,14 +2577,6 @@
    "reasonCategory": "usageTrusted",
    "updated": "2022-10-05T18:51:56.411Z"
  },
-  {
-    "rule": "React-useRef",
-    "path": "ts/components/TextAttachment.tsx",
-    "line": "    const ref = useRef<HTMLDivElement>(null);",
-    "reasonCategory": "usageTrusted",
-    "updated": "2023-07-25T21:55:26.191Z",
-    "reasonDetail": "<optional>"
-  },
  {
    "rule": "React-useRef",
    "path": "ts/components/TextAttachment.tsx",
@ -2582,6 +2591,14 @@
    "reasonCategory": "usageTrusted",
    "updated": "2022-06-16T23:23:32.306Z"
  },
+  {
+    "rule": "React-useRef",
+    "path": "ts/components/TextAttachment.tsx",
+    "line": "    const ref = useRef<HTMLDivElement>(null);",
+    "reasonCategory": "usageTrusted",
+    "updated": "2023-07-25T21:55:26.191Z",
+    "reasonDetail": "<optional>"
+  },
  {
    "rule": "React-useRef",
    "path": "ts/components/TextStoryCreator.tsx",
@ -2874,6 +2891,14 @@
    "updated": "2023-07-25T21:55:26.191Z",
    "reasonDetail": "<optional>"
  },
+  {
+    "rule": "React-useRef",
+    "path": "ts/quill/formatting/menu.tsx",
+    "line": "  const buttonRef = React.useRef<HTMLButtonElement | null>(null);",
+    "reasonCategory": "usageTrusted",
+    "updated": "2023-04-22T00:07:56.294Z",
+    "reasonDetail": "Popper needs to reference the button"
+  },
  {
    "rule": "React-useRef",
    "path": "ts/quill/formatting/menu.tsx",
@ -2890,14 +2915,6 @@
    "updated": "2023-08-02T19:01:24.771Z",
    "reasonDetail": "We need a persistent timer to track long-hovers"
  },
-  {
-    "rule": "React-useRef",
-    "path": "ts/quill/formatting/menu.tsx",
-    "line": "  const buttonRef = React.useRef<HTMLButtonElement | null>(null);",
-    "reasonCategory": "usageTrusted",
-    "updated": "2023-04-22T00:07:56.294Z",
-    "reasonDetail": "Popper needs to reference the button"
-  },
  {
    "rule": "DOM-innerHTML",
    "path": "ts/quill/signal-clipboard/util.ts",
@ -2941,29 +2958,5 @@
    "line": "  message.innerHTML = window.i18n('icu:optimizingApplication');",
    "reasonCategory": "usageTrusted",
    "updated": "2021-09-17T21:02:59.414Z"
-  },
-  {
-    "rule": "React-useRef",
-    "path": "ts/components/CallsList.tsx",
-    "line": "  const infiniteLoaderRef = useRef<InfiniteLoader>(null);",
-    "reasonCategory": "usageTrusted",
-    "updated": "2023-08-02T00:21:37.858Z",
-    "reasonDetail": "<optional>"
-  },
-  {
-    "rule": "React-useRef",
-    "path": "ts/components/CallsList.tsx",
-    "line": "  const listRef = useRef<List>(null);",
-    "reasonCategory": "usageTrusted",
-    "updated": "2023-08-02T00:21:37.858Z",
-    "reasonDetail": "<optional>"
-  },
-  {
-    "rule": "React-useRef",
-    "path": "ts/components/CallsList.tsx",
-    "line": "  const prevOptionsRef = useRef<CallHistoryFilterOptions | null>(null);",
-    "reasonCategory": "usageTrusted",
-    "updated": "2023-08-17T00:07:01.015Z",
-    "reasonDetail": "<optional>"
  }
 ]
--- a/yarn.lock
+++ b/yarn.lock