[v16] Fix Connect for Intel Macs (#44435)

* Fix Connect for Intel Macs (#44383)

* Update `electron-builder@25.0.0`

* Remove `legacy` option

* Add patch for `electron-builder` that allows universal builds to work

* Remove packages patching

* `electron-builder@25.0.1`

(cherry picked from commit f797b86)

* Update `e`

package.json

@@ -28,7 +28,6 @@
   "private": true,
   "resolutions": {
     "esbuild": "^0.20.2",
-    "node-gyp": "^10.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "**/d3-color": "^3.1.0",

web/packages/teleterm/electron-builder-config.js

@@ -214,17 +214,4 @@ module.exports = {
     buildResources: 'build_resources',
     output: 'build/release',
   },
-  // TODO(gzdunek): Remove once @electron/rebuild migrates to node-gyp@10.
-  // https://github.com/electron/rebuild/blob/main/package.json#L50
-  // (and remove the node-gyp resolution from the main package.json).
-  // The `legacy` option makes the builder use an app-builder binary as in previous
-  // versions of electron-builder. Without this option, it uses @electron/rebuild.
-  //
-  // We have to use node-gyp@10 because the macOS builder uses Python@3.12
-  // which is not compatible with node-gyp@9 (and we don't install distutils
-  // separately there)
-  // https://github.com/nodejs/node-gyp/issues/2869#issuecomment-1769572922.
-  // I tried to use @electron/rebuild with node-gyp@10, but it didn't work,
-  // rebuilding native deps simply hung forever.
-  nativeRebuilder: 'legacy',
 };

web/packages/teleterm/package.json

@@ -41,7 +41,7 @@
     "@types/tar-fs": "^2.0.4",
     "@types/whatwg-url": "^11.0.5",
     "electron": "31.1.0",
-    "electron-builder": "^25.0.0-alpha.11",
+    "electron-builder": "^25.0.1",
     "electron-notarize": "^1.2.2",
     "electron-vite": "^2.3.0",
     "events": "3.3.0",