Skip to content

Commit

Permalink
fix: Reduce lodash, use lodash.merge directly
Browse files Browse the repository at this point in the history
  • Loading branch information
darscan committed May 6, 2020
1 parent 136b3a9 commit d671a6e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions lib/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as debugFactory from 'debug';
import * as nconf from 'nconf';
import * as path from 'path';
import * as _ from '@snyk/lodash';
import * as _merge from 'lodash.merge';

// eslint-disable-next-line @typescript-eslint/no-require-imports
require('./nconf-truth');
Expand Down Expand Up @@ -65,7 +65,7 @@ export function loadConfig(
typeof config[trimmedKey] === 'object' &&
typeof config[key] === 'object'
) {
config[trimmedKey] = _.merge(config[trimmedKey], config[key]);
config[trimmedKey] = _merge(config[trimmedKey], config[key]);
} else {
config[trimmedKey] = config[key];
}
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"author": "Remy Sharp",
"license": "Apache-2.0",
"devDependencies": {
"@types/lodash": "^4.14.147",
"@types/nconf": "^0.10.0",
"@types/node": "^6.14.9",
"@typescript-eslint/eslint-plugin": "^2.7.0",
Expand All @@ -30,8 +29,8 @@
"typescript": "^3.7.2"
},
"dependencies": {
"@snyk/lodash": "4.17.15-patch",
"debug": "^4.1.1",
"lodash.merge": "^4.6.2",
"nconf": "^0.10.0"
},
"repository": {
Expand Down

0 comments on commit d671a6e

Please sign in to comment.