refactor: path-references refactoring and using 'import' instead of 'require' (#1752)

* refactor references to 'userData' and 'appData' directories to move hardcoding into single location
* convert to es6 for lower memory usage as per https://codesource.io/the-difference-between-import-and-require-in-javascript/

1 files changed, 7 insertions, 9 deletions

diff --git a/src/helpers/service-helpers.js b/src/helpers/service-helpers.js
index 28d483182..745f40dd9 100644
--- a/src/helpers/service-helpers.js
+++ b/src/helpers/service-helpers.js
@@ -1,18 +1,16 @@
-import path from 'path';
-import { app } from '@electron/remote';
-import fs from 'fs-extra';
+import { readdirSync, removeSync } from 'fs-extra';
+import { userDataPath } from '../environment';
 
-export function getServicePartitionsDirectory() {
-  return path.join(app.getPath('userData'), 'Partitions');
+export function getServicePartitionsDirectory(...segments) {
+  return userDataPath('Partitions', ...([segments].flat()));
 }
 
 export function removeServicePartitionDirectory(id = '', addServicePrefix = false) {
-  const servicePartition = path.join(getServicePartitionsDirectory(), `${addServicePrefix ? 'service-' : ''}${id}`);
-
-  return fs.remove(servicePartition);
+  const servicePartition = getServicePartitionsDirectory(`${addServicePrefix ? 'service-' : ''}${id}`);
+  return removeSync(servicePartition);
 }
 
 export async function getServiceIdsFromPartitions() {
-  const files = await fs.readdir(getServicePartitionsDirectory());
+  const files = readdirSync(getServicePartitionsDirectory());
   return files.filter((n) => n !== '__chrome_extension');
 }