aboutsummaryrefslogtreecommitdiff
path: root/node_modules/istanbul-lib-coverage
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-04-20 03:09:25 +0200
committerFlorian Dold <florian.dold@gmail.com>2017-04-24 16:14:29 +0200
commit82f2b76e25a4a67e01ec67e5ebe39d14ad771ea8 (patch)
tree965f6eb89b84d65a62b49008fd972c004832ccd1 /node_modules/istanbul-lib-coverage
parente6e0cbc387c2a77b48e4065c229daa65bf1aa0fa (diff)
downloadwallet-core-82f2b76e25a4a67e01ec67e5ebe39d14ad771ea8.tar.xz
Reorganize module loading.
We now use webpack instead of SystemJS, effectively bundling modules into one file (plus commons chunks) for every entry point. This results in a much smaller extension size (almost half). Furthermore we use yarn/npm even for extension run-time dependencies. This relieves us from manually vendoring and building dependencies. It's also easier to understand for new developers familiar with node.
Diffstat (limited to 'node_modules/istanbul-lib-coverage')
-rw-r--r--node_modules/istanbul-lib-coverage/CHANGELOG.md16
-rw-r--r--node_modules/istanbul-lib-coverage/README.md1
-rw-r--r--node_modules/istanbul-lib-coverage/lib/file.js4
-rw-r--r--node_modules/istanbul-lib-coverage/package.json12
4 files changed, 23 insertions, 10 deletions
diff --git a/node_modules/istanbul-lib-coverage/CHANGELOG.md b/node_modules/istanbul-lib-coverage/CHANGELOG.md
index 12057e61a..7b01b5c81 100644
--- a/node_modules/istanbul-lib-coverage/CHANGELOG.md
+++ b/node_modules/istanbul-lib-coverage/CHANGELOG.md
@@ -1,6 +1,20 @@
# Change Log
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+All notable changes to this project will be documented in this file.
+See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+<a name="1.0.2"></a>
+## [1.0.2](https://github.com/istanbuljs/istanbul-lib-coverage/compare/istanbul-lib-coverage@1.0.1...istanbul-lib-coverage@1.0.2) (2017-03-27)
+
+<a name="1.0.1"></a>
+## [1.0.1](https://github.com/istanbuljs/istanbul-lib-coverage/compare/v1.0.0...v1.0.1) (2017-01-18)
+
+
+### Bug Fixes
+
+* handle edge-case surrounding merging two file coverage reports ([22e154c](https://github.com/istanbuljs/istanbul-lib-coverage/commit/22e154c))
+
+
<a name="1.0.0"></a>
# [1.0.0](https://github.com/istanbuljs/istanbul-lib-coverage/compare/v1.0.0-alpha.3...v1.0.0) (2016-08-12)
diff --git a/node_modules/istanbul-lib-coverage/README.md b/node_modules/istanbul-lib-coverage/README.md
index 2f893e297..8e98eb579 100644
--- a/node_modules/istanbul-lib-coverage/README.md
+++ b/node_modules/istanbul-lib-coverage/README.md
@@ -1,6 +1,7 @@
istanbul-lib-coverage
---------------------
+[![Greenkeeper badge](https://badges.greenkeeper.io/istanbuljs/istanbul-lib-coverage.svg)](https://greenkeeper.io/)
[![Build Status](https://travis-ci.org/istanbuljs/istanbul-lib-coverage.svg?branch=master)](https://travis-ci.org/istanbuljs/istanbul-lib-coverage)
An API that provides a read-only view of coverage information with the ability
diff --git a/node_modules/istanbul-lib-coverage/lib/file.js b/node_modules/istanbul-lib-coverage/lib/file.js
index 0cfb8a4be..3cb0ce263 100644
--- a/node_modules/istanbul-lib-coverage/lib/file.js
+++ b/node_modules/istanbul-lib-coverage/lib/file.js
@@ -250,6 +250,10 @@ FileCoverage.prototype.merge = function (other) {
var i,
retArray = that.data.b[k],
secondArray = other.b[k];
+ if (!retArray) {
+ that.data.b[k] = secondArray;
+ return;
+ }
for (i = 0; i < retArray.length; i += 1) {
retArray[i] += secondArray[i];
}
diff --git a/node_modules/istanbul-lib-coverage/package.json b/node_modules/istanbul-lib-coverage/package.json
index f9ce1f2b8..2e9bc8cc9 100644
--- a/node_modules/istanbul-lib-coverage/package.json
+++ b/node_modules/istanbul-lib-coverage/package.json
@@ -1,23 +1,17 @@
{
"name": "istanbul-lib-coverage",
- "version": "1.0.0",
+ "version": "1.0.2",
"description": "Data library for istanbul coverage objects",
"author": "Krishnan Anantheswaran <kananthmail-github@yahoo.com>",
"main": "index.js",
"scripts": {
- "fast": "mocha test/",
"pretest": "jshint index.js lib/ test/",
- "test": "istanbul cover -x 'docs/**' --include-all-sources --print=both _mocha -- test/",
- "posttest": "istanbul check-coverage --statements 95 --branches 80",
- "release": "standard-version"
+ "test": "mocha"
},
"devDependencies": {
"chai": "^3.0.0",
- "coveralls": "^2.11.4",
- "istanbul": "^0.4.0",
"jshint": "^2.8.0",
- "mocha": "^2.2.5",
- "standard-version": "^2.4.0"
+ "mocha": "^3.2.0"
},
"karmaDeps": {
"browserify-istanbul": "^0.2.1",