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/internal-server/app/Controllers/Http/RecipeController.js | 2 +- src/internal-server/app/Controllers/Http/UserController.js | 6 ++---- src/internal-server/start/migrate.js | 2 +- src/internal-server/start/routes.js | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src/internal-server') diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js index 2c7baf2a4..d44839db1 100644 --- a/src/internal-server/app/Controllers/Http/RecipeController.js +++ b/src/internal-server/app/Controllers/Http/RecipeController.js @@ -6,7 +6,7 @@ const Env = use('Env'); const fetch = require('node-fetch'); const debug = require('debug')('Ferdi:internalServer:RecipeController'); const { LIVE_FERDI_API } = require('../../../../config'); -const { API_VERSION } = require('../../../../environment'); +const { API_VERSION } = require('../../../../environment-remote'); const RECIPES_URL = `${LIVE_FERDI_API}/${API_VERSION}/recipes`; diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js index 747606da7..9bbd2ff6e 100644 --- a/src/internal-server/app/Controllers/Http/UserController.js +++ b/src/internal-server/app/Controllers/Http/UserController.js @@ -7,10 +7,8 @@ const btoa = require('btoa'); const fetch = require('node-fetch'); const { v4: uuid } = require('uuid'); const crypto = require('crypto'); -const { - DEFAULT_APP_SETTINGS, - API_VERSION, -} = require('../../../../environment'); +const { DEFAULT_APP_SETTINGS } = require('../../../../environment'); +const { API_VERSION } = require('../../../../environment-remote'); const { default: userAgent } = require('../../../../helpers/userAgent-helpers'); const apiRequest = (url, route, method, auth) => diff --git a/src/internal-server/start/migrate.js b/src/internal-server/start/migrate.js index 0f25240cc..97cefcc54 100644 --- a/src/internal-server/start/migrate.js +++ b/src/internal-server/start/migrate.js @@ -1,4 +1,4 @@ -const { ferdiVersion } = require('../../environment'); +const { ferdiVersion } = require('../../environment-remote'); /** * Migrate server database to work with current Ferdi version diff --git a/src/internal-server/start/routes.js b/src/internal-server/start/routes.js index e75380ccd..db74479c9 100644 --- a/src/internal-server/start/routes.js +++ b/src/internal-server/start/routes.js @@ -8,7 +8,7 @@ /** @type {typeof import('@adonisjs/framework/src/Route/Manager')} */ const Route = use('Route'); -const { API_VERSION } = require('../../environment'); +const { API_VERSION } = require('../../environment-remote'); // Run latest database migration const migrate = require('./migrate'); -- cgit v1.2.3-70-g09d2