Merge 17c7378 into d8bf244

taskforcesh · Dec 21, 2019 · cf1065f · cf1065f
2 parents d8bf244 + 17c7378
commit cf1065f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
     "lodash": "^4.17.11",
     "node-uuid": "^1.4.8",
     "semver": "^6.3.0",
+    "tslib": "^1.10.0",
     "uuid": "^3.3.3"
   },
   "devDependencies": {

diff --git a/src/classes/child-pool.ts b/src/classes/child-pool.ts
@@ -1,6 +1,6 @@
 import childProcess, { ChildProcess } from 'child_process';
 import path from 'path';
-import _ from 'lodash';
+import { forEach, values, flatten } from 'lodash';
 import getPort from 'get-port';
 import fs from 'fs';
 import { promisify } from 'util';
@@ -16,7 +16,7 @@ const convertExecArgv = async (execArgv: string[]): Promise<string[]> => {
   const standard: string[] = [];
   const convertedArgs: string[] = [];
 
-  _.forEach(execArgv, async arg => {
+  forEach(execArgv, async arg => {
     if (arg.indexOf('--inspect') === -1) {
       standard.push(arg);
     } else {
@@ -96,7 +96,7 @@ export class ChildPool {
   }
 
   clean() {
-    const children = _.values(this.retained).concat(this.getAllFree());
+    const children = values(this.retained).concat(this.getAllFree());
 
     children.forEach(child => {
       // TODO: We may want to use SIGKILL if the process does not die after some time.
@@ -112,7 +112,7 @@ export class ChildPool {
   }
 
   getAllFree() {
-    return _.flatten(_.values(this.free));
+    return flatten(values(this.free));
   }
 }
 

diff --git a/src/classes/master.ts b/src/classes/master.ts
@@ -4,7 +4,7 @@
  *
  */
 import { promisify } from 'util';
-import _ from 'lodash';
+import { toString } from 'lodash';
 
 let status: any;
 let processor: any;
@@ -83,7 +83,7 @@ process.on('message', async msg => {
 
 process.on('uncaughtException', err => {
   if (!err.message) {
-    err = new Error(_.toString(err));
+    err = new Error(toString(err));
   }
   process.send({
     cmd: 'failed',

diff --git a/src/test/test_repeat.ts b/src/test/test_repeat.ts
@@ -7,10 +7,10 @@ import { expect } from 'chai';
 import IORedis from 'ioredis';
 import { beforeEach, describe, it } from 'mocha';
 import { v4 } from 'uuid';
+import { defaults } from 'lodash';
 
 const sinon = require('sinon');
 const moment = require('moment');
-const _ = require('lodash');
 
 const ONE_SECOND = 1000;
 const ONE_MINUTE = 60 * ONE_SECOND;
@@ -522,10 +522,7 @@ describe('repeat', function() {
         repeatWorker.addNextRepeatableJob = async (...args) => {
           // In order to simulate race condition
           // Make removeRepeatables happen any time after a moveToX is called
-          await queue.removeRepeatable(
-            'test',
-            _.defaults({ jobId }, repeatOpts),
-          );
+          await queue.removeRepeatable('test', defaults({ jobId }, repeatOpts));
 
           // nextRepeatableJob will now re-add the removed repeatable
           const result = await nextRepeatableJob.apply(repeat, args);

diff --git a/yarn.lock b/yarn.lock
@@ -5645,7 +5645,7 @@ tslib@1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
   integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==
 
-tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1:
+tslib@^1.10.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==