Skip to content

Commit

Permalink
Bump the electron group with 2 updates (#50148)
Browse files Browse the repository at this point in the history
* 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](electron/electron@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/[email protected]/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
...



* 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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
ravicious and dependabot[bot] authored Dec 12, 2024
1 parent efb945f commit 366b336
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 21 deletions.
2 changes: 1 addition & 1 deletion web/packages/build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions web/packages/teleterm/electron-builder-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions web/packages/teleterm/notarize.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
Expand Down
2 changes: 1 addition & 1 deletion web/packages/teleterm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
38 changes: 19 additions & 19 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5110,10 +5110,10 @@ [email protected]:
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.10.tgz#cf12e593b6b847fb9d04027fa755c6c6610d778b"
integrity sha512-Ev4jj3D7Bo+O0GPD2NMvJl+PGiBAfS7pUGawntBNpCbxtpncfUixqFj9z9Jme7V7s3LBGqsWZZP54fxBX3JKJw==

[email protected].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==
[email protected].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"
Expand Down Expand Up @@ -7279,12 +7279,12 @@ dir-glob@^3.0.1:
dependencies:
path-type "^4.0.0"

[email protected].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==
[email protected].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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 366b336

Please sign in to comment.