diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4f4d986da4820..5258282a287b4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -470,11 +470,11 @@ importers: specifier: ^5.5.0 version: 5.5.0 electron: - specifier: 33.1.0 - version: 33.1.0 + specifier: 33.2.1 + version: 33.2.1 electron-builder: - specifier: ^25.1.7 - version: 25.1.7(electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.7)) + specifier: ^25.1.8 + version: 25.1.8(electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.8)) electron-vite: specifier: ^2.3.0 version: 2.3.0(@swc/core@1.9.3)(vite@5.4.8(@types/node@20.17.9)(terser@5.31.1)) @@ -2880,6 +2880,13 @@ packages: dmg-builder: 25.1.7 electron-builder-squirrel-windows: 25.1.7 + app-builder-lib@25.1.8: + resolution: {integrity: sha512-pCqe7dfsQFBABC1jeKZXQWhGcCPF3rPCXDdfqVKjIeWBcXzyC1iOWZdfFhGl+S9MyE/k//DFmC6FzuGAUudNDg==} + engines: {node: '>=14.0.0'} + peerDependencies: + dmg-builder: 25.1.8 + electron-builder-squirrel-windows: 25.1.8 + append-transform@2.0.0: resolution: {integrity: sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==} engines: {node: '>=8'} @@ -3578,8 +3585,8 @@ packages: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} engines: {node: '>=8'} - dmg-builder@25.1.7: - resolution: {integrity: sha512-Hac0AfXQrAV62JT99Had6bvUJb/f7vjJTaLOsmA/gAQcrc/cLmNAqCJ0ZZDqwKy2+LKXnxx45TvMXvovKd4iMg==} + dmg-builder@25.1.8: + resolution: {integrity: sha512-NoXo6Liy2heSklTI5OIZbCgXC1RzrDQsZkeEwXhdOro3FT1VBOvbubvscdPnjVuQ4AMwwv61oaH96AbiYg9EnQ==} dmg-license@1.0.11: resolution: {integrity: sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==} @@ -3646,8 +3653,8 @@ packages: electron-builder-squirrel-windows@25.1.7: resolution: {integrity: sha512-nJMvw1FNy+6YP8HmjSb0JwMowpdlZpydZGab9KevKO/fIC9wTcr5rkhbLsTfEPOjdAqOTycRoK0mOJCFB/1uig==} - electron-builder@25.1.7: - resolution: {integrity: sha512-lsKtX93GSHWnmuteNRvBzgJIjRiiYB0qrJVRjShwBi75Ns+mRdWeOGZiXItqOWj+3g5UyY722kgoq2WlqCB87A==} + electron-builder@25.1.8: + resolution: {integrity: sha512-poRgAtUHHOnlzZnc9PK4nzG53xh74wj2Jy7jkTrqZ0MWPoHGh1M2+C//hGeYdA+4K8w4yiVCNYoLXF7ySj2Wig==} engines: {node: '>=14.0.0'} hasBin: true @@ -3668,8 +3675,8 @@ packages: '@swc/core': optional: true - electron@33.1.0: - resolution: {integrity: sha512-7KiY6MtRo1fVFLPGyHS7Inh8yZfrbUTy43nNwUgMD2CBk729BgSwOC2WhmcptNJVlzHJpVxSWkiVi2hp9mH/bw==} + electron@33.2.1: + resolution: {integrity: sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg==} engines: {node: '>= 12.20.55'} hasBin: true @@ -9410,7 +9417,47 @@ snapshots: app-builder-bin@5.0.0-alpha.10: {} - app-builder-lib@25.1.7(dmg-builder@25.1.7(electron-builder-squirrel-windows@25.1.7))(electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.7)): + app-builder-lib@25.1.7(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.7))(electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.8)): + dependencies: + '@develar/schema-utils': 2.6.5 + '@electron/notarize': 2.5.0 + '@electron/osx-sign': 1.3.1 + '@electron/rebuild': 3.6.1 + '@electron/universal': 2.0.1 + '@malept/flatpak-bundler': 0.4.0 + '@types/fs-extra': 9.0.13 + async-exit-hook: 2.0.1 + bluebird-lst: 1.0.9 + builder-util: 25.1.7 + builder-util-runtime: 9.2.10 + chromium-pickle-js: 0.2.0 + config-file-ts: 0.2.8-rc1 + debug: 4.3.7 + dmg-builder: 25.1.8(electron-builder-squirrel-windows@25.1.7) + dotenv: 16.4.5 + dotenv-expand: 11.0.6 + ejs: 3.1.10 + electron-builder-squirrel-windows: 25.1.7(dmg-builder@25.1.8) + electron-publish: 25.1.7 + form-data: 4.0.1 + fs-extra: 10.1.0 + hosted-git-info: 4.1.0 + is-ci: 3.0.1 + isbinaryfile: 5.0.2 + js-yaml: 4.1.0 + json5: 2.2.3 + lazy-val: 1.0.5 + minimatch: 10.0.1 + resedit: 1.7.0 + sanitize-filename: 1.6.3 + semver: 7.6.3 + tar: 6.2.1 + temp-file: 3.4.0 + transitivePeerDependencies: + - bluebird + - supports-color + + app-builder-lib@25.1.8(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.7))(electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.8)): dependencies: '@develar/schema-utils': 2.6.5 '@electron/notarize': 2.5.0 @@ -9426,11 +9473,11 @@ snapshots: chromium-pickle-js: 0.2.0 config-file-ts: 0.2.8-rc1 debug: 4.3.7 - dmg-builder: 25.1.7(electron-builder-squirrel-windows@25.1.7) + dmg-builder: 25.1.8(electron-builder-squirrel-windows@25.1.7) dotenv: 16.4.5 dotenv-expand: 11.0.6 ejs: 3.1.10 - electron-builder-squirrel-windows: 25.1.7(dmg-builder@25.1.7) + electron-builder-squirrel-windows: 25.1.7(dmg-builder@25.1.8) electron-publish: 25.1.7 form-data: 4.0.1 fs-extra: 10.1.0 @@ -10289,9 +10336,9 @@ snapshots: dependencies: path-type: 4.0.0 - dmg-builder@25.1.7(electron-builder-squirrel-windows@25.1.7): + dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.7): dependencies: - app-builder-lib: 25.1.7(dmg-builder@25.1.7(electron-builder-squirrel-windows@25.1.7))(electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.7)) + app-builder-lib: 25.1.8(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.7))(electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.8)) builder-util: 25.1.7 builder-util-runtime: 9.2.10 fs-extra: 10.1.0 @@ -10373,9 +10420,9 @@ snapshots: dependencies: jake: 10.8.5 - electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.7): + electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.8): dependencies: - app-builder-lib: 25.1.7(dmg-builder@25.1.7(electron-builder-squirrel-windows@25.1.7))(electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.7)) + app-builder-lib: 25.1.7(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.7))(electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.8)) archiver: 5.3.2 builder-util: 25.1.7 fs-extra: 10.1.0 @@ -10384,13 +10431,13 @@ snapshots: - dmg-builder - supports-color - electron-builder@25.1.7(electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.7)): + electron-builder@25.1.8(electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.8)): dependencies: - app-builder-lib: 25.1.7(dmg-builder@25.1.7(electron-builder-squirrel-windows@25.1.7))(electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.7)) + app-builder-lib: 25.1.8(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.7))(electron-builder-squirrel-windows@25.1.7(dmg-builder@25.1.8)) builder-util: 25.1.7 builder-util-runtime: 9.2.10 chalk: 4.1.2 - dmg-builder: 25.1.7(electron-builder-squirrel-windows@25.1.7) + dmg-builder: 25.1.8(electron-builder-squirrel-windows@25.1.7) fs-extra: 10.1.0 is-ci: 3.0.1 lazy-val: 1.0.5 @@ -10429,7 +10476,7 @@ snapshots: transitivePeerDependencies: - supports-color - electron@33.1.0: + electron@33.2.1: dependencies: '@electron/get': 2.0.2 '@types/node': 20.17.9 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 6f24853b5c7a3..4cd65da0abec2 100644 --- a/web/packages/teleterm/package.json +++ b/web/packages/teleterm/package.json @@ -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",