chore: upgrade `@electron/notarize` to v2 (#1687)

* chore: upgrade @electron/notarize to v2

- remove redundant `appBundleId` and provide fallback for `appleId` and `appleIdPassword`
- replace `ts-ignore` with `eslint-disable` in notarize.js
- Explicitly disable electron-builder notarizing

Co-authored-by: Alphrag <34252790+Alphrag@users.noreply.github.com>

4 files changed, 12 insertions, 11 deletions

diff --git a/build-helpers/notarize.js b/build-helpers/notarize.js
index 32faa97b8..e3fece0b3 100644
--- a/build-helpers/notarize.js
+++ b/build-helpers/notarize.js
@@ -11,15 +11,14 @@ exports.default = async function notarizing(context) {
 
   const appName = context.packager.appInfo.productFilename;
 
-  // @ts-ignore global-require
+  // eslint-disable-next-line global-require
   const { notarize } = require('@electron/notarize');
 
   await notarize({
     tool: 'notarytool',
-    appBundleId: 'org.ferdium.ferdium-app',
     appPath: `${appOutDir}/${appName}.app`,
     teamId: '55E9FPJ93P',
-    appleId: process.env.APPLEID,
-    appleIdPassword: process.env.APPLEID_PASSWORD,
+    appleId: process.env.APPLEID || '',
+    appleIdPassword: process.env.APPLEID_PASSWORD || '',
   });
 };
diff --git a/electron-builder.yml b/electron-builder.yml
index ba76bfde1..ad12c7e5a 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -70,6 +70,7 @@ mac:
   entitlements: "./build-helpers/entitlements.mas.plist"
   entitlementsInherit: "./build-helpers/entitlements.mas.inherit.plist"
   artifactName: "${productName}-${os}-bundle-${version}-${arch}.${ext}"
+  notarize: false
   target:
     - target: dmg
       arch: [x64, arm64]
diff --git a/package.json b/package.json
index 291f84c79..e39cace3b 100644
--- a/package.json
+++ b/package.json
@@ -135,7 +135,7 @@
     "@biomejs/biome": "1.6.1",
     "@commitlint/cli": "19.2.1",
     "@commitlint/config-conventional": "19.1.0",
-    "@electron/notarize": "1.2.3",
+    "@electron/notarize": "2.3.0",
     "@formatjs/cli": "6.2.9",
     "@jest/types": "29.6.3",
     "@types/auto-launch": "5.0.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index be8a320ea..e88ccd691 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -268,8 +268,8 @@ devDependencies:
     specifier: 19.1.0
     version: 19.1.0
   '@electron/notarize':
-    specifier: 1.2.3
-    version: 1.2.3
+    specifier: 2.3.0
+    version: 2.3.0
   '@formatjs/cli':
     specifier: 6.2.9
     version: 6.2.9
@@ -1431,18 +1431,19 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@electron/notarize@1.2.3:
-    resolution: {integrity: sha512-9oRzT56rKh5bspk3KpAVF8lPKHYQrBnRwcgiOeR0hdilVEQmszDaAu0IPCPrwwzJN0ugNs0rRboTreHMt/6mBQ==}
+  /@electron/notarize@2.2.1:
+    resolution: {integrity: sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==}
     engines: {node: '>= 10.0.0'}
     dependencies:
       debug: 4.3.4(supports-color@5.5.0)
       fs-extra: 9.1.0
+      promise-retry: 2.0.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@electron/notarize@2.2.1:
-    resolution: {integrity: sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==}
+  /@electron/notarize@2.3.0:
+    resolution: {integrity: sha512-EiTBU0BwE7HZZjAG1fFWQaiQpCuPrVGn7jPss1kUjD6eTTdXXd29RiZqEqkgN7xqt/Pgn4g3I7Saqovanrfj3w==}
     engines: {node: '>= 10.0.0'}
     dependencies:
       debug: 4.3.4(supports-color@5.5.0)