From 296ce5ce62bcde6888df291f97105fa912ed7d35 Mon Sep 17 00:00:00 2001
From: Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>
Date: Wed, 26 May 2021 21:05:50 +0530
Subject: Replace 'remote' with 'electron/remote' (#1448)

* Locked new version of 'recipes' submodule with corresponding changes.
---
 src/api/server/LocalApi.js  | 5 ++---
 src/api/server/ServerApi.js | 5 ++---
 src/api/utils/auth.js       | 4 +---
 3 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/api')

diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index cc8035523..4b1f03f22 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -1,12 +1,11 @@
-import { ipcRenderer, remote } from 'electron';
+import { ipcRenderer } from 'electron';
+import { session } from '@electron/remote';
 import du from 'du';
 
 import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js';
 
 const debug = require('debug')('Ferdi:LocalApi');
 
-const { session } = remote;
-
 export default class LocalApi {
   // Settings
   getAppSettings(type) {
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 627425948..5fd5268ce 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -2,7 +2,7 @@ import os from 'os';
 import path from 'path';
 import tar from 'tar';
 import fs from 'fs-extra';
-import { remote } from 'electron';
+import { app, require as remoteRequire } from '@electron/remote';
 
 import ServiceModel from '../../models/Service';
 import RecipePreviewModel from '../../models/RecipePreview';
@@ -35,8 +35,7 @@ module.paths.unshift(
   getRecipeDirectory(),
 );
 
-const { app } = remote;
-const { default: fetch } = remote.require('electron-fetch');
+const { default: fetch } = remoteRequire('electron-fetch');
 
 export default class ServerApi {
   recipePreviews = [];
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js
index 6dbdeaa7f..5952cfe11 100644
--- a/src/api/utils/auth.js
+++ b/src/api/utils/auth.js
@@ -1,8 +1,6 @@
-import { remote } from 'electron';
+import { app } from '@electron/remote';
 import localStorage from 'mobx-localstorage';
 
-const { app } = remote;
-
 export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => {
   const request = Object.assign(options, {
     mode: 'cors',
-- 
cgit v1.2.3-54-g00ecf