From 32c8a2149ad18179610af02483b794b426b7b9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jovan=20Kruni=C4=87?= Date: Thu, 26 Nov 2020 17:35:16 +0100 Subject: [PATCH] fix: stapps core version in config Closes #74 --- config/default.ts | 5 ++++- src/common.ts | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/default.ts b/config/default.ts index d95714d9..add0f882 100644 --- a/config/default.ts +++ b/config/default.ts @@ -1,6 +1,8 @@ // tslint:disable:no-default-export // tslint:disable:no-magic-numbers import {SCConfigFile, SCSettingInputType, SCThingOriginType, SCThingType} from '@openstapps/core'; +import {readFileSync} from 'fs'; +import {resolve} from 'path'; /** * This is the default configuration for app and backend @@ -253,7 +255,8 @@ const config: Partial = { }, backend: { - SCVersion: '1.0.0', + SCVersion: JSON.parse((readFileSync(resolve('.', '.', 'package.json'), 'utf-8')).toString()) + .dependencies['@openstapps/core'], externalRequestTimeout: 5000, hiddenTypes: [ SCThingType.DateSeries, diff --git a/src/common.ts b/src/common.ts index 64c5e40f..1e9e5e26 100644 --- a/src/common.ts +++ b/src/common.ts @@ -16,8 +16,6 @@ import {SCConfigFile, SCPluginMetaData} from '@openstapps/core'; import {Validator} from '@openstapps/core-tools/lib/validate'; import config from 'config'; -import {readFileSync} from 'fs'; -import {resolve} from 'path'; import {BackendTransport} from './notification/backend-transport'; /** @@ -58,8 +56,7 @@ export const plugins = new Map(); /** * The version of the installed core */ -export const coreVersion: string = JSON.parse((readFileSync(resolve('.', '.', 'package.json'), 'utf-8')).toString()) - .dependencies['@openstapps/core']; +export const coreVersion: string = configFile.backend.SCVersion; /** * The default timeout in milliseconds