fix: dont dynamically import package.json

Chia-Network · May 20, 2022 · 6e8f823 · 6e8f823
1 parent 11fcf52
commit 6e8f823
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 51 deletions.
diff --git a/src/config/config.cjs b/src/config/config.cjs
@@ -6,29 +6,17 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const logger = require('./logger.cjs').logger;
+const packageJson = require('../../package.json');
 
 const homeDir = os.homedir();
 const defaultConfig = require('../utils/defaultConfig.json');
 
 const getDataModelVersion = () => {
-  const packageJson = fileLoader('package.json');
   const version = packageJson.version;
   const majorVersion = version.split('.')[0];
   return `v${majorVersion}`;
 };
 
-const fileLoader = _.memoize((filepath) => {
-  logger.debug(`Reading file at ${filepath}`);
-
-  const file = path.resolve(filepath);
-
-  try {
-    return yaml.load(fs.readFileSync(file, 'utf8'));
-  } catch (e) {
-    logger.error(`File not found at ${file}`, e);
-  }
-});
-
 const persistanceFolder = `${homeDir}/.chia/climate-warehouse/${getDataModelVersion()}`;
 
 // Adding this duplicate function here because im having trouble

diff --git a/src/config/logger.cjs b/src/config/logger.cjs
@@ -1,35 +1,18 @@
-const _ = require('lodash');
 const winston = require('winston');
 const { format, transports, createLogger } = winston;
-const yaml = require('js-yaml');
 const DailyRotateFile = require('winston-daily-rotate-file');
-const path = require('path');
 
 const fs = require('fs');
 const os = require('os');
 const homeDir = os.homedir();
-
-const fileLoader = _.memoize((filepath) => {
-  console.log(`Reading file at ${filepath}`);
-
-  const file = path.resolve(filepath);
-
-  try {
-    return yaml.load(fs.readFileSync(file, 'utf8'));
-  } catch (e) {
-    console.log(`File not found at ${file}`, e);
-  }
-});
+const packageJson = require('../../package.json');
 
 const getDataModelVersion = () => {
-  const packageJson = fileLoader('package.json');
   const version = packageJson.version;
   const majorVersion = version.split('.')[0];
   return `v${majorVersion}`;
 };
 
-
-
 const logDir = `${homeDir}/.chia/climate-warehouse/${getDataModelVersion()}/logs`;
 
 if (!fs.existsSync(logDir)) {

diff --git a/src/utils/file-loader.js b/src/utils/file-loader.js
diff --git a/src/utils/helpers.js b/src/utils/helpers.js
@@ -4,7 +4,7 @@ import _ from 'lodash';
 
 import { isPluralized } from './string-utils.js';
 import { formatModelAssociationName } from './model-utils.js';
-import { fileLoader } from './file-loader';
+import packageJson from '../../package.json';
 
 export const paginationParams = (page, limit) => {
   if (page === undefined || limit === undefined) {
@@ -78,7 +78,6 @@ export const columnsToInclude = (userColumns, foreignKeys) => {
 };
 
 export const getDataModelVersion = () => {
-  const packageJson = fileLoader('package.json');
   const version = packageJson.version;
   const majorVersion = version.split('.')[0];
   return `v${majorVersion}`;