aboutsummaryrefslogtreecommitdiff
path: root/node_modules/istanbul-lib-coverage/lib
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/lib
parente6e0cbc387c2a77b48e4065c229daa65bf1aa0fa (diff)
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/lib')
-rw-r--r--node_modules/istanbul-lib-coverage/lib/file.js4
1 files changed, 4 insertions, 0 deletions
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];
}