From acc65b2518766ae6e68282a6ec9b3a86f81fb474 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Tue, 6 Jul 2021 15:19:13 +0100 Subject: [PATCH] [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. --- libraries/settings/Settings.js | 6 +++--- libraries/settings/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/settings/Settings.js b/libraries/settings/Settings.js index 60bd447098..6672803955 100644 --- a/libraries/settings/Settings.js +++ b/libraries/settings/Settings.js @@ -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`) ]; } diff --git a/libraries/settings/package.json b/libraries/settings/package.json index 0ea2fde33e..27fae668c3 100644 --- a/libraries/settings/package.json +++ b/libraries/settings/package.json @@ -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" }