Skip to content

Commit

Permalink
chore: update dependencies (#855)
Browse files Browse the repository at this point in the history
  • Loading branch information
coreyfarrell authored and bcoe committed Jun 6, 2018
1 parent d0f654c commit f09cf02
Show file tree
Hide file tree
Showing 8 changed files with 828 additions and 1,702 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ You can tell nyc to exclude specific files and directories by adding
an `nyc.exclude` array to your `package.json`. Each element of
the array is a glob pattern indicating which paths should be omitted.

Globs are matched using [micromatch](https://www.npmjs.com/package/micromatch).
Globs are matched using [minimatch](https://www.npmjs.com/package/minimatch).

For example, the following config will exclude any files with the extension `.spec.js`,
and anything in the `build` directory:
Expand Down Expand Up @@ -240,7 +240,7 @@ an `include` key with a list of globs to specify specific files that should be c
}
```

> `nyc` uses micromatch for glob expansions, you can read its documentation [here](https://www.npmjs.com/package/micromatch).
> `nyc` uses minimatch for glob expansions, you can read its documentation [here](https://www.npmjs.com/package/minimatch).
> Note: include defaults to `['**']`
Expand Down
6 changes: 3 additions & 3 deletions build-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
var fs = require('fs')
var path = require('path')
var rimraf = require('rimraf')
var mkdirp = require('mkdirp')
var mkdirp = require('make-dir')
var forkingTap = require('forking-tap')
var zeroFill = require('zero-fill')
var sanitizeFilename = require('sanitize-filename')
Expand All @@ -24,8 +24,8 @@ var individualTests = forkingTap(originalTestSource, {

function writeTest (test, i, enableCache) {
var filename = ['built', zeroFill(3, i)]
.concat(test.nestedName)
.join('-')
.concat(test.nestedName)
.join('-')

if (enableCache) {
filename += '-cache'
Expand Down
7 changes: 4 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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('mkdirp')
const mkdirp = require('make-dir')
const Module = require('module')
const onExit = require('signal-exit')
const path = require('path')
Expand Down Expand Up @@ -122,7 +122,7 @@ NYC.prototype._loadAdditionalModules = function () {
this.require.forEach(function (r) {
// first attempt to require the module relative to
// the directory being instrumented.
var p = resolveFrom(_this.cwd, r)
var p = resolveFrom.silent(_this.cwd, r)
if (p) {
require(p)
return
Expand Down Expand Up @@ -298,7 +298,8 @@ NYC.prototype._transformFactory = function (cacheDir) {
}
}

NYC.prototype._handleJs = function (code, filename) {
NYC.prototype._handleJs = function (code, options) {
var filename = options.filename
var relFile = path.relative(this.cwd, filename)
// ensure the path has correct casing (see istanbuljs/nyc#269 and nodejs/node#6624)
filename = path.resolve(this.cwd, relFile)
Expand Down
2 changes: 1 addition & 1 deletion lib/self-coverage-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const path = require('path')
const fs = require('fs')
const mkdirp = require('mkdirp')
const mkdirp = require('make-dir')
const onExit = require('signal-exit')

onExit(function () {
Expand Down
Loading

0 comments on commit f09cf02

Please sign in to comment.