From a45e85a730885fb74b4e8d18b32562cc904da04d Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 10 Feb 2021 01:21:29 -0500
Subject: [PATCH] Use `settings.root` to anchor pathnames

---
 src/node/hooks/express/tests.js | 3 +--
 src/node/hooks/i18n.js          | 9 +++++----
 src/node/utils/Minify.js        | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/node/hooks/express/tests.js b/src/node/hooks/express/tests.js
index 8c2e8edb5..c533ae8ca 100644
--- a/src/node/hooks/express/tests.js
+++ b/src/node/hooks/express/tests.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const path = require('path');
-const npm = require('npm');
 const fs = require('fs');
 const util = require('util');
 const settings = require('../../utils/Settings');
@@ -29,7 +28,7 @@ exports.expressCreateServer = (hookName, args, cb) => {
     res.end(`var specs_list = ${JSON.stringify(files)};\n`);
   });
 
-  const rootTestFolder = path.join(npm.root, '../tests/frontend/');
+  const rootTestFolder = path.join(settings.root, 'src/tests/frontend/');
 
   const url2FilePath = (url) => {
     let subPath = url.substr('/tests/frontend'.length);
diff --git a/src/node/hooks/i18n.js b/src/node/hooks/i18n.js
index 31848b484..81944a074 100644
--- a/src/node/hooks/i18n.js
+++ b/src/node/hooks/i18n.js
@@ -4,8 +4,7 @@ const languages = require('languages4translatewiki');
 const fs = require('fs');
 const path = require('path');
 const _ = require('underscore');
-const npm = require('npm');
-const plugins = require('../../static/js/pluginfw/plugin_defs.js').plugins;
+const pluginDefs = require('../../static/js/pluginfw/plugin_defs.js');
 const existsSync = require('../utils/path_exists');
 const settings = require('../utils/Settings');
 
@@ -38,10 +37,12 @@ const getAllLocales = () => {
   };
 
   // add core supported languages first
-  extractLangs(`${npm.root}/ep_etherpad-lite/locales`);
+  extractLangs(path.join(settings.root, 'src/locales'));
 
   // add plugins languages (if any)
-  for (const pluginName in plugins) extractLangs(path.join(npm.root, pluginName, 'locales'));
+  for (const {package: {path: pluginPath}} of Object.values(pluginDefs.plugins)) {
+    extractLangs(path.join(pluginPath, 'locales'));
+  }
 
   // Build a locale index (merge all locale data other than user-supplied overrides)
   const locales = {};
diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index c9d263406..bf25787a2 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -32,7 +32,7 @@ const log4js = require('log4js');
 
 const logger = log4js.getLogger('Minify');
 
-const ROOT_DIR = path.normalize(`${__dirname}/../../static/`);
+const ROOT_DIR = path.join(settings.root, 'src/static/');
 
 const threadsPool = new Threads.Pool(() => Threads.spawn(new Threads.Worker('./MinifyWorker')), 2);