.eslintrc

@@ -1,3 +1,19 @@
 {
-  "extends": "standard"
+  "extends": "standard",
+  "env": {
+    "node": true,
+    "mocha": true
+  },
+  "globals": {
+    "expect": true,
+    "sinon": true
+  },
+  "overrides": [
+    {
+      "files": ["test/**/*.js"],
+      "rules": {
+        "no-unused-expressions": "off"
+      }
+    }
+  ]
 }

.travis.yml

@@ -1,19 +1,21 @@
 language: node_js
 node_js:
-  - 4
-  - 5
-  - 7
-  - 8
+  - 10
+  - 12
 
-# Make sure we have new NPM.
-before_install:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - npm install -g npm
-  - npm config set loglevel warn
+services:
+  - xvfb
 
 before_script:
   - npm install -g grunt-cli
 
+after_success:
+  # run automated release process with semantic-release
+  - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_EVENT_TYPE" == "push" && "$TRAVIS_NODE_VERSION" == "12" ]]; then
+      semantic-release;
+    fi;
+
 script:
-  - grunt
+  - commitlint-travis
+  - npm run lint
+  - grunt

CHANGELOG.md

@@ -1,3 +1,138 @@
+## [2.0.2](https://github.com/karma-runner/karma-coverage/compare/v2.0.1...v2.0.2) (2020-04-13)
+
+
+### Bug Fixes
+
+* **reporter:** update calls to  match new API in istanbul-lib-report fix [#398](https://github.com/karma-runner/karma-coverage/issues/398) ([#403](https://github.com/karma-runner/karma-coverage/issues/403)) ([4962a70](https://github.com/karma-runner/karma-coverage/commit/4962a70026efbbd77e9fa7b6bfd6be29047c1082))
+* remove information about old istanbul lib ([#404](https://github.com/karma-runner/karma-coverage/issues/404)) ([5cf931a](https://github.com/karma-runner/karma-coverage/commit/5cf931afe331cfcebf7cf934ec52de933344091d))
+
+<a name="2.0.1"></a>
+## [2.0.1](https://github.com/karma-runner/karma-coverage/compare/v2.0.0...v2.0.1) (2019-08-20)
+
+
+
+<a name="2.0.0"></a>
+# [2.0.0](https://github.com/karma-runner/karma-coverage/compare/v1.1.1...v2.0.0) (2019-08-20)
+
+
+### Bug Fixes
+
+* **build:** Update to lodash 4 ([d6d21d2](https://github.com/karma-runner/karma-coverage/commit/d6d21d2)), closes [#242](https://github.com/karma-runner/karma-coverage/issues/242)
+* **reporter:** replace colons in the output path ([3b2bffa](https://github.com/karma-runner/karma-coverage/commit/3b2bffa))
+* bump lodash for CVE-2018-16487 ([15f8b12](https://github.com/karma-runner/karma-coverage/commit/15f8b12))
+
+
+### Chores
+
+* Update travis config ([00090ea](https://github.com/karma-runner/karma-coverage/commit/00090ea))
+* **deps:** Use latest istanbul lib packages ([#377](https://github.com/karma-runner/karma-coverage/issues/377)) ([f40d6af](https://github.com/karma-runner/karma-coverage/commit/f40d6af))
+
+
+### BREAKING CHANGES
+
+* **deps:** This set of changes may impact some use cases.
+
+* chore: Add Updated Istanbul Dependencies
+
+The istanbul package is deprecated in favor several split packages that
+control different aspects of how istanbul works. This commit adds the
+recommended packages that will be used in future commits as
+karma-coverage's usage of istanbul is updated to the latest api.
+
+* refactor(reporter): Follow new report API
+
+This commit refactors the in memory report implementation to use the new
+istanbul report API.
+
+Report creation is removed from newer versions of the istanbul API, so
+this commit adds a set of utility functions to wrap around the new API
+and provide similar functionality as the old API. The top level export
+uses the new utility function to register the in-memory report.
+
+* refactor(preprocessor): Switch to istanbul-lib-instrument
+
+This commit updates the preprocessor to use istanbul-lib-instrument
+instead of the deprecated istanbul package. The biggest change in this
+refactor is using a callable function instead of a constructor when
+creating instrumenters
+
+The old istanbul package exposed the Instrumenter directly, allowing the
+preprocessor to create an instance of it. istanbul-lib-instrument,
+however, exposes a callable function that creates an Instrumenter.
+This commit updates the preprocessor to follow this new pattern of using
+a callable function. In order to ensure backwards compatibility, a
+utility function is added to wrap constructors with a callable function
+for creation automatically.
+
+This change allows the following configuration for creating instrumenters:
+1. An object that contains an Instrumenter constructor
+2. An Instrumenter constructor itself
+3. A callable function that returns an Instrumenter instance.
+
+This commit also uses the istanbul-lib-source-maps package to handle
+storing source maps. A global source map store registers source maps so
+they can be used later on in the reporter.
+
+* refactor(reporter): Switch to istanbul-lib-coverage
+
+This commit updates the reporter by using the istanbul-lib-coverage
+package api for handling coverage checking/management and the
+istanbul-lib-report package api for handling reporting.
+
+The new apis remove the need for collectors and remove the need to
+handle disposing collectors.
+
+* refactor: Remove unused source cache utilities
+
+This commit removes the source-cache-store and source-cache files as
+they are no longer being used. The source-map-store and
+istanbul-lib-source-maps are used instead, so these files are no longer
+needed.
+
+* feat(util): Add Reset Functionality
+
+This commit updates the report creator utility to allow resetting the
+custom reporter map.
+
+* fix(preprocessor): Track Coverage Maps Properly
+
+This commit updates the preprocessor to properly access file coverage
+when storing it in the global coverage map (when includeAllSources is
+true). The previous method did not work because the returned
+instrumented code from the default istanbul instrumenter returns the
+coverage map in a POJO object instead of JSON notation. This breaks the
+coverage regex used to match and parse the coverage map.
+
+The istanbul instrumenter offers the ability to receive the coverage map
+for the last instrumented file through a separate function, so that is
+tested for and used if it is supported. The original method is used as a
+fallback for backwards compatibility.
+
+This commit also addresses changes from the v0 instanbul instrumenter
+options. The changes are additive only to maintain backwards compatibility
+for other instrumenters.
+
+* fix(reporter): Access Data Properly to Check Coverage
+
+This commit fixes errors with accessing data properly during the
+checkCoverage method. A previous commit updated the implementation to
+use istanbul-lib-coverage, but this involved an api change to access the
+raw coverage data (which checkCoverage uses).
+
+This commit also fixes the checking coverage for each file by using a
+map to store file coverage summaries instead of merging summaries like
+the global results. Per file coverage now works as expected.
+
+* test: Update Unit Tests to use new Istanbul API
+
+This commit updates the mocking done in unit tests to properly mock the
+new istanbul API. Additionally, new unit test suites are added for the
+utility methods report-creator and source-map-store.
+* drop support for node < 8
+* **reporter:** the output folder names change, they no longer contain `:`
+
+
+
 <a name="1.1.2"></a>
 ## [1.1.2](https://github.com/karma-runner/karma-coverage/compare/v1.1.1...v1.1.2) (2018-05-03)
 

README.md

@@ -119,4 +119,4 @@ For more information on Karma see the [homepage].
 
 
 [homepage]: http://karma-runner.github.com
-[Istanbul]: https://github.com/gotwarlost/istanbul
+[Istanbul]: https://istanbul.js.org

gruntfile.js

@@ -8,8 +8,8 @@ module.exports = function (grunt) {
       },
       unit: {
         src: [
-          'test/mocha-globals.coffee',
-          'test/*.spec.coffee'
+          'test/mocha-globals.js',
+          'test/*.spec.js'
         ]
       }
     },
@@ -58,20 +58,12 @@ module.exports = function (grunt) {
       coffeeRequireJS: {
         configFile: 'examples/coffee-requirejs/karma.conf.coffee'
       }
-    },
-    eslint: {
-      target: [
-        'lib/*.js',
-        'gruntfile.js',
-        'karma.conf.js'
-      ]
     }
   })
 
   require('load-grunt-tasks')(grunt)
 
-  grunt.registerTask('test', ['simplemocha', 'karma'])
-  grunt.registerTask('default', ['eslint', 'test'])
+  grunt.registerTask('default', ['simplemocha', 'karma'])
 
   grunt.registerTask('release', 'Bump the version and publish to NPM.', function (type) {
     grunt.task.run([

lib/in-memory-report.js

@@ -1,20 +1,29 @@
-var Report = require('istanbul').Report
-var util = require('util')
+const { ReportBase } = require('istanbul-lib-report')
 
-function InMemoryReport (opt) {
-  this.opt = opt
-}
+class InMemoryReport extends ReportBase {
+  constructor (opt) {
+    super(opt)
+    this.opt = opt
+  }
+
+  onStart () {
+    this.data = {}
+  }
 
-util.inherits(InMemoryReport, Report)
+  onDetail (node) {
+    const fc = node.getFileCoverage()
+    const key = fc.path
+    this.data[key] = fc.toJSON()
+  }
 
-InMemoryReport.prototype.writeReport = function (collector, sync) {
-  if (!this.opt.emitter || !this.opt.emitter.emit) {
-    console.error('Could not raise "coverage_complete" event, missing emitter because it was not supplied during initialization of the reporter')
-  } else {
-    this.opt.emitter.emit('coverage_complete', this.opt.browser, collector.getFinalCoverage())
+  onEnd () {
+    if (!this.opt || !this.opt.emitter || !this.opt.emitter.emit) {
+      console.error('Could not raise "coverage_complete" event, missing emitter because it was not supplied during initialization of the reporter')
+      return
+    }
+    this.opt.emitter.emit('coverage_complete', this.opt.browser, this.data)
   }
 }
-
 InMemoryReport.TYPE = 'in-memory'
 
 module.exports = InMemoryReport

lib/index.js

@@ -5,7 +5,7 @@
 // Exposes the preprocessor and reporter plugins.
 
 // Registering one additional (karma specific) reporter: in-memory
-require('istanbul').Report.register(require('./in-memory-report'))
+require('./report-creator').register(require('./in-memory-report'))
 
 module.exports = {
   'preprocessor:coverage': ['factory', require('./preprocessor')],