mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
[misc] fix path to app config/ dir following the renaming of the package
The Settings.js file is now located in node_modules/@overleaf/settings, which is one level deeper than node_modules/settings-sharelatex.
This commit is contained in:
parent
81f4c31208
commit
acc65b2518
2 changed files with 4 additions and 4 deletions
|
@ -4,7 +4,7 @@ const path = require("path");
|
|||
const env = (process.env.NODE_ENV || "development").toLowerCase();
|
||||
const { merge } = require('./merge');
|
||||
|
||||
const defaultSettingsPath = path.normalize(__dirname + "/../../config/settings.defaults");
|
||||
const defaultSettingsPath = path.normalize(__dirname + "/../../../config/settings.defaults");
|
||||
|
||||
if (fs.existsSync(`${defaultSettingsPath}.js`)) {
|
||||
console.log(`Using default settings from ${defaultSettingsPath}.js`);
|
||||
|
@ -23,10 +23,10 @@ if (process.env.SHARELATEX_CONFIG) {
|
|||
} else {
|
||||
possibleConfigFiles = [
|
||||
process.cwd() + `/config/settings.${env}.js`,
|
||||
path.normalize(__dirname + `/../../config/settings.${env}.js`),
|
||||
path.normalize(__dirname + `/../../../config/settings.${env}.js`),
|
||||
// TODO: remove these in the next major version
|
||||
process.cwd() + `/config/settings.${env}.coffee`,
|
||||
path.normalize(__dirname + `/../../config/settings.${env}.coffee`)
|
||||
path.normalize(__dirname + `/../../../config/settings.${env}.coffee`)
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@overleaf/settings",
|
||||
"description": "A centralised settings system for Overleaf",
|
||||
"version": "2.1.0",
|
||||
"version": "2.1.1",
|
||||
"repository": "overleaf/settings-module"
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue