github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-22 02:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5258 from overleaf/revert-5214-bg-migrate-node-uuid-to-uuid

Browse source 
Revert "migrate node-uuid to uuid"

GitOrigin-RevId: f512eb1040e2ce6d87774de9c1fc884594480cef
This commit is contained in:
Brian Gough 2021-09-27 16:44:04 +01:00 committed by Copybot
parent 730c473651
commit d630d4a37c
7 changed files with 3406 additions and 2368 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

715
libraries/object-persistor/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

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

@ -1,6 +1,6 @@
{ {
"name": "@overleaf/object-persistor", "name": "@overleaf/object-persistor",
"version": "1.0.3", "version": "1.0.2",
"description": "Module for storing objects in multiple backends, with fallback on 404 to assist migration between them", "description": "Module for storing objects in multiple backends, with fallback on 404 to assist migration between them",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
@ -24,9 +24,9 @@
"fast-crc32c": "^2.0.0", "fast-crc32c": "^2.0.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"logger-sharelatex": "^2.1.1", "logger-sharelatex": "^2.1.1",
"node-uuid": "^1.4.8",
"range-parser": "^1.2.1", "range-parser": "^1.2.1",
"tiny-async-pool": "^1.1.0", "tiny-async-pool": "^1.1.0"
"uuid": "^8.3.2"
}, },
"devDependencies": { "devDependencies": {
"chai": "^4.2.0", "chai": "^4.2.0",

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

@ -1,6 +1,6 @@
const fs = require('fs') const fs = require('fs')
const glob = require('glob') const glob = require('glob')
const uuid = require('uuid') const uuid = require('node-uuid')
const path = require('path') const path = require('path')
const Stream = require('stream') const Stream = require('stream')
const { promisify } = require('util') const { promisify } = require('util')

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

@ -60,7 +60,7 @@ describe('FSPersistorTests', function () {
glob, glob,
stream, stream,
crypto, crypto,
uuid: uuid, 'node-uuid': uuid,
// imported by PersistorHelper but otherwise unused here // imported by PersistorHelper but otherwise unused here
'logger-sharelatex': {} 'logger-sharelatex': {}
}, },

2
services/filestore/app/js/LocalFileWriter.js
View file

@ -1,5 +1,5 @@
const fs = require('fs') const fs = require('fs')
const uuid = require('uuid') const uuid = require('node-uuid')
const path = require('path') const path = require('path')
const Stream = require('stream') const Stream = require('stream')
const { callbackify, promisify } = require('util') const { callbackify, promisify } = require('util')

5043
services/filestore/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
services/filestore/package.json
View file

@ -32,12 +32,12 @@
"glob": "^7.1.6", "glob": "^7.1.6",
"lodash.once": "^4.1.1", "lodash.once": "^4.1.1",
"logger-sharelatex": "^2.2.0", "logger-sharelatex": "^2.2.0",
"node-uuid": "~1.4.8",
"range-parser": "^1.2.1", "range-parser": "^1.2.1",
"request": "^2.88.2", "request": "^2.88.2",
"request-promise-native": "^1.0.8", "request-promise-native": "^1.0.8",
"stream-buffers": "~0.2.6", "stream-buffers": "~0.2.6",
"tiny-async-pool": "^1.1.0", "tiny-async-pool": "^1.1.0"
"uuid": "^8.3.2"
}, },
"devDependencies": { "devDependencies": {
"@google-cloud/storage": "^5.1.2", "@google-cloud/storage": "^5.1.2",