File tree Expand file tree Collapse file tree 2 files changed +3
-19
lines changed Expand file tree Collapse file tree 2 files changed +3
-19
lines changed Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ var path = require("path");
12
12
var typescript = require ( "typescript" ) ;
13
13
var mkdirp = require ( "mkdirp" ) ;
14
14
var rimraf = require ( "rimraf" ) ;
15
+ var objectAssign = require ( "object-assign" ) ;
15
16
16
17
17
18
function loadRelativeConfig ( ) {
@@ -120,25 +121,7 @@ function writeToFile(fileOutputOpts, result) {
120
121
/* Merges two (or more) objects,
121
122
giving the last one precedence */
122
123
function merge ( target , source ) {
123
- if ( typeof target !== 'object' ) {
124
- target = { } ;
125
- }
126
-
127
- for ( var property in source ) {
128
- if ( source . hasOwnProperty ( property ) ) {
129
- var sourceProperty = source [ property ] ;
130
- if ( typeof sourceProperty === 'object' ) {
131
- target [ property ] = merge ( target [ property ] , sourceProperty ) ;
132
- continue ;
133
- }
134
- target [ property ] = sourceProperty ;
135
- }
136
- }
137
-
138
- for ( var a = 2 , l = arguments . length ; a < l ; a ++ ) {
139
- merge ( target , arguments [ a ] ) ;
140
- }
141
-
124
+ objectAssign ( target , source ) ;
142
125
return target ;
143
126
}
144
127
Original file line number Diff line number Diff line change 29
29
"dependencies" : {
30
30
"loader-utils" : " ^0.2.7" ,
31
31
"mkdirp" : " ^0.5.1" ,
32
+ "object-assign" : " ^4.0.1" ,
32
33
"rimraf" : " ^2.4.4" ,
33
34
"strip-json-comments" : " ^1.0.2"
34
35
}
You can’t perform that action at this time.
0 commit comments