From 167ec32c0db99bb637e9881ace21403430ae6235 Mon Sep 17 00:00:00 2001 From: Rajiv Shah Date: Tue, 31 Oct 2023 17:51:33 -0400 Subject: [PATCH] chore: Update to @electron/notarize for new notarytool --- packages/desktop/electron-builder-config.js | 2 +- packages/desktop/package.json | 2 +- packages/desktop/scripts/notarize.macos.js | 7 ++--- yarn.lock | 31 +++++++++++++-------- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/packages/desktop/electron-builder-config.js b/packages/desktop/electron-builder-config.js index 71f5581be82..02d722ce765 100644 --- a/packages/desktop/electron-builder-config.js +++ b/packages/desktop/electron-builder-config.js @@ -12,7 +12,7 @@ const prodConfig = () => ({ afterSign: async () => { // eslint-disable-next-line no-useless-catch try { - await notarize(APP_ID, getAppName()) + await notarize(getAppName()) } catch (err) { // This catch is necessary or the promise rejection is swallowed throw err diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 04e395c48ad..96cd6a3b006 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -42,6 +42,7 @@ "url": "^0.11.0" }, "devDependencies": { + "@electron/notarize": "^2.1.0", "@sentry/webpack-plugin": "^1.18.5", "@tsconfig/svelte": "^4.0.1", "@types/webpack": "^5.28.1", @@ -50,7 +51,6 @@ "css-loader": "^6.7.3", "electron": "22.3.27", "electron-builder": "^24.0.0", - "electron-notarize": "^1.0.0", "esbuild-loader": "^4.0.2", "lodash.merge": "^4.6.2", "mini-css-extract-plugin": "^2.7.6", diff --git a/packages/desktop/scripts/notarize.macos.js b/packages/desktop/scripts/notarize.macos.js index 19fa25406d5..984975042ae 100644 --- a/packages/desktop/scripts/notarize.macos.js +++ b/packages/desktop/scripts/notarize.macos.js @@ -1,4 +1,4 @@ -const { notarize } = require('electron-notarize') +const { notarize } = require('@electron/notarize') const path = require('path') /** @@ -6,7 +6,7 @@ const path = require('path') * @param {string} appName * @returns void */ -module.exports = async (appBundleId, appName) => { +module.exports = async (appName) => { if (process.platform !== 'darwin' || process.env.MACOS_SKIP_NOTARIZATION) { return true } @@ -23,10 +23,9 @@ module.exports = async (appBundleId, appName) => { } await notarize({ - appBundleId: appBundleId, appPath: path.resolve(__dirname, `../out/mac/${appName}.app`), appleId: APPLE_ID, appleIdPassword: APPLE_ID_PASSWORD, - ascProvider: 'UG77RJKZHH', + teamId: 'UG77RJKZHH', }) } diff --git a/yarn.lock b/yarn.lock index 01c00501c14..78a9ae627a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -458,6 +458,15 @@ debug "^4.1.1" fs-extra "^9.0.1" +"@electron/notarize@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.1.0.tgz#76aaec10c8687225e8d0a427cc9df67611c46ff3" + integrity sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA== + dependencies: + debug "^4.1.1" + fs-extra "^9.0.1" + promise-retry "^2.0.1" + "@electron/osx-sign@^1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.4.tgz#8e91442846471636ca0469426a82b253b9170151" @@ -1695,6 +1704,13 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== +"@types/node-forge@^1.3.0": + version "1.3.8" + resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.8.tgz#044ad98354ff309a031a55a40ad122f3be1ac2bb" + integrity sha512-vGXshY9vim9CJjrpcS5raqSjEfKlJcWy2HNdgUasR66fAnVEYarrf1ULV4nfvpC1nZq/moA9qyqBcu83x+Jlrg== + dependencies: + "@types/node" "*" + "@types/node@*": version "20.4.0" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.0.tgz#01d637d1891e419bc85763b46f42809cd2d5addb" @@ -3475,14 +3491,6 @@ electron-log@^4.3.1: resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.4.8.tgz#fcb9f714dbcaefb6ac7984c4683912c74730248a" integrity sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA== -electron-notarize@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.2.2.tgz#ebf2b258e8e08c1c9f8ff61dc53d5b16b439daf4" - integrity sha512-ZStVWYcWI7g87/PgjPJSIIhwQXOaw4/XeXU+pWqMMktSLHaGMLHdyPPN7Cmao7+Cr7fYufA16npdtMndYciHNw== - dependencies: - debug "^4.1.1" - fs-extra "^9.0.1" - electron-publish@24.4.0: version "24.4.0" resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.4.0.tgz#a58f49ecd727620f65372881788ebb1a9b853284" @@ -7392,10 +7400,11 @@ select-hose@^2.0.0: integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg== selfsigned@^2.0.1, selfsigned@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61" - integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ== + version "2.4.1" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0" + integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q== dependencies: + "@types/node-forge" "^1.3.0" node-forge "^1" semver-compare@^1.0.0: