From e9a4ae027d1d1cd08ccd55f562b3cef756a95997 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Wed, 2 Mar 2022 12:27:48 +0100 Subject: [PATCH] Merge pull request #6928 from overleaf/msm-fix-config-lookup-ce [settings] use entry point file to locate config GitOrigin-RevId: 7e860233619a8c51929ca9d363e0a82454cd0c2a --- libraries/settings/Settings.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/settings/Settings.js b/libraries/settings/Settings.js index 1b2d4c8dda..1f98d3a051 100644 --- a/libraries/settings/Settings.js +++ b/libraries/settings/Settings.js @@ -4,12 +4,15 @@ const Path = require('path') const { merge } = require('./merge') const CWD = process.cwd() +const ENTRY_POINT_DIR = Path.dirname(process.argv[1]) const NODE_ENV = (process.env.NODE_ENV || 'development').toLowerCase() const SHARELATEX_CONFIG = process.env.SHARELATEX_CONFIG let settings let settingsExist = false -const defaultsPath = pathIfExists(Path.join(CWD, 'config/settings.defaults.js')) +const defaultsPath = + pathIfExists(Path.join(CWD, 'config/settings.defaults.js')) || + pathIfExists(Path.join(ENTRY_POINT_DIR, 'config/settings.defaults.js')) if (defaultsPath) { console.log(`Using default settings from ${defaultsPath}`) settings = require(defaultsPath)