From 63e3ffcb0e0d5184e0a6518d1311ba885dfef399 Mon Sep 17 00:00:00 2001
From: Rhys Kidd <rhyskidd@gmail.com>
Date: Tue, 30 Jan 2018 00:22:33 -0500
Subject: [PATCH] Replace pelias-mergeable with lodash.merge

pelias-mergeable is to be deprecated, so replace usage with the functionality
provided by lodash.

Given we only require a small subset of lodash, add dependency for lodash.merge
to avoid pulling in an unnecessarily large dependency.
---
 package.json | 2 +-
 settings.js  | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2109849d..df7417ea 100644
--- 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": "latest",
     "pelias-config": "2.13.0"
   },
   "devDependencies": {
diff --git a/settings.js b/settings.js
index db0a3d9a..7341e069 100644
--- 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;