Skip to content

Commit 2b1e144

Browse files
sshevSergey Shevchenko
authored andcommitted
fix merge function
1 parent 957b179 commit 2b1e144

File tree

2 files changed

+3
-19
lines changed

2 files changed

+3
-19
lines changed

index.js

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ var path = require("path");
1212
var typescript = require("typescript");
1313
var mkdirp = require("mkdirp");
1414
var rimraf = require("rimraf");
15+
var objectAssign = require("object-assign");
1516

1617

1718
function loadRelativeConfig() {
@@ -120,25 +121,7 @@ function writeToFile(fileOutputOpts, result) {
120121
/* Merges two (or more) objects,
121122
giving the last one precedence */
122123
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);
142125
return target;
143126
}
144127

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"dependencies": {
3030
"loader-utils": "^0.2.7",
3131
"mkdirp": "^0.5.1",
32+
"object-assign": "^4.0.1",
3233
"rimraf": "^2.4.4",
3334
"strip-json-comments": "^1.0.2"
3435
}

0 commit comments

Comments
 (0)