diff options
author | Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-05-26 21:05:50 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-26 21:05:50 +0530 |
commit | 296ce5ce62bcde6888df291f97105fa912ed7d35 (patch) | |
tree | b28e7d2373f1020c1183469aa3a9feafecede569 /src/api/server | |
parent | Added new entry in context menu: 'Download image' (#1449) (diff) | |
download | ferdium-app-296ce5ce62bcde6888df291f97105fa912ed7d35.tar.gz ferdium-app-296ce5ce62bcde6888df291f97105fa912ed7d35.tar.zst ferdium-app-296ce5ce62bcde6888df291f97105fa912ed7d35.zip |
Replace 'remote' with 'electron/remote' (#1448)
* Locked new version of 'recipes' submodule with corresponding changes.
Diffstat (limited to 'src/api/server')
-rw-r--r-- | src/api/server/LocalApi.js | 5 | ||||
-rw-r--r-- | src/api/server/ServerApi.js | 5 |
2 files changed, 4 insertions, 6 deletions
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 @@ | |||
1 | import { ipcRenderer, remote } from 'electron'; | 1 | import { ipcRenderer } from 'electron'; |
2 | import { session } from '@electron/remote'; | ||
2 | import du from 'du'; | 3 | import du from 'du'; |
3 | 4 | ||
4 | import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js'; | 5 | import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js'; |
5 | 6 | ||
6 | const debug = require('debug')('Ferdi:LocalApi'); | 7 | const debug = require('debug')('Ferdi:LocalApi'); |
7 | 8 | ||
8 | const { session } = remote; | ||
9 | |||
10 | export default class LocalApi { | 9 | export default class LocalApi { |
11 | // Settings | 10 | // Settings |
12 | getAppSettings(type) { | 11 | 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'; | |||
2 | import path from 'path'; | 2 | import path from 'path'; |
3 | import tar from 'tar'; | 3 | import tar from 'tar'; |
4 | import fs from 'fs-extra'; | 4 | import fs from 'fs-extra'; |
5 | import { remote } from 'electron'; | 5 | import { app, require as remoteRequire } from '@electron/remote'; |
6 | 6 | ||
7 | import ServiceModel from '../../models/Service'; | 7 | import ServiceModel from '../../models/Service'; |
8 | import RecipePreviewModel from '../../models/RecipePreview'; | 8 | import RecipePreviewModel from '../../models/RecipePreview'; |
@@ -35,8 +35,7 @@ module.paths.unshift( | |||
35 | getRecipeDirectory(), | 35 | getRecipeDirectory(), |
36 | ); | 36 | ); |
37 | 37 | ||
38 | const { app } = remote; | 38 | const { default: fetch } = remoteRequire('electron-fetch'); |
39 | const { default: fetch } = remote.require('electron-fetch'); | ||
40 | 39 | ||
41 | export default class ServerApi { | 40 | export default class ServerApi { |
42 | recipePreviews = []; | 41 | recipePreviews = []; |