Merge pull request #1 from istanbuljs/master

Sync repo
AndrewFinlay · Oct 19, 2018 · 50083f0 · 50083f0
2 parents 6b6cd5e + 223c6c9
commit 50083f0
Show file tree

Hide file tree

Showing 12 changed files with 695 additions and 650 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,30 @@
 
 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.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)
 

diff --git a/ISSUE_TEMPLATE b/ISSUE_TEMPLATE
@@ -1,10 +1,18 @@
 <!--Please use the template provided below when reporting bugs:-->
+## Link to bug demonstration repository.
+<!--
+A demo repository will show the combination of module versions being used,
+command-lines and configurations.  NYC is very complex, it is difficult or
+even impossible to triage most bugs without this information.
+
+If you cannot share a link to your repository (maybe it's private) then you must
+create a basic `nyc-bug-demo` repository and link to that please.
+-->
+
 ## Expected Behavior
 
 ## Observed Behavior
 
-## Bonus Points! Code (or Repository) that Reproduces Issue
-
 ## Forensic Information
 
 **Operating System:** the operating system you observed the issue on.

diff --git a/README.md b/README.md
@@ -90,7 +90,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"]
@@ -291,7 +291,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"
   }
 }

diff --git a/index.js b/index.js
@@ -41,7 +41,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.tempDir || config.tempDirectory || './.nyc_output'
   this._instrumenterLib = require(config.instrumenter || './lib/instrumenters/istanbul')
   this._reportDir = config.reportDir || 'coverage'
   this._sourceMap = typeof config.sourceMap === 'boolean' ? config.sourceMap : true

diff --git a/lib/commands/merge.js b/lib/commands/merge.js
@@ -24,10 +24,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')
 }
 

diff --git a/lib/commands/report.js b/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,

diff --git a/lib/config-util.js b/lib/config-util.js
@@ -116,7 +116,7 @@ Config.buildYargs = function (cwd) {
       global: false
     })
     .option('es-modules', {
-      default: false,
+      default: true,
       type: 'boolean',
       describe: 'tell the instrumenter to treat files as ES Modules',
       global: false
@@ -222,11 +222,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,