[v14] Fix Connect for Intel Macs (#44437)

* Fix Connect for Intel Macs (#44383)

* Update `[email protected]`

* Remove `legacy` option

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

* Remove packages patching

* `[email protected]`

(cherry picked from commit f797b86)

* Update `e`

package.json

@@ -26,7 +26,6 @@
   },
   "private": true,
   "resolutions": {
-    "node-gyp": "^10.0.1",
     "react": "16.14.0",
     "**/d3-color": "^3.1.0",
     "**/minimist": "^1.2.8",

web/packages/build/package.json

@@ -62,7 +62,7 @@
     "core-js": "^3",
     "cross-env": "5.0.5",
     "cross-spawn": "6.0.5",
-    "electron-builder": "^25.0.0-alpha.11",
+    "electron-builder": "^25.0.1",
     "eslint": "^8.56.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-import-resolver-webpack": "^0.13.7",

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 [email protected]
-  // 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',
 };