Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
feat: allow .nycrc.json (#580)
BREAKING CHANGE: new version of find-up requires dropping 0.10/0.12 support (which we had already been planning).
  • Loading branch information
bensaufley authored and bcoe committed May 27, 2017
1 parent e062a86 commit a1a457f
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -3,7 +3,6 @@ language: node_js
node_js:
- 6
- 4
- "0.10"
- "stable"

before_install:
Expand Down
1 change: 0 additions & 1 deletion appveyor.yml
Expand Up @@ -2,7 +2,6 @@ environment:
matrix:
- nodejs_version: '6' # stable
- nodejs_version: '4' # LTS
- nodejs_version: '0.12'
install:
- ps: Install-Product node $env:nodejs_version
- npm cache clear
Expand Down
2 changes: 1 addition & 1 deletion lib/config-util.js
Expand Up @@ -14,7 +14,7 @@ var Config = {}
Config.loadConfig = function (argv, cwd) {
cwd = cwd || process.env.NYC_CWD || process.cwd()
var pkgPath = findUp.sync('package.json', {cwd: cwd})
var rcPath = findUp.sync('.nycrc', {cwd: cwd})
var rcPath = findUp.sync(['.nycrc', '.nycrc.json'], {cwd: cwd})
var rcConfig = null

if (rcPath) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -80,7 +80,7 @@
"debug-log": "^1.0.1",
"default-require-extensions": "^1.0.0",
"find-cache-dir": "^0.1.1",
"find-up": "^1.1.2",
"find-up": "^2.1.0",
"foreground-child": "^1.5.3",
"glob": "^7.0.6",
"istanbul-lib-coverage": "^1.1.0",
Expand Down

0 comments on commit a1a457f

Please sign in to comment.