Comparing version 1.1.7 to 1.1.8
{ | ||
"name": "blanket", | ||
"description": "seamless js code coverage", | ||
"version": "1.1.7", | ||
"version": "1.1.8", | ||
"homepage": "https://github.com/alex-seville/blanket", | ||
@@ -18,8 +18,3 @@ "author": { | ||
}, | ||
"licenses": [ | ||
{ | ||
"type": "MIT", | ||
"url": "https://github.com/alex-seville/blanket/blob/master/LICENSE-MIT" | ||
} | ||
], | ||
"license": "MIT", | ||
"main": "src/index.js", | ||
@@ -30,18 +25,21 @@ "engines": { | ||
"dependencies": { | ||
"esprima": "~1.2.2", | ||
"esprima": "~2.4.1", | ||
"falafel": "~0.3.1", | ||
"xtend": "~3.0.0" | ||
"xtend": "~4.0.0" | ||
}, | ||
"devDependencies": { | ||
"async": "~0.9.0", | ||
"coffee-script": "~1.7.1", | ||
"async": "~1.4.0", | ||
"coffee-react": "^4.0.0", | ||
"coffee-script": "~1.9.3", | ||
"grunt": "~0.4.5", | ||
"grunt-contrib-clean": "~0.5.0", | ||
"grunt-contrib-concat": "~0.4.0", | ||
"grunt-contrib-jshint": "~0.10.0", | ||
"grunt-contrib-uglify": "~0.4.0", | ||
"load-grunt-tasks": "~0.4.0", | ||
"mocha": "~1.20.1", | ||
"phantomjs": "1.8.2-0", | ||
"requirejs": "~2.1.14", | ||
"grunt-cli": "^0.1.13", | ||
"grunt-contrib-clean": "~0.6.0", | ||
"grunt-contrib-concat": "~0.5.1", | ||
"grunt-contrib-jshint": "~0.11.2", | ||
"grunt-contrib-uglify": "~0.9.1", | ||
"load-grunt-tasks": "~3.2.0", | ||
"mocha": "~2.2.5", | ||
"phantomjs": "1.9.17", | ||
"requirejs": "~2.1.19", | ||
"react": "^0.13.3", | ||
"travis-cov": "*", | ||
@@ -51,2 +49,3 @@ "uglify-save-license": "~0.4.1" | ||
"scripts": { | ||
"build": "grunt build", | ||
"test": "grunt --verbose blanketTest" | ||
@@ -53,0 +52,0 @@ }, |
@@ -8,6 +8,8 @@ # Blanket.js | ||
**NOTE: All Pull-Requests must be made into the `development` branch.** | ||
**NOTE: All Pull-Requests must be made into the `master` branch.** | ||
[![Build Status](https://travis-ci.org/alex-seville/blanket.svg)](https://travis-ci.org/alex-seville/blanket) | ||
[![Dependency Status](https://david-dm.org/alex-seville/blanket.svg)](https://david-dm.org/alex-seville/blanket) | ||
[![devDependency Status](https://david-dm.org/alex-seville/blanket/dev-status.svg)](https://david-dm.org/alex-seville/blanket#info=devDependencies) | ||
@@ -97,3 +99,3 @@ * [Getting Started](#getting-started) | ||
3. Add your custom build details to the grunt.js file under `concat` | ||
3. `grunt buildit` | ||
3. `npm run build` | ||
@@ -105,3 +107,3 @@ A minified and unminfied copy of the source can be created (see the `min` task). | ||
**All development takes place on the `development` branch** | ||
**All development takes place on the `master` branch** | ||
**Your pull request must pass all tests (run `npm test` to be sure) and respect all existing coverage thresholds** | ||
@@ -123,3 +125,3 @@ | ||
v1.1.5 - Refactor reporter API. | ||
v1.1.5 - Refactor reporter API. | ||
@@ -131,3 +133,3 @@ | ||
Loaded reverting for grunt-blanket, branch tracking reporter fixed, coverage on-the-go (displaying coverage results while a single page is being used). | ||
Apr 28-13 - 1.1.3 | ||
@@ -134,0 +136,0 @@ YUI support added with custom adapter (and some wrapping code). CompoundJS support appears to be outside the scope of project. |
@@ -47,2 +47,10 @@ (function() { | ||
runner.on('hook', function(){ | ||
blanket.onTestStart(); | ||
}); | ||
runner.on('hook end', function(){ | ||
blanket.onTestsDone(); | ||
}); | ||
// NOTE: this is an instance of BlanketReporter | ||
@@ -49,0 +57,0 @@ new OriginalReporter(runner); |
@@ -185,3 +185,7 @@ (function(_blanket){ | ||
}else{ | ||
window.addEventListener("load",startEvent,false); | ||
if (document.readyState === "complete") { | ||
startEvent(); | ||
} else { | ||
window.addEventListener("load",startEvent,false); | ||
} | ||
} | ||
@@ -188,0 +192,0 @@ }, |
@@ -211,3 +211,5 @@ (function(_blanket){ | ||
}else{ | ||
throw new Error("Error parsing instrumented code: "+err); | ||
var e = new Error("Error parsing instrumented code: "+err); | ||
e.error = err; | ||
throw e; | ||
} | ||
@@ -214,0 +216,0 @@ } |
@@ -174,3 +174,5 @@ var extend = require("xtend"), | ||
}else{ | ||
throw new Error("BLANKET-Error parsing instrumented code: "+err); | ||
var e = new Error("BLANKET-Error parsing instrumented code: "+err); | ||
e.error = err; | ||
throw e; | ||
} | ||
@@ -185,4 +187,11 @@ } | ||
//if a loader is specified, use it | ||
if (blanket.options("loader")){ | ||
require(blanket.options("loader"))(blanket); | ||
var loaderOption = blanket.options("loader"); | ||
if (loaderOption){ | ||
if (Array.isArray(loaderOption)) { | ||
loaderOption.forEach(function(loader) { | ||
require(loader)(blanket); | ||
}); | ||
} else { | ||
require(loaderOption)(blanket); | ||
} | ||
} | ||
@@ -207,3 +216,3 @@ newLoader = require.extensions['.js']; | ||
if (['node', 'iojs', 'nodejs', 'jx'].indexOf(path.basename(args[0])) > -2 && | ||
if (['node', 'iojs', 'nodejs', 'jx'].indexOf(path.basename(args[0])) > -1 && | ||
args[1].indexOf(join('node_modules','mocha','bin')) > -1 && | ||
@@ -210,0 +219,0 @@ blanketRequired){ |
@@ -1,3 +0,2 @@ | ||
var fs = require("fs"), | ||
path = require("path"); | ||
var simpleNodeLoader = require('./simple-node-loader'); | ||
@@ -8,36 +7,7 @@ module.exports = function(blanket) { | ||
require.extensions['.coffee'] = function(localModule, filename) { | ||
var antipattern = blanket.options("antifilter"), | ||
pattern = blanket.options("filter"); | ||
filename = blanket.normalizeBackslashes(filename); | ||
var compile = function(content) { | ||
return coffeeScript.compile(content); | ||
}; | ||
if (typeof antipattern !== "undefined" && blanket.matchPattern(filename.replace(/\.coffee$/, ""), antipattern)) { | ||
oldLoaderCS(localModule, filename); | ||
if (blanket.options("debug")) { | ||
console.log("BLANKET-File will never be instrumented:" + filename); | ||
} | ||
} else if (blanket.matchPattern(filename, pattern)) { | ||
if (blanket.options("debug")) { | ||
console.log("BLANKET-Attempting instrument of:" + filename); | ||
} | ||
var content = fs.readFileSync(filename, 'utf8'); | ||
content = coffeeScript.compile(content); | ||
blanket.instrument({ | ||
inputFile: content, | ||
inputFileName: filename | ||
}, function(instrumented) { | ||
var baseDirPath = blanket.normalizeBackslashes(path.dirname(filename)) + '/.'; | ||
try { | ||
instrumented = instrumented.replace(/require\s*\(\s*("|')\./g, 'require($1' + baseDirPath); | ||
localModule._compile(instrumented, filename); | ||
} catch (err) { | ||
console.log("Error parsing instrumented code: " + err); | ||
} | ||
}); | ||
} else { | ||
oldLoaderCS(localModule, filename); | ||
} | ||
}; | ||
}; | ||
require.extensions['.coffee'] = simpleNodeLoader(blanket, oldLoaderCS, compile, /\.coffee$/); | ||
}; |
@@ -45,3 +45,6 @@ blanket.defaultReporter = function(coverage){ | ||
.replace(/\"/g, """) | ||
.replace(/\'/g, "'"); | ||
.replace(/\'/g, "'") | ||
.replace(/`/g, "`") | ||
.replace(/[$]/g, "$") | ||
.replace(/&/g, "&"); | ||
} | ||
@@ -48,0 +51,0 @@ |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Dynamic require
Supply chain riskDynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
New author
Supply chain riskA new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.
Found 1 instance in 1 package
Dynamic require
Supply chain riskDynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.
Found 1 instance in 1 package
934393
32
17093
138
0
16
32
+ Addedesprima@2.4.1(transitive)
+ Addedxtend@4.0.2(transitive)
- Removedesprima@1.2.5(transitive)
- Removedxtend@3.0.0(transitive)
Updatedesprima@~2.4.1
Updatedxtend@~4.0.0