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).
istanbuljs · May 27, 2017 · a1a457f · a1a457f
1 parent e062a86
commit a1a457f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: node_js
 node_js:
   - 6
   - 4
-  - "0.10"
   - "stable"
 
 before_install:

diff --git a/appveyor.yml b/appveyor.yml
@@ -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

diff --git a/lib/config-util.js b/lib/config-util.js
@@ -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) {

diff --git a/package.json b/package.json
@@ -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",
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ language: node_js @@
     node_js:
       - 6
       - 4
-      - "0.10"
       - "stable"
     before_install:
@@ Expand Down @@