feat: Merge pull request #266 from Echelon9/refactor/deprecate-mergeable

Replace pelias-mergeable with lodash.merge
pelias · Jan 31, 2018 · c54717f · c54717f
2 parents 9b0b5dd + e5318f7
commit c54717f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "colors": "^1.1.2",
     "elasticsearch": "^13.3.1",
     "joi": "^12.0.0",
-    "mergeable": "latest",
+    "lodash.merge": "^4.6.0",
     "pelias-config": "2.13.0"
   },
   "devDependencies": {

diff --git a/settings.js b/settings.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var Mergeable = require('mergeable');
+var merge = require('lodash.merge');
 var peliasConfig = require('pelias-config');
 var punctuation = require('./punctuation');
 var street_suffix = require('./street_suffix');
@@ -308,9 +308,7 @@ function generate(){
   if( 'object' == typeof config &&
       'object' == typeof config.elasticsearch &&
       'object' == typeof config.elasticsearch.settings ){
-    var defaults = new Mergeable( settings );
-    defaults.deepMerge( config.elasticsearch.settings );
-    return defaults.export();
+    return merge({}, settings, config.elasticsearch.settings);
   }
 
   return settings;