.github/stale.yml

@@ -0,0 +1,6 @@
+exemptLabels:
+  - "Great First Contribution"
+  - pinned
+  - security
+
+staleLabel: stale

.travis.yml

@@ -1,14 +1,25 @@
-sudo: false
 language: node_js
+os:
+  - windows
+  - linux
+  - osx
 node_js:
+  - "node"
+  - 10
   - 8
   - 6
-  - "stable"
+matrix:
+## An ENOMEM error occurs with 11.6.0 under Travis-CI for Windows.
+## Disable until we can determine the cause.
+#  include:
+#    - os: windows
+#      node_js: "latest"
+  exclude:
+    - os: windows
+      node_js: "node"
 git:
   depth:
     1
-env:
-  secure: "SVg7NpV0Sru296kdp+eFl07RFjtJy242fWQ1KDCUdk/1EtZEOzBoSKP7Tn3zX/VLBieexL0T31EwYvRztnL97Sr8VgpYU0z95vCPO8FrixElJR6NH3dqrKeNzC3xOYdV0fy2b4UMlPJOI0aYDT1KHm1aWtkb2J8zqII+XbMtlDaelfHCDxa2+RBII9nYYDP62z+0chQFS6MGPSNwve3G2emYHZpYP5iTFmOzaFUCAjLskKvnnsY0jyx5XssqAo17747WKZl5SDgN8YHZIwhE5tB9m9j3MGjJhwdsR3kmq2om0GD1tQFFAXzWhWad3zNBUE4fLqswgASi39o5NIEzvSRzpw77ttOkkIFGem0l421Zi25W8x5n6GZvP06Y47ddmjNBlniwIzG4fb3dbIByCy/g5SjUYmfnke7stXXBKsPv0eEadlLGFWnG5RIfnyGjvUgQ//QXSAnBBzYF9IK+KUdU8c9kHF6kPybsGEzjQoX+4EJL6kZ4sNX9qxjHERUr4Jb6rAMOnKI9VtCBNqwcCC3nV5DDWHS86hKwbuTbBFkszP7majOi0kUQJTO/tZGwVVcphSDwhL5QkmMepLOqXyRICdUcB2ffXHYhZLiZPofYdom8csaDolqFkotJEBj3GM3gwHvUC3i1vxshxtjF6NHjanhpiIpHLRCs6R1RESE="
 
 after_script:
   - "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls"

CHANGELOG.md

@@ -2,6 +2,25 @@
 
 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.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)
 

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)
 
@@ -90,7 +89,7 @@ We recommend using [`babel-plugin-istanbul`] if your project uses the babel tool
   ```json
     {
       "babel": {
-        "presets": ["@babel/env"],
+        "presets": ["@babel/preset-env"],
         "env": {
           "test": {
             "plugins": ["istanbul"]
@@ -252,13 +251,11 @@ modules should be required in the subprocess collecting coverage:
 
 ## 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:**
 

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,

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')
@@ -23,6 +23,8 @@ const SourceMaps = require('./lib/source-maps')
 const testExclude = require('test-exclude')
 const uuid = require('uuid/v4')
 
+const debugLog = util.debuglog('nyc')
+
 var ProcessInfo
 try {
   ProcessInfo = require('./lib/process.covered.js')
@@ -41,7 +43,7 @@ function NYC (config) {
   this.config = config
 
   this.subprocessBin = config.subprocessBin || path.resolve(__dirname, './bin/nyc.js')
-  this._tempDirectory = config.tempDir || 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({
@@ -140,7 +142,8 @@ NYC.prototype._createInstrumenter = function () {
     produceSourceMap: this.config.produceSourceMap,
     compact: this.config.compact,
     preserveComments: this.config.preserveComments,
-    esModules: this.config.esModules
+    esModules: this.config.esModules,
+    plugins: this.config.plugins
   })
 }
 
@@ -178,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
@@ -210,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) {
@@ -246,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)
   })
 }
@@ -265,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) {
@@ -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) {

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 {
@@ -49,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}`)

lib/config-util.js

@@ -11,15 +11,15 @@ 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)
   }
   return 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) {
@@ -109,6 +109,10 @@ 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',

lib/instrumenters/istanbul.js

@@ -4,8 +4,11 @@ var convertSourceMap = require('convert-source-map')
 var mergeSourceMap = require('merge-source-map')
 
 function InstrumenterIstanbul (cwd, options) {
+  const plugins = options.plugins
+  const configPlugins = plugins ? { plugins } : {}
+
   var istanbul = InstrumenterIstanbul.istanbul()
-  var instrumenter = istanbul.createInstrumenter({
+  var instrumenter = istanbul.createInstrumenter(Object.assign({
     autoWrap: true,
     coverageVariable: '__coverage__',
     embedSource: true,
@@ -14,7 +17,7 @@ function InstrumenterIstanbul (cwd, options) {
     produceSourceMap: options.produceSourceMap,
     ignoreClassMethods: options.ignoreClassMethods,
     esModules: options.esModules
-  })
+  }, configPlugins))
 
   return {
     instrumentSync: function (code, filename, sourceMap) {