Skip to content

Commit

Permalink
Bump the electron group with 2 updates (#49610)
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
...

Signed-off-by: dependabot[bot] <[email protected]>

* 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>
Co-authored-by: Rafał Cieślak <[email protected]>
  • Loading branch information
dependabot[bot] and ravicious authored Dec 12, 2024
1 parent f72a4a4 commit b757ce9
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 23 deletions.
89 changes: 68 additions & 21 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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
4 changes: 2 additions & 2 deletions web/packages/teleterm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"@types/whatwg-url": "^11.0.5",
"@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0",
"electron": "33.1.0",
"electron-builder": "^25.1.7",
"electron": "33.2.1",
"electron-builder": "^25.1.8",
"electron-vite": "^2.3.0",
"events": "3.3.0",
"immer": "^10.1.1",
Expand Down

0 comments on commit b757ce9

Please sign in to comment.