michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: wrap loadConfig in try/catch

Browse source
This commit is contained in:
Nate Moore 2021-12-14 15:30:49 -06:00
parent 9388fd0cdf
commit 4c21b35ea6
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
packages/astro/src/core/config.ts
View file

@ -126,18 +126,21 @@ export async function loadConfig(options: LoadConfigOptions): Promise<AstroConfi
let userConfig: AstroUserConfig = {};
let userConfigPath: string | undefined;
if (options.filename) {
userConfigPath = /^\.*\//.test(options.filename) ? options.filename : `./${options.filename}`;
userConfigPath = fileURLToPath(new URL(userConfigPath, `file://${root}/`));
}
// Automatically load config file using Proload
// If `userConfigPath` is `undefined`, Proload will search for `astro.config.[cm]?[jt]s`
const config = await load('astro', { mustExist: false, cwd: root, filePath: userConfigPath });
if (config) {
userConfig = config.value;
}
// normalize, validate, and return
return validateConfig(userConfig, root);
if (options.filename) {
userConfigPath = /^\.*\//.test(options.filename) ? options.filename : `./${options.filename}`;
userConfigPath = fileURLToPath(new URL(userConfigPath, `file://${root}/`));
}
// Automatically load config file using Proload
// If `userConfigPath` is `undefined`, Proload will search for `astro.config.[cm]?[jt]s`
let config;
try {
config = await load('astro', { mustExist: false, cwd: root, filePath: userConfigPath });
} catch (e) {}
if (config) {
userConfig = config.value;
}
// normalize, validate, and return
return validateConfig(userConfig, root);
}
export function formatConfigError(err: z.ZodError) {