Merge pull request #7977 from overleaf/jpa-use-local-libraries

[misc] use local libraries

GitOrigin-RevId: ec16907c0ce4f9a79689c522f37d52502559e7b2

libraries/access-token-encryptor/package.json

@@ -15,12 +15,12 @@
   "license": "AGPL-3.0-only",
   "dependencies": {},
   "peerDependencies": {
-    "@overleaf/logger": "^2.3.0"
+    "@overleaf/logger": "*"
   },
   "devDependencies": {
     "bunyan": "^1.8.15",
     "chai": "^4.3.6",
-    "@overleaf/logger": "^2.2.0",
+    "@overleaf/logger": "*",
     "mocha": "^8.4.0",
     "nock": "0.15.2",
     "sandboxed-module": "^2.0.4",

libraries/metrics/package.json

@@ -32,6 +32,6 @@
     "test:ci": "npm run test"
   },
   "peerDependencies": {
-    "@overleaf/logger": ">= 3.0.0"
+    "@overleaf/logger": "*"
   }
 }

libraries/object-persistor/package.json

@@ -18,18 +18,21 @@
   },
   "author": "Overleaf (https://www.overleaf.com/)",
   "license": "AGPL-3.0",
+  "peerDependencies": {
+    "@overleaf/logger": "*"
+  },
   "dependencies": {
     "@google-cloud/storage": "~5.1.2",
     "@overleaf/o-error": "^3.4.0",
     "aws-sdk": "^2.718.0",
     "fast-crc32c": "https://github.com/overleaf/node-fast-crc32c/archive/aae6b2a4c7a7a159395df9cc6c38dfde702d6f51.tar.gz",
     "glob": "^7.1.6",
-    "logger-sharelatex": "^2.1.1",
     "node-uuid": "^1.4.8",
     "range-parser": "^1.2.1",
     "tiny-async-pool": "^1.1.0"
   },
   "devDependencies": {
+    "@overleaf/logger": "*",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
     "mocha": "^8.4.0",

libraries/object-persistor/src/MigrationPersistor.js

@@ -1,5 +1,5 @@
 const AbstractPersistor = require('./AbstractPersistor')
-const Logger = require('logger-sharelatex')
+const Logger = require('@overleaf/logger')
 const Stream = require('stream')
 const { promisify } = require('util')
 const { NotFoundError, WriteError } = require('./Errors')

libraries/object-persistor/src/PersistorFactory.js

@@ -1,4 +1,4 @@
-const Logger = require('logger-sharelatex')
+const Logger = require('@overleaf/logger')
 const { SettingsError } = require('./Errors')
 const GcsPersistor = require('./GcsPersistor')
 const S3Persistor = require('./S3Persistor')

libraries/object-persistor/src/PersistorHelper.js

@@ -1,6 +1,6 @@
 const Crypto = require('crypto')
 const Stream = require('stream')
-const Logger = require('logger-sharelatex')
+const Logger = require('@overleaf/logger')
 const { WriteError, ReadError, NotFoundError } = require('./Errors')
 const { promisify } = require('util')
 

libraries/object-persistor/test/unit/FSPersistorTests.js

@@ -62,7 +62,7 @@ describe('FSPersistorTests', function () {
         crypto,
         'node-uuid': uuid,
         // imported by PersistorHelper but otherwise unused here
-        'logger-sharelatex': {},
+        '@overleaf/logger': {},
       },
       globals: { console },
     }))({ paths: { uploadFolder: '/tmp' } })

libraries/object-persistor/test/unit/GcsPersistorTests.js

@@ -131,7 +131,7 @@ describe('GcsPersistorTests', function () {
     GcsPersistor = new (SandboxedModule.require(modulePath, {
       requires: {
         '@google-cloud/storage': { Storage },
-        'logger-sharelatex': Logger,
+        '@overleaf/logger': Logger,
         'tiny-async-pool': asyncPool,
         './Errors': Errors,
         fs: Fs,

libraries/object-persistor/test/unit/MigrationPersistorTests.js

@@ -76,7 +76,7 @@ describe('MigrationPersistorTests', function () {
       requires: {
         stream: Stream,
         './Errors': Errors,
-        'logger-sharelatex': Logger,
+        '@overleaf/logger': Logger,
       },
       globals: { console },
     })

libraries/object-persistor/test/unit/PersistorFactoryTests.js

@@ -29,7 +29,7 @@ describe('PersistorManager', function () {
       './GcsPersistor': GcsPersistor,
       './S3Persistor': S3Persistor,
       './FSPersistor': FSPersistor,
-      'logger-sharelatex': {
+      '@overleaf/logger': {
         info() {},
         err() {},
       },

libraries/object-persistor/test/unit/S3PersistorTests.js

@@ -148,7 +148,7 @@ describe('S3PersistorTests', function () {
     S3Persistor = new (SandboxedModule.require(modulePath, {
       requires: {
         'aws-sdk/clients/s3': S3,
-        'logger-sharelatex': Logger,
+        '@overleaf/logger': Logger,
         './Errors': Errors,
         fs: Fs,
         stream: Stream,

libraries/redis-wrapper/package.json

@@ -19,6 +19,7 @@
     "test:ci": "npm run test"
   },
   "peerDependencies": {
+    "@overleaf/logger": "*",
     "@overleaf/o-error": "^3.4.0"
   },
   "dependencies": {
@@ -27,7 +28,7 @@
   "devDependencies": {
     "@overleaf/o-error": "^3.4.0",
     "chai": "^4.3.6",
-    "@overleaf/logger": "^2.3.0",
+    "@overleaf/logger": "*",
     "mocha": "^8.4.0",
     "sandboxed-module": "^2.0.4",
     "sinon": "^9.2.4"