Mirrors/tabby
2
0
Fork 0
mirror of https://github.com/Eugeny/tabby synced 2024-11-15 01:17:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8693 from wljince007/v1.0.197_fixerror

Browse source
This commit is contained in:
Eugene 2023-07-16 11:50:18 +02:00 committed by GitHub
commit 821dcbff69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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> {