From 81b935e317a0485cf714aaea51acb56d7b8396c1 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Mon, 16 May 2022 15:25:37 +0100 Subject: [PATCH] Merge pull request #7977 from overleaf/jpa-use-local-libraries [misc] use local libraries GitOrigin-RevId: ec16907c0ce4f9a79689c522f37d52502559e7b2 --- libraries/access-token-encryptor/package.json | 4 +- libraries/metrics/package.json | 2 +- libraries/object-persistor/package.json | 5 +- .../src/MigrationPersistor.js | 2 +- .../object-persistor/src/PersistorFactory.js | 2 +- .../object-persistor/src/PersistorHelper.js | 2 +- .../test/unit/FSPersistorTests.js | 2 +- .../test/unit/GcsPersistorTests.js | 2 +- .../test/unit/MigrationPersistorTests.js | 2 +- .../test/unit/PersistorFactoryTests.js | 2 +- .../test/unit/S3PersistorTests.js | 2 +- libraries/redis-wrapper/package.json | 3 +- package-lock.json | 146 ++---------------- 13 files changed, 30 insertions(+), 146 deletions(-) diff --git a/libraries/access-token-encryptor/package.json b/libraries/access-token-encryptor/package.json index ae41515d12..2ebecc6d5c 100644 --- a/libraries/access-token-encryptor/package.json +++ b/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", diff --git a/libraries/metrics/package.json b/libraries/metrics/package.json index fdd9eea7d1..314b68c4ba 100644 --- a/libraries/metrics/package.json +++ b/libraries/metrics/package.json @@ -32,6 +32,6 @@ "test:ci": "npm run test" }, "peerDependencies": { - "@overleaf/logger": ">= 3.0.0" + "@overleaf/logger": "*" } } diff --git a/libraries/object-persistor/package.json b/libraries/object-persistor/package.json index 77c772bcba..58c323a668 100644 --- a/libraries/object-persistor/package.json +++ b/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", diff --git a/libraries/object-persistor/src/MigrationPersistor.js b/libraries/object-persistor/src/MigrationPersistor.js index d41048b90d..0b476e46cc 100644 --- a/libraries/object-persistor/src/MigrationPersistor.js +++ b/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') diff --git a/libraries/object-persistor/src/PersistorFactory.js b/libraries/object-persistor/src/PersistorFactory.js index 1cfc8e48df..ec7e674ef3 100644 --- a/libraries/object-persistor/src/PersistorFactory.js +++ b/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') diff --git a/libraries/object-persistor/src/PersistorHelper.js b/libraries/object-persistor/src/PersistorHelper.js index 48d4e0706f..fae348d274 100644 --- a/libraries/object-persistor/src/PersistorHelper.js +++ b/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') diff --git a/libraries/object-persistor/test/unit/FSPersistorTests.js b/libraries/object-persistor/test/unit/FSPersistorTests.js index 2b20618032..4697275d97 100644 --- a/libraries/object-persistor/test/unit/FSPersistorTests.js +++ b/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' } }) diff --git a/libraries/object-persistor/test/unit/GcsPersistorTests.js b/libraries/object-persistor/test/unit/GcsPersistorTests.js index 296b2034a3..7b1c717c94 100644 --- a/libraries/object-persistor/test/unit/GcsPersistorTests.js +++ b/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, diff --git a/libraries/object-persistor/test/unit/MigrationPersistorTests.js b/libraries/object-persistor/test/unit/MigrationPersistorTests.js index 7145071ca5..b3063487fd 100644 --- a/libraries/object-persistor/test/unit/MigrationPersistorTests.js +++ b/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 }, }) diff --git a/libraries/object-persistor/test/unit/PersistorFactoryTests.js b/libraries/object-persistor/test/unit/PersistorFactoryTests.js index 6a2424d41e..8add51dbc6 100644 --- a/libraries/object-persistor/test/unit/PersistorFactoryTests.js +++ b/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() {}, }, diff --git a/libraries/object-persistor/test/unit/S3PersistorTests.js b/libraries/object-persistor/test/unit/S3PersistorTests.js index 2c9ad8eec4..5e882fb129 100644 --- a/libraries/object-persistor/test/unit/S3PersistorTests.js +++ b/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, diff --git a/libraries/redis-wrapper/package.json b/libraries/redis-wrapper/package.json index 76ef19d52f..597c4ddaad 100644 --- a/libraries/redis-wrapper/package.json +++ b/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" diff --git a/package-lock.json b/package-lock.json index f85382d134..d5bb9840aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "version": "2.2.0", "license": "AGPL-3.0-only", "devDependencies": { - "@overleaf/logger": "^2.2.0", + "@overleaf/logger": "*", "bunyan": "^1.8.15", "chai": "^4.3.6", "mocha": "^8.4.0", @@ -60,21 +60,7 @@ "sinon": "^9.2.4" }, "peerDependencies": { - "@overleaf/logger": "^2.3.0" - } - }, - "libraries/access-token-encryptor/node_modules/@overleaf/logger": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@overleaf/logger/-/logger-2.3.0.tgz", - "integrity": "sha512-uFxxA9WXgy8pwVqKUhHrdEZP7JhMHjBdhuo9J4qcBvIzu9PDIY6U5R8qwb6rdgxINKuesjJOAGXna768X/Gcew==", - "dev": true, - "dependencies": { - "@google-cloud/logging-bunyan": "^3.1.0", - "@overleaf/o-error": "^3.0.0", - "@sentry/node": "^6.13.2", - "bunyan": "^1.8.14", - "node-fetch": "^2.6.1", - "yn": "^4.0.0" + "@overleaf/logger": "*" } }, "libraries/logger": { @@ -118,7 +104,7 @@ "sinon": "^9.2.4" }, "peerDependencies": { - "@overleaf/logger": ">= 3.0.0" + "@overleaf/logger": "*" } }, "libraries/metrics/node_modules/yn": { @@ -211,11 +197,11 @@ "license": "AGPL-3.0", "dependencies": { "@google-cloud/storage": "~5.1.2", + "@overleaf/logger": "*", "@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" @@ -931,7 +917,7 @@ "ioredis": "~4.27.1" }, "devDependencies": { - "@overleaf/logger": "^2.3.0", + "@overleaf/logger": "*", "@overleaf/o-error": "^3.4.0", "chai": "^4.3.6", "mocha": "^8.4.0", @@ -939,23 +925,10 @@ "sinon": "^9.2.4" }, "peerDependencies": { + "@overleaf/logger": "*", "@overleaf/o-error": "^3.4.0" } }, - "libraries/redis-wrapper/node_modules/@overleaf/logger": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@overleaf/logger/-/logger-2.3.0.tgz", - "integrity": "sha512-uFxxA9WXgy8pwVqKUhHrdEZP7JhMHjBdhuo9J4qcBvIzu9PDIY6U5R8qwb6rdgxINKuesjJOAGXna768X/Gcew==", - "dev": true, - "dependencies": { - "@google-cloud/logging-bunyan": "^3.1.0", - "@overleaf/o-error": "^3.0.0", - "@sentry/node": "^6.13.2", - "bunyan": "^1.8.14", - "node-fetch": "^2.6.1", - "yn": "^4.0.0" - } - }, "libraries/settings": { "name": "@overleaf/settings", "version": "3.0.0" @@ -20071,19 +20044,6 @@ "node": ">=8.0" } }, - "node_modules/logger-sharelatex": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/logger-sharelatex/-/logger-sharelatex-2.3.0.tgz", - "integrity": "sha512-280UgIWwPFoCi0+4eKoI2jcMgCW7hoMJ5+eBF+IX47LsMsLkORYczs9kbSUZXQ62zDRo0kEP5s2GZ/Jds3ZsMA==", - "dependencies": { - "@google-cloud/logging-bunyan": "^3.1.0", - "@overleaf/o-error": "^3.0.0", - "@sentry/node": "^6.13.2", - "bunyan": "^1.8.14", - "node-fetch": "^2.6.1", - "yn": "^4.0.0" - } - }, "node_modules/lolex": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lolex/-/lolex-6.0.0.tgz", @@ -31748,14 +31708,6 @@ "buffer-crc32": "~0.2.3" } }, - "node_modules/yn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yn/-/yn-4.0.0.tgz", - "integrity": "sha512-huWiiCS4TxKc4SfgmTwW1K7JmXPPAmuXWYy4j9qjQo4+27Kni8mGhAAi1cloRWmBe2EqcLgt3IGqQoRL/MtPgg==", - "engines": { - "node": ">=10" - } - }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", @@ -33105,9 +33057,9 @@ "dependencies": { "@overleaf/logger": "^3.1.0", "@overleaf/metrics": "^4.0.0", - "@overleaf/o-error": "^2.1.0", + "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.1.0", - "@overleaf/settings": "^2.1.1", + "@overleaf/settings": "^3.0.0", "aws-sdk": "^2.556.0", "democracy": "^3.1.3", "express": "^4.11.0", @@ -33123,16 +33075,6 @@ "mocha": "^8.4.0" } }, - "services/k8s-debugger/node_modules/@overleaf/o-error": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@overleaf/o-error/-/o-error-2.1.0.tgz", - "integrity": "sha512-Zd9sks9LrLw8ErHt/cXeWIkyxWAqNAvNGn7wIjLQJH6TTEEW835PWOhpch+hQwwWsTxWIx/JDj+IpZ3ouw925g==" - }, - "services/k8s-debugger/node_modules/@overleaf/settings": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@overleaf/settings/-/settings-2.1.1.tgz", - "integrity": "sha512-vcJwqCGFKmQxTP/syUqCeMaSRjHmBcQgKOACR9He2uJcErg2GZPa1go+nGvszMbkElM4HfRKm/MfxvqHhoN4TQ==" - }, "services/notifications": { "name": "@overleaf/notifications", "license": "ISC", @@ -40108,29 +40050,13 @@ "@overleaf/access-token-encryptor": { "version": "file:libraries/access-token-encryptor", "requires": { - "@overleaf/logger": "^2.2.0", + "@overleaf/logger": "*", "bunyan": "^1.8.15", "chai": "^4.3.6", "mocha": "^8.4.0", "nock": "0.15.2", "sandboxed-module": "^2.0.4", "sinon": "^9.2.4" - }, - "dependencies": { - "@overleaf/logger": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@overleaf/logger/-/logger-2.3.0.tgz", - "integrity": "sha512-uFxxA9WXgy8pwVqKUhHrdEZP7JhMHjBdhuo9J4qcBvIzu9PDIY6U5R8qwb6rdgxINKuesjJOAGXna768X/Gcew==", - "dev": true, - "requires": { - "@google-cloud/logging-bunyan": "^3.1.0", - "@overleaf/o-error": "^3.0.0", - "@sentry/node": "^6.13.2", - "bunyan": "^1.8.14", - "node-fetch": "^2.6.1", - "yn": "^4.0.0" - } - } } }, "@overleaf/analytics": { @@ -41109,9 +41035,9 @@ "requires": { "@overleaf/logger": "^3.1.0", "@overleaf/metrics": "^4.0.0", - "@overleaf/o-error": "^2.1.0", + "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.1.0", - "@overleaf/settings": "^2.1.1", + "@overleaf/settings": "^3.0.0", "aws-sdk": "^2.556.0", "chai": "^4.3.6", "chai-as-promised": "^7.1.1", @@ -41123,18 +41049,6 @@ "request": "^2.88.0", "request-promise-native": "^1.0.7", "uuid": "^3.3.3" - }, - "dependencies": { - "@overleaf/o-error": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@overleaf/o-error/-/o-error-2.1.0.tgz", - "integrity": "sha512-Zd9sks9LrLw8ErHt/cXeWIkyxWAqNAvNGn7wIjLQJH6TTEEW835PWOhpch+hQwwWsTxWIx/JDj+IpZ3ouw925g==" - }, - "@overleaf/settings": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@overleaf/settings/-/settings-2.1.1.tgz", - "integrity": "sha512-vcJwqCGFKmQxTP/syUqCeMaSRjHmBcQgKOACR9He2uJcErg2GZPa1go+nGvszMbkElM4HfRKm/MfxvqHhoN4TQ==" - } } }, "@overleaf/logger": { @@ -41453,13 +41367,13 @@ "version": "file:libraries/object-persistor", "requires": { "@google-cloud/storage": "~5.1.2", + "@overleaf/logger": "*", "@overleaf/o-error": "^3.4.0", "aws-sdk": "^2.718.0", "chai": "^4.3.6", "chai-as-promised": "^7.1.1", "fast-crc32c": "https://github.com/overleaf/node-fast-crc32c/archive/aae6b2a4c7a7a159395df9cc6c38dfde702d6f51.tar.gz", "glob": "^7.1.6", - "logger-sharelatex": "^2.1.1", "mocha": "^8.4.0", "mongodb": "^3.5.9", "node-uuid": "^1.4.8", @@ -42062,29 +41976,13 @@ "@overleaf/redis-wrapper": { "version": "file:libraries/redis-wrapper", "requires": { - "@overleaf/logger": "^2.3.0", + "@overleaf/logger": "*", "@overleaf/o-error": "^3.4.0", "chai": "^4.3.6", "ioredis": "~4.27.1", "mocha": "^8.4.0", "sandboxed-module": "^2.0.4", "sinon": "^9.2.4" - }, - "dependencies": { - "@overleaf/logger": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@overleaf/logger/-/logger-2.3.0.tgz", - "integrity": "sha512-uFxxA9WXgy8pwVqKUhHrdEZP7JhMHjBdhuo9J4qcBvIzu9PDIY6U5R8qwb6rdgxINKuesjJOAGXna768X/Gcew==", - "dev": true, - "requires": { - "@google-cloud/logging-bunyan": "^3.1.0", - "@overleaf/o-error": "^3.0.0", - "@sentry/node": "^6.13.2", - "bunyan": "^1.8.14", - "node-fetch": "^2.6.1", - "yn": "^4.0.0" - } - } } }, "@overleaf/references": { @@ -56989,19 +56887,6 @@ "streamroller": "^3.0.2" } }, - "logger-sharelatex": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/logger-sharelatex/-/logger-sharelatex-2.3.0.tgz", - "integrity": "sha512-280UgIWwPFoCi0+4eKoI2jcMgCW7hoMJ5+eBF+IX47LsMsLkORYczs9kbSUZXQ62zDRo0kEP5s2GZ/Jds3ZsMA==", - "requires": { - "@google-cloud/logging-bunyan": "^3.1.0", - "@overleaf/o-error": "^3.0.0", - "@sentry/node": "^6.13.2", - "bunyan": "^1.8.14", - "node-fetch": "^2.6.1", - "yn": "^4.0.0" - } - }, "lolex": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lolex/-/lolex-6.0.0.tgz", @@ -66824,11 +66709,6 @@ "buffer-crc32": "~0.2.3" } }, - "yn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yn/-/yn-4.0.0.tgz", - "integrity": "sha512-huWiiCS4TxKc4SfgmTwW1K7JmXPPAmuXWYy4j9qjQo4+27Kni8mGhAAi1cloRWmBe2EqcLgt3IGqQoRL/MtPgg==" - }, "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",