Эх сурвалжийг харах

[SafeExec] replace _.once with lodash.once

Jakob Ackermann 6 жил өмнө
parent
commit
32557ab1d7

+ 2 - 2
services/filestore/app/js/SafeExec.js

@@ -1,4 +1,4 @@
-const _ = require('underscore')
+const lodashOnce = require('lodash.once')
 const childProcess = require('child_process')
 const childProcess = require('child_process')
 const Settings = require('settings-sharelatex')
 const Settings = require('settings-sharelatex')
 const { ConversionsDisabledError, FailedCommandError } = require('./Errors')
 const { ConversionsDisabledError, FailedCommandError } = require('./Errors')
@@ -28,7 +28,7 @@ function safeExec(command, options, callback) {
 
 
   let killTimer
   let killTimer
 
 
-  const cleanup = _.once(function(err) {
+  const cleanup = lodashOnce(function(err) {
     if (killTimer) {
     if (killTimer) {
       clearTimeout(killTimer)
       clearTimeout(killTimer)
     }
     }

+ 5 - 5
services/filestore/package-lock.json

@@ -3177,6 +3177,11 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
       "dev": true
     },
     },
+    "lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+    },
     "lodash.pickby": {
     "lodash.pickby": {
       "version": "4.6.0",
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
       "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
@@ -5478,11 +5483,6 @@
       "integrity": "sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==",
       "integrity": "sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==",
       "dev": true
       "dev": true
     },
     },
-    "underscore": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz",
-      "integrity": "sha512-yejOFsRnTJs0N9CK5Apzf6maDO2djxGoLLrlZlvGs2o9ZQuhIhDL18rtFyy4FBIbOkzA6+4hDgXbgz5EvDQCXQ=="
-    },
     "unpipe": {
     "unpipe": {
       "version": "1.0.0",
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",

+ 2 - 2
services/filestore/package.json

@@ -27,6 +27,7 @@
     "express": "^4.2.0",
     "express": "^4.2.0",
     "glob": "^7.1.6",
     "glob": "^7.1.6",
     "heapdump": "^0.3.2",
     "heapdump": "^0.3.2",
+    "lodash.once": "^4.1.1",
     "logger-sharelatex": "^1.7.0",
     "logger-sharelatex": "^1.7.0",
     "metrics-sharelatex": "^2.2.0",
     "metrics-sharelatex": "^2.2.0",
     "mocha": "5.2.0",
     "mocha": "5.2.0",
@@ -38,8 +39,7 @@
     "rimraf": "2.2.8",
     "rimraf": "2.2.8",
     "settings-sharelatex": "^1.1.0",
     "settings-sharelatex": "^1.1.0",
     "stream-buffers": "~0.2.5",
     "stream-buffers": "~0.2.5",
-    "stream-meter": "^1.0.4",
-    "underscore": "~1.5.2"
+    "stream-meter": "^1.0.4"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "babel-eslint": "^10.0.3",
     "babel-eslint": "^10.0.3",