From d4b037cc75b1ea96ddc0a8e96c9c7b6ca3c756c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 07:38:59 +0000 Subject: [PATCH] Bump the electron group with 2 updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump the electron group with 2 updates Bumps the electron group with 2 updates: [electron](https://github.com/electron/electron) and [electron-builder](https://github.com/electron-userland/electron-builder/tree/HEAD/packages/electron-builder). Updates `electron` from 33.1.0 to 33.2.1 - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v33.1.0...v33.2.1) Updates `electron-builder` from 25.1.7 to 25.1.8 - [Release notes](https://github.com/electron-userland/electron-builder/releases) - [Changelog](https://github.com/electron-userland/electron-builder/blob/master/packages/electron-builder/CHANGELOG.md) - [Commits](https://github.com/electron-userland/electron-builder/commits/electron-builder@25.1.8/packages/electron-builder) --- updated-dependencies: - dependency-name: electron dependency-type: direct:development update-type: version-update:semver-minor dependency-group: electron - dependency-name: electron-builder dependency-type: direct:development update-type: version-update:semver-patch dependency-group: electron ... Signed-off-by: dependabot[bot] * Turn off electron-builder's notarization * Add console.log to notarize.js Otherwise the output during a build would just say this: > skipped macOS notarization reason=`notarize` options were set explicitly `false` which could give the wrong impression that notarization was not done at all. --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rafał Cieślak --- web/packages/build/package.json | 2 +- .../teleterm/electron-builder-config.js | 5 +++ web/packages/teleterm/notarize.js | 2 + web/packages/teleterm/package.json | 2 +- yarn.lock | 38 +++++++++---------- 5 files changed, 28 insertions(+), 21 deletions(-) diff --git a/web/packages/build/package.json b/web/packages/build/package.json index 8af1aee8dd4e3..6a607154c9492 100644 --- a/web/packages/build/package.json +++ b/web/packages/build/package.json @@ -62,7 +62,7 @@ "core-js": "^3", "cross-env": "5.0.5", "cross-spawn": "6.0.5", - "electron-builder": "^25.1.7", + "electron-builder": "^25.1.8", "eslint": "^8.56.0", "eslint-import-resolver-typescript": "^3.6.1", "eslint-plugin-babel": "^5.3.1", diff --git a/web/packages/teleterm/electron-builder-config.js b/web/packages/teleterm/electron-builder-config.js index 27a874422f6e6..b61b2b316b9bd 100644 --- a/web/packages/teleterm/electron-builder-config.js +++ b/web/packages/teleterm/electron-builder-config.js @@ -43,6 +43,8 @@ module.exports = { appId, asar: true, asarUnpack: '**\\*.{node,dll}', + // TODO(ravicious): Migrate from custom notarize.js script to using the notarize field of the + // mac target. afterSign: 'notarize.js', afterPack: packed => { // @electron-universal adds the `ElectronAsarIntegrity` key to every .plist @@ -95,6 +97,9 @@ module.exports = { target: 'dmg', category: 'public.app-category.developer-tools', type: 'distribution', + // TODO(ravicious): Migrate from custom notarize.js script to using the notarize field of the + // mac target. + notarize: false, hardenedRuntime: true, gatekeeperAssess: false, // If CONNECT_TSH_APP_PATH is provided, we assume that tsh.app is already signed. diff --git a/web/packages/teleterm/notarize.js b/web/packages/teleterm/notarize.js index 082a43e3ff5f3..dad6cfd9d9be2 100644 --- a/web/packages/teleterm/notarize.js +++ b/web/packages/teleterm/notarize.js @@ -23,6 +23,8 @@ exports.default = async function notarizing(context) { const appName = context.packager.appInfo.productFilename; const appBundleId = context.packager.appInfo.macBundleIdentifier; + console.log('notarize.js: Notarizing in progress.'); + return await notarize({ appBundleId, appPath: `${appOutDir}/${appName}.app`, diff --git a/web/packages/teleterm/package.json b/web/packages/teleterm/package.json index d7d9719b74f07..59c5292813e1a 100644 --- a/web/packages/teleterm/package.json +++ b/web/packages/teleterm/package.json @@ -45,7 +45,7 @@ "@types/node-forge": "^1.0.4", "@types/tar-fs": "^2.0.1", "@types/whatwg-url": "^11.0.1", - "electron": "33.1.0", + "electron": "33.2.1", "electron-vite": "^2.0.0", "google-protobuf": "^3.21.2", "immer": "^10.1.1", diff --git a/yarn.lock b/yarn.lock index 3f96d85ef84f7..c85b07d1066a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5110,10 +5110,10 @@ app-builder-bin@5.0.0-alpha.10: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.10.tgz#cf12e593b6b847fb9d04027fa755c6c6610d778b" integrity sha512-Ev4jj3D7Bo+O0GPD2NMvJl+PGiBAfS7pUGawntBNpCbxtpncfUixqFj9z9Jme7V7s3LBGqsWZZP54fxBX3JKJw== -app-builder-lib@25.1.7: - version "25.1.7" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-25.1.7.tgz#f8ce8e2edc6d91becbe956b1205da1f3849cafe9" - integrity sha512-JxmN+D/Dn7BLQoN+cTFO+zbMHcpI10v/xjyjFO1FKpHbApOG+OQt/xUyVjKWp4FYplIfuHdpxqTXo1PN/Wzm/A== +app-builder-lib@25.1.8: + version "25.1.8" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-25.1.8.tgz#ae376039c5f269c7d562af494a087e5bc6310f1b" + integrity sha512-pCqe7dfsQFBABC1jeKZXQWhGcCPF3rPCXDdfqVKjIeWBcXzyC1iOWZdfFhGl+S9MyE/k//DFmC6FzuGAUudNDg== dependencies: "@develar/schema-utils" "~2.6.5" "@electron/notarize" "2.5.0" @@ -7279,12 +7279,12 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -dmg-builder@25.1.7: - version "25.1.7" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-25.1.7.tgz#a3bb8e1dc790faec04503568480db80f5077a2cb" - integrity sha512-Hac0AfXQrAV62JT99Had6bvUJb/f7vjJTaLOsmA/gAQcrc/cLmNAqCJ0ZZDqwKy2+LKXnxx45TvMXvovKd4iMg== +dmg-builder@25.1.8: + version "25.1.8" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-25.1.8.tgz#41f3b725edd896156e891016a44129e1bd580430" + integrity sha512-NoXo6Liy2heSklTI5OIZbCgXC1RzrDQsZkeEwXhdOro3FT1VBOvbubvscdPnjVuQ4AMwwv61oaH96AbiYg9EnQ== dependencies: - app-builder-lib "25.1.7" + app-builder-lib "25.1.8" builder-util "25.1.7" builder-util-runtime "9.2.10" fs-extra "^10.1.0" @@ -7461,16 +7461,16 @@ ejs@^3.1.8: dependencies: jake "^10.8.5" -electron-builder@^25.1.7: - version "25.1.7" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-25.1.7.tgz#b3d1504925a4d3693d97c76c0d2f2906613ffe4b" - integrity sha512-lsKtX93GSHWnmuteNRvBzgJIjRiiYB0qrJVRjShwBi75Ns+mRdWeOGZiXItqOWj+3g5UyY722kgoq2WlqCB87A== +electron-builder@^25.1.8: + version "25.1.8" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-25.1.8.tgz#b0e310f1600787610bb84c3f39bc7aadb2548486" + integrity sha512-poRgAtUHHOnlzZnc9PK4nzG53xh74wj2Jy7jkTrqZ0MWPoHGh1M2+C//hGeYdA+4K8w4yiVCNYoLXF7ySj2Wig== dependencies: - app-builder-lib "25.1.7" + app-builder-lib "25.1.8" builder-util "25.1.7" builder-util-runtime "9.2.10" chalk "^4.1.2" - dmg-builder "25.1.7" + dmg-builder "25.1.8" fs-extra "^10.1.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -7507,10 +7507,10 @@ electron-vite@^2.0.0: magic-string "^0.30.5" picocolors "^1.0.0" -electron@33.1.0: - version "33.1.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-33.1.0.tgz#c86042e71fa964a054b3306810a3c451aada98f7" - integrity sha512-7KiY6MtRo1fVFLPGyHS7Inh8yZfrbUTy43nNwUgMD2CBk729BgSwOC2WhmcptNJVlzHJpVxSWkiVi2hp9mH/bw== +electron@33.2.1: + version "33.2.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-33.2.1.tgz#d0d7bba7a7abf4f14881d0a6e03c498b301a2d5f" + integrity sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg== dependencies: "@electron/get" "^2.0.0" "@types/node" "^20.9.0"