Merge branch 'master' into tcsc/idc-friendlynames

gravitational · Dec 12, 2024 · 0350b7c · 0350b7c
2 parents b09ea80 + b757ce9
commit 0350b7c
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 23 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git 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
@@ -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
@@ -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",