tslint-loader
Advanced tools
Comparing version 2.1.3 to 2.1.4
33
index.js
@@ -15,2 +15,3 @@ /* | ||
var rimraf = require("rimraf"); | ||
var objectAssign = require("object-assign"); | ||
@@ -21,3 +22,3 @@ | ||
formatter: "custom", | ||
formattersDirectory: 'node_modules/tslint-loader/formatters/', | ||
formattersDirectory: __dirname + '/formatters/', | ||
configuration: {} | ||
@@ -55,3 +56,3 @@ }; | ||
if(this.options.tslint) { | ||
merge(options, this.options.tslint); | ||
objectAssign(options, this.options.tslint); | ||
} | ||
@@ -63,3 +64,3 @@ | ||
var query = loaderUtils.parseQuery(this.query); | ||
merge(options, query); | ||
objectAssign(options, query); | ||
@@ -124,28 +125,2 @@ var linter = new Linter(this.resourcePath, input, options); | ||
/* Merges two (or more) objects, | ||
giving the last one precedence */ | ||
function merge(target, source) { | ||
if ( typeof target !== 'object' ) { | ||
target = {}; | ||
} | ||
for (var property in source) { | ||
if ( source.hasOwnProperty(property) ) { | ||
var sourceProperty = source[ property ]; | ||
if ( typeof sourceProperty === 'object' ) { | ||
target[ property ] = merge( target[ property ], sourceProperty ); | ||
continue; | ||
} | ||
target[ property ] = sourceProperty; | ||
} | ||
} | ||
for (var a = 2, l = arguments.length; a < l; a++) { | ||
merge(target, arguments[a]); | ||
} | ||
return target; | ||
} | ||
module.exports = function(input, map) { | ||
@@ -152,0 +127,0 @@ this.cacheable && this.cacheable(); |
{ | ||
"name": "tslint-loader", | ||
"version": "2.1.3", | ||
"version": "2.1.4", | ||
"description": "tslint loader for webpack", | ||
@@ -32,2 +32,3 @@ "main": "index.js", | ||
"mkdirp": "^0.5.1", | ||
"object-assign": "^4.0.1", | ||
"rimraf": "^2.4.4", | ||
@@ -34,0 +35,0 @@ "strip-json-comments": "^1.0.2" |
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
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
7911
6
126
+ Addedobject-assign@^4.0.1