From 49922e978c666dd4e35438f417dca3a7afa5a9ec Mon Sep 17 00:00:00 2001
From: David Carley <dacarley@gmail.com>
Date: Mon, 30 Oct 2017 13:17:30 -0700
Subject: [PATCH] Fixing coverage problems by upgrading to nyc (the new
 istanbul)

---
 .gitignore      | 1 +
 .travis.yml     | 3 ++-
 package.json    | 6 +++---
 test/mocha.opts | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 26e0f14d111..69e0ae38642 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ node_modules
 .idea/
 .npm/
 /packages/**/lib/*
+/.nyc_output
diff --git a/.travis.yml b/.travis.yml
index 0153ba4fe2f..b69cbff4c72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,5 @@ install:
     - npm install
 script:
     - npm run build
-    - npm run test-coveralls
+    - npm run test
+    - npm run coverage
diff --git a/package.json b/package.json
index b9f7022ea6f..2a7edd81271 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,8 @@
     "watch": "gulp watch",
     "docs": "cd docs; make html;",
     "lint": "gulp lint",
-    "test": "mocha; gulp lint",
-    "test-coveralls": "istanbul cover _mocha -- -R spec && cat coverage/lcov.info | coveralls --verbose"
+    "test": "nyc --reporter=html --reporter=text mocha",
+    "coverage": "nyc report --reporter=text-lcov | coveralls --verbose"
   },
   "repository": {
     "type": "git",
@@ -91,10 +91,10 @@
     "gulp-plumber": "^1.1.0",
     "gulp-replace": "^0.6.1",
     "gulp-util": "^3.0.8",
-    "istanbul": "^0.4.5",
     "lerna": "^2.4.0",
     "lodash": "^4.17.4",
     "mocha": "^4.0.1",
+    "nyc": "^11.2.1",
     "rollup": "^0.50.0",
     "rollup-plugin-babel": "^3.0.2",
     "rollup-plugin-commonjs": "^8.2.4",
diff --git a/test/mocha.opts b/test/mocha.opts
index 2f069847370..9142d15026d 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,2 +1,2 @@
---reporter dot
+--reporter spec
 --require babel-register