Skip to content

Commit ff278a5

Browse files
WillWill
authored andcommitted
remove merge function
1 parent 1abfe6f commit ff278a5

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

index.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ function locateConfigFile(filename, startingPath) {
5151
function lint(input, options) {
5252
//Override options in tslint.json by those passed to the compiler
5353
if(this.options.tslint) {
54-
merge(options, this.options.tslint);
54+
objectAssign(options, this.options.tslint);
5555
}
5656

5757
var bailEnabled = (this.options.bail === true);
5858

5959
//Override options in tslint.json by those passed to the loader as a query string
6060
var query = loaderUtils.parseQuery(this.query);
61-
merge(options, query);
61+
objectAssign(options, query);
6262

6363
var linter = new Linter(this.resourcePath, input, options);
6464
var result = linter.lint();
@@ -118,14 +118,6 @@ function writeToFile(fileOutputOpts, result) {
118118
}
119119
}
120120

121-
/* Merges two (or more) objects,
122-
giving the last one precedence */
123-
function merge(target, source) {
124-
objectAssign(target, source);
125-
return target;
126-
}
127-
128-
129121
module.exports = function(input, map) {
130122
this.cacheable && this.cacheable();
131123
var callback = this.async();

0 commit comments

Comments
 (0)