imdone-core 1.34.1 → 1.34.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -214,13 +214,19 @@ function mixin(repo, fs = require('fs')) {
|
|
|
214
214
|
const currentConfig = repo.config
|
|
215
215
|
if (currentConfig && currentConfig.code)
|
|
216
216
|
include_lists = _union(include_lists, currentConfig.code.include_lists)
|
|
217
|
+
|
|
218
|
+
if (currentConfig && currentConfig.settings)
|
|
219
|
+
loadedConfig.settings = {...loadedConfig.settings, ...currentConfig.settings}
|
|
220
|
+
|
|
217
221
|
if (loadedConfig && loadedConfig.code)
|
|
218
222
|
include_lists = _union(include_lists, loadedConfig.code.include_lists)
|
|
223
|
+
|
|
219
224
|
if (loadedConfig && loadedConfig.sync)
|
|
220
225
|
loadedConfig.sync = {
|
|
221
226
|
...loadedConfig.sync,
|
|
222
227
|
useImdoneioForPriority: false,
|
|
223
228
|
}
|
|
229
|
+
|
|
224
230
|
const newConfig = new Config(
|
|
225
231
|
_assign({}, baseConfig, repo.config, loadedConfig, { path: repo.path })
|
|
226
232
|
)
|