From 204a80708e6e0a2189de16438a3eb4b57ef84987 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Fri, 1 Oct 2021 21:51:55 +0530 Subject: refactor: split 'environment' into 'environment-remote' with only the remote module dependency (might be a pre-requisite for the electron v14 upgrade) --- src/api/apiBase.ts | 2 +- src/api/server/ServerApi.js | 9 ++------- src/api/utils/auth.js | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) (limited to 'src/api') diff --git a/src/api/apiBase.ts b/src/api/apiBase.ts index 510ccb619..a30793848 100644 --- a/src/api/apiBase.ts +++ b/src/api/apiBase.ts @@ -1,7 +1,7 @@ /** * Get API base URL from store */ -import { API_VERSION } from '../environment'; +import { API_VERSION } from '../environment-remote'; import { DEV_API_FRANZ_WEBSITE, LIVE_FRANZ_API, diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js index fb0d64dc3..e321f9372 100644 --- a/src/api/server/ServerApi.js +++ b/src/api/server/ServerApi.js @@ -22,13 +22,8 @@ import UserModel from '../../models/User'; import { sleep } from '../../helpers/async-helpers'; import { SERVER_NOT_LOADED } from '../../config'; -import { - osArch, - osPlatform, - userDataRecipesPath, - userDataPath, - ferdiVersion, -} from '../../environment'; +import { osArch, osPlatform } from '../../environment'; +import { userDataRecipesPath, userDataPath, ferdiVersion } from '../../environment-remote'; import { asarRecipesPath } from '../../helpers/asar-helpers'; import apiBase from '../apiBase'; import { prepareAuthRequest, sendAuthRequest } from '../utils/auth'; diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js index 527c68840..07b0c096b 100644 --- a/src/api/utils/auth.js +++ b/src/api/utils/auth.js @@ -1,5 +1,5 @@ import localStorage from 'mobx-localstorage'; -import { ferdiLocale, ferdiVersion } from '../../environment'; +import { ferdiLocale, ferdiVersion } from '../../environment-remote'; export const prepareAuthRequest = ( // eslint-disable-next-line unicorn/no-object-as-default-parameter -- cgit v1.2.3-54-g00ecf