Merge pull request #16859 from overleaf/jpa-sharelatex-cleanup

[misc] ShareLaTeX cleanup - high impact

GitOrigin-RevId: 6dcce9b0f15e30f7afcf6d69c3df36a369f38120
This commit is contained in:
Jakob Ackermann
2024-02-09 09:04:11 +00:00
committed by Copybot
parent b22466f776
commit 003182b1da
76 changed files with 176 additions and 189 deletions
+2 -2
View File
@@ -8,9 +8,9 @@ Settings file location
----------------------
You can specify a custom location for the settings file by setting the
`SHARELATEX_CONFIG` environment variable. E.g.
`OVERLEAF_CONFIG` environment variable. E.g.
$ export SHARELATEX_CONFIG=/home/james/config/settings.development.js
$ export OVERLEAF_CONFIG=/home/james/config/settings.development.js
Otherwise, the settings will be loaded from `config/settings.NODE_ENV.js`,
where `NODE_ENV` is another environment variable, or defaults to `development`.
+7 -1
View File
@@ -9,6 +9,12 @@ const ENTRY_POINT_DIR = process.argv[1]
: undefined
const NODE_ENV = (process.env.NODE_ENV || 'development').toLowerCase()
const SHARELATEX_CONFIG = process.env.SHARELATEX_CONFIG
const OVERLEAF_CONFIG = process.env.OVERLEAF_CONFIG || SHARELATEX_CONFIG
if (SHARELATEX_CONFIG && SHARELATEX_CONFIG !== OVERLEAF_CONFIG) {
throw new Error(
'found mismatching SHARELATEX_CONFIG, rename to OVERLEAF_CONFIG'
)
}
let settings
let settingsExist = false
@@ -26,7 +32,7 @@ if (defaultsPath) {
}
const overridesPath =
pathIfExists(SHARELATEX_CONFIG) ||
pathIfExists(OVERLEAF_CONFIG) ||
pathIfExists(Path.join(CWD, `config/settings.${NODE_ENV}.cjs`)) ||
pathIfExists(Path.join(CWD, `config/settings.${NODE_ENV}.js`))
if (overridesPath) {