nyc 15.0.0-beta.3 → 15.0.0

package/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 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.
 
-## [15.0.0-beta.3](https://github.com/istanbuljs/nyc/compare/v14.1.1...v15.0.0-beta.3) (2019-12-09)
+## [15.0.0](https://github.com/istanbuljs/nyc/compare/v14.1.1...v15.0.0) (2019-12-20)
 
 
 ### ⚠ BREAKING CHANGES
@@ -21,6 +21,7 @@ files.
 * Add `.cjs`, `.mjs`, `.ts`, `.tsx`, `.jsx` to default extensions ([#1110](https://github.com/istanbuljs/nyc/issues/1110)) ([914b776](https://github.com/istanbuljs/nyc/commit/914b776215ad3ea54f0e46b4ba2904a8a9d4dfdd)), closes [#1103](https://github.com/istanbuljs/nyc/issues/1103)
 * Allow `nyc instrument` to instrument code in place ([#1149](https://github.com/istanbuljs/nyc/issues/1149)) ([7783284](https://github.com/istanbuljs/nyc/commit/77832845b85134d21eca3a23c812c4f21f36713f))
 * Drop node.js 6, upgrade dependencies ([#1134](https://github.com/istanbuljs/nyc/issues/1134)) ([00c3b34](https://github.com/istanbuljs/nyc/commit/00c3b3440a5b2ffe11b9c19ae4e08ad2f5b70e33))
+* Filenames relative to project cwd in coverage reports ([#1212](https://github.com/istanbuljs/nyc/issues/1212)) ([5258e9f](https://github.com/istanbuljs/nyc/commit/5258e9fdb1d9e3d4abd4cc9768bc09cd8040a6be))
 * Use @istanbuljs/schema for yargs setup ([#1194](https://github.com/istanbuljs/nyc/issues/1194)) ([fd40d49](https://github.com/istanbuljs/nyc/commit/fd40d49331665d936b86f30e9a873ba80071b770))
 * Use istanbul-lib-processinfo ([#1145](https://github.com/istanbuljs/nyc/issues/1145)) ([7943413](https://github.com/istanbuljs/nyc/commit/7943413dc032f8f98a164fdde88d7344e817bb5e))
 * Use source base name to prefix cache files ([#1144](https://github.com/istanbuljs/nyc/issues/1144)) ([5c1b7a9](https://github.com/istanbuljs/nyc/commit/5c1b7a9c43771f3439af44a1104e5426519e1123))

package/bin/nyc.js

@@ -52,15 +52,20 @@ async function main () {
   }
 
   if (!argv.useSpawnWrap) {
-    const { preloadAppend, propagateEnv } = require('node-preload')
-
-    nyc.require.forEach(requireModule => {
-      const mod = resolveFrom.silent(nyc.cwd, requireModule) || requireModule
-      preloadAppend(mod)
+    const requireModules = [
+      require.resolve('../lib/register-env.js'),
+      ...nyc.require.map(mod => resolveFrom.silent(nyc.cwd, mod) || mod)
+    ]
+    const preloadList = require('node-preload')
+    preloadList.push(
+      ...requireModules,
+      require.resolve('../lib/wrap.js')
+    )
+
+    Object.assign(process.env, env)
+    requireModules.forEach(mod => {
       require(mod)
     })
-    preloadAppend(require.resolve('../lib/wrap.js'))
-    Object.assign(propagateEnv, env)
   }
 
   if (argv.all) {

package/index.js

@@ -365,8 +365,8 @@ class NYC {
     // This is a bug with the spawn-wrap method where
     // we cannot force propagation of NYC_PROCESS_ID.
     if (!this.config.useSpawnWrap) {
-      const { propagateEnv } = require('node-preload')
-      propagateEnv.NYC_PROCESS_ID = this.processInfo.uuid
+      const updateVariable = require('./lib/register-env.js')
+      updateVariable('NYC_PROCESS_ID')
     }
     this._addRequireHooks()
     this._wrapExit()
@@ -441,6 +441,7 @@ class NYC {
       reports.create(_reporter, {
         skipEmpty: this.config.skipEmpty,
         skipFull: this.config.skipFull,
+        projectRoot: this.cwd,
         maxCols: process.stdout.columns || 100
       }).execute(context)
     })

package/lib/register-env.js

@@ -0,0 +1,27 @@
+'use strict'
+
+const processOnSpawn = require('process-on-spawn')
+
+const envToCopy = {}
+
+processOnSpawn.addListener(({ env }) => {
+  Object.assign(env, envToCopy)
+})
+
+const copyAtLoad = [
+  'NYC_CONFIG',
+  'NYC_CWD',
+  'NYC_PROCESS_ID',
+  'BABEL_DISABLE_CACHE',
+  'NYC_PROCESS_ID'
+]
+
+for (const env of copyAtLoad) {
+  if (env in process.env) {
+    envToCopy[env] = process.env[env]
+  }
+}
+
+module.exports = function updateVariable (envName) {
+  envToCopy[envName] = process.env[envName]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nyc",
-  "version": "15.0.0-beta.3",
+  "version": "15.0.0",
   "description": "the Istanbul command line interface",
   "main": "index.js",
   "scripts": {
@@ -55,31 +55,32 @@
   "author": "Ben Coe <ben@npmjs.com>",
   "license": "ISC",
   "dependencies": {
-    "@istanbuljs/load-nyc-config": "^1.0.0-alpha.2",
+    "@istanbuljs/load-nyc-config": "^1.0.0",
     "@istanbuljs/schema": "^0.1.2",
     "caching-transform": "^4.0.0",
     "convert-source-map": "^1.7.0",
     "decamelize": "^1.2.0",
-    "find-cache-dir": "=3.0.0",
+    "find-cache-dir": "^3.2.0",
     "find-up": "^4.1.0",
     "foreground-child": "^2.0.0",
     "glob": "^7.1.6",
-    "istanbul-lib-coverage": "^3.0.0-alpha.2",
-    "istanbul-lib-hook": "^3.0.0-alpha.2",
-    "istanbul-lib-instrument": "^4.0.0-alpha.3",
+    "istanbul-lib-coverage": "^3.0.0",
+    "istanbul-lib-hook": "^3.0.0",
+    "istanbul-lib-instrument": "^4.0.0",
     "istanbul-lib-processinfo": "^2.0.2",
-    "istanbul-lib-report": "^3.0.0-alpha.2",
-    "istanbul-lib-source-maps": "^4.0.0-alpha.5",
-    "istanbul-reports": "^3.0.0-alpha.6",
+    "istanbul-lib-report": "^3.0.0",
+    "istanbul-lib-source-maps": "^4.0.0",
+    "istanbul-reports": "^3.0.0",
     "js-yaml": "^3.13.1",
     "make-dir": "^3.0.0",
     "p-map": "^3.0.0",
-    "node-preload": "^0.1.4",
+    "process-on-spawn": "^1.0.0",
+    "node-preload": "^0.2.0",
     "resolve-from": "^5.0.0",
     "rimraf": "^3.0.0",
     "signal-exit": "^3.0.2",
-    "spawn-wrap": "^2.0.0-beta.0",
-    "test-exclude": "^6.0.0-alpha.3",
+    "spawn-wrap": "^2.0.0",
+    "test-exclude": "^6.0.0",
     "uuid": "^3.3.3",
     "yargs": "^15.0.2"
   },
@@ -91,7 +92,7 @@
     "source-map-support": "^0.5.16",
     "standard": "^12.0.1",
     "standard-version": "^7.0.1",
-    "tap": "^14.10.2",
+    "tap": "^14.10.5",
     "which": "^2.0.2"
   },
   "engines": {