-
Notifications
You must be signed in to change notification settings - Fork 522
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jest-example' of github.com:purkhusid/rules_nodejs into…
… jest-example
- Loading branch information
Showing
9 changed files
with
79 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # Marker that this directory is a Bazel package | ||
|
|
||
| # These patch files from Globegitter: | ||
| # https://gist.github.com/Globegitter/690dd1b97828a3927b436bc11211f139 |
File renamed without changes.
31 changes: 31 additions & 0 deletions
31
examples/jest/tools/patches/babel-plugin-istanbul+5.1.2.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| diff --git a/node_modules/babel-plugin-istanbul/lib/index.js b/node_modules/babel-plugin-istanbul/lib/index.js | ||
| index 259adb4..102a54f 100644 | ||
| --- a/node_modules/babel-plugin-istanbul/lib/index.js | ||
| +++ b/node_modules/babel-plugin-istanbul/lib/index.js | ||
| @@ -27,7 +27,7 @@ function makeShouldSkip() { | ||
| var exclude; | ||
| return function shouldSkip(file, opts) { | ||
| if (!exclude || exclude.cwd !== opts.cwd) { | ||
| - var cwd = getRealpath(process.env.NYC_CWD || process.cwd()); | ||
| + var cwd = process.env.NYC_CWD || process.cwd(); | ||
| var nycConfig = process.env.NYC_CONFIG ? JSON.parse(process.env.NYC_CONFIG) : {}; | ||
| var config = {}; | ||
|
|
||
| @@ -68,7 +68,7 @@ function makeVisitor(_ref) { | ||
| Program: { | ||
| enter: function enter(path) { | ||
| this.__dv__ = null; | ||
| - var realPath = getRealpath(this.file.opts.filename); | ||
| + var realPath = this.file.opts.filename; | ||
|
|
||
| if (shouldSkip(realPath, this.opts)) { | ||
| return; | ||
| @@ -101,7 +101,7 @@ function makeVisitor(_ref) { | ||
| var result = this.__dv__.exit(path); | ||
|
|
||
| if (this.opts.onCover) { | ||
| - this.opts.onCover(getRealpath(this.file.opts.filename), result.fileCoverage); | ||
| + this.opts.onCover(this.file.opts.filename, result.fileCoverage); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| diff --git a/node_modules/istanbul-api/lib/file-matcher.js b/node_modules/istanbul-api/lib/file-matcher.js | ||
| index d926363..587d5d4 100644 | ||
| --- a/node_modules/istanbul-api/lib/file-matcher.js | ||
| +++ b/node_modules/istanbul-api/lib/file-matcher.js | ||
| @@ -18,8 +18,8 @@ function filesFor(options, callback) { | ||
| let root = options.root; | ||
| let includes = options.includes; | ||
| let excludes = options.excludes; | ||
| - const realpath = options.realpath; | ||
| - const relative = options.relative; | ||
| + const realpath = false; | ||
| + const relative = true; | ||
|
|
||
| root = root || process.cwd(); | ||
| includes = includes && Array.isArray(includes) ? includes : ['**/*.js']; | ||
| @@ -35,6 +35,7 @@ function filesFor(options, callback) { | ||
| return callback(err); | ||
| } | ||
| if (relative) { | ||
| + console.log("istanbul", files) | ||
| return callback(err, files); | ||
| } | ||
|
|
||
| @@ -62,8 +63,8 @@ function matcherFor(options, callback) { | ||
| options = null; | ||
| } | ||
| options = options || {}; | ||
| - options.relative = false; //force absolute paths | ||
| - options.realpath = true; //force real paths (to match Node.js module paths) | ||
| + options.relative = true; //force absolute paths | ||
| + options.realpath = false; //force real paths (to match Node.js module paths) | ||
|
|
||
| filesFor(options, (err, files) => { | ||
| const fileMap = Object.create(null); |