diff --git a/Gruntfile.js b/Gruntfile.js index 9cee93ccb6..c38511386f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -26,7 +26,7 @@ const semver = require('semver') const knox = require('knox') const crypto = require('crypto') const async = require('async') -const settings = require('settings-sharelatex') +const settings = require('@overleaf/settings') const _ = require('underscore') const SERVICES = require('./config/services') diff --git a/package-lock.json b/package-lock.json index 69bb8563cf..2f074b3a51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -157,6 +157,11 @@ "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", "dev": true }, + "@overleaf/settings": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@overleaf/settings/-/settings-2.1.1.tgz", + "integrity": "sha512-vcJwqCGFKmQxTP/syUqCeMaSRjHmBcQgKOACR9He2uJcErg2GZPa1go+nGvszMbkElM4HfRKm/MfxvqHhoN4TQ==" + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -2868,20 +2873,6 @@ "integrity": "sha1-eUEYKz/8xYC/8cF5QqzfeVHA0hM=", "dev": true }, - "settings-sharelatex": { - "version": "git+https://github.com/sharelatex/settings-sharelatex.git#b4fb8404c5de571d029bf4c29e96a60b21206f94", - "from": "git+https://github.com/sharelatex/settings-sharelatex.git", - "requires": { - "coffee-script": "1.6.0" - }, - "dependencies": { - "coffee-script": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz", - "integrity": "sha1-gIs5bhEPU9AhoZpO8fZb4OjjX6M=" - } - } - }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", diff --git a/package.json b/package.json index b9f180e084..c46ac96be4 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "format:fix": "prettier --write $PWD/'**/*.js'" }, "dependencies": { + "@overleaf/settings": "^2.1.1", "async": "^0.9.0", "bson": "^1.0.4", "coffee-script": "^1.11.1", @@ -21,7 +22,6 @@ "mongojs": "2.4.0", "redis": "^2.6.2", "rimraf": "~2.2.6", - "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git", "underscore": "^1.7.0" }, "devDependencies": { diff --git a/tasks/CreateAndDestroyUsers.js b/tasks/CreateAndDestroyUsers.js index 22be44ae88..b7d519cc6c 100644 --- a/tasks/CreateAndDestroyUsers.js +++ b/tasks/CreateAndDestroyUsers.js @@ -23,7 +23,7 @@ module.exports = function (grunt) { process.exit(1) } - const settings = require('settings-sharelatex') + const settings = require('@overleaf/settings') const mongodb = require('../web/app/src/infrastructure/mongodb') const UserRegistrationHandler = require('../web/app/src/Features/User/UserRegistrationHandler') const OneTimeTokenHandler = require('../web/app/src/Features/Security/OneTimeTokenHandler') @@ -88,7 +88,7 @@ ${settings.siteUrl}/user/password/set?passwordResetToken=${token} console.error('Usage: grunt user:delete --email=joe@example.com') process.exit(1) } - const settings = require('settings-sharelatex') + const settings = require('@overleaf/settings') const mongodb = require('../web/app/src/infrastructure/mongodb') const UserGetter = require('../web/app/src/Features/User/UserGetter') const UserDeleter = require('../web/app/src/Features/User/UserDeleter')