From 44d8c3f04ba90bf226866360ad3fa4657a3417de Mon Sep 17 00:00:00 2001
From: wljince007 <liangwang007@gmail.com>
Date: Sun, 16 Jul 2023 17:46:27 +0800
Subject: [PATCH] config of different configProviders combination merge
 together

---
 tabby-core/src/services/config.service.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tabby-core/src/services/config.service.ts b/tabby-core/src/services/config.service.ts
index 8b5f7629..ef0bbd23 100644
--- a/tabby-core/src/services/config.service.ts
+++ b/tabby-core/src/services/config.service.ts
@@ -15,6 +15,9 @@ const deepmerge = require('deepmerge')
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export const configMerge = (a, b) => deepmerge(a, b, { arrayMerge: (_d, s) => s }) // eslint-disable-line @typescript-eslint/no-var-requires
 
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export const configMergeByDefault = (a, b) => deepmerge(a, b) // eslint-disable-line @typescript-eslint/no-var-requires
+
 const LATEST_VERSION = 1
 
 function isStructuralMember (v) {
@@ -162,7 +165,7 @@ export class ConfigService {
                 defaults = configMerge(provider.defaults, defaults)
             }
             return defaults
-        }).reduce(configMerge)
+        }).reduce(configMergeByDefault)
     }
 
     getDefaults (): Record<string, any> {