github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-12 17:36:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
[misc] use local libraries

GitOrigin-RevId: ec16907c0ce4f9a79689c522f37d52502559e7b2
This commit is contained in:
Jakob Ackermann 2022-05-16 15:25:37 +01:00 • committed by Copybot
parent 173d582080
commit 81b935e317
13 changed files with 30 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/access-token-encryptor/package.json
View file

@ -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",

2
libraries/metrics/package.json
View file

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

5
libraries/object-persistor/package.json
View file

@ -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",

2
libraries/object-persistor/src/MigrationPersistor.js
View file

@ -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')

2
libraries/object-persistor/src/PersistorFactory.js
View file

@ -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')

2
libraries/object-persistor/src/PersistorHelper.js
View file

@ -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')

2
libraries/object-persistor/test/unit/FSPersistorTests.js
View file

@ -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' } })

2
libraries/object-persistor/test/unit/GcsPersistorTests.js
View file

@ -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,

2
libraries/object-persistor/test/unit/MigrationPersistorTests.js
View file

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

2
libraries/object-persistor/test/unit/PersistorFactoryTests.js
View file

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

2
libraries/object-persistor/test/unit/S3PersistorTests.js
View file

@ -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,

3
libraries/redis-wrapper/package.json
View file

@ -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"

146
package-lock.json generated
View file

@ -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",