Revert find-up, use || if no .nycrc found

bensaufley · May 26, 2017 · 4e96d49 · 4e96d49
1 parent 773e27c
commit 4e96d49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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', '.nycrc.json'], {cwd: cwd})
+  var rcPath = findUp.sync('.nycrc', {cwd: cwd}) || findUp.sync('.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": "^2.1.0",
+    "find-up": "^1.1.2",
     "foreground-child": "^1.5.3",
     "glob": "^7.0.6",
     "istanbul-lib-coverage": "^1.1.0",