Back out "Back out Electron 7.1.1/7.1.2 upgrades"

Summary:
Original commit changeset: 05d13aca7145

Attempt to upgrade `electron` as it instacrashed; `electron-builder` version 22.1.0 didn't sign package correctly and caused the instacrash,

Reduced the version to 21.2.0 (latest).

Reviewed By: passy, nikoant

Differential Revision: D18954671

fbshipit-source-id: bc2dbd4fec9afb51d9a535974651b13d195407b4

package.json

@@ -26,7 +26,8 @@
       }
     },
     "win": {
-      "publisherName": "Facebook, Inc."
+      "publisherName": "Facebook, Inc.",
+      "sign": null
     },
     "asar": false,
     "fileAssociations": [
@@ -41,7 +42,7 @@
     ]
   },
   "resolutions": {
-    "@jest-runner/electron/electron": "5.0.11",
+    "@jest-runner/electron/electron": "7.1.2",
     "adbkit/adbkit-logcat": "2",
     "@types/react": "16.9.15",
     "@types/react-dom": "^16.9.4"
@@ -60,7 +61,7 @@
     "clearMocks": true
   },
   "devDependencies": {
-    "@jest-runner/electron": "^2.0.1",
+    "@jest-runner/electron": "^2.0.2",
     "@testing-library/react": "^9.3.0",
     "@types/algoliasearch": "^3.30.19",
     "@types/deep-equal": "^1.0.1",
@@ -87,8 +88,8 @@
     "@typescript-eslint/parser": "^2.1.1-alpha.4",
     "babel-code-frame": "^6.26.0",
     "babel-eslint": "^10.0.1",
-    "electron": "^5.0.11",
-    "electron-builder": "^20.38.5",
+    "electron": "7.1.2",
+    "electron-builder": "^21.2.0",
     "eslint": "^6.7.0",
     "eslint-config-fbjs": "^3.1.1",
     "eslint-plugin-babel": "^5.3.0",
@@ -192,8 +193,6 @@
   },
   "greenkeeper": {
     "ignore": [
-      "electron",
-      "electron-builder",
       "tmp"
     ]
   },

src/MenuBar.tsx

@@ -108,7 +108,7 @@ export function setupMenuBar(
       const menu = applicationMenu.items.find(
         menuItem => menuItem.label === topLevelMenu,
       );
-      if (menu) {
+      if (menu && menu.submenu) {
         const menuItem = menu.submenu.items.find(
           menuItem => menuItem.label === label,
         );
@@ -270,7 +270,7 @@ function getTemplate(
         {
           label: 'Select All',
           accelerator: 'CmdOrCtrl+A',
-          role: 'selectall',
+          role: 'selectAll',
         },
       ],
     },
@@ -384,7 +384,7 @@ function getTemplate(
   ];
 
   if (process.platform === 'darwin') {
-    const name = app.getName();
+    const name = app.name;
     template.unshift({
       label: name,
       submenu: [
@@ -411,7 +411,7 @@ function getTemplate(
         {
           label: 'Hide Others',
           accelerator: 'Command+Shift+H',
-          role: 'hideothers',
+          role: 'hideOthers',
         },
         {
           label: 'Show All',

src/chrome/settings/configFields.tsx

@@ -7,6 +7,7 @@
  * @format
  */
 
+import electron from 'electron';
 import {FlexColumn, styled, Text, FlexRow, Input, colors, Glyph} from 'flipper';
 import React, {useState} from 'react';
 import {promises as fs} from 'fs';
@@ -87,16 +88,18 @@ export function FilePathConfigField(props: {
       />
       <FlexColumn
         onClick={() =>
-          remote.dialog.showOpenDialog(
-            {
+          remote.dialog
+            .showOpenDialog({
               properties: ['openDirectory', 'showHiddenFiles'],
               defaultPath: path.resolve('/'),
-            },
-            (paths: Array<string> | undefined) => {
-              paths && setValue(paths[0]);
-              paths && props.onChange(paths[0]);
-            },
-          )
+            })
+            .then((result: electron.SaveDialogReturnValue) => {
+              if (result.filePath) {
+                const path: string = result.filePath.toString();
+                setValue(path);
+                props.onChange(path);
+              }
+            })
         }>
         <CenteredGlyph name="dots-3-circle" variant="outline" />
       </FlexColumn>

src/dispatcher/application.tsx

@@ -7,7 +7,7 @@
  * @format
  */
 
-import {remote, ipcRenderer} from 'electron';
+import {remote, ipcRenderer, IpcRendererEvent} from 'electron';
 import {toggleAction} from '../reducers/application';
 import {setStaticView} from '../reducers/connections';
 import {Store} from '../reducers/index.js';
@@ -68,7 +68,7 @@ export default (store: Store, logger: Logger) => {
 
   ipcRenderer.on(
     'flipper-protocol-handler',
-    (_event: string, query: string) => {
+    (_event: IpcRendererEvent, query: string) => {
       const uri = new URL(query);
       if (query.startsWith('flipper://import')) {
         const {search} = new URL(query);
@@ -117,11 +117,14 @@ export default (store: Store, logger: Logger) => {
     },
   );
 
-  ipcRenderer.on('open-flipper-file', (_event: string, url: string) => {
-    tryCatchReportPlatformFailures(() => {
-      return importFileToStore(url, store);
-    }, `${IMPORT_FLIPPER_TRACE_EVENT}:Deeplink`);
-  });
+  ipcRenderer.on(
+    'open-flipper-file',
+    (_event: IpcRendererEvent, url: string) => {
+      tryCatchReportPlatformFailures(() => {
+        return importFileToStore(url, store);
+      }, `${IMPORT_FLIPPER_TRACE_EVENT}:Deeplink`);
+    },
+  );
 
   if (process.env.FLIPPER_PORTS) {
     const portOverrides = parseFlipperPorts(process.env.FLIPPER_PORTS);

src/dispatcher/notifications.tsx

@@ -12,8 +12,8 @@ import {Logger} from '../fb-interfaces/Logger';
 import {PluginNotification} from '../reducers/notifications';
 import {FlipperPlugin, FlipperDevicePlugin} from '../plugin';
 import isHeadless from '../utils/isHeadless';
-import {ipcRenderer} from 'electron';
 import {setStaticView} from '../reducers/connections';
+import {ipcRenderer, IpcRendererEvent} from 'electron';
 import {
   setActiveNotifications,
   updatePluginBlacklist,
@@ -39,6 +39,7 @@ export default (store: Store, logger: Logger) => {
   ipcRenderer.on(
     'notificationEvent',
     (
+      _event: IpcRendererEvent,
       _e: Error,
       eventName: NotificationEvents,
       pluginNotification: PluginNotification,

src/utils/exportData.tsx

@@ -724,8 +724,9 @@ export function showOpenDialog(store: Store) {
     properties: ['openFile'],
     filters: [{extensions: ['flipper', 'json', 'txt'], name: 'Flipper files'}],
   };
-  remote.dialog.showOpenDialog(options, (filePaths?: Array<string>) => {
-    if (filePaths !== undefined && filePaths.length > 0) {
+  remote.dialog.showOpenDialog(options).then(result => {
+    const filePaths = result.filePaths;
+    if (filePaths.length > 0) {
       tryCatchReportPlatformFailures(() => {
         importFileToStore(filePaths[0], store);
       }, `${IMPORT_FLIPPER_TRACE_EVENT}:UI`);
@@ -734,14 +735,17 @@ export function showOpenDialog(store: Store) {
 }
 
 export function startFileExport(dispatch: Store['dispatch']) {
-  electron.remote.dialog.showSaveDialog(
-    // @ts-ignore This appears to work but isn't allowed by the types
-    null,
-    {
-      title: 'FlipperExport',
-      defaultPath: path.join(os.homedir(), 'FlipperExport.flipper'),
-    },
-    async (file: string) => {
+  electron.remote.dialog
+    .showSaveDialog(
+      // @ts-ignore This appears to work but isn't allowed by the types
+      null,
+      {
+        title: 'FlipperExport',
+        defaultPath: path.join(os.homedir(), 'FlipperExport.flipper'),
+      },
+    )
+    .then(async (result: electron.SaveDialogReturnValue) => {
+      const file = result.filePath;
       if (!file) {
         return;
       }
@@ -752,8 +756,7 @@ export function startFileExport(dispatch: Store['dispatch']) {
           closeOnFinish: false,
         }),
       );
-    },
-  );
+    });
 }
 
 export function startLinkExport(dispatch: Store['dispatch']) {

src/utils/js-client/serverUtils.tsx

@@ -9,7 +9,7 @@
 
 import Client, {ClientQuery} from '../../Client';
 import {FlipperClientConnection} from '../../Client';
-import {ipcRenderer, remote} from 'electron';
+import {ipcRenderer, remote, IpcRendererEvent} from 'electron';
 import JSDevice from '../../devices/JSDevice';
 import {Store} from 'src/reducers';
 import {Logger} from 'src/fb-interfaces/Logger';
@@ -41,7 +41,7 @@ export function initJsEmulatorIPC(
 ) {
   ipcRenderer.on(
     'from-js-emulator-init-client',
-    (_event: string, message: any) => {
+    (_event: IpcRendererEvent, message: any) => {
       const {windowId} = message;
       const {plugins, appName} = message.payload;
       store.dispatch({
@@ -102,21 +102,24 @@ export function initJsEmulatorIPC(
         flipperServer.emit('clients-change');
         client.emit('plugins-change');
 
-        ipcRenderer.on('from-js-emulator', (_event: string, message: any) => {
-          const {command, payload} = message;
-          if (command === 'sendFlipperObject') {
-            client.onMessage(
-              JSON.stringify({
-                params: {
-                  api: payload.api,
-                  method: payload.method,
-                  params: JSON.parse(payload.params),
-                },
-                method: 'execute',
-              }),
-            );
-          }
-        });
+        ipcRenderer.on(
+          'from-js-emulator',
+          (_event: IpcRendererEvent, message: any) => {
+            const {command, payload} = message;
+            if (command === 'sendFlipperObject') {
+              client.onMessage(
+                JSON.stringify({
+                  params: {
+                    api: payload.api,
+                    method: payload.method,
+                    params: JSON.parse(payload.params),
+                  },
+                  method: 'execute',
+                }),
+              );
+            }
+          },
+        );
       });
     },
   );