From 82f2b76e25a4a67e01ec67e5ebe39d14ad771ea8 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 20 Apr 2017 03:09:25 +0200 Subject: 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. --- node_modules/istanbul-lib-coverage/lib/file.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'node_modules/istanbul-lib-coverage/lib/file.js') 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]; } -- cgit v1.2.3