curated-linter
Advanced tools
Comparing version 1.1.1 to 1.1.2
@@ -1,9 +0,9 @@ | ||
const getPkgConf = require('pkg-conf') | ||
const deepAssign = require('deep-assign') | ||
const getPkgConfig = require('pkg-conf') | ||
const merge = require('lodash.merge') | ||
const getMergedOpts = function (config = {}) { | ||
const pkgOpts = this.config.packageJson ? getPkgConf(this.config.name) : Promise.resolve({}) | ||
return pkgOpts.then(pkgOpts => deepAssign(this.config, pkgOpts, config)) | ||
const getMergedConfig = function (config = {}) { | ||
const pkgConfig = this.config.packageJson ? getPkgConfig(this.config.name) : Promise.resolve({}) | ||
return pkgConfig.then(pkgConfig => merge(this.config, pkgConfig, config)) | ||
} | ||
module.exports = getMergedOpts | ||
module.exports = getMergedConfig |
{ | ||
"name": "curated-linter", | ||
"version": "1.1.1", | ||
"version": "1.1.2", | ||
"description": "Creates curated linters, like standard", | ||
@@ -49,6 +49,6 @@ "main": "lib/index.js", | ||
"clone": "^2.1.0", | ||
"deep-assign": "^2.0.0", | ||
"deglob": "^2.1.0", | ||
"lint-files": "^1.0.0", | ||
"lint-text": "^1.0.1", | ||
"lodash.merge": "^4.6.0", | ||
"meow": "^3.7.0", | ||
@@ -55,0 +55,0 @@ "pify": "https://api.github.com/repos/mightyiam/pify/tarball/multiargs-error", |
16203
+ Addedlodash.merge@^4.6.0
+ Addedlodash.merge@4.6.2(transitive)
- Removeddeep-assign@^2.0.0
- Removeddeep-assign@2.0.0(transitive)
- Removedis-obj@1.0.1(transitive)