Просмотр исходного кода

Merge pull request #7 from overleaf/jpa-fix-defaults-path

[misc] fix path to app config/ dir following the renaming of the package
Jakob Ackermann 5 лет назад
Родитель
Сommit
51dc1c437a
2 измененных файлов с 4 добавлено и 4 удалено
  1. 3 3
      libraries/settings/Settings.js
  2. 1 1
      libraries/settings/package.json

+ 3 - 3
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`)
 	];
 }
 

+ 1 - 1
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"
 }