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/CHANGELOG.md | 16 +++++++++++++++- node_modules/istanbul-lib-coverage/README.md | 1 + node_modules/istanbul-lib-coverage/lib/file.js | 4 ++++ node_modules/istanbul-lib-coverage/package.json | 12 +++--------- 4 files changed, 23 insertions(+), 10 deletions(-) (limited to 'node_modules/istanbul-lib-coverage') 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. + + +## [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) + + +## [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)) + + # [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 ", "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", -- cgit v1.2.3