diff --git a/services/web/app.js b/services/web/app.js index 25a0cebf4d..16aa07b77c 100644 --- a/services/web/app.js +++ b/services/web/app.js @@ -12,7 +12,7 @@ const metrics = require('@overleaf/metrics') metrics.initialize(process.env.METRICS_APP_NAME || 'web') const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const PlansLocator = require('./app/src/Features/Subscription/PlansLocator') logger.initialize(process.env.METRICS_APP_NAME || 'web') logger.logger.serializers.user = require('./app/src/infrastructure/LoggerSerializers').user diff --git a/services/web/app/src/Features/Analytics/AnalyticsManager.js b/services/web/app/src/Features/Analytics/AnalyticsManager.js index 79bc56911d..281d6a14c3 100644 --- a/services/web/app/src/Features/Analytics/AnalyticsManager.js +++ b/services/web/app/src/Features/Analytics/AnalyticsManager.js @@ -6,7 +6,7 @@ const Queues = require('../../infrastructure/Queues') const uuid = require('uuid') const _ = require('lodash') const { expressify } = require('../../util/promises') -const { logger } = require('logger-sharelatex') +const { logger } = require('@overleaf/logger') const analyticsEventsQueue = Queues.getQueue('analytics-events') const analyticsEditingSessionsQueue = Queues.getQueue( diff --git a/services/web/app/src/Features/Analytics/AnalyticsRegistrationSourceMiddleware.js b/services/web/app/src/Features/Analytics/AnalyticsRegistrationSourceMiddleware.js index 33116579ea..733d636f60 100644 --- a/services/web/app/src/Features/Analytics/AnalyticsRegistrationSourceMiddleware.js +++ b/services/web/app/src/Features/Analytics/AnalyticsRegistrationSourceMiddleware.js @@ -1,4 +1,4 @@ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const OError = require('@overleaf/o-error') const AnalyticsRegistrationSourceHelper = require('./AnalyticsRegistrationSourceHelper') const SessionManager = require('../../Features/Authentication/SessionManager') diff --git a/services/web/app/src/Features/Analytics/AnalyticsUTMTrackingMiddleware.js b/services/web/app/src/Features/Analytics/AnalyticsUTMTrackingMiddleware.js index 3bef84130f..1bfc14c673 100644 --- a/services/web/app/src/Features/Analytics/AnalyticsUTMTrackingMiddleware.js +++ b/services/web/app/src/Features/Analytics/AnalyticsUTMTrackingMiddleware.js @@ -5,7 +5,7 @@ const querystring = require('querystring') const { URL } = require('url') const Settings = require('@overleaf/settings') const OError = require('@overleaf/o-error') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') function recordUTMTags() { return function (req, res, next) { diff --git a/services/web/app/src/Features/Authentication/AuthenticationController.js b/services/web/app/src/Features/Authentication/AuthenticationController.js index f18e8a4e91..ef7318ac35 100644 --- a/services/web/app/src/Features/Authentication/AuthenticationController.js +++ b/services/web/app/src/Features/Authentication/AuthenticationController.js @@ -4,7 +4,7 @@ const OError = require('@overleaf/o-error') const LoginRateLimiter = require('../Security/LoginRateLimiter') const UserUpdater = require('../User/UserUpdater') const Metrics = require('@overleaf/metrics') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const querystring = require('querystring') const Settings = require('@overleaf/settings') const basicAuth = require('basic-auth-connect') diff --git a/services/web/app/src/Features/Authorization/AuthorizationMiddleware.js b/services/web/app/src/Features/Authorization/AuthorizationMiddleware.js index 8324b6aa72..610ef4661d 100644 --- a/services/web/app/src/Features/Authorization/AuthorizationMiddleware.js +++ b/services/web/app/src/Features/Authorization/AuthorizationMiddleware.js @@ -1,5 +1,5 @@ const AuthorizationManager = require('./AuthorizationManager') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { ObjectId } = require('mongodb') const Errors = require('../Errors/Errors') const HttpErrorHandler = require('../Errors/HttpErrorHandler') diff --git a/services/web/app/src/Features/BetaProgram/BetaProgramController.js b/services/web/app/src/Features/BetaProgram/BetaProgramController.js index b8d8d3c49f..9c29b87578 100644 --- a/services/web/app/src/Features/BetaProgram/BetaProgramController.js +++ b/services/web/app/src/Features/BetaProgram/BetaProgramController.js @@ -2,7 +2,7 @@ const BetaProgramHandler = require('./BetaProgramHandler') const OError = require('@overleaf/o-error') const UserGetter = require('../User/UserGetter') const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const SessionManager = require('../Authentication/SessionManager') const BetaProgramController = { diff --git a/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js b/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js index a135b27771..f8ab1836b0 100644 --- a/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js +++ b/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js @@ -1,7 +1,7 @@ const OError = require('@overleaf/o-error') const { URL } = require('url') const settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const V1Api = require('../V1/V1Api') const sanitizeHtml = require('sanitize-html') diff --git a/services/web/app/src/Features/Captcha/CaptchaMiddleware.js b/services/web/app/src/Features/Captcha/CaptchaMiddleware.js index 2bf2877345..d1b9fd6bd7 100644 --- a/services/web/app/src/Features/Captcha/CaptchaMiddleware.js +++ b/services/web/app/src/Features/Captcha/CaptchaMiddleware.js @@ -12,7 +12,7 @@ */ let CaptchaMiddleware const request = require('request') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Settings = require('@overleaf/settings') module.exports = CaptchaMiddleware = { diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsController.js b/services/web/app/src/Features/Collaborators/CollaboratorsController.js index 31159162a6..2155a7723c 100644 --- a/services/web/app/src/Features/Collaborators/CollaboratorsController.js +++ b/services/web/app/src/Features/Collaborators/CollaboratorsController.js @@ -8,7 +8,7 @@ const SessionManager = require('../Authentication/SessionManager') const EditorRealTimeController = require('../Editor/EditorRealTimeController') const TagsHandler = require('../Tags/TagsHandler') const Errors = require('../Errors/Errors') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { expressify } = require('../../util/promises') module.exports = { diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js b/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js index b8f1fa56a8..9dd3f1c9d9 100644 --- a/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js +++ b/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js @@ -3,7 +3,7 @@ const OError = require('@overleaf/o-error') const { Project } = require('../../models/Project') const ProjectGetter = require('../Project/ProjectGetter') const ProjectHelper = require('../Project/ProjectHelper') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const ContactManager = require('../Contacts/ContactManager') const PrivilegeLevels = require('../Authorization/PrivilegeLevels') const TpdsProjectFlusher = require('../ThirdPartyDataStore/TpdsProjectFlusher') diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js b/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js index 89d3447853..e29bae96f5 100644 --- a/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js +++ b/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js @@ -19,7 +19,7 @@ const LimitationsManager = require('../Subscription/LimitationsManager') const UserGetter = require('../User/UserGetter') const CollaboratorsGetter = require('./CollaboratorsGetter') const CollaboratorsInviteHandler = require('./CollaboratorsInviteHandler') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Settings = require('@overleaf/settings') const EmailHelper = require('../Helpers/EmailHelper') const EditorRealTimeController = require('../Editor/EditorRealTimeController') diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsInviteHandler.js b/services/web/app/src/Features/Collaborators/CollaboratorsInviteHandler.js index 80c1767873..8ef7b71702 100644 --- a/services/web/app/src/Features/Collaborators/CollaboratorsInviteHandler.js +++ b/services/web/app/src/Features/Collaborators/CollaboratorsInviteHandler.js @@ -13,7 +13,7 @@ */ const { ProjectInvite } = require('../../models/ProjectInvite') const OError = require('@overleaf/o-error') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const CollaboratorsEmailHandler = require('./CollaboratorsEmailHandler') const CollaboratorsHandler = require('./CollaboratorsHandler') const UserGetter = require('../User/UserGetter') diff --git a/services/web/app/src/Features/Collaborators/OwnershipTransferHandler.js b/services/web/app/src/Features/Collaborators/OwnershipTransferHandler.js index bf31664b70..4d86113ebe 100644 --- a/services/web/app/src/Features/Collaborators/OwnershipTransferHandler.js +++ b/services/web/app/src/Features/Collaborators/OwnershipTransferHandler.js @@ -1,4 +1,4 @@ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { Project } = require('../../models/Project') const ProjectGetter = require('../Project/ProjectGetter') const UserGetter = require('../User/UserGetter') diff --git a/services/web/app/src/Features/Compile/ClsiCookieManager.js b/services/web/app/src/Features/Compile/ClsiCookieManager.js index 23f0c04646..b70f6435e3 100644 --- a/services/web/app/src/Features/Compile/ClsiCookieManager.js +++ b/services/web/app/src/Features/Compile/ClsiCookieManager.js @@ -21,7 +21,7 @@ if (Settings.redis.clsi_cookie_secondary != null) { rclient_secondary = RedisWrapper.client('clsi_cookie_secondary') } const Cookie = require('cookie') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Metrics = require('@overleaf/metrics') const clsiCookiesEnabled = diff --git a/services/web/app/src/Features/Compile/ClsiManager.js b/services/web/app/src/Features/Compile/ClsiManager.js index 62aa8d7897..8f3252f648 100644 --- a/services/web/app/src/Features/Compile/ClsiManager.js +++ b/services/web/app/src/Features/Compile/ClsiManager.js @@ -3,7 +3,7 @@ const Settings = require('@overleaf/settings') const request = require('request') const ProjectGetter = require('../Project/ProjectGetter') const ProjectEntityHandler = require('../Project/ProjectEntityHandler') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { URL } = require('url') const OError = require('@overleaf/o-error') diff --git a/services/web/app/src/Features/Compile/ClsiStateManager.js b/services/web/app/src/Features/Compile/ClsiStateManager.js index 02a2fd88e4..6e988ddfc2 100644 --- a/services/web/app/src/Features/Compile/ClsiStateManager.js +++ b/services/web/app/src/Features/Compile/ClsiStateManager.js @@ -15,7 +15,7 @@ */ let ClsiStateManager const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const crypto = require('crypto') const ProjectEntityHandler = require('../Project/ProjectEntityHandler') diff --git a/services/web/app/src/Features/Compile/CompileController.js b/services/web/app/src/Features/Compile/CompileController.js index 4314362a1a..dc2d3d48de 100644 --- a/services/web/app/src/Features/Compile/CompileController.js +++ b/services/web/app/src/Features/Compile/CompileController.js @@ -18,7 +18,7 @@ const Metrics = require('@overleaf/metrics') const ProjectGetter = require('../Project/ProjectGetter') const CompileManager = require('./CompileManager') const ClsiManager = require('./ClsiManager') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const request = require('request') const Settings = require('@overleaf/settings') const SessionManager = require('../Authentication/SessionManager') diff --git a/services/web/app/src/Features/Contacts/ContactController.js b/services/web/app/src/Features/Contacts/ContactController.js index 292578cdae..861f7329bb 100644 --- a/services/web/app/src/Features/Contacts/ContactController.js +++ b/services/web/app/src/Features/Contacts/ContactController.js @@ -16,7 +16,7 @@ let ContactsController const SessionManager = require('../Authentication/SessionManager') const ContactManager = require('./ContactManager') const UserGetter = require('../User/UserGetter') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Modules = require('../../infrastructure/Modules') module.exports = ContactsController = { diff --git a/services/web/app/src/Features/Cooldown/CooldownManager.js b/services/web/app/src/Features/Cooldown/CooldownManager.js index 4ae7da6182..70cb3b4b1a 100644 --- a/services/web/app/src/Features/Cooldown/CooldownManager.js +++ b/services/web/app/src/Features/Cooldown/CooldownManager.js @@ -13,7 +13,7 @@ let CooldownManager const RedisWrapper = require('../../infrastructure/RedisWrapper') const rclient = RedisWrapper.client('cooldown') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const COOLDOWN_IN_SECONDS = 60 * 10 diff --git a/services/web/app/src/Features/Cooldown/CooldownMiddleware.js b/services/web/app/src/Features/Cooldown/CooldownMiddleware.js index 0f5f98fb2d..8d1b456cb4 100644 --- a/services/web/app/src/Features/Cooldown/CooldownMiddleware.js +++ b/services/web/app/src/Features/Cooldown/CooldownMiddleware.js @@ -12,7 +12,7 @@ */ let CooldownMiddleware const CooldownManager = require('./CooldownManager') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') module.exports = CooldownMiddleware = { freezeProject(req, res, next) { diff --git a/services/web/app/src/Features/Docstore/DocstoreManager.js b/services/web/app/src/Features/Docstore/DocstoreManager.js index 87995f342e..05f22783cb 100644 --- a/services/web/app/src/Features/Docstore/DocstoreManager.js +++ b/services/web/app/src/Features/Docstore/DocstoreManager.js @@ -2,7 +2,7 @@ const { promisify } = require('util') const { promisifyMultiResult } = require('../../util/promises') const request = require('request').defaults({ jar: false }) const OError = require('@overleaf/o-error') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const settings = require('@overleaf/settings') const Errors = require('../Errors/Errors') diff --git a/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js b/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js index 358ee1e2b0..b4777d140c 100644 --- a/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js +++ b/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js @@ -3,7 +3,7 @@ const OError = require('@overleaf/o-error') const settings = require('@overleaf/settings') const _ = require('underscore') const async = require('async') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const metrics = require('@overleaf/metrics') const { promisify } = require('util') diff --git a/services/web/app/src/Features/Documents/DocumentController.js b/services/web/app/src/Features/Documents/DocumentController.js index 0d0e7e23af..aa00235c49 100644 --- a/services/web/app/src/Features/Documents/DocumentController.js +++ b/services/web/app/src/Features/Documents/DocumentController.js @@ -3,7 +3,7 @@ const OError = require('@overleaf/o-error') const ProjectLocator = require('../Project/ProjectLocator') const ProjectEntityHandler = require('../Project/ProjectEntityHandler') const ProjectEntityUpdateHandler = require('../Project/ProjectEntityUpdateHandler') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const _ = require('lodash') function getDocument(req, res, next) { diff --git a/services/web/app/src/Features/Downloads/ProjectDownloadsController.js b/services/web/app/src/Features/Downloads/ProjectDownloadsController.js index 0e16eb6c57..74a7f5b437 100644 --- a/services/web/app/src/Features/Downloads/ProjectDownloadsController.js +++ b/services/web/app/src/Features/Downloads/ProjectDownloadsController.js @@ -12,7 +12,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let ProjectDownloadsController -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Metrics = require('@overleaf/metrics') const ProjectGetter = require('../Project/ProjectGetter') const ProjectZipStreamManager = require('./ProjectZipStreamManager') diff --git a/services/web/app/src/Features/Downloads/ProjectZipStreamManager.js b/services/web/app/src/Features/Downloads/ProjectZipStreamManager.js index 8c66cb892e..38112691c5 100644 --- a/services/web/app/src/Features/Downloads/ProjectZipStreamManager.js +++ b/services/web/app/src/Features/Downloads/ProjectZipStreamManager.js @@ -1,7 +1,7 @@ let ProjectZipStreamManager const archiver = require('archiver') const async = require('async') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const ProjectEntityHandler = require('../Project/ProjectEntityHandler') const ProjectGetter = require('../Project/ProjectGetter') const FileStoreHandler = require('../FileStore/FileStoreHandler') diff --git a/services/web/app/src/Features/Editor/EditorController.js b/services/web/app/src/Features/Editor/EditorController.js index 1788ae2902..6fc8959bdd 100644 --- a/services/web/app/src/Features/Editor/EditorController.js +++ b/services/web/app/src/Features/Editor/EditorController.js @@ -13,7 +13,7 @@ * DS207: Consider shorter variations of null checks * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const OError = require('@overleaf/o-error') const Metrics = require('@overleaf/metrics') const ProjectEntityUpdateHandler = require('../Project/ProjectEntityUpdateHandler') diff --git a/services/web/app/src/Features/Editor/EditorHttpController.js b/services/web/app/src/Features/Editor/EditorHttpController.js index 549a69bcac..555b7b2233 100644 --- a/services/web/app/src/Features/Editor/EditorHttpController.js +++ b/services/web/app/src/Features/Editor/EditorHttpController.js @@ -14,7 +14,7 @@ const Errors = require('../Errors/Errors') const HttpErrorHandler = require('../Errors/HttpErrorHandler') const ProjectEntityUpdateHandler = require('../Project/ProjectEntityUpdateHandler') const DocstoreManager = require('../Docstore/DocstoreManager') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { expressify } = require('../../util/promises') module.exports = { diff --git a/services/web/app/src/Features/Email/EmailSender.js b/services/web/app/src/Features/Email/EmailSender.js index d3b9ebb873..9a9aa5380b 100644 --- a/services/web/app/src/Features/Email/EmailSender.js +++ b/services/web/app/src/Features/Email/EmailSender.js @@ -1,5 +1,5 @@ const { callbackify } = require('util') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const metrics = require('@overleaf/metrics') const Settings = require('@overleaf/settings') const nodemailer = require('nodemailer') diff --git a/services/web/app/src/Features/Errors/ErrorController.js b/services/web/app/src/Features/Errors/ErrorController.js index d223abbf3c..338b526035 100644 --- a/services/web/app/src/Features/Errors/ErrorController.js +++ b/services/web/app/src/Features/Errors/ErrorController.js @@ -1,6 +1,6 @@ let ErrorController const Errors = require('./Errors') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const SessionManager = require('../Authentication/SessionManager') const SamlLogHandler = require('../SamlLog/SamlLogHandler') const HttpErrorHandler = require('./HttpErrorHandler') diff --git a/services/web/app/src/Features/Errors/HttpErrorHandler.js b/services/web/app/src/Features/Errors/HttpErrorHandler.js index cdbd8caec6..b706583111 100644 --- a/services/web/app/src/Features/Errors/HttpErrorHandler.js +++ b/services/web/app/src/Features/Errors/HttpErrorHandler.js @@ -1,4 +1,4 @@ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Settings = require('@overleaf/settings') function renderJSONError(res, message, info = {}) { diff --git a/services/web/app/src/Features/Exports/ExportsController.js b/services/web/app/src/Features/Exports/ExportsController.js index 7d31f479aa..01e1a358c0 100644 --- a/services/web/app/src/Features/Exports/ExportsController.js +++ b/services/web/app/src/Features/Exports/ExportsController.js @@ -12,7 +12,7 @@ */ const ExportsHandler = require('./ExportsHandler') const SessionManager = require('../Authentication/SessionManager') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') module.exports = { exportProject(req, res, next) { diff --git a/services/web/app/src/Features/Exports/ExportsHandler.js b/services/web/app/src/Features/Exports/ExportsHandler.js index 21cc94b27c..d456b7473c 100644 --- a/services/web/app/src/Features/Exports/ExportsHandler.js +++ b/services/web/app/src/Features/Exports/ExportsHandler.js @@ -20,7 +20,7 @@ const ProjectHistoryHandler = require('../Project/ProjectHistoryHandler') const ProjectLocator = require('../Project/ProjectLocator') const ProjectRootDocManager = require('../Project/ProjectRootDocManager') const UserGetter = require('../User/UserGetter') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') let settings = require('@overleaf/settings') const async = require('async') let request = require('request') diff --git a/services/web/app/src/Features/FileStore/FileHashManager.js b/services/web/app/src/Features/FileStore/FileHashManager.js index bde054fa06..8d6f75e810 100644 --- a/services/web/app/src/Features/FileStore/FileHashManager.js +++ b/services/web/app/src/Features/FileStore/FileHashManager.js @@ -13,7 +13,7 @@ */ let FileHashManager const crypto = require('crypto') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const fs = require('fs') const _ = require('underscore') diff --git a/services/web/app/src/Features/FileStore/FileStoreController.js b/services/web/app/src/Features/FileStore/FileStoreController.js index 9ebae11893..7db347fae0 100644 --- a/services/web/app/src/Features/FileStore/FileStoreController.js +++ b/services/web/app/src/Features/FileStore/FileStoreController.js @@ -1,4 +1,4 @@ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const FileStoreHandler = require('./FileStoreHandler') const ProjectLocator = require('../Project/ProjectLocator') diff --git a/services/web/app/src/Features/FileStore/FileStoreHandler.js b/services/web/app/src/Features/FileStore/FileStoreHandler.js index bb8e57d598..85aac4d748 100644 --- a/services/web/app/src/Features/FileStore/FileStoreHandler.js +++ b/services/web/app/src/Features/FileStore/FileStoreHandler.js @@ -1,5 +1,5 @@ const _ = require('underscore') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const fs = require('fs') const request = require('request') const settings = require('@overleaf/settings') diff --git a/services/web/app/src/Features/HealthCheck/HealthCheckController.js b/services/web/app/src/Features/HealthCheck/HealthCheckController.js index 3e7b84d0e7..4f8a2eddcd 100644 --- a/services/web/app/src/Features/HealthCheck/HealthCheckController.js +++ b/services/web/app/src/Features/HealthCheck/HealthCheckController.js @@ -1,7 +1,7 @@ const RedisWrapper = require('../../infrastructure/RedisWrapper') const rclient = RedisWrapper.client('health_check') const settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const UserGetter = require('../User/UserGetter') const { SmokeTestFailure, diff --git a/services/web/app/src/Features/History/HistoryController.js b/services/web/app/src/Features/History/HistoryController.js index 1319f6b088..7482d676e8 100644 --- a/services/web/app/src/Features/History/HistoryController.js +++ b/services/web/app/src/Features/History/HistoryController.js @@ -1,7 +1,7 @@ let HistoryController const OError = require('@overleaf/o-error') const async = require('async') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const request = require('request') const settings = require('@overleaf/settings') const SessionManager = require('../Authentication/SessionManager') diff --git a/services/web/app/src/Features/InactiveData/InactiveProjectManager.js b/services/web/app/src/Features/InactiveData/InactiveProjectManager.js index 2c8acc23ac..0495370260 100644 --- a/services/web/app/src/Features/InactiveData/InactiveProjectManager.js +++ b/services/web/app/src/Features/InactiveData/InactiveProjectManager.js @@ -14,7 +14,7 @@ let InactiveProjectManager const OError = require('@overleaf/o-error') const async = require('async') const _ = require('underscore') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const DocstoreManager = require('../Docstore/DocstoreManager') const ProjectGetter = require('../Project/ProjectGetter') const ProjectUpdateHandler = require('../Project/ProjectUpdateHandler') diff --git a/services/web/app/src/Features/Institutions/InstitutionsAPI.js b/services/web/app/src/Features/Institutions/InstitutionsAPI.js index 0f27ad8b50..98368fb96b 100644 --- a/services/web/app/src/Features/Institutions/InstitutionsAPI.js +++ b/services/web/app/src/Features/Institutions/InstitutionsAPI.js @@ -1,5 +1,5 @@ const OError = require('@overleaf/o-error') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const metrics = require('@overleaf/metrics') const settings = require('@overleaf/settings') const request = require('requestretry') diff --git a/services/web/app/src/Features/LinkedFiles/LinkedFilesController.js b/services/web/app/src/Features/LinkedFiles/LinkedFilesController.js index b6f06ee1e9..991c5b23b6 100644 --- a/services/web/app/src/Features/LinkedFiles/LinkedFilesController.js +++ b/services/web/app/src/Features/LinkedFiles/LinkedFilesController.js @@ -17,7 +17,7 @@ const SessionManager = require('../Authentication/SessionManager') const EditorController = require('../Editor/EditorController') const ProjectLocator = require('../Project/ProjectLocator') const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const _ = require('underscore') const LinkedFilesHandler = require('./LinkedFilesHandler') const { diff --git a/services/web/app/src/Features/Metadata/MetaController.js b/services/web/app/src/Features/Metadata/MetaController.js index 070219c5b1..44173b461c 100644 --- a/services/web/app/src/Features/Metadata/MetaController.js +++ b/services/web/app/src/Features/Metadata/MetaController.js @@ -15,7 +15,7 @@ let MetaController const OError = require('@overleaf/o-error') const EditorRealTimeController = require('../Editor/EditorRealTimeController') const MetaHandler = require('./MetaHandler') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') module.exports = MetaController = { getMetadata(req, res, next) { diff --git a/services/web/app/src/Features/Newsletter/NewsletterManager.js b/services/web/app/src/Features/Newsletter/NewsletterManager.js index e05a02bb86..80d5cd24a6 100644 --- a/services/web/app/src/Features/Newsletter/NewsletterManager.js +++ b/services/web/app/src/Features/Newsletter/NewsletterManager.js @@ -1,5 +1,5 @@ const { callbackify } = require('util') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Settings = require('@overleaf/settings') const crypto = require('crypto') const Mailchimp = require('mailchimp-api-v3') diff --git a/services/web/app/src/Features/Notifications/NotificationsHandler.js b/services/web/app/src/Features/Notifications/NotificationsHandler.js index 45282b7269..f6415f43b8 100644 --- a/services/web/app/src/Features/Notifications/NotificationsHandler.js +++ b/services/web/app/src/Features/Notifications/NotificationsHandler.js @@ -1,6 +1,6 @@ const settings = require('@overleaf/settings') const request = require('request') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const _ = require('lodash') const notificationsApi = _.get(settings, ['apis', 'notifications', 'url']) diff --git a/services/web/app/src/Features/Project/ProjectApiController.js b/services/web/app/src/Features/Project/ProjectApiController.js index e06a43346a..8bab741df1 100644 --- a/services/web/app/src/Features/Project/ProjectApiController.js +++ b/services/web/app/src/Features/Project/ProjectApiController.js @@ -12,7 +12,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ const ProjectDetailsHandler = require('./ProjectDetailsHandler') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') module.exports = { getProjectDetails(req, res, next) { diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js index 36975f3ef3..44295dbd19 100644 --- a/services/web/app/src/Features/Project/ProjectController.js +++ b/services/web/app/src/Features/Project/ProjectController.js @@ -4,7 +4,7 @@ const OError = require('@overleaf/o-error') const fs = require('fs') const crypto = require('crypto') const async = require('async') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { ObjectId } = require('mongodb') const ProjectDeleter = require('./ProjectDeleter') const ProjectDuplicator = require('./ProjectDuplicator') diff --git a/services/web/app/src/Features/Project/ProjectCreationHandler.js b/services/web/app/src/Features/Project/ProjectCreationHandler.js index f5eeffccb2..401f40f4a9 100644 --- a/services/web/app/src/Features/Project/ProjectCreationHandler.js +++ b/services/web/app/src/Features/Project/ProjectCreationHandler.js @@ -1,4 +1,4 @@ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const OError = require('@overleaf/o-error') const metrics = require('@overleaf/metrics') const Settings = require('@overleaf/settings') diff --git a/services/web/app/src/Features/Project/ProjectDeleter.js b/services/web/app/src/Features/Project/ProjectDeleter.js index 0800fa6ab9..e1f2c6406b 100644 --- a/services/web/app/src/Features/Project/ProjectDeleter.js +++ b/services/web/app/src/Features/Project/ProjectDeleter.js @@ -5,7 +5,7 @@ const { callbackify } = require('util') const { Project } = require('../../models/Project') const { DeletedProject } = require('../../models/DeletedProject') const Errors = require('../Errors/Errors') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler') const TagsHandler = require('../Tags/TagsHandler') const ProjectHelper = require('./ProjectHelper') diff --git a/services/web/app/src/Features/Project/ProjectDetailsHandler.js b/services/web/app/src/Features/Project/ProjectDetailsHandler.js index a52be57439..90ef7548c1 100644 --- a/services/web/app/src/Features/Project/ProjectDetailsHandler.js +++ b/services/web/app/src/Features/Project/ProjectDetailsHandler.js @@ -2,7 +2,7 @@ const _ = require('underscore') const ProjectGetter = require('./ProjectGetter') const UserGetter = require('../User/UserGetter') const { Project } = require('../../models/Project') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const TpdsUpdateSender = require('../ThirdPartyDataStore/TpdsUpdateSender') const PublicAccessLevels = require('../Authorization/PublicAccessLevels') const Errors = require('../Errors/Errors') diff --git a/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js b/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js index 461cd726e3..c144a57903 100644 --- a/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js +++ b/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js @@ -1,7 +1,7 @@ const { callbackify } = require('util') const { callbackifyMultiResult } = require('../../util/promises') const _ = require('underscore') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const path = require('path') const { ObjectId } = require('mongodb') const Settings = require('@overleaf/settings') diff --git a/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js b/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js index 5a172ffbd8..369f2ca492 100644 --- a/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js +++ b/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js @@ -1,7 +1,7 @@ const _ = require('lodash') const OError = require('@overleaf/o-error') const async = require('async') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Settings = require('@overleaf/settings') const Path = require('path') const fs = require('fs') diff --git a/services/web/app/src/Features/Project/ProjectGetter.js b/services/web/app/src/Features/Project/ProjectGetter.js index 25997e3ac0..5b72433b76 100644 --- a/services/web/app/src/Features/Project/ProjectGetter.js +++ b/services/web/app/src/Features/Project/ProjectGetter.js @@ -4,7 +4,7 @@ const OError = require('@overleaf/o-error') const metrics = require('@overleaf/metrics') const { promisifyAll } = require('../../util/promises') const { Project } = require('../../models/Project') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const LockManager = require('../../infrastructure/LockManager') const { DeletedProject } = require('../../models/DeletedProject') diff --git a/services/web/app/src/Features/Project/ProjectHistoryHandler.js b/services/web/app/src/Features/Project/ProjectHistoryHandler.js index 862bec0c5c..0517d84d94 100644 --- a/services/web/app/src/Features/Project/ProjectHistoryHandler.js +++ b/services/web/app/src/Features/Project/ProjectHistoryHandler.js @@ -15,7 +15,7 @@ */ const { Project } = require('../../models/Project') const ProjectDetailsHandler = require('./ProjectDetailsHandler') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const settings = require('@overleaf/settings') const HistoryManager = require('../History/HistoryManager') const ProjectEntityUpdateHandler = require('./ProjectEntityUpdateHandler') diff --git a/services/web/app/src/Features/Project/ProjectLocator.js b/services/web/app/src/Features/Project/ProjectLocator.js index e62b4dccae..7d672fab75 100644 --- a/services/web/app/src/Features/Project/ProjectLocator.js +++ b/services/web/app/src/Features/Project/ProjectLocator.js @@ -1,5 +1,5 @@ const _ = require('underscore') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const async = require('async') const ProjectGetter = require('./ProjectGetter') const Errors = require('../Errors/Errors') diff --git a/services/web/app/src/Features/Project/ProjectUpdateHandler.js b/services/web/app/src/Features/Project/ProjectUpdateHandler.js index 4716ac40dd..789ffbcce5 100644 --- a/services/web/app/src/Features/Project/ProjectUpdateHandler.js +++ b/services/web/app/src/Features/Project/ProjectUpdateHandler.js @@ -12,7 +12,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ const { Project } = require('../../models/Project') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') module.exports = { markAsUpdated(projectId, lastUpdatedAt, lastUpdatedBy, callback) { diff --git a/services/web/app/src/Features/Publishers/PublishersGetter.js b/services/web/app/src/Features/Publishers/PublishersGetter.js index 03b038fd6b..0e44e4f4f7 100644 --- a/services/web/app/src/Features/Publishers/PublishersGetter.js +++ b/services/web/app/src/Features/Publishers/PublishersGetter.js @@ -15,7 +15,7 @@ let PublishersGetter const UserMembershipsHandler = require('../UserMembership/UserMembershipsHandler') const UserMembershipEntityConfigs = require('../UserMembership/UserMembershipEntityConfigs') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const _ = require('underscore') module.exports = PublishersGetter = { diff --git a/services/web/app/src/Features/References/ReferencesController.js b/services/web/app/src/Features/References/ReferencesController.js index 160da5f065..0ea054f2a5 100644 --- a/services/web/app/src/Features/References/ReferencesController.js +++ b/services/web/app/src/Features/References/ReferencesController.js @@ -11,7 +11,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let ReferencesController -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const ReferencesHandler = require('./ReferencesHandler') const settings = require('@overleaf/settings') const EditorRealTimeController = require('../Editor/EditorRealTimeController') diff --git a/services/web/app/src/Features/References/ReferencesHandler.js b/services/web/app/src/Features/References/ReferencesHandler.js index df90d0c979..8f634317a2 100644 --- a/services/web/app/src/Features/References/ReferencesHandler.js +++ b/services/web/app/src/Features/References/ReferencesHandler.js @@ -14,7 +14,7 @@ */ let ReferencesHandler const OError = require('@overleaf/o-error') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const request = require('request') const settings = require('@overleaf/settings') const Features = require('../../infrastructure/Features') diff --git a/services/web/app/src/Features/SamlLog/SamlLogHandler.js b/services/web/app/src/Features/SamlLog/SamlLogHandler.js index 354eaa6ac7..8b69f324c0 100644 --- a/services/web/app/src/Features/SamlLog/SamlLogHandler.js +++ b/services/web/app/src/Features/SamlLog/SamlLogHandler.js @@ -1,5 +1,5 @@ const { SamlLog } = require('../../models/SamlLog') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') function log(providerId, sessionId, data) { try { diff --git a/services/web/app/src/Features/Security/RateLimiterMiddleware.js b/services/web/app/src/Features/Security/RateLimiterMiddleware.js index bf6f175c45..41a0f804b5 100644 --- a/services/web/app/src/Features/Security/RateLimiterMiddleware.js +++ b/services/web/app/src/Features/Security/RateLimiterMiddleware.js @@ -1,5 +1,5 @@ const RateLimiter = require('../../infrastructure/RateLimiter') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const SessionManager = require('../Authentication/SessionManager') const LoginRateLimiter = require('./LoginRateLimiter') const settings = require('@overleaf/settings') diff --git a/services/web/app/src/Features/ServerAdmin/AdminController.js b/services/web/app/src/Features/ServerAdmin/AdminController.js index 9b5fa3a6eb..6f8e8b50bb 100644 --- a/services/web/app/src/Features/ServerAdmin/AdminController.js +++ b/services/web/app/src/Features/ServerAdmin/AdminController.js @@ -16,7 +16,7 @@ */ const metrics = require('@overleaf/metrics') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const _ = require('underscore') const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler') const Settings = require('@overleaf/settings') diff --git a/services/web/app/src/Features/Spelling/SpellingController.js b/services/web/app/src/Features/Spelling/SpellingController.js index baf0a29d83..0363770ff0 100644 --- a/services/web/app/src/Features/Spelling/SpellingController.js +++ b/services/web/app/src/Features/Spelling/SpellingController.js @@ -1,6 +1,6 @@ const request = require('request') const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const SessionManager = require('../Authentication/SessionManager') const TEN_SECONDS = 1000 * 10 diff --git a/services/web/app/src/Features/StaticPages/UniversityController.js b/services/web/app/src/Features/StaticPages/UniversityController.js index 3304589d99..7d8f07cd56 100644 --- a/services/web/app/src/Features/StaticPages/UniversityController.js +++ b/services/web/app/src/Features/StaticPages/UniversityController.js @@ -11,7 +11,7 @@ */ let UniversityController const settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Settings = require('@overleaf/settings') module.exports = UniversityController = { diff --git a/services/web/app/src/Features/Subscription/FeaturesUpdater.js b/services/web/app/src/Features/Subscription/FeaturesUpdater.js index 323a041ca2..b1872a6294 100644 --- a/services/web/app/src/Features/Subscription/FeaturesUpdater.js +++ b/services/web/app/src/Features/Subscription/FeaturesUpdater.js @@ -6,7 +6,7 @@ const SubscriptionLocator = require('./SubscriptionLocator') const UserFeaturesUpdater = require('./UserFeaturesUpdater') const FeaturesHelper = require('./FeaturesHelper') const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const ReferalFeatures = require('../Referal/ReferalFeatures') const V1SubscriptionManager = require('./V1SubscriptionManager') const InstitutionsFeatures = require('../Institutions/InstitutionsFeatures') diff --git a/services/web/app/src/Features/Subscription/LimitationsManager.js b/services/web/app/src/Features/Subscription/LimitationsManager.js index 1d4ee7959c..5405f9a6ad 100644 --- a/services/web/app/src/Features/Subscription/LimitationsManager.js +++ b/services/web/app/src/Features/Subscription/LimitationsManager.js @@ -1,5 +1,5 @@ const OError = require('@overleaf/o-error') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const ProjectGetter = require('../Project/ProjectGetter') const UserGetter = require('../User/UserGetter') const SubscriptionLocator = require('./SubscriptionLocator') diff --git a/services/web/app/src/Features/Subscription/PlansLocator.js b/services/web/app/src/Features/Subscription/PlansLocator.js index 27972b0eef..4c40031c2b 100644 --- a/services/web/app/src/Features/Subscription/PlansLocator.js +++ b/services/web/app/src/Features/Subscription/PlansLocator.js @@ -1,5 +1,5 @@ const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') function ensurePlansAreSetupCorrectly() { Settings.plans.forEach(plan => { diff --git a/services/web/app/src/Features/Subscription/RecurlyClient.js b/services/web/app/src/Features/Subscription/RecurlyClient.js index 6387536025..5be35ee39d 100644 --- a/services/web/app/src/Features/Subscription/RecurlyClient.js +++ b/services/web/app/src/Features/Subscription/RecurlyClient.js @@ -1,6 +1,6 @@ const recurly = require('recurly') const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { callbackify } = require('util') const UserGetter = require('../User/UserGetter') diff --git a/services/web/app/src/Features/Subscription/RecurlyWrapper.js b/services/web/app/src/Features/Subscription/RecurlyWrapper.js index f8110ce0f4..db95a23f6d 100644 --- a/services/web/app/src/Features/Subscription/RecurlyWrapper.js +++ b/services/web/app/src/Features/Subscription/RecurlyWrapper.js @@ -21,7 +21,7 @@ const crypto = require('crypto') const request = require('request') const Settings = require('@overleaf/settings') const xml2js = require('xml2js') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Async = require('async') const Errors = require('../Errors/Errors') const SubscriptionErrors = require('./Errors') diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js index 8af637f8b3..2ed2ae95b3 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionController.js +++ b/services/web/app/src/Features/Subscription/SubscriptionController.js @@ -5,7 +5,7 @@ const SubscriptionViewModelBuilder = require('./SubscriptionViewModelBuilder') const LimitationsManager = require('./LimitationsManager') const RecurlyWrapper = require('./RecurlyWrapper') const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const GeoIpLookup = require('../../infrastructure/GeoIpLookup') const FeaturesUpdater = require('./FeaturesUpdater') const planFeatures = require('./planFeatures') diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupController.js b/services/web/app/src/Features/Subscription/SubscriptionGroupController.js index 2985acbfbd..5d4a43adfe 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionGroupController.js +++ b/services/web/app/src/Features/Subscription/SubscriptionGroupController.js @@ -13,7 +13,7 @@ */ const SubscriptionGroupHandler = require('./SubscriptionGroupHandler') const OError = require('@overleaf/o-error') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const SubscriptionLocator = require('./SubscriptionLocator') const SessionManager = require('../Authentication/SessionManager') const _ = require('underscore') diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js index 0b60c7ebd4..44a0196552 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js +++ b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js @@ -21,7 +21,7 @@ const SubscriptionLocator = require('./SubscriptionLocator') const UserGetter = require('../User/UserGetter') const { Subscription } = require('../../models/Subscription') const LimitationsManager = require('./LimitationsManager') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler') const EmailHandler = require('../Email/EmailHandler') const settings = require('@overleaf/settings') diff --git a/services/web/app/src/Features/Subscription/SubscriptionHandler.js b/services/web/app/src/Features/Subscription/SubscriptionHandler.js index b9d9372f8b..3146d770dc 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionHandler.js +++ b/services/web/app/src/Features/Subscription/SubscriptionHandler.js @@ -3,7 +3,7 @@ const { promisify } = require('util') const RecurlyWrapper = require('./RecurlyWrapper') const RecurlyClient = require('./RecurlyClient') const { User } = require('../../models/User') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const SubscriptionUpdater = require('./SubscriptionUpdater') const LimitationsManager = require('./LimitationsManager') const EmailHandler = require('../Email/EmailHandler') diff --git a/services/web/app/src/Features/Subscription/SubscriptionLocator.js b/services/web/app/src/Features/Subscription/SubscriptionLocator.js index b12cd392d7..e497e57a8d 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionLocator.js +++ b/services/web/app/src/Features/Subscription/SubscriptionLocator.js @@ -15,7 +15,7 @@ const { promisify } = require('util') const { Subscription } = require('../../models/Subscription') const { DeletedSubscription } = require('../../models/DeletedSubscription') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') require('./GroupPlansData') // make sure dynamic group plans are loaded const SubscriptionLocator = { diff --git a/services/web/app/src/Features/Subscription/SubscriptionUpdater.js b/services/web/app/src/Features/Subscription/SubscriptionUpdater.js index d0d20fa292..c658012b79 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionUpdater.js +++ b/services/web/app/src/Features/Subscription/SubscriptionUpdater.js @@ -7,7 +7,7 @@ const FeaturesUpdater = require('./FeaturesUpdater') const FeaturesHelper = require('./FeaturesHelper') const AnalyticsManager = require('../Analytics/AnalyticsManager') const { DeletedSubscription } = require('../../models/DeletedSubscription') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') /** * Change the admin of the given subscription. diff --git a/services/web/app/src/Features/Subscription/TeamInvitesController.js b/services/web/app/src/Features/Subscription/TeamInvitesController.js index bff6cd6d5c..3477f72948 100644 --- a/services/web/app/src/Features/Subscription/TeamInvitesController.js +++ b/services/web/app/src/Features/Subscription/TeamInvitesController.js @@ -11,7 +11,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ const settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const TeamInvitesHandler = require('./TeamInvitesHandler') const SessionManager = require('../Authentication/SessionManager') const SubscriptionLocator = require('./SubscriptionLocator') diff --git a/services/web/app/src/Features/Subscription/TeamInvitesHandler.js b/services/web/app/src/Features/Subscription/TeamInvitesHandler.js index b2ca4ee03f..e4e8d12f11 100644 --- a/services/web/app/src/Features/Subscription/TeamInvitesHandler.js +++ b/services/web/app/src/Features/Subscription/TeamInvitesHandler.js @@ -1,5 +1,5 @@ let TeamInvitesHandler -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const crypto = require('crypto') const async = require('async') diff --git a/services/web/app/src/Features/Templates/TemplatesController.js b/services/web/app/src/Features/Templates/TemplatesController.js index 27c7f14fc0..3dd29699ca 100644 --- a/services/web/app/src/Features/Templates/TemplatesController.js +++ b/services/web/app/src/Features/Templates/TemplatesController.js @@ -16,7 +16,7 @@ const path = require('path') const SessionManager = require('../Authentication/SessionManager') const TemplatesManager = require('./TemplatesManager') const ProjectHelper = require('../Project/ProjectHelper') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') module.exports = TemplatesController = { getV1Template(req, res) { diff --git a/services/web/app/src/Features/Templates/TemplatesManager.js b/services/web/app/src/Features/Templates/TemplatesManager.js index 38d599f934..fdb13251c8 100644 --- a/services/web/app/src/Features/Templates/TemplatesManager.js +++ b/services/web/app/src/Features/Templates/TemplatesManager.js @@ -20,7 +20,7 @@ const FileWriter = require('../../infrastructure/FileWriter') const async = require('async') const fs = require('fs') const util = require('util') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const request = require('request') const requestPromise = require('request-promise-native') const settings = require('@overleaf/settings') diff --git a/services/web/app/src/Features/Templates/TemplatesMiddleware.js b/services/web/app/src/Features/Templates/TemplatesMiddleware.js index 8315f537b2..ff3bebf4c9 100644 --- a/services/web/app/src/Features/Templates/TemplatesMiddleware.js +++ b/services/web/app/src/Features/Templates/TemplatesMiddleware.js @@ -9,7 +9,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ const settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') module.exports = { saveTemplateDataInSession(req, res, next) { diff --git a/services/web/app/src/Features/ThirdPartyDataStore/TpdsController.js b/services/web/app/src/Features/ThirdPartyDataStore/TpdsController.js index 30741ee823..1d3bead17b 100644 --- a/services/web/app/src/Features/ThirdPartyDataStore/TpdsController.js +++ b/services/web/app/src/Features/ThirdPartyDataStore/TpdsController.js @@ -3,7 +3,7 @@ let parseParams const TpdsUpdateHandler = require('./TpdsUpdateHandler') const UpdateMerger = require('./UpdateMerger') const Errors = require('../Errors/Errors') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Path = require('path') const metrics = require('@overleaf/metrics') const NotificationsBuilder = require('../Notifications/NotificationsBuilder') diff --git a/services/web/app/src/Features/ThirdPartyDataStore/TpdsProjectFlusher.js b/services/web/app/src/Features/ThirdPartyDataStore/TpdsProjectFlusher.js index 984e1eff99..a5407897d7 100644 --- a/services/web/app/src/Features/ThirdPartyDataStore/TpdsProjectFlusher.js +++ b/services/web/app/src/Features/ThirdPartyDataStore/TpdsProjectFlusher.js @@ -1,5 +1,5 @@ const { callbackify } = require('util') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler') const ProjectGetter = require('../Project/ProjectGetter') const ProjectEntityHandler = require('../Project/ProjectEntityHandler') diff --git a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateHandler.js b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateHandler.js index ab48b297a2..4d9d28038a 100644 --- a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateHandler.js +++ b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateHandler.js @@ -1,5 +1,5 @@ const UpdateMerger = require('./UpdateMerger') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const NotificationsBuilder = require('../Notifications/NotificationsBuilder') const ProjectCreationHandler = require('../Project/ProjectCreationHandler') const ProjectDeleter = require('../Project/ProjectDeleter') diff --git a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js index 7353e254e6..69f7f7a2ea 100644 --- a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js +++ b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js @@ -1,7 +1,7 @@ const { ObjectId } = require('mongodb') const _ = require('lodash') const { callbackify } = require('util') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const metrics = require('@overleaf/metrics') const path = require('path') const request = require('request-promise-native') diff --git a/services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js b/services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js index dbf861a1a6..b6053282f9 100644 --- a/services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js +++ b/services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js @@ -16,7 +16,7 @@ const OError = require('@overleaf/o-error') const _ = require('underscore') const async = require('async') const fs = require('fs') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const EditorController = require('../Editor/EditorController') const FileTypeManager = require('../Uploads/FileTypeManager') const FileWriter = require('../../infrastructure/FileWriter') diff --git a/services/web/app/src/Features/TokenAccess/TokenAccessController.js b/services/web/app/src/Features/TokenAccess/TokenAccessController.js index aa0cb6e894..e9b8031788 100644 --- a/services/web/app/src/Features/TokenAccess/TokenAccessController.js +++ b/services/web/app/src/Features/TokenAccess/TokenAccessController.js @@ -2,7 +2,7 @@ const AuthenticationController = require('../Authentication/AuthenticationContro const SessionManager = require('../Authentication/SessionManager') const TokenAccessHandler = require('./TokenAccessHandler') const Errors = require('../Errors/Errors') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const settings = require('@overleaf/settings') const OError = require('@overleaf/o-error') const { expressify } = require('../../util/promises') diff --git a/services/web/app/src/Features/TokenAccess/TokenAccessHandler.js b/services/web/app/src/Features/TokenAccess/TokenAccessHandler.js index 6f57657063..1dd4004547 100644 --- a/services/web/app/src/Features/TokenAccess/TokenAccessHandler.js +++ b/services/web/app/src/Features/TokenAccess/TokenAccessHandler.js @@ -3,7 +3,7 @@ const PublicAccessLevels = require('../Authorization/PublicAccessLevels') const PrivilegeLevels = require('../Authorization/PrivilegeLevels') const { ObjectId } = require('mongodb') const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const V1Api = require('../V1/V1Api') const crypto = require('crypto') const { promisifyAll } = require('../../util/promises') diff --git a/services/web/app/src/Features/Uploads/ArchiveManager.js b/services/web/app/src/Features/Uploads/ArchiveManager.js index eced8d4169..2a8f1aa61a 100644 --- a/services/web/app/src/Features/Uploads/ArchiveManager.js +++ b/services/web/app/src/Features/Uploads/ArchiveManager.js @@ -12,7 +12,7 @@ * DS207: Consider shorter variations of null checks * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const OError = require('@overleaf/o-error') const metrics = require('@overleaf/metrics') const fs = require('fs') diff --git a/services/web/app/src/Features/Uploads/FileSystemImportManager.js b/services/web/app/src/Features/Uploads/FileSystemImportManager.js index bded16e79b..bf80372375 100644 --- a/services/web/app/src/Features/Uploads/FileSystemImportManager.js +++ b/services/web/app/src/Features/Uploads/FileSystemImportManager.js @@ -5,7 +5,7 @@ const EditorController = require('../Editor/EditorController') const Errors = require('../Errors/Errors') const FileTypeManager = require('./FileTypeManager') const SafePath = require('../Project/SafePath') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') module.exports = { addEntity: callbackify(addEntity), diff --git a/services/web/app/src/Features/Uploads/ProjectUploadController.js b/services/web/app/src/Features/Uploads/ProjectUploadController.js index 69de196eb9..74e7a99db6 100644 --- a/services/web/app/src/Features/Uploads/ProjectUploadController.js +++ b/services/web/app/src/Features/Uploads/ProjectUploadController.js @@ -12,7 +12,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let ProjectUploadController -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const metrics = require('@overleaf/metrics') const fs = require('fs') const Path = require('path') diff --git a/services/web/app/src/Features/Uploads/ProjectUploadManager.js b/services/web/app/src/Features/Uploads/ProjectUploadManager.js index 530bb6352b..47a75799b1 100644 --- a/services/web/app/src/Features/Uploads/ProjectUploadManager.js +++ b/services/web/app/src/Features/Uploads/ProjectUploadManager.js @@ -14,7 +14,7 @@ const ProjectRootDocManager = require('../Project/ProjectRootDocManager') const ProjectDetailsHandler = require('../Project/ProjectDetailsHandler') const ProjectDeleter = require('../Project/ProjectDeleter') const TpdsProjectFlusher = require('../ThirdPartyDataStore/TpdsProjectFlusher') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') module.exports = { createProjectFromZipArchive: callbackify(createProjectFromZipArchive), diff --git a/services/web/app/src/Features/User/SAMLIdentityManager.js b/services/web/app/src/Features/User/SAMLIdentityManager.js index 58108553d1..581071be70 100644 --- a/services/web/app/src/Features/User/SAMLIdentityManager.js +++ b/services/web/app/src/Features/User/SAMLIdentityManager.js @@ -8,7 +8,7 @@ const SubscriptionLocator = require('../Subscription/SubscriptionLocator') const UserAuditLogHandler = require('../User/UserAuditLogHandler') const UserGetter = require('../User/UserGetter') const UserUpdater = require('../User/UserUpdater') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { User } = require('../../models/User') async function _addAuditLogEntry( diff --git a/services/web/app/src/Features/User/ThirdPartyIdentityManager.js b/services/web/app/src/Features/User/ThirdPartyIdentityManager.js index c1054d8741..4d318b5668 100644 --- a/services/web/app/src/Features/User/ThirdPartyIdentityManager.js +++ b/services/web/app/src/Features/User/ThirdPartyIdentityManager.js @@ -4,7 +4,7 @@ const EmailHandler = require(`${APP_ROOT}/Features/Email/EmailHandler`) const EmailOptionsHelper = require(`${APP_ROOT}/Features/Email/EmailOptionsHelper`) const Errors = require('../Errors/Errors') const _ = require('lodash') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const OError = require('@overleaf/o-error') const settings = require('@overleaf/settings') const { User } = require(`${APP_ROOT}/models/User`) diff --git a/services/web/app/src/Features/User/UserController.js b/services/web/app/src/Features/User/UserController.js index fbfdec5ee6..e36fae0364 100644 --- a/services/web/app/src/Features/User/UserController.js +++ b/services/web/app/src/Features/User/UserController.js @@ -4,7 +4,7 @@ const UserGetter = require('./UserGetter') const { User } = require('../../models/User') const NewsletterManager = require('../Newsletter/NewsletterManager') const UserRegistrationHandler = require('./UserRegistrationHandler') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const metrics = require('@overleaf/metrics') const AuthenticationManager = require('../Authentication/AuthenticationManager') const SessionManager = require('../Authentication/SessionManager') diff --git a/services/web/app/src/Features/User/UserCreator.js b/services/web/app/src/Features/User/UserCreator.js index 828e0e7f83..52652a828f 100644 --- a/services/web/app/src/Features/User/UserCreator.js +++ b/services/web/app/src/Features/User/UserCreator.js @@ -1,4 +1,4 @@ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const util = require('util') const { AffiliationError } = require('../Errors/Errors') const Features = require('../../infrastructure/Features') diff --git a/services/web/app/src/Features/User/UserDeleter.js b/services/web/app/src/Features/User/UserDeleter.js index a183978cb8..159c13bdf4 100644 --- a/services/web/app/src/Features/User/UserDeleter.js +++ b/services/web/app/src/Features/User/UserDeleter.js @@ -1,5 +1,5 @@ const { callbackify } = require('util') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const moment = require('moment') const { User } = require('../../models/User') const { DeletedUser } = require('../../models/DeletedUser') diff --git a/services/web/app/src/Features/User/UserEmailsController.js b/services/web/app/src/Features/User/UserEmailsController.js index 5538911e3a..d546347876 100644 --- a/services/web/app/src/Features/User/UserEmailsController.js +++ b/services/web/app/src/Features/User/UserEmailsController.js @@ -1,4 +1,4 @@ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const SessionManager = require('../Authentication/SessionManager') const UserGetter = require('./UserGetter') const UserUpdater = require('./UserUpdater') diff --git a/services/web/app/src/Features/User/UserGetter.js b/services/web/app/src/Features/User/UserGetter.js index 54d4a73329..1c2d98f7bd 100644 --- a/services/web/app/src/Features/User/UserGetter.js +++ b/services/web/app/src/Features/User/UserGetter.js @@ -1,7 +1,7 @@ const { callbackify } = require('util') const { db } = require('../../infrastructure/mongodb') const metrics = require('@overleaf/metrics') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const moment = require('moment') const settings = require('@overleaf/settings') const { promisifyAll } = require('../../util/promises') diff --git a/services/web/app/src/Features/User/UserPagesController.js b/services/web/app/src/Features/User/UserPagesController.js index 63c445c3ba..a3eb86d170 100644 --- a/services/web/app/src/Features/User/UserPagesController.js +++ b/services/web/app/src/Features/User/UserPagesController.js @@ -1,7 +1,7 @@ const UserGetter = require('./UserGetter') const OError = require('@overleaf/o-error') const UserSessionsManager = require('./UserSessionsManager') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Settings = require('@overleaf/settings') const AuthenticationController = require('../Authentication/AuthenticationController') const SessionManager = require('../Authentication/SessionManager') diff --git a/services/web/app/src/Features/User/UserRegistrationHandler.js b/services/web/app/src/Features/User/UserRegistrationHandler.js index a45b6dbcc8..377bf2dd7c 100644 --- a/services/web/app/src/Features/User/UserRegistrationHandler.js +++ b/services/web/app/src/Features/User/UserRegistrationHandler.js @@ -4,7 +4,7 @@ const UserGetter = require('./UserGetter') const AuthenticationManager = require('../Authentication/AuthenticationManager') const NewsletterManager = require('../Newsletter/NewsletterManager') const async = require('async') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const crypto = require('crypto') const EmailHandler = require('../Email/EmailHandler') const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler') diff --git a/services/web/app/src/Features/User/UserSessionsManager.js b/services/web/app/src/Features/User/UserSessionsManager.js index ce1abf1f0c..e8839204b8 100644 --- a/services/web/app/src/Features/User/UserSessionsManager.js +++ b/services/web/app/src/Features/User/UserSessionsManager.js @@ -1,6 +1,6 @@ const OError = require('@overleaf/o-error') const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Async = require('async') const _ = require('underscore') const { promisify } = require('util') diff --git a/services/web/app/src/Features/User/UserUpdater.js b/services/web/app/src/Features/User/UserUpdater.js index a565cd5523..9008e8ffa4 100644 --- a/services/web/app/src/Features/User/UserUpdater.js +++ b/services/web/app/src/Features/User/UserUpdater.js @@ -1,4 +1,4 @@ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const OError = require('@overleaf/o-error') const { db } = require('../../infrastructure/mongodb') const { normalizeQuery } = require('../Helpers/Mongo') diff --git a/services/web/app/src/Features/UserMembership/UserMembershipHandler.js b/services/web/app/src/Features/UserMembership/UserMembershipHandler.js index 6a70cfa764..46b727f350 100644 --- a/services/web/app/src/Features/UserMembership/UserMembershipHandler.js +++ b/services/web/app/src/Features/UserMembership/UserMembershipHandler.js @@ -23,7 +23,7 @@ const EntityModels = { } const UserMembershipViewModel = require('./UserMembershipViewModel') const UserGetter = require('../User/UserGetter') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const UserMembershipEntityConfigs = require('./UserMembershipEntityConfigs') const UserMembershipHandler = { diff --git a/services/web/app/src/Features/V1/V1Handler.js b/services/web/app/src/Features/V1/V1Handler.js index beeb40bdec..a76bfa4220 100644 --- a/services/web/app/src/Features/V1/V1Handler.js +++ b/services/web/app/src/Features/V1/V1Handler.js @@ -16,7 +16,7 @@ let V1Handler const OError = require('@overleaf/o-error') const V1Api = require('./V1Api') const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') module.exports = V1Handler = { authWithV1(email, password, callback) { diff --git a/services/web/app/src/infrastructure/ExpressLocals.js b/services/web/app/src/infrastructure/ExpressLocals.js index 526a4cbd03..6fd52ad6c4 100644 --- a/services/web/app/src/infrastructure/ExpressLocals.js +++ b/services/web/app/src/infrastructure/ExpressLocals.js @@ -1,4 +1,4 @@ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Settings = require('@overleaf/settings') const querystring = require('querystring') const _ = require('lodash') diff --git a/services/web/app/src/infrastructure/FileWriter.js b/services/web/app/src/infrastructure/FileWriter.js index a5301b22e1..5cdf5ca7f1 100644 --- a/services/web/app/src/infrastructure/FileWriter.js +++ b/services/web/app/src/infrastructure/FileWriter.js @@ -12,7 +12,7 @@ */ const fs = require('fs') const OError = require('@overleaf/o-error') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const uuid = require('uuid') const _ = require('underscore') const Settings = require('@overleaf/settings') diff --git a/services/web/app/src/infrastructure/GeoIpLookup.js b/services/web/app/src/infrastructure/GeoIpLookup.js index 59ab8f5c23..27e7874055 100644 --- a/services/web/app/src/infrastructure/GeoIpLookup.js +++ b/services/web/app/src/infrastructure/GeoIpLookup.js @@ -1,7 +1,7 @@ const request = require('request') const settings = require('@overleaf/settings') const _ = require('underscore') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { URL } = require('url') const { promisify, promisifyMultiResult } = require('../util/promises') diff --git a/services/web/app/src/infrastructure/LockManager.js b/services/web/app/src/infrastructure/LockManager.js index 4e8adfc98f..4d58b4be9f 100644 --- a/services/web/app/src/infrastructure/LockManager.js +++ b/services/web/app/src/infrastructure/LockManager.js @@ -2,7 +2,7 @@ const { callbackify, promisify } = require('util') const metrics = require('@overleaf/metrics') const RedisWrapper = require('./RedisWrapper') const rclient = RedisWrapper.client('lock') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const os = require('os') const crypto = require('crypto') const async = require('async') diff --git a/services/web/app/src/infrastructure/Mongoose.js b/services/web/app/src/infrastructure/Mongoose.js index f680abe94c..b4eee7fa80 100644 --- a/services/web/app/src/infrastructure/Mongoose.js +++ b/services/web/app/src/infrastructure/Mongoose.js @@ -1,6 +1,6 @@ const mongoose = require('mongoose') const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') if ( typeof global.beforeEach === 'function' && diff --git a/services/web/app/src/infrastructure/ProxyManager.js b/services/web/app/src/infrastructure/ProxyManager.js index bbeff7b1d0..6cc0ecebed 100644 --- a/services/web/app/src/infrastructure/ProxyManager.js +++ b/services/web/app/src/infrastructure/ProxyManager.js @@ -12,7 +12,7 @@ */ let ProxyManager const settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const request = require('request') const { URL, URLSearchParams } = require('url') diff --git a/services/web/app/src/infrastructure/Server.js b/services/web/app/src/infrastructure/Server.js index 199c52a071..e940a4b3ab 100644 --- a/services/web/app/src/infrastructure/Server.js +++ b/services/web/app/src/infrastructure/Server.js @@ -1,7 +1,7 @@ const Path = require('path') const express = require('express') const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const metrics = require('@overleaf/metrics') const expressLocals = require('./ExpressLocals') const Validation = require('./Validation') diff --git a/services/web/app/src/infrastructure/SessionStoreManager.js b/services/web/app/src/infrastructure/SessionStoreManager.js index a9ef6bdd21..9233730f92 100644 --- a/services/web/app/src/infrastructure/SessionStoreManager.js +++ b/services/web/app/src/infrastructure/SessionStoreManager.js @@ -1,5 +1,5 @@ const Metrics = require('@overleaf/metrics') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') function computeValidationToken(req) { // this should be a deterministic function of the client-side sessionID, diff --git a/services/web/app/src/infrastructure/Views.js b/services/web/app/src/infrastructure/Views.js index e1323a823d..1460006eb7 100644 --- a/services/web/app/src/infrastructure/Views.js +++ b/services/web/app/src/infrastructure/Views.js @@ -1,4 +1,4 @@ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const pug = require('pug') const globby = require('globby') const Settings = require('@overleaf/settings') diff --git a/services/web/app/src/models/Institution.js b/services/web/app/src/models/Institution.js index 7b44012405..79aa0cf27a 100644 --- a/services/web/app/src/models/Institution.js +++ b/services/web/app/src/models/Institution.js @@ -2,7 +2,7 @@ const mongoose = require('../infrastructure/Mongoose') const { Schema } = mongoose const { ObjectId } = Schema const settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const request = require('request') const InstitutionSchema = new Schema({ diff --git a/services/web/app/src/models/Publisher.js b/services/web/app/src/models/Publisher.js index b19a0b4cac..84002a955a 100644 --- a/services/web/app/src/models/Publisher.js +++ b/services/web/app/src/models/Publisher.js @@ -2,7 +2,7 @@ const mongoose = require('../infrastructure/Mongoose') const { Schema } = mongoose const { ObjectId } = Schema const settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const request = require('request') const PublisherSchema = new Schema({ diff --git a/services/web/app/src/router.js b/services/web/app/src/router.js index 99b9d29400..f0115526f8 100644 --- a/services/web/app/src/router.js +++ b/services/web/app/src/router.js @@ -57,7 +57,7 @@ const { unsupportedBrowserMiddleware, } = require('./infrastructure/UnsupportedBrowserMiddleware') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const _ = require('underscore') module.exports = { initialize } diff --git a/services/web/modules/launchpad/app/src/LaunchpadController.js b/services/web/modules/launchpad/app/src/LaunchpadController.js index a46c4d83c5..1ddd90557a 100644 --- a/services/web/modules/launchpad/app/src/LaunchpadController.js +++ b/services/web/modules/launchpad/app/src/LaunchpadController.js @@ -16,7 +16,7 @@ const OError = require('@overleaf/o-error') const Settings = require('@overleaf/settings') const Path = require('path') const Url = require('url') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const metrics = require('@overleaf/metrics') const UserRegistrationHandler = require('../../../../app/src/Features/User/UserRegistrationHandler') const EmailHandler = require('../../../../app/src/Features/Email/EmailHandler') diff --git a/services/web/modules/launchpad/app/src/LaunchpadRouter.js b/services/web/modules/launchpad/app/src/LaunchpadRouter.js index 5c88c9fbf4..21d8a58b48 100644 --- a/services/web/modules/launchpad/app/src/LaunchpadRouter.js +++ b/services/web/modules/launchpad/app/src/LaunchpadRouter.js @@ -9,7 +9,7 @@ * DS207: Consider shorter variations of null checks * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const LaunchpadController = require('./LaunchpadController') const AuthenticationController = require('../../../../app/src/Features/Authentication/AuthenticationController') const AuthorizationMiddleware = require('../../../../app/src/Features/Authorization/AuthorizationMiddleware') diff --git a/services/web/modules/user-activate/app/src/UserActivateRouter.js b/services/web/modules/user-activate/app/src/UserActivateRouter.js index 18ebaeb9c3..a63cb9d1ad 100644 --- a/services/web/modules/user-activate/app/src/UserActivateRouter.js +++ b/services/web/modules/user-activate/app/src/UserActivateRouter.js @@ -1,4 +1,4 @@ -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const UserActivateController = require('./UserActivateController') const AuthenticationController = require('../../../../app/src/Features/Authentication/AuthenticationController') diff --git a/services/web/package-lock.json b/services/web/package-lock.json index 845015d952..132c16333c 100644 --- a/services/web/package-lock.json +++ b/services/web/package-lock.json @@ -5407,9 +5407,9 @@ } }, "@google-cloud/debug-agent": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/@google-cloud/debug-agent/-/debug-agent-5.1.3.tgz", - "integrity": "sha512-WbzeEz4MvPlM7DX2QBsPcWgF62u7LSQv/oMYPl0L+TddTebqjDKiVXwxpzWk61NIfcKiet3dyCbPIt3N5o8XPQ==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/@google-cloud/debug-agent/-/debug-agent-5.2.8.tgz", + "integrity": "sha512-HL7yMAzAagmPmRT7Xl2cCNBylxYOz9BSFfU9GFrq1/OiP5DoG4wTPBonk3DP1ODKmXA2BoqmtNNPee2gZVVZbw==", "requires": { "@google-cloud/common": "^3.0.0", "acorn": "^8.0.0", @@ -5420,14 +5420,14 @@ "gcp-metadata": "^4.0.0", "p-limit": "^3.0.1", "semver": "^7.0.0", - "source-map": "^0.6.1", + "source-map": "^0.7.3", "split": "^1.0.0" }, "dependencies": { "acorn": { - "version": "8.0.5", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.0.5.tgz", - "integrity": "sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg==" + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==" }, "p-limit": { "version": "3.1.0", @@ -5438,17 +5438,17 @@ } }, "semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "requires": { "lru-cache": "^6.0.0" } }, "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" } } }, @@ -5653,54 +5653,29 @@ } }, "@google-cloud/profiler": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@google-cloud/profiler/-/profiler-4.1.0.tgz", - "integrity": "sha512-9e1zXRctLSUHAoAsFGwE4rS28fr0siiG+jXl5OpwTK8ZAUlxb70aosHaZGdsv8YXrYKjuiufjRZ/OXCs0XLI9g==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/@google-cloud/profiler/-/profiler-4.1.5.tgz", + "integrity": "sha512-n+HAOicoPRo0JXwxWpDYdLN+M0gIqdQdMp77oe1B+bJY+5d4W2ye5e1SpxsDjcSC5864jO+xEd0tn/d7rMvS7g==", "requires": { "@google-cloud/common": "^3.0.0", "@types/console-log-level": "^1.4.0", "@types/semver": "^7.0.0", "console-log-level": "^1.4.0", - "delay": "^4.0.1", + "delay": "^5.0.0", "extend": "^3.0.2", "gcp-metadata": "^4.0.0", - "parse-duration": "^0.4.4", - "pprof": "3.0.0", + "parse-duration": "^1.0.0", + "pprof": "3.2.0", "pretty-ms": "^7.0.0", - "protobufjs": "~6.10.0", + "protobufjs": "~6.11.0", "semver": "^7.0.0", "teeny-request": "^7.0.0" }, "dependencies": { - "@types/node": { - "version": "13.13.42", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.42.tgz", - "integrity": "sha512-g+w2QgbW7k2CWLOXzQXbO37a7v5P9ObPvYahKphdBLV5aqpbVZRhTpWCT0SMRqX1i30Aig791ZmIM2fJGL2S8A==" - }, - "protobufjs": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.2.tgz", - "integrity": "sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ==", - "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.1", - "@types/node": "^13.7.0", - "long": "^4.0.0" - } - }, "semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "requires": { "lru-cache": "^6.0.0" } @@ -5874,12 +5849,12 @@ } }, "@google-cloud/trace-agent": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-5.1.3.tgz", - "integrity": "sha512-f+5DX7n6QpDlHA+4kr81z69SLAdrlvd9T8skqCMgnYvtXx14AwzXZyzEDf3jppOYzYoqPPJv8XYiyYHHmYD0BA==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-5.1.5.tgz", + "integrity": "sha512-8Mrspg9nebd1VA4xC+XQTBBY3PV3SoUR70CHc3waN9lZskrCQO0Ha50VamhtUx8gUMgUK8ANed5EsF8rv+jY4Q==", "requires": { "@google-cloud/common": "^3.0.0", - "@opencensus/propagation-stackdriver": "0.0.22", + "@opencensus/propagation-stackdriver": "0.1.0", "builtin-modules": "^3.0.0", "console-log-level": "^1.4.0", "continuation-local-storage": "^3.2.1", @@ -5896,6 +5871,28 @@ "uuid": "^8.0.0" }, "dependencies": { + "@opencensus/core": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@opencensus/core/-/core-0.1.0.tgz", + "integrity": "sha512-Bdbi5vi44a1fwyHNyKh6bwzuFZJeZJPhzdwogk/Kw5juoEeRGPworK1sgtB3loeR8cqLyi5us0mz9h0xqINiSQ==", + "requires": { + "continuation-local-storage": "^3.2.1", + "log-driver": "^1.2.7", + "semver": "^7.0.0", + "shimmer": "^1.2.0", + "uuid": "^8.0.0" + } + }, + "@opencensus/propagation-stackdriver": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@opencensus/propagation-stackdriver/-/propagation-stackdriver-0.1.0.tgz", + "integrity": "sha512-YLklu8jnnYKaJ8gUFz3rM0FVdsWXEJAMLzeeU4JRac6LI34raENy4kvRezZtNEFS5KthaJUsYg04sPc/Ag0w4w==", + "requires": { + "@opencensus/core": "^0.1.0", + "hex2dec": "^1.0.1", + "uuid": "^8.0.0" + } + }, "arrify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", @@ -5907,9 +5904,9 @@ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, "google-auth-library": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.2.tgz", - "integrity": "sha512-vjyNZR3pDLC0u7GHLfj+Hw9tGprrJwoMwkYGqURCXYITjCrP9HprOyxVV+KekdLgATtWGuDkQG2MTh0qpUPUgg==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.10.1.tgz", + "integrity": "sha512-nQxgM1ZopUMcpMnu95kOSzI+9tJl4YDOZJomSTBGlRLpxfBopdwto7WvzoI87HuN0nQqVETgOsHi/C/po1rppA==", "requires": { "arrify": "^2.0.0", "base64-js": "^1.3.0", @@ -5942,9 +5939,9 @@ } }, "semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "requires": { "lru-cache": "^6.0.0" } @@ -6667,25 +6664,36 @@ "@otplib/plugin-thirty-two": "^12.0.1" } }, + "@overleaf/logger": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@overleaf/logger/-/logger-3.1.0.tgz", + "integrity": "sha512-B/JgmC6CLGOnl1M69/YK7skKmv+ky9dbAdXhq2GXvFRtcTSEBJTCgl6tdUsdlzoRP9HqQbrWX3qVYgtd93iT1Q==", + "requires": { + "@overleaf/o-error": "^3.0.0", + "@sentry/node": "^6.13.2", + "bunyan": "^1.8.14", + "node-fetch": "^2.6.1", + "yn": "^4.0.0" + }, + "dependencies": { + "yn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yn/-/yn-4.0.0.tgz", + "integrity": "sha512-huWiiCS4TxKc4SfgmTwW1K7JmXPPAmuXWYy4j9qjQo4+27Kni8mGhAAi1cloRWmBe2EqcLgt3IGqQoRL/MtPgg==" + } + } + }, "@overleaf/metrics": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/@overleaf/metrics/-/metrics-3.5.1.tgz", - "integrity": "sha512-RLHxkMF7Y3725L3QwXo9cIn2gGobsMYUGuxKxg7PVMrPTMsomHEMeG7StOxCO7ML1Z/BwB/9nsVYNrsRdAJtKg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@overleaf/metrics/-/metrics-4.0.0.tgz", + "integrity": "sha512-qvQ3WSyVEqfuJ5intfh4aWIekFIDkNCsocG9acg9445L/QIK3MV7j3DkQ/IsXgD8TdOOLHWLKETCrxWKMNtw7Q==", "requires": { "@google-cloud/debug-agent": "^5.1.2", - "@google-cloud/profiler": "^4.0.3", + "@google-cloud/profiler": "^4.1.3", "@google-cloud/trace-agent": "^5.1.1", "compression": "^1.7.4", "prom-client": "^11.1.3", - "underscore": "~1.6.0", "yn": "^3.1.1" - }, - "dependencies": { - "underscore": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", - "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=" - } } }, "@overleaf/o-error": { @@ -7150,6 +7158,123 @@ "tslib": "^1.9.3" } }, + "@sentry/node": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-6.14.1.tgz", + "integrity": "sha512-tnEfcaF5Z7I4D619XL76sjRd7VMDitZZ7ydfA8sWGC1BPaPyyIJzVxE/a7qJBQGW7W0Oo7ctwOI1hpmfyOpPxg==", + "requires": { + "@sentry/core": "6.14.1", + "@sentry/hub": "6.14.1", + "@sentry/tracing": "6.14.1", + "@sentry/types": "6.14.1", + "@sentry/utils": "6.14.1", + "cookie": "^0.4.1", + "https-proxy-agent": "^5.0.0", + "lru_map": "^0.3.3", + "tslib": "^1.9.3" + }, + "dependencies": { + "@sentry/core": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.14.1.tgz", + "integrity": "sha512-x2MOax+adphal0ytBsvQukwN5mcxZzb5zsPZ1YWzewQk3BY+2T/DFo50iVpaWdUXsJL2FtoZVVgtpTmf+/3JPw==", + "requires": { + "@sentry/hub": "6.14.1", + "@sentry/minimal": "6.14.1", + "@sentry/types": "6.14.1", + "@sentry/utils": "6.14.1", + "tslib": "^1.9.3" + } + }, + "@sentry/hub": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.14.1.tgz", + "integrity": "sha512-IqANj5qKG1N+nqBsuYIwAZsXDMmO/Sc4H2zZ2MP7QvRyp0ptpJmu1oTE0r0fohIcGgIWbnIphJjw990Lp507eA==", + "requires": { + "@sentry/types": "6.14.1", + "@sentry/utils": "6.14.1", + "tslib": "^1.9.3" + } + }, + "@sentry/minimal": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.14.1.tgz", + "integrity": "sha512-rxS0YUggCSuA7EzS1ai5jU8XArk4FBHZ02gmSoSSLtwFXmeQIa9XBKY0OEFmG2LMQYNOpvcGsezDO51EB6/X9w==", + "requires": { + "@sentry/hub": "6.14.1", + "@sentry/types": "6.14.1", + "tslib": "^1.9.3" + } + }, + "@sentry/types": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.14.1.tgz", + "integrity": "sha512-RIk3ZwQKZnASrYWfV5i4wbzVveHz8xLFAS2ySIMqh+hICKnB0N4/r8a1Of/84j7pj+iAbf5vPS85639eIf+9qg==" + }, + "@sentry/utils": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.14.1.tgz", + "integrity": "sha512-GVvf0z18L4DN0a6vIBdHSlrK/Dj8QFhuiiJ8NtccSoY8xiKXQNz9FKN5d52NUNqm59aopAxcVAcs57yQSdxrZQ==", + "requires": { + "@sentry/types": "6.14.1", + "tslib": "^1.9.3" + } + }, + "cookie": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==" + } + } + }, + "@sentry/tracing": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.14.1.tgz", + "integrity": "sha512-Bv/+S5Wn9OPxP7sA9VYMV1wpmXWptFVIMFoG4BuyV4aFYdIAMxSNE/ktqXwmqn+nkBic04nP9rF6lMJBLIvIaA==", + "requires": { + "@sentry/hub": "6.14.1", + "@sentry/minimal": "6.14.1", + "@sentry/types": "6.14.1", + "@sentry/utils": "6.14.1", + "tslib": "^1.9.3" + }, + "dependencies": { + "@sentry/hub": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.14.1.tgz", + "integrity": "sha512-IqANj5qKG1N+nqBsuYIwAZsXDMmO/Sc4H2zZ2MP7QvRyp0ptpJmu1oTE0r0fohIcGgIWbnIphJjw990Lp507eA==", + "requires": { + "@sentry/types": "6.14.1", + "@sentry/utils": "6.14.1", + "tslib": "^1.9.3" + } + }, + "@sentry/minimal": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.14.1.tgz", + "integrity": "sha512-rxS0YUggCSuA7EzS1ai5jU8XArk4FBHZ02gmSoSSLtwFXmeQIa9XBKY0OEFmG2LMQYNOpvcGsezDO51EB6/X9w==", + "requires": { + "@sentry/hub": "6.14.1", + "@sentry/types": "6.14.1", + "tslib": "^1.9.3" + } + }, + "@sentry/types": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.14.1.tgz", + "integrity": "sha512-RIk3ZwQKZnASrYWfV5i4wbzVveHz8xLFAS2ySIMqh+hICKnB0N4/r8a1Of/84j7pj+iAbf5vPS85639eIf+9qg==" + }, + "@sentry/utils": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.14.1.tgz", + "integrity": "sha512-GVvf0z18L4DN0a6vIBdHSlrK/Dj8QFhuiiJ8NtccSoY8xiKXQNz9FKN5d52NUNqm59aopAxcVAcs57yQSdxrZQ==", + "requires": { + "@sentry/types": "6.14.1", + "tslib": "^1.9.3" + } + } + } + }, "@sentry/types": { "version": "6.3.5", "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.3.5.tgz", @@ -10838,9 +10963,9 @@ } }, "@types/console-log-level": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@types/console-log-level/-/console-log-level-1.4.0.tgz", - "integrity": "sha512-x+OscEQwcx5Biair4enH7ov9W+clcqUWaZRaxn5IkT4yNWWjRr2oiYDkY/x1uXSTVZOQ2xlbFQySaQGB+VdXGQ==" + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@types/console-log-level/-/console-log-level-1.4.2.tgz", + "integrity": "sha512-TnhDAntcJthcCMrR3OAKAUjgHyQgoms1yaBJepGv+BtXi8PLf8aX2L/NMCfofRTpVqW0bLklpGTsuqmUSCR2Uw==" }, "@types/events": { "version": "3.0.0", @@ -11166,9 +11291,9 @@ } }, "@types/semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==" + "version": "7.3.9", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.9.tgz", + "integrity": "sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ==" }, "@types/serve-static": { "version": "1.13.10", @@ -15793,9 +15918,9 @@ "integrity": "sha512-HT6PKVqkwpzwB3jl5hXFoQteEWXbSWMzG3Z8RVYlx8hZwCOLCy4NU7vkSB3dYX3e6ORwRfGw4uFOXaw4rn/a9Q==" }, "coffeescript": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.5.1.tgz", - "integrity": "sha512-J2jRPX0eeFh5VKyVnoLrfVFgLZtnnmp96WQSLAS8OrLm2wtQLcnikYKe1gViJKDH7vucjuhHvBKKBP3rKcD1tQ==" + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.6.1.tgz", + "integrity": "sha512-GG5nkF93qII8HmHqnnibkgpp/SV7PSnSPiWsbinwya7nNOe95aE/x2xrKZJFks8Qpko3TNrC+/LahaKgrz5YCg==" }, "collapse-white-space": { "version": "1.0.6", @@ -15845,6 +15970,11 @@ "simple-swizzle": "^0.2.2" } }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" + }, "colorette": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", @@ -17166,7 +17296,7 @@ "d64": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/d64/-/d64-1.0.0.tgz", - "integrity": "sha512-5eNy3WZziVYnrogqgXhcdEmqcDB2IHurTqLcrgssJsfkMVCUoUaZpK6cJjxxvLV2dUm5SuJMNcYfVGoin9UIRw==" + "integrity": "sha1-QAKofoUMv8n52XBrYPymE6MzbpA=" }, "damerau-levenshtein": { "version": "1.0.6", @@ -17464,9 +17594,9 @@ } }, "delay": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/delay/-/delay-4.4.1.tgz", - "integrity": "sha512-aL3AhqtfhOlT/3ai6sWXeqwnw63ATNpnUiN4HL7x9q+My5QtHlO3OIkasmug9LKzpheLdmUKGRKnYXYAS7FQkQ==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz", + "integrity": "sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==" }, "delayed-stream": { "version": "1.0.0", @@ -19876,7 +20006,7 @@ "expressionify": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/expressionify/-/expressionify-0.9.3.tgz", - "integrity": "sha512-ZhmYFs8RPiRcXrDUNgABPNjtScZvShmKAKeWA6VP4c07eNCfz7B6WsAnBH+XLiDUXj8mFoX1i25pwQvuNW5PYg==" + "integrity": "sha1-/iJnx+hpRXfxP02oML/DyNgXf5I=" }, "ext": { "version": "1.4.0", @@ -21029,7 +21159,7 @@ "functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, "functions-have-names": { @@ -25295,7 +25425,7 @@ "lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" + "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=" }, "lodash.debounce": { "version": "4.0.8", @@ -25586,6 +25716,11 @@ } } }, + "lru_map": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz", + "integrity": "sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=" + }, "lz-string": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz", @@ -25955,7 +26090,7 @@ "microtime-nodejs": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/microtime-nodejs/-/microtime-nodejs-1.0.0.tgz", - "integrity": "sha512-SthP/4JW6HUIZfgM0nadNtwKm/WMH0+z1i4RsPDnud+UasjoABzSkCk3eMhIRzipgwPhkdAYpTI69X4II4j1pA==" + "integrity": "sha1-iFlASvLipGKhXJzWvyxORo2r2+g=" }, "miller-rabin": { "version": "4.0.1", @@ -26161,7 +26296,6 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, "requires": { "minipass": "^3.0.0", "yallist": "^4.0.0" @@ -26171,7 +26305,6 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz", "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==", - "dev": true, "requires": { "yallist": "^4.0.0" } @@ -26218,7 +26351,7 @@ "mkdirp": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==", "requires": { "minimist": "0.0.8" }, @@ -26915,7 +27048,7 @@ "mv": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", - "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==", + "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=", "optional": true, "requires": { "mkdirp": "~0.5.1", @@ -26926,7 +27059,7 @@ "glob": { "version": "6.0.4", "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "optional": true, "requires": { "inflight": "^1.0.4", @@ -26939,7 +27072,7 @@ "rimraf": { "version": "2.4.5", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", - "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==", + "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=", "optional": true, "requires": { "glob": "^6.0.1" @@ -27001,13 +27134,13 @@ "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, "ncp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", - "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==", + "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=", "optional": true }, "needle": { @@ -28683,9 +28816,9 @@ } }, "parse-duration": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-0.4.4.tgz", - "integrity": "sha512-KbAJuYGUhZkB9gotDiKLnZ7Z3VTacK3fgwmDdB6ZVDtJbMBT6MfLga0WJaYpPDu0mzqT0NgHtHDt5PY4l0nidg==" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-1.0.2.tgz", + "integrity": "sha512-Dg27N6mfok+ow1a2rj/nRjtCfaKrHUZV2SJpEn/s8GaVUSlf4GGRCRP1c13Hj+wfPKVMrFDqLMLITkYKgKxyyg==" }, "parse-entities": { "version": "2.0.0", @@ -29844,50 +29977,114 @@ "dev": true }, "pprof": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pprof/-/pprof-3.0.0.tgz", - "integrity": "sha512-uPWbAhoH/zvq1kM3/Fd/wshb4D7sLlGap8t6uCTER4aZRWqqyPYgXzpjWbT0Unn5U25pEy2VREUu27nQ9o9VPA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/pprof/-/pprof-3.2.0.tgz", + "integrity": "sha512-yhORhVWefg94HZgjVa6CDtYSNZJnJzZ82d4pkmrZJxf1/Y29Me/uHYLEVo6KawKKFhQywl5cGbkdnVx9bZoMew==", "requires": { + "@mapbox/node-pre-gyp": "^1.0.0", "bindings": "^1.2.1", - "delay": "^4.0.1", + "delay": "^5.0.0", "findit2": "^2.2.3", "nan": "^2.14.0", - "node-pre-gyp": "^0.16.0", "p-limit": "^3.0.0", "pify": "^5.0.0", - "protobufjs": "~6.10.0", + "protobufjs": "~6.11.0", "source-map": "^0.7.3", "split": "^1.0.1" }, "dependencies": { - "@types/node": { - "version": "13.13.42", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.42.tgz", - "integrity": "sha512-g+w2QgbW7k2CWLOXzQXbO37a7v5P9ObPvYahKphdBLV5aqpbVZRhTpWCT0SMRqX1i30Aig791ZmIM2fJGL2S8A==" - }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "@mapbox/node-pre-gyp": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.6.tgz", + "integrity": "sha512-qK1ECws8UxuPqOA8F5LFD90vyVU33W7N3hGfgsOVfrJaRVc8McC3JClTDHpeSbL9CBrOHly/4GsNPAvIgNZE+g==", "requires": { - "minimist": "^1.2.5" + "detect-libc": "^1.0.3", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.5", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" } }, - "node-pre-gyp": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.16.0.tgz", - "integrity": "sha512-4efGA+X/YXAHLi1hN8KaPrILULaUn2nWecFrn1k2I+99HpoyvcOGEbtcOxpDiUwPF2ZANMJDh32qwOUPenuR1g==", + "are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.3", - "needle": "^2.5.0", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4.4.2" + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + } + }, + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" + }, + "fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "requires": { + "minipass": "^3.0.0" + } + }, + "gauge": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.1.tgz", + "integrity": "sha512-6STz6KdQgxO4S/ko+AbjlFGGdGcknluoqU+79GOFCDqqyYj5OanQf9AjxwN0jCidtT+ziPMmPSt9E4hfQ0CwIQ==", + "requires": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1 || ^2.0.0", + "strip-ansi": "^3.0.1 || ^4.0.0", + "wide-align": "^1.1.2" + } + }, + "minipass": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "requires": { + "yallist": "^4.0.0" + } + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, + "node-fetch": { + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz", + "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==", + "requires": { + "whatwg-url": "^5.0.0" + } + }, + "nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "requires": { + "abbrev": "1" + } + }, + "npmlog": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "requires": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" } }, "p-limit": { @@ -29903,38 +30100,81 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz", "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==" }, - "protobufjs": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.2.tgz", - "integrity": "sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ==", + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.1", - "@types/node": "^13.7.0", - "long": "^4.0.0" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } }, "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "requires": { "glob": "^7.1.3" } }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + }, "source-map": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" + }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "requires": { + "safe-buffer": "~5.2.0" + } + }, + "tar": { + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "requires": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + } + }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } } } }, @@ -33523,7 +33763,7 @@ "sliced": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", - "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=" + "integrity": "sha512-VZBmZP8WU3sMOZm1bdgTadsQbcscK0UM8oKxKVBs4XAhUo2Xxzm/OFMGBkPusxw9xL3Uy8LrzEqGqJhclsr0yA==" }, "slugify": { "version": "1.4.0", @@ -36003,7 +36243,7 @@ "timed-out": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", - "integrity": "sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==" + "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=" }, "timekeeper": { "version": "2.2.0", diff --git a/services/web/package.json b/services/web/package.json index 68f7d84281..36c9f3e1b2 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -66,7 +66,8 @@ "@codemirror/state": "^0.19.2", "@codemirror/stream-parser": "^0.19.2", "@codemirror/view": "^0.19.9", - "@overleaf/metrics": "^3.5.1", + "@overleaf/logger": "^3.1.0", + "@overleaf/metrics": "^4.0.0", "@overleaf/o-error": "^3.3.1", "@overleaf/object-persistor": "^1.0.1", "@overleaf/redis-wrapper": "^2.0.0", @@ -132,7 +133,6 @@ "jsonwebtoken": "^8.5.1", "ldapjs": "^0.7.1", "lodash": "^4.17.19", - "logger-sharelatex": "^2.2.0", "lru-cache": "^6.0.0", "mailchimp-api-v3": "^1.12.0", "marked": "^0.3.5", diff --git a/services/web/scripts/ensure_affiliations.js b/services/web/scripts/ensure_affiliations.js index 746ae2c438..47fdb0821d 100644 --- a/services/web/scripts/ensure_affiliations.js +++ b/services/web/scripts/ensure_affiliations.js @@ -1,7 +1,7 @@ const { waitForDb } = require('../app/src/infrastructure/mongodb') const { User } = require('../app/src/models/User') const UserController = require('../app/src/Features/User/UserController') -require('logger-sharelatex').logger.level('error') +require('@overleaf/logger').logger.level('error') const pLimit = require('p-limit') const CONCURRENCY = 10 const failure = [] diff --git a/services/web/test/acceptance/src/BackFillDeletedFilesTests.js b/services/web/test/acceptance/src/BackFillDeletedFilesTests.js index 13b96299f0..5e9a0927d8 100644 --- a/services/web/test/acceptance/src/BackFillDeletedFilesTests.js +++ b/services/web/test/acceptance/src/BackFillDeletedFilesTests.js @@ -1,7 +1,7 @@ const { exec } = require('child_process') const { promisify } = require('util') const { expect } = require('chai') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { db, ObjectId } = require('../../../app/src/infrastructure/mongodb') const User = require('./helpers/User').promises diff --git a/services/web/test/acceptance/src/BackFillDocNameForDeletedDocsTests.js b/services/web/test/acceptance/src/BackFillDocNameForDeletedDocsTests.js index 036ac9a568..cdc2194aa7 100644 --- a/services/web/test/acceptance/src/BackFillDocNameForDeletedDocsTests.js +++ b/services/web/test/acceptance/src/BackFillDocNameForDeletedDocsTests.js @@ -1,7 +1,7 @@ const { exec } = require('child_process') const { promisify } = require('util') const { expect } = require('chai') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { db, ObjectId } = require('../../../app/src/infrastructure/mongodb') const User = require('./helpers/User').promises diff --git a/services/web/test/acceptance/src/BackFillDummyDocMetaTests.js b/services/web/test/acceptance/src/BackFillDummyDocMetaTests.js index 17b6727dbf..7935314233 100644 --- a/services/web/test/acceptance/src/BackFillDummyDocMetaTests.js +++ b/services/web/test/acceptance/src/BackFillDummyDocMetaTests.js @@ -1,7 +1,7 @@ const { exec } = require('child_process') const { promisify } = require('util') const { expect } = require('chai') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { filterOutput } = require('./helpers/settings') const { db, ObjectId } = require('../../../app/src/infrastructure/mongodb') diff --git a/services/web/test/acceptance/src/DeleteOrphanedDocsOnlineCheckTests.js b/services/web/test/acceptance/src/DeleteOrphanedDocsOnlineCheckTests.js index 22afed51d4..05db8e066e 100644 --- a/services/web/test/acceptance/src/DeleteOrphanedDocsOnlineCheckTests.js +++ b/services/web/test/acceptance/src/DeleteOrphanedDocsOnlineCheckTests.js @@ -1,7 +1,7 @@ const { exec } = require('child_process') const { promisify } = require('util') const { expect } = require('chai') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { filterOutput } = require('./helpers/settings') const { db, ObjectId } = require('../../../app/src/infrastructure/mongodb') diff --git a/services/web/test/acceptance/src/RegenerateDuplicateReferralIdsTests.js b/services/web/test/acceptance/src/RegenerateDuplicateReferralIdsTests.js index 5a0d564af5..b18b4568f7 100644 --- a/services/web/test/acceptance/src/RegenerateDuplicateReferralIdsTests.js +++ b/services/web/test/acceptance/src/RegenerateDuplicateReferralIdsTests.js @@ -1,7 +1,7 @@ const { exec } = require('child_process') const { promisify } = require('util') const { expect } = require('chai') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const { filterOutput } = require('./helpers/settings') const { db } = require('../../../app/src/infrastructure/mongodb') @@ -91,7 +91,7 @@ describe('RegenerateDuplicateReferralIds', function () { `BATCH_SIZE=${BATCH_SIZE}`, // log details on duplicate matching 'VERBOSE_LOGGING=true', - // disable verbose logging from logger-sharelatex + // disable verbose logging 'LOG_LEVEL=ERROR', // actual command diff --git a/services/web/test/acceptance/src/helpers/InitApp.js b/services/web/test/acceptance/src/helpers/InitApp.js index d9cfa65621..fad6de67e6 100644 --- a/services/web/test/acceptance/src/helpers/InitApp.js +++ b/services/web/test/acceptance/src/helpers/InitApp.js @@ -2,7 +2,7 @@ const App = require('../../../../app.js') const QueueWorkers = require('../../../../app/src/infrastructure/QueueWorkers') const MongoHelper = require('./MongoHelper') const RedisHelper = require('./RedisHelper') -const { logger } = require('logger-sharelatex') +const { logger } = require('@overleaf/logger') logger.level('error') diff --git a/services/web/test/acceptance/src/helpers/redis.js b/services/web/test/acceptance/src/helpers/redis.js index b954ccce81..d45a476e45 100644 --- a/services/web/test/acceptance/src/helpers/redis.js +++ b/services/web/test/acceptance/src/helpers/redis.js @@ -12,7 +12,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ const Settings = require('@overleaf/settings') -const logger = require('logger-sharelatex') +const logger = require('@overleaf/logger') const Async = require('async') const UserSessionsRedis = require('../../../../app/src/Features/User/UserSessionsRedis') diff --git a/services/web/test/unit/bootstrap.js b/services/web/test/unit/bootstrap.js index 132f3ff2ad..3d5328a8d8 100644 --- a/services/web/test/unit/bootstrap.js +++ b/services/web/test/unit/bootstrap.js @@ -50,7 +50,7 @@ SandboxedModule.configure({ function getSandboxedModuleRequires() { const requires = { - 'logger-sharelatex': globalStubs.logger, + '@overleaf/logger': globalStubs.logger, } const internalModules = [ diff --git a/services/web/test/unit/src/Subscription/RecurlyClientTests.js b/services/web/test/unit/src/Subscription/RecurlyClientTests.js index f42a2a8bb1..726c545892 100644 --- a/services/web/test/unit/src/Subscription/RecurlyClientTests.js +++ b/services/web/test/unit/src/Subscription/RecurlyClientTests.js @@ -64,7 +64,7 @@ describe('RecurlyClient', function () { requires: { '@overleaf/settings': this.settings, recurly: this.recurly, - 'logger-sharelatex': { + '@overleaf/logger': { err: sinon.stub(), error: sinon.stub(), warn: sinon.stub(),