@@ -51,14 +51,14 @@ function locateConfigFile(filename, startingPath) {
51
51
function lint ( input , options ) {
52
52
//Override options in tslint.json by those passed to the compiler
53
53
if ( this . options . tslint ) {
54
- merge ( options , this . options . tslint ) ;
54
+ objectAssign ( options , this . options . tslint ) ;
55
55
}
56
56
57
57
var bailEnabled = ( this . options . bail === true ) ;
58
58
59
59
//Override options in tslint.json by those passed to the loader as a query string
60
60
var query = loaderUtils . parseQuery ( this . query ) ;
61
- merge ( options , query ) ;
61
+ objectAssign ( options , query ) ;
62
62
63
63
var linter = new Linter ( this . resourcePath , input , options ) ;
64
64
var result = linter . lint ( ) ;
@@ -118,14 +118,6 @@ function writeToFile(fileOutputOpts, result) {
118
118
}
119
119
}
120
120
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
-
129
121
module . exports = function ( input , map ) {
130
122
this . cacheable && this . cacheable ( ) ;
131
123
var callback = this . async ( ) ;
0 commit comments