Replace 'remote' with 'electron/remote' (#1448)

* Locked new version of 'recipes' submodule with corresponding changes.

4 files changed, 8 insertions, 18 deletions

diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js
index c5e8a5aad..1fdbea595 100644
--- a/src/components/auth/Locked.js
+++ b/src/components/auth/Locked.js
@@ -1,4 +1,4 @@
-import { remote } from 'electron';
+import { systemPreferences } from '@electron/remote';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
@@ -12,10 +12,6 @@ import { isMac } from '../../environment';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-const {
-  systemPreferences,
-} = remote;
-
 const messages = defineMessages({
   headline: {
     id: 'locked.headline',
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 24bbe7939..d4714a809 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -1,4 +1,6 @@
-import { remote } from 'electron';
+import {
+  Menu, dialog, app, getCurrentWindow,
+} from '@electron/remote';
 import React, { Component } from 'react';
 import { defineMessages, intlShape } from 'react-intl';
 import PropTypes from 'prop-types';
@@ -14,8 +16,6 @@ import { ctrlKey, cmdKey } from '../../../environment';
 
 const IS_SERVICE_DEBUGGING_ENABLED = (localStorage.getItem('debug') || '').includes('Ferdi:Service');
 
-const { Menu, dialog, app } = remote;
-
 const messages = defineMessages({
   reload: {
     id: 'tabs.item.reload',
@@ -236,7 +236,7 @@ const styles = {
           'is-disabled': !service.isEnabled,
         })}
         onClick={clickHandler}
-        onContextMenu={() => menu.popup(remote.getCurrentWindow())}
+        onContextMenu={() => menu.popup(getCurrentWindow())}
         data-tip={`${service.name} ${shortcutIndex <= 9 ? `(${ctrlKey}+${shortcutIndex})` : ''}`}
       >
         <img
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index eef529730..28f456608 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -1,4 +1,4 @@
-import { remote } from 'electron';
+import { app, systemPreferences } from '@electron/remote';
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
@@ -19,10 +19,6 @@ import {
 } from '../../../config';
 import { isMac, isWindows } from '../../../environment';
 
-const {
-  systemPreferences,
-} = remote;
-
 const messages = defineMessages({
   headline: {
     id: 'settings.app.headline',
@@ -665,7 +661,7 @@ export default @observer class EditSettingsForm extends Component {
               )}
               {intl.formatMessage(messages.currentVersion)}
               {' '}
-              {remote.app.getVersion()}
+              {app.getVersion()}
               {noUpdateAvailable && (
               <>
                 <br />
diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.js b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
index f6fc7c171..36c126565 100644
--- a/src/components/settings/supportFerdi/SupportFerdiDashboard.js
+++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
@@ -1,10 +1,8 @@
 import React, { Component } from 'react';
 import { defineMessages, FormattedHTMLMessage, intlShape } from 'react-intl';
-import { remote } from 'electron';
+import { BrowserWindow } from '@electron/remote';
 import InfoBar from '../../ui/InfoBar';
 
-const { BrowserWindow } = remote;
-
 const messages = defineMessages({
   headline: {
     id: 'settings.supportFerdi.headline',