Merge branch 'master' into upgrade/config-typescript

ethereumjs · Oct 23, 2020 · 34bbec0 · 34bbec0
2 parents 7d95394 + b45a1bf
commit 34bbec0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.nycrc b/.nycrc
@@ -1,5 +1,5 @@
 {
-  "extends": "@ethereumjs/config-nyc",
+  "extends": "@ethereumjs/config-coverage",
   "include": [
     "lib/**/*.ts"
   ]

diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-spread": "^7.10.1",
-    "@ethereumjs/config-nyc": "^1.1.1",
+    "@ethereumjs/config-coverage": "^2.0.0",
     "@ethereumjs/config-typescript": "^2.0.0",
     "@polkadot/ts": "^0.3.48",
     "@types/node": "^14.11.5",
@@ -101,7 +101,7 @@
     "karma-firefox-launcher": "^1.3.0",
     "karma-tap": "^4.2.0",
     "karma-typescript": "^5.0.3",
-    "nyc": "~13.3.0",
+    "nyc": "^14.1.1",
     "pino": "^5.8.0",
     "pino-pretty": "^2.2.2",
     "standard": "~12.0.1",