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/helpers | |
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/helpers')
-rw-r--r-- | src/helpers/recipe-helpers.js | 6 | ||||
-rw-r--r-- | src/helpers/service-helpers.js | 4 | ||||
-rw-r--r-- | src/helpers/userAgent-helpers.js | 7 |
3 files changed, 4 insertions, 13 deletions
diff --git a/src/helpers/recipe-helpers.js b/src/helpers/recipe-helpers.js index a31c29e72..7daa0aaab 100644 --- a/src/helpers/recipe-helpers.js +++ b/src/helpers/recipe-helpers.js | |||
@@ -1,9 +1,5 @@ | |||
1 | import path from 'path'; | 1 | import path from 'path'; |
2 | import { remote } from 'electron'; | 2 | import { app } from '@electron/remote'; |
3 | |||
4 | // import ServiceModel from '../models/Service'; | ||
5 | |||
6 | const { app } = remote; | ||
7 | 3 | ||
8 | export function getRecipeDirectory(id = '') { | 4 | export function getRecipeDirectory(id = '') { |
9 | return path.join(app.getPath('userData'), 'recipes', id); | 5 | return path.join(app.getPath('userData'), 'recipes', id); |
diff --git a/src/helpers/service-helpers.js b/src/helpers/service-helpers.js index 83f89f108..f6363aca8 100644 --- a/src/helpers/service-helpers.js +++ b/src/helpers/service-helpers.js | |||
@@ -1,9 +1,7 @@ | |||
1 | import path from 'path'; | 1 | import path from 'path'; |
2 | import { remote } from 'electron'; | 2 | import { app } from '@electron/remote'; |
3 | import fs from 'fs-extra'; | 3 | import fs from 'fs-extra'; |
4 | 4 | ||
5 | const { app } = remote; | ||
6 | |||
7 | export function getServicePartitionsDirectory() { | 5 | export function getServicePartitionsDirectory() { |
8 | return path.join(app.getPath('userData'), 'Partitions'); | 6 | return path.join(app.getPath('userData'), 'Partitions'); |
9 | } | 7 | } |
diff --git a/src/helpers/userAgent-helpers.js b/src/helpers/userAgent-helpers.js index fd0d16e2d..c5eee0082 100644 --- a/src/helpers/userAgent-helpers.js +++ b/src/helpers/userAgent-helpers.js | |||
@@ -1,11 +1,8 @@ | |||
1 | import { remote, app } from 'electron'; | ||
2 | import os from 'os'; | 1 | import os from 'os'; |
3 | import macosVersion from 'macos-version'; | 2 | import macosVersion from 'macos-version'; |
4 | import { isMac, isWindows } from '../environment'; | 3 | import { app, isMac, isWindows } from '../environment'; |
5 | 4 | ||
6 | // This helper gets included from the backend and frontend but we only need to use "remote" | 5 | export const ferdiVersion = app.getVersion(); |
7 | // if we are in the frontend | ||
8 | export const ferdiVersion = remote && remote.app ? remote.app.getVersion() : app.getVersion(); | ||
9 | 6 | ||
10 | function macOS() { | 7 | function macOS() { |
11 | const version = macosVersion(); | 8 | const version = macosVersion(); |