Răsfoiți Sursa

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

Revert "migrate node-uuid to uuid"

GitOrigin-RevId: f512eb1040e2ce6d87774de9c1fc884594480cef
Brian Gough 4 ani în urmă
părinte
comite
d630d4a37c

Fișier diff suprimat deoarece este prea mare
+ 236 - 324
libraries/object-persistor/package-lock.json


+ 3 - 3
libraries/object-persistor/package.json

@@ -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",
-    "uuid": "^8.3.2"
+    "tiny-async-pool": "^1.1.0"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "chai": "^4.2.0",
     "chai": "^4.2.0",

+ 1 - 1
libraries/object-persistor/src/FSPersistor.js

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

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

@@ -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': {}
       },
       },

+ 1 - 1
services/filestore/app/js/LocalFileWriter.js

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

Fișier diff suprimat deoarece este prea mare
+ 843 - 134
services/filestore/package-lock.json


+ 2 - 2
services/filestore/package.json

@@ -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",
-    "uuid": "^8.3.2"
+    "tiny-async-pool": "^1.1.0"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "@google-cloud/storage": "^5.1.2",
     "@google-cloud/storage": "^5.1.2",

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff