GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-07-05 02:50:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

config of different configProviders combination merge together

Browse Source
This commit is contained in:
wljince007 2023-07-16 17:46:27 +08:00
parent da0a4569de
commit 44d8c3f04b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tabby-core/src/services/config.service.ts
View File

@ -15,6 +15,9 @@ const deepmerge = require('deepmerge')
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types // 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 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 const LATEST_VERSION = 1
function isStructuralMember (v) { function isStructuralMember (v) {
@ -162,7 +165,7 @@ export class ConfigService {
defaults = configMerge(provider.defaults, defaults) defaults = configMerge(provider.defaults, defaults)
} }
return defaults return defaults
}).reduce(configMerge) }).reduce(configMergeByDefault)
} }
getDefaults (): Record<string, any> { getDefaults (): Record<string, any> {