Skip to content

Commit a1a457f

Browse files
bensaufleybcoe
authored andcommitted
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).
1 parent e062a86 commit a1a457f

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ language: node_js
33
node_js:
44
- 6
55
- 4
6-
- "0.10"
76
- "stable"
87

98
before_install:

appveyor.yml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ environment:
22
matrix:
33
- nodejs_version: '6' # stable
44
- nodejs_version: '4' # LTS
5-
- nodejs_version: '0.12'
65
install:
76
- ps: Install-Product node $env:nodejs_version
87
- npm cache clear

lib/config-util.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var Config = {}
1414
Config.loadConfig = function (argv, cwd) {
1515
cwd = cwd || process.env.NYC_CWD || process.cwd()
1616
var pkgPath = findUp.sync('package.json', {cwd: cwd})
17-
var rcPath = findUp.sync('.nycrc', {cwd: cwd})
17+
var rcPath = findUp.sync(['.nycrc', '.nycrc.json'], {cwd: cwd})
1818
var rcConfig = null
1919

2020
if (rcPath) {

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"debug-log": "^1.0.1",
8181
"default-require-extensions": "^1.0.0",
8282
"find-cache-dir": "^0.1.1",
83-
"find-up": "^1.1.2",
83+
"find-up": "^2.1.0",
8484
"foreground-child": "^1.5.3",
8585
"glob": "^7.0.6",
8686
"istanbul-lib-coverage": "^1.1.0",

0 commit comments

Comments
 (0)