From ede70b6f993240a48bcb667f0a96627c40f8a21d Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Mon, 15 Jun 2020 09:52:21 +0100 Subject: [PATCH 1/2] migrate from underscore to lodash --- services/clsi/app/js/DockerRunner.js | 2 +- services/clsi/app/js/OutputCacheManager.js | 2 +- services/clsi/app/js/OutputFileOptimiser.js | 2 +- services/clsi/app/js/db.js | 2 +- services/clsi/package-lock.json | 10 ---------- services/clsi/package.json | 2 +- services/clsi/test/load/js/loadTest.js | 2 +- services/clsi/test/unit/js/DockerRunnerTests.js | 3 ++- services/clsi/test/unit/js/OutputFileOptimiserTests.js | 3 ++- 9 files changed, 10 insertions(+), 18 deletions(-) diff --git a/services/clsi/app/js/DockerRunner.js b/services/clsi/app/js/DockerRunner.js index c50087d018..cb6ec2d2a7 100644 --- a/services/clsi/app/js/DockerRunner.js +++ b/services/clsi/app/js/DockerRunner.js @@ -25,7 +25,7 @@ const async = require('async') const LockManager = require('./DockerLockManager') const fs = require('fs') const Path = require('path') -const _ = require('underscore') +const _ = require('lodash') const metrics = require('metrics-sharelatex') logger.info('using docker runner') diff --git a/services/clsi/app/js/OutputCacheManager.js b/services/clsi/app/js/OutputCacheManager.js index c2c962f1bc..c0b0d6ed17 100644 --- a/services/clsi/app/js/OutputCacheManager.js +++ b/services/clsi/app/js/OutputCacheManager.js @@ -19,7 +19,7 @@ const fs = require('fs') const fse = require('fs-extra') const Path = require('path') const logger = require('logger-sharelatex') -const _ = require('underscore') +const _ = require('lodash') const Settings = require('settings-sharelatex') const crypto = require('crypto') diff --git a/services/clsi/app/js/OutputFileOptimiser.js b/services/clsi/app/js/OutputFileOptimiser.js index 80dadab483..e3b3e60e4e 100644 --- a/services/clsi/app/js/OutputFileOptimiser.js +++ b/services/clsi/app/js/OutputFileOptimiser.js @@ -19,7 +19,7 @@ const Path = require('path') const { spawn } = require('child_process') const logger = require('logger-sharelatex') const Metrics = require('./Metrics') -const _ = require('underscore') +const _ = require('lodash') module.exports = OutputFileOptimiser = { optimiseFile(src, dst, callback) { diff --git a/services/clsi/app/js/db.js b/services/clsi/app/js/db.js index c749af253c..15510ae34c 100644 --- a/services/clsi/app/js/db.js +++ b/services/clsi/app/js/db.js @@ -10,7 +10,7 @@ */ const Sequelize = require('sequelize') const Settings = require('settings-sharelatex') -const _ = require('underscore') +const _ = require('lodash') const logger = require('logger-sharelatex') const options = _.extend({ logging: false }, Settings.mysql.clsi) diff --git a/services/clsi/package-lock.json b/services/clsi/package-lock.json index 7f896457cd..63d9c1e768 100644 --- a/services/clsi/package-lock.json +++ b/services/clsi/package-lock.json @@ -6640,11 +6640,6 @@ "integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==", "dev": true }, - "underscore": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz", - "integrity": "sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==" - }, "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", @@ -6834,11 +6829,6 @@ "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.4.1.tgz", "integrity": "sha512-3eBwRyEln6E1MSzcxcVpQIhRG8Q1jLvEqRmCZqS3dsfXEDR/AhOF4d+jHg1qvDCpYaVRZjENPQyrVxAkQqxPgQ==" }, - "when": { - "version": "3.7.8", - "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz", - "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I=" - }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", diff --git a/services/clsi/package.json b/services/clsi/package.json index e57bfa5518..df30ef77df 100644 --- a/services/clsi/package.json +++ b/services/clsi/package.json @@ -27,6 +27,7 @@ "fs-extra": "^8.1.0", "heapdump": "^0.3.15", "lockfile": "^1.0.4", + "lodash": "^4.17.15", "logger-sharelatex": "^1.9.1", "lynx": "0.2.0", "metrics-sharelatex": "^2.6.0", @@ -35,7 +36,6 @@ "sequelize": "^5.21.5", "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.1.0", "sqlite3": "^4.1.1", - "underscore": "^1.9.2", "v8-profiler-node8": "^6.1.1", "wrench": "~1.5.9" }, diff --git a/services/clsi/test/load/js/loadTest.js b/services/clsi/test/load/js/loadTest.js index ff9850efd8..c4116a2a30 100644 --- a/services/clsi/test/load/js/loadTest.js +++ b/services/clsi/test/load/js/loadTest.js @@ -13,7 +13,7 @@ const request = require('request') const Settings = require('settings-sharelatex') const async = require('async') const fs = require('fs') -const _ = require('underscore') +const _ = require('lodash') const concurentCompiles = 5 const totalCompiles = 50 diff --git a/services/clsi/test/unit/js/DockerRunnerTests.js b/services/clsi/test/unit/js/DockerRunnerTests.js index 1e44daffb4..b761d20340 100644 --- a/services/clsi/test/unit/js/DockerRunnerTests.js +++ b/services/clsi/test/unit/js/DockerRunnerTests.js @@ -70,7 +70,8 @@ describe('DockerRunner', function() { return runner(callback) } } - } + }, + globals: { Math } // used by lodash }) this.Docker = Docker this.getContainer = Docker.prototype.getContainer diff --git a/services/clsi/test/unit/js/OutputFileOptimiserTests.js b/services/clsi/test/unit/js/OutputFileOptimiserTests.js index b4983bf0f8..669044142c 100644 --- a/services/clsi/test/unit/js/OutputFileOptimiserTests.js +++ b/services/clsi/test/unit/js/OutputFileOptimiserTests.js @@ -30,7 +30,8 @@ describe('OutputFileOptimiser', function() { child_process: { spawn: (this.spawn = sinon.stub()) }, 'logger-sharelatex': { log: sinon.stub(), warn: sinon.stub() }, './Metrics': {} - } + }, + globals: { Math } // used by lodash }) this.directory = '/test/dir' return (this.callback = sinon.stub()) From 2eb43272565c246f47af933c75e90ad36679e446 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Tue, 16 Jun 2020 08:45:53 +0100 Subject: [PATCH 2/2] fix format --- services/clsi/app/js/DockerRunner.js | 1 - 1 file changed, 1 deletion(-) diff --git a/services/clsi/app/js/DockerRunner.js b/services/clsi/app/js/DockerRunner.js index e75b997d21..21ea97f0b2 100644 --- a/services/clsi/app/js/DockerRunner.js +++ b/services/clsi/app/js/DockerRunner.js @@ -27,7 +27,6 @@ const fs = require('fs') const Path = require('path') const _ = require('lodash') - logger.info('using docker runner') const usingSiblingContainers = () =>