|
|
@ -256,6 +256,10 @@ export async function resolveUserConfig(
|
|
|
|
configDeps = configExports.dependencies.map((file) =>
|
|
|
|
configDeps = configExports.dependencies.map((file) =>
|
|
|
|
normalizePath(path.resolve(file))
|
|
|
|
normalizePath(path.resolve(file))
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
debug(`loaded config at ${c.yellow(configPath)}`)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Auto-generate additional config if user leaves it unspecified
|
|
|
|
// Auto-generate additional config if user leaves it unspecified
|
|
|
|
if (userConfig.additionalConfig === undefined) {
|
|
|
|
if (userConfig.additionalConfig === undefined) {
|
|
|
|
const [additionalConfig, additionalDeps] = await gatherAdditionalConfig(
|
|
|
|
const [additionalConfig, additionalDeps] = await gatherAdditionalConfig(
|
|
|
@ -268,9 +272,6 @@ export async function resolveUserConfig(
|
|
|
|
userConfig.additionalConfig = additionalConfig
|
|
|
|
userConfig.additionalConfig = additionalConfig
|
|
|
|
configDeps = configDeps.concat(...additionalDeps)
|
|
|
|
configDeps = configDeps.concat(...additionalDeps)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
debug(`loaded config at ${c.yellow(configPath)}`)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return [await resolveConfigExtends(userConfig), configPath, configDeps]
|
|
|
|
return [await resolveConfigExtends(userConfig), configPath, configDeps]
|
|
|
|
}
|
|
|
|
}
|
|
|
|