Back out Electron 7.1.1/7.1.2 upgrades

Summary:
Original commit changeset: eddfbb3571c7
Original commit changeset: f7300f527b65

Pains me to do this, but probably our best chance right now to get a release out.

Reviewed By: cekkaewnumchai

Differential Revision: D18687890

fbshipit-source-id: 05d13aca71457ca6dd19f5b45d58158ae223e66f
This commit is contained in:
Pascal Hartig
2019-11-25 10:48:59 -08:00
committed by realpassy
parent adb1cb163b
commit a75a52a25b
10 changed files with 546 additions and 446 deletions

View File

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

View File

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