diff options
| -rw-r--r-- | lib/plugin.js | 3 | ||||
| -rw-r--r-- | package.json | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/plugin.js b/lib/plugin.js index 5469cd1..db88d54 100644 --- a/lib/plugin.js +++ b/lib/plugin.js @@ -5,6 +5,7 @@ var path = require('path'); var url = require('url'); var fs = require('./utils/fs'); var resolve = require('resolve'); +var mergeDefaults = require('merge-defaults'); var jsonschema = require('jsonschema'); var jsonSchemaDefaults = require('json-schema-defaults'); @@ -183,7 +184,7 @@ Plugin.prototype.validateConfig = function(config) { // Insert default values var defaults = jsonSchemaDefaults(schema); - return _.merge(defaults, config); + return mergeDefaults(config, defaults); }); }; diff --git a/package.json b/package.json index d547143..fb1b940 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,8 @@ "escape-string-regexp": "1.0.3", "juice": "1.5.0", "jsonschema": "1.0.2", - "json-schema-defaults": "0.1.1" + "json-schema-defaults": "0.1.1", + "merge-defaults": "0.2.1" }, "devDependencies": { "eslint": "1.5.0", |