nyc 13.0.0 → 13.3.0

package/CHANGELOG.md

@@ -2,6 +2,64 @@
 
 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="13.3.0"></a>
+# [13.3.0](https://github.com/istanbuljs/nyc/compare/v13.2.0...v13.3.0) (2019-02-14)
+
+
+### Bug Fixes
+
+* update dependendencies due to vulnerabilities ([#992](https://github.com/istanbuljs/nyc/issues/992)) ([e8cc59b](https://github.com/istanbuljs/nyc/commit/e8cc59b)), closes [#991](https://github.com/istanbuljs/nyc/issues/991)
+
+
+### Features
+
+* Support nyc report --check-coverage ([#984](https://github.com/istanbuljs/nyc/issues/984)) ([dd48410](https://github.com/istanbuljs/nyc/commit/dd48410))
+
+
+
+<a name="13.2.0"></a>
+# [13.2.0](https://github.com/istanbuljs/nyc/compare/v13.1.0...v13.2.0) (2019-01-27)
+
+
+### Bug Fixes
+
+* Create directory for merge destination. ([#979](https://github.com/istanbuljs/nyc/issues/979)) ([921d386](https://github.com/istanbuljs/nyc/commit/921d386)), closes [#976](https://github.com/istanbuljs/nyc/issues/976)
+* missing command temp-directory ([#928](https://github.com/istanbuljs/nyc/issues/928)) ([28b6d09](https://github.com/istanbuljs/nyc/commit/28b6d09)), closes [#927](https://github.com/istanbuljs/nyc/issues/927)
+* nyc processing files not covered by include when `all` is enabled. ([#914](https://github.com/istanbuljs/nyc/issues/914)) ([40afc5f](https://github.com/istanbuljs/nyc/commit/40afc5f)), closes [#913](https://github.com/istanbuljs/nyc/issues/913) [#782](https://github.com/istanbuljs/nyc/issues/782)
+
+
+### Features
+
+* avoid hardcoded HOME for spawn-wrap working dir ([#957](https://github.com/istanbuljs/nyc/issues/957)) ([ff834aa](https://github.com/istanbuljs/nyc/commit/ff834aa)), closes [#951](https://github.com/istanbuljs/nyc/issues/951)
+* document the fact that cacheDir is configurable ([#968](https://github.com/istanbuljs/nyc/issues/968)) ([35cd49a](https://github.com/istanbuljs/nyc/commit/35cd49a))
+* Option Plugins ([#948](https://github.com/istanbuljs/nyc/issues/948)) ([df2730d](https://github.com/istanbuljs/nyc/commit/df2730d))
+
+
+
+<a name="13.1.0"></a>
+# [13.1.0](https://github.com/istanbuljs/nyc/compare/v13.0.1...v13.1.0) (2018-09-06)
+
+
+### Features
+
+* Bump dependencies. ([#915](https://github.com/istanbuljs/nyc/issues/915)) ([0b3d2cf](https://github.com/istanbuljs/nyc/commit/0b3d2cf))
+* Rename --temp-directory option to --temp-dir ([#897](https://github.com/istanbuljs/nyc/issues/897)) ([ccf42df](https://github.com/istanbuljs/nyc/commit/ccf42df))
+
+
+
+<a name="13.0.1"></a>
+## [13.0.1](https://github.com/istanbuljs/nyc/compare/v13.0.0...v13.0.1) (2018-07-24)
+
+
+### Bug Fixes
+
+* add flag to allow control of intrumenter esModules option, default to looser parsing ([#863](https://github.com/istanbuljs/nyc/issues/863)) ([6b6cd5e](https://github.com/istanbuljs/nyc/commit/6b6cd5e))
+* Enable es-modules by default. ([#889](https://github.com/istanbuljs/nyc/issues/889)) ([d0b76e2](https://github.com/istanbuljs/nyc/commit/d0b76e2)), closes [#796](https://github.com/istanbuljs/nyc/issues/796)
+* Update caching-transform options. ([#873](https://github.com/istanbuljs/nyc/issues/873)) ([52b69ef](https://github.com/istanbuljs/nyc/commit/52b69ef))
+* use uuid/v4 to generate unique identifiers. ([#883](https://github.com/istanbuljs/nyc/issues/883)) ([7483ed9](https://github.com/istanbuljs/nyc/commit/7483ed9))
+
+
+
 <a name="13.0.0"></a>
 # [13.0.0](https://github.com/istanbuljs/nyc/compare/v12.0.2...v13.0.0) (2018-06-08)
 

package/README.md

@@ -3,7 +3,6 @@
 [![Build Status](https://travis-ci.org/istanbuljs/nyc.svg?branch=master)](https://travis-ci.org/istanbuljs/nyc)
 [![Coverage Status](https://coveralls.io/repos/bcoe/nyc/badge.svg?branch=)](https://coveralls.io/r/bcoe/nyc?branch=master)
 [![NPM version](https://img.shields.io/npm/v/nyc.svg)](https://www.npmjs.com/package/nyc)
-[![Windows Tests](https://img.shields.io/appveyor/ci/bcoe/nyc-ilw23/master.svg?label=Windows%20Tests)](https://ci.appveyor.com/project/bcoe/nyc-ilw23)
 [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
 [![community slack](http://devtoolscommunity.herokuapp.com/badge.svg)](http://devtoolscommunity.herokuapp.com)
 
@@ -12,7 +11,7 @@ _Having problems? want to contribute? join our [community slack](http://devtools
 Istanbul's state of the art command line interface, with support for:
 
 * applications that spawn subprocesses.
-* ES2015 transforms, via [babel-plugin-istanbul](https://github.com/istanbuljs/babel-plugin-istanbul), or source-maps.
+* ES2015 transforms, via [`babel-plugin-istanbul`], or source-maps.
 
 ## Instrumenting your code
 
@@ -62,10 +61,8 @@ stack traces for instrumented code will reflect their original lines.
 
 ### Support for custom require hooks (babel, typescript, etc.)
 
-nyc supports custom require hooks like
-[`babel-register`](http://babeljs.io/docs/usage/require/). nyc can
-load the hooks for you, [using the `--require`
-flag](#require-additional-modules).
+nyc supports custom require hooks like [`@babel/register`]. nyc can load
+the hooks for you, [using the `--require` flag](#require-additional-modules).
 
 Source maps are used to map coverage information back to the appropriate lines
 of the pre-transpiled code. You'll have to configure your custom require hook
@@ -75,8 +72,8 @@ the `sourceMaps` option to `inline`.
 ### Source-Map support for pre-instrumented codebases
 
 If you opt to pre-instrument your source-code (rather than using a just-in-time
-transpiler like [`babel-register`](http://babeljs.io/docs/usage/require/))
-nyc supports both inline source-maps and `.map` files.
+transpiler like [`@babel/register`]) nyc supports both inline source-maps and
+`.map` files.
 
 _Important: If you are using nyc with a project that pre-instruments its code,
 run nyc with the configuration option `--exclude-after-remap` set to `false`.
@@ -85,15 +82,14 @@ covered under exclude rules._
 
 ## Use with `babel-plugin-istanbul` for Babel Support
 
-We recommend using [`babel-plugin-istanbul`](https://github.com/istanbuljs/babel-plugin-istanbul) if your
-project uses the babel tool chain:
+We recommend using [`babel-plugin-istanbul`] if your project uses the babel tool chain:
 
 1. enable the `babel-plugin-istanbul` plugin:
 
   ```json
     {
       "babel": {
-        "presets": ["env"],
+        "presets": ["@babel/preset-env"],
         "env": {
           "test": {
             "plugins": ["istanbul"]
@@ -114,7 +110,7 @@ project uses the babel tool chain:
   {
     "nyc": {
       "require": [
-        "babel-register"
+        "@babel/register"
       ],
       "sourceMap": false,
       "instrument": false
@@ -251,17 +247,15 @@ an `include` key with a list of globs to specify specific files that should be c
 The `--require` flag can be provided to `nyc` to indicate that additional
 modules should be required in the subprocess collecting coverage:
 
-`nyc --require babel-register --require babel-polyfill mocha`
+`nyc --require @babel/register --require @babel/polyfill mocha`
 
 ## Caching
 
-You can run `nyc` with the optional `--cache` flag, to prevent it from
-instrumenting the same files multiple times. This can significantly
-improve runtime performance.
+`nyc`'s default behavior is to cache instrumented files to disk to prevent instrumenting source files multiple times, and speed `nyc` execution times. You can disable this behavior by running `nyc` with the `--cache false` flag. You can also change the default cache directory from `./node_modules/.cache/nyc` by setting the `--cache-dir` flag.
 
 ## Configuring `nyc`
 
-Any configuration options that can be set via the command line can also be specified in the `nyc` stanza of your package.json, or within a `.nycrc` file:
+Any configuration options that can be set via the command line can also be specified in the `nyc` stanza of your package.json, or within a `.nycrc` (or `.nycrc.json`) file:
 
 **package.json:**
 
@@ -294,7 +288,7 @@ Any configuration options that can be set via the command line can also be speci
     ],
     "cache": true,
     "all": true,
-    "temp-directory": "./alternative-tmp",
+    "temp-dir": "./alternative-tmp",
     "report-dir": "./alternative"
   }
 }
@@ -450,3 +444,6 @@ You can find more tutorials at http://istanbul.js.org/docs/tutorials
 ## Other advanced features
 
 Take a look at http://istanbul.js.org/docs/advanced/ and please feel free to [contribute documentation](https://github.com/istanbuljs/istanbuljs.github.io/tree/development/content).
+
+[`@babel/register`]: https://www.npmjs.com/package/@babel/register
+[`babel-plugin-istanbul`]: https://github.com/istanbuljs/babel-plugin-istanbul

package/bin/nyc.js

@@ -42,6 +42,9 @@ if ([
   if (argv.all) nyc.addAllFiles()
 
   var env = {
+    // Support running nyc as a user without HOME (e.g. linux 'nobody'),
+    // https://github.com/istanbuljs/nyc/issues/951
+    SPAWN_WRAP_SHIM_ROOT: process.env.SPAWN_WRAP_SHIM_ROOT || process.env.XDG_CACHE_HOME || require('os').homedir(),
     NYC_CONFIG: JSON.stringify(argv),
     NYC_CWD: process.cwd(),
     NYC_ROOT_ID: nyc.rootId,

package/index.js

@@ -4,7 +4,7 @@
 
 const arrify = require('arrify')
 const cachingTransform = require('caching-transform')
-const debugLog = require('debug-log')('nyc')
+const util = require('util')
 const findCacheDir = require('find-cache-dir')
 const fs = require('fs')
 const glob = require('glob')
@@ -12,7 +12,6 @@ const Hash = require('./lib/hash')
 const libCoverage = require('istanbul-lib-coverage')
 const libHook = require('istanbul-lib-hook')
 const libReport = require('istanbul-lib-report')
-const md5hex = require('md5-hex')
 const mkdirp = require('make-dir')
 const Module = require('module')
 const onExit = require('signal-exit')
@@ -22,6 +21,9 @@ const resolveFrom = require('resolve-from')
 const rimraf = require('rimraf')
 const SourceMaps = require('./lib/source-maps')
 const testExclude = require('test-exclude')
+const uuid = require('uuid/v4')
+
+const debugLog = util.debuglog('nyc')
 
 var ProcessInfo
 try {
@@ -41,7 +43,7 @@ function NYC (config) {
   this.config = config
 
   this.subprocessBin = config.subprocessBin || path.resolve(__dirname, './bin/nyc.js')
-  this._tempDirectory = config.tempDirectory || './.nyc_output'
+  this._tempDirectory = config.tempDirectory || config.tempDir || './.nyc_output'
   this._instrumenterLib = require(config.instrumenter || './lib/instrumenters/istanbul')
   this._reportDir = config.reportDir || 'coverage'
   this._sourceMap = typeof config.sourceMap === 'boolean' ? config.sourceMap : true
@@ -50,7 +52,7 @@ function NYC (config) {
   this.cwd = config.cwd || process.cwd()
   this.reporter = arrify(config.reporter || 'text')
 
-  this.cacheDirectory = (config.cacheDir && path.resolve(config.cacheDir)) || findCacheDir({name: 'nyc', cwd: this.cwd})
+  this.cacheDirectory = (config.cacheDir && path.resolve(config.cacheDir)) || findCacheDir({ name: 'nyc', cwd: this.cwd })
   this.cache = Boolean(this.cacheDirectory && config.cache)
 
   this.exclude = testExclude({
@@ -91,13 +93,11 @@ function NYC (config) {
 }
 
 NYC.prototype._createTransform = function (ext) {
-  var _this = this
   var opts = {
     salt: Hash.salt,
-    hash: function (code, metadata, salt) {
-      var hash = Hash(code, metadata.filename)
-      _this.hashCache[metadata.filename] = hash
-      return hash
+    hashData: (input, metadata) => [metadata.filename],
+    onHash: (input, metadata, hash) => {
+      this.hashCache[metadata.filename] = hash
     },
     cacheDir: this.cacheDirectory,
     // when running --all we should not load source-file from
@@ -141,7 +141,9 @@ NYC.prototype._createInstrumenter = function () {
     ignoreClassMethods: [].concat(this.config.ignoreClassMethod).filter(a => a),
     produceSourceMap: this.config.produceSourceMap,
     compact: this.config.compact,
-    preserveComments: this.config.preserveComments
+    preserveComments: this.config.preserveComments,
+    esModules: this.config.esModules,
+    plugins: this.config.plugins
   })
 }
 
@@ -179,14 +181,14 @@ NYC.prototype.addAllFiles = function () {
   this.fakeRequire = true
   this.walkAllFiles(this.cwd, function (filename) {
     filename = path.resolve(_this.cwd, filename)
-    _this.addFile(filename)
-    var coverage = coverageFinder()
-    var lastCoverage = _this.instrumenter().lastFileCoverage()
-    if (lastCoverage) {
-      filename = lastCoverage.path
-    }
-    if (lastCoverage && _this.exclude.shouldInstrument(filename)) {
-      coverage[filename] = lastCoverage
+    if (_this.exclude.shouldInstrument(filename)) {
+      _this.addFile(filename)
+      var coverage = coverageFinder()
+      var lastCoverage = _this.instrumenter().lastFileCoverage()
+      if (lastCoverage) {
+        filename = lastCoverage.path
+        coverage[filename] = lastCoverage
+      }
     }
   })
   this.fakeRequire = false
@@ -211,7 +213,7 @@ NYC.prototype.instrumentAllFiles = function (input, output, cb) {
     }
 
     if (transform) {
-      code = transform(code, {filename: filename, relFile: inFile})
+      code = transform(code, { filename: filename, relFile: inFile })
     }
 
     if (!output) {
@@ -247,7 +249,7 @@ NYC.prototype.walkAllFiles = function (dir, visitor) {
     pattern = '**/*{' + this.extensions.join() + '}'
   }
 
-  glob.sync(pattern, {cwd: dir, nodir: true, ignore: this.exclude.exclude}).forEach(function (filename) {
+  glob.sync(pattern, { cwd: dir, nodir: true, ignore: this.exclude.exclude }).forEach(function (filename) {
     visitor(filename)
   })
 }
@@ -266,7 +268,7 @@ NYC.prototype._maybeInstrumentSource = function (code, filename, relFile) {
     }
   }
 
-  return transform ? transform(code, {filename: filename, relFile: relFile}) : null
+  return transform ? transform(code, { filename: filename, relFile: relFile }) : null
 }
 
 NYC.prototype._transformFactory = function (cacheDir) {
@@ -282,8 +284,9 @@ NYC.prototype._transformFactory = function (cacheDir) {
     try {
       instrumented = instrumenter.instrumentSync(code, filename, sourceMap)
     } catch (e) {
-      debugLog('failed to instrument ' + filename + 'with error: ' + e.stack)
+      debugLog('failed to instrument ' + filename + ' with error: ' + e.stack)
       if (this.config.exitOnError) {
+        console.error('Failed to instrument ' + filename)
         process.exit(1)
       } else {
         instrumented = code
@@ -355,7 +358,7 @@ NYC.prototype._wrapExit = function () {
   // regardless of how the process exits.
   onExit(function () {
     _this.writeCoverageFile()
-  }, {alwaysLast: true})
+  }, { alwaysLast: true })
 }
 
 NYC.prototype.wrap = function (bin) {
@@ -365,11 +368,7 @@ NYC.prototype.wrap = function (bin) {
   return this
 }
 
-NYC.prototype.generateUniqueID = function () {
-  return md5hex(
-    process.hrtime().concat(process.pid).map(String)
-  )
-}
+NYC.prototype.generateUniqueID = uuid
 
 NYC.prototype.writeCoverageFile = function () {
   var coverage = coverageFinder()
@@ -429,7 +428,7 @@ NYC.prototype.getCoverageMapFromAllCoverageFiles = function (baseDirectory) {
     map.merge(report)
   }, baseDirectory)
   // depending on whether source-code is pre-instrumented
-  // or instrumented using a JIT plugin like babel-require
+  // or instrumented using a JIT plugin like @babel/require
   // you may opt to exclude files after applying
   // source-map remapping logic.
   if (this.config.excludeAfterRemap) {

package/lib/commands/instrument.js

@@ -14,7 +14,7 @@ exports.builder = function (yargs) {
     .option('require', {
       alias: 'i',
       default: [],
-      describe: 'a list of additional modules that nyc should attempt to require in its subprocess, e.g., babel-register, babel-polyfill.'
+      describe: 'a list of additional modules that nyc should attempt to require in its subprocess, e.g., @babel/register, @babel/polyfill.'
     })
     .option('extension', {
       alias: 'e',

package/lib/commands/merge.js

@@ -1,5 +1,7 @@
 'use strict'
 const fs = require('fs')
+const path = require('path')
+const makeDir = require('make-dir')
 
 var NYC
 try {
@@ -24,10 +26,14 @@ exports.builder = function (yargs) {
       type: 'text',
       default: 'coverage.json'
     })
-    .option('temp-directory', {
+    .option('temp-dir', {
+      alias: 't',
       describe: 'directory to read raw coverage information from',
       default: './.nyc_output'
     })
+    .option('temp-directory', {
+      hidden: true
+    })
     .example('$0 merge ./out coverage.json', 'merge together reports in ./out and output as coverage.json')
 }
 
@@ -45,6 +51,7 @@ exports.handler = function (argv) {
     console.error(`failed access input directory ${argv.inputDirectory} with error:\n\n${err.message}`)
     process.exit(1)
   }
+  makeDir.sync(path.dirname(argv.outputFile))
   const map = nyc.getCoverageMapFromAllCoverageFiles(argv.inputDirectory)
   fs.writeFileSync(argv.outputFile, JSON.stringify(map, null, 2), 'utf8')
   console.info(`coverage files in ${argv.inputDirectory} merged into ${argv.outputFile}`)

package/lib/commands/report.js

@@ -20,10 +20,14 @@ exports.builder = function (yargs) {
       describe: 'directory to output coverage reports in',
       default: 'coverage'
     })
-    .option('temp-directory', {
+    .option('temp-dir', {
+      alias: 't',
       describe: 'directory to read raw coverage information from',
       default: './.nyc_output'
     })
+    .option('temp-directory', {
+      hidden: true
+    })
     .option('show-process-tree', {
       describe: 'display the tree of spawned processes',
       default: false,
@@ -35,6 +39,38 @@ exports.builder = function (yargs) {
       type: 'boolean',
       global: false
     })
+    .option('check-coverage', {
+      type: 'boolean',
+      default: false,
+      describe: 'check whether coverage is within thresholds provided',
+      global: false
+    })
+    .option('branches', {
+      default: 0,
+      description: 'what % of branches must be covered?',
+      global: false
+    })
+    .option('functions', {
+      default: 0,
+      description: 'what % of functions must be covered?',
+      global: false
+    })
+    .option('lines', {
+      default: 90,
+      description: 'what % of lines must be covered?',
+      global: false
+    })
+    .option('statements', {
+      default: 0,
+      description: 'what % of statements must be covered?',
+      global: false
+    })
+    .option('per-file', {
+      default: false,
+      type: 'boolean',
+      description: 'check thresholds per file',
+      global: false
+    })
     .example('$0 report --reporter=lcov', 'output an HTML lcov report to ./coverage')
 }
 
@@ -42,4 +78,12 @@ exports.handler = function (argv) {
   process.env.NYC_CWD = process.cwd()
   var nyc = new NYC(argv)
   nyc.report()
+  if (argv.checkCoverage) {
+    nyc.checkCoverage({
+      lines: argv.lines,
+      functions: argv.functions,
+      branches: argv.branches,
+      statements: argv.statements
+    }, argv['per-file'])
+  }
 }

package/lib/config-util.js

@@ -11,7 +11,7 @@ var Config = {}
 
 function guessCWD (cwd) {
   cwd = cwd || process.env.NYC_CWD || process.cwd()
-  const pkgPath = findUp.sync('package.json', {cwd: cwd})
+  const pkgPath = findUp.sync('package.json', { cwd: cwd })
   if (pkgPath) {
     cwd = path.dirname(pkgPath)
   }
@@ -19,7 +19,7 @@ function guessCWD (cwd) {
 }
 
 Config.loadConfig = function (argv, cwd) {
-  const rcPath = findUp.sync([argv.nycrcPath || '.nycrc', '.nycrc.json'], {cwd: guessCWD(cwd)})
+  const rcPath = findUp.sync([argv.nycrcPath || '.nycrc', '.nycrc.json'], { cwd: guessCWD(cwd) })
   let config = {}
 
   if (rcPath) {
@@ -93,7 +93,7 @@ Config.buildYargs = function (cwd) {
     .option('require', {
       alias: 'i',
       default: [],
-      describe: 'a list of additional modules that nyc should attempt to require in its subprocess, e.g., babel-register, babel-polyfill',
+      describe: 'a list of additional modules that nyc should attempt to require in its subprocess, e.g., @babel/register, @babel/polyfill',
       global: false
     })
     .option('eager', {
@@ -109,12 +109,22 @@ Config.buildYargs = function (cwd) {
       describe: 'cache instrumentation results for improved performance',
       global: false
     })
+    .option('cache-dir', {
+      describe: 'explicitly set location for instrumentation cache',
+      global: false
+    })
     .option('babel-cache', {
       default: false,
       type: 'boolean',
       describe: 'cache babel transpilation results for improved performance',
       global: false
     })
+    .option('es-modules', {
+      default: true,
+      type: 'boolean',
+      describe: 'tell the instrumenter to treat files as ES Modules',
+      global: false
+    })
     .option('extension', {
       alias: 'e',
       default: [],
@@ -216,11 +226,16 @@ Config.buildYargs = function (cwd) {
       description: 'specify a different .nycrc path',
       global: false
     })
-    .option('temp-directory', {
+    .option('temp-dir', {
+      alias: 't',
       describe: 'directory to output raw coverage information to',
       default: './.nyc_output',
       global: false
     })
+    .option('temp-directory', {
+      hidden: true,
+      global: false
+    })
     .option('skip-empty', {
       describe: 'don\'t show empty files (no lines of code) in report',
       default: false,
@@ -235,7 +250,7 @@ Config.buildYargs = function (cwd) {
     })
     .pkgConf('nyc', cwd)
     .example('$0 npm test', 'instrument your tests with coverage')
-    .example('$0 --require babel-core/register npm test', 'instrument your tests with coverage and transpile with Babel')
+    .example('$0 --require @babel/register npm test', 'instrument your tests with coverage and transpile with Babel')
     .example('$0 report --reporter=text-lcov', 'output lcov report after running your tests')
     .epilog('visit https://git.io/vHysA for list of available reporters')
     .boolean('h')

package/lib/hash.js

@@ -1,14 +1,8 @@
-const CACHE_VERSION = require('../package.json').version
-const md5hex = require('md5-hex')
-const salt = JSON.stringify({
-  istanbul: require('istanbul-lib-coverage/package.json').version,
-  nyc: CACHE_VERSION
-})
+'use strict'
 
-function Hash (code, filename) {
-  return md5hex([code, filename, salt]) + '_' + CACHE_VERSION
+module.exports = {
+  salt: JSON.stringify({
+    istanbul: require('istanbul-lib-coverage/package.json').version,
+    nyc: require('../package.json').version
+  })
 }
-
-Hash.salt = salt
-
-module.exports = Hash

package/lib/instrumenters/istanbul.js

@@ -1,11 +1,14 @@
 'use strict'
 
-var convertSourceMap = require('convert-source-map')
-var mergeSourceMap = require('merge-source-map')
+const { createInstrumenter } = require('istanbul-lib-instrument')
+const convertSourceMap = require('convert-source-map')
+const mergeSourceMap = require('merge-source-map')
 
 function InstrumenterIstanbul (cwd, options) {
-  var istanbul = InstrumenterIstanbul.istanbul()
-  var instrumenter = istanbul.createInstrumenter({
+  const plugins = options.plugins
+  const configPlugins = plugins ? { plugins } : {}
+
+  const instrumenter = createInstrumenter(Object.assign({
     autoWrap: true,
     coverageVariable: '__coverage__',
     embedSource: true,
@@ -13,11 +16,11 @@ function InstrumenterIstanbul (cwd, options) {
     preserveComments: options.preserveComments,
     produceSourceMap: options.produceSourceMap,
     ignoreClassMethods: options.ignoreClassMethods,
-    esModules: true
-  })
+    esModules: options.esModules
+  }, configPlugins))
 
   return {
-    instrumentSync: function (code, filename, sourceMap) {
+    instrumentSync (code, filename, sourceMap) {
       var instrumented = instrumenter.instrumentSync(code, filename)
       // the instrumenter can optionally produce source maps,
       // this is useful for features like remapping stack-traces.
@@ -36,16 +39,10 @@ function InstrumenterIstanbul (cwd, options) {
       }
       return instrumented
     },
-    lastFileCoverage: function () {
+    lastFileCoverage () {
       return instrumenter.lastFileCoverage()
     }
   }
 }
 
-InstrumenterIstanbul.istanbul = function () {
-  InstrumenterIstanbul._istanbul || (InstrumenterIstanbul._istanbul = require('istanbul-lib-instrument'))
-
-  return InstrumenterIstanbul._istanbul || (InstrumenterIstanbul._istanbul = require('istanbul'))
-}
-
 module.exports = InstrumenterIstanbul

package/lib/instrumenters/noop.js

@@ -1,10 +1,10 @@
-var FileCoverage = require('istanbul-lib-coverage').classes.FileCoverage
-var readInitialCoverage = require('istanbul-lib-instrument').readInitialCoverage
+const { FileCoverage } = require('istanbul-lib-coverage').classes
+const { readInitialCoverage } = require('istanbul-lib-instrument')
 
 function NOOP () {
   return {
-    instrumentSync: function (code, filename) {
-      var extracted = readInitialCoverage(code)
+    instrumentSync (code, filename) {
+      const extracted = readInitialCoverage(code)
       if (extracted) {
         this.fileCoverage = new FileCoverage(extracted.coverageData)
       } else {
@@ -12,7 +12,7 @@ function NOOP () {
       }
       return code
     },
-    lastFileCoverage: function () {
+    lastFileCoverage () {
       return this.fileCoverage
     }
   }

package/node_modules/ansi-regex/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "ansi-regex@3.0.0",
-      "/Users/benjamincoe/bcoe/nyc"
+      "/usr/src/npm/nyc"
     ]
   ],
   "_from": "ansi-regex@3.0.0",
@@ -26,7 +26,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
   "_spec": "3.0.0",
-  "_where": "/Users/benjamincoe/bcoe/nyc",
+  "_where": "/usr/src/npm/nyc",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",

package/node_modules/append-transform/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "append-transform@1.0.0",
-      "/Users/benjamincoe/bcoe/nyc"
+      "/usr/src/npm/nyc"
     ]
   ],
   "_from": "append-transform@1.0.0",
@@ -26,7 +26,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
   "_spec": "1.0.0",
-  "_where": "/Users/benjamincoe/bcoe/nyc",
+  "_where": "/usr/src/npm/nyc",
   "author": {
     "name": "James Talmage",
     "email": "james@talmage.io",