Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check for --config file extensions after they fail to load, allowing custom loaders #3135

Merged
merged 3 commits into from Nov 13, 2022
Merged

Check for --config file extensions after they fail to load, allowing custom loaders #3135

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37b4e3b
refactor: push config file extension checks a bit to allow loaders
panva Nov 1, 2022
ef0a163
Tweak error reporting
novemberborn Nov 13, 2022
0944c14
Merge branch 'main' into allow-loaders-for-config
novemberborn Nov 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions lib/load-config.js
View file
Open in desktop
Expand Up @@ -36,10 +36,6 @@ const loadConfigFile = async ({projectDir, configFile}) => {
function resolveConfigFile(configFile) {
if (configFile) {
configFile = path.resolve(configFile); // Relative to CWD

if (!configFile.endsWith('.js') && !configFile.endsWith('.cjs') && !configFile.endsWith('.mjs')) {
throw new Error('Config files must have .js, .cjs or .mjs extensions');
}
}

return configFile;
Expand Down Expand Up @@ -78,7 +74,7 @@ async function checkJsonFile(searchDir) {
}
}

export async function loadConfig({configFile, resolveFrom = process.cwd(), defaults = {}} = {}) {
export async function loadConfig({configFile, resolveFrom = process.cwd(), defaults = {}} = {}) { // eslint-disable-line complexity
let packageConf = await packageConfig('ava', {cwd: resolveFrom});
const filepath = packageJsonPath(packageConf);
const projectDir = filepath === undefined ? resolveFrom : path.dirname(filepath);
Expand All @@ -94,7 +90,17 @@ export async function loadConfig({configFile, resolveFrom = process.cwd(), defau
let fileForErrorMessage;
let conflicting = [];
if (configFile) {
const loaded = await loadConfigFile({projectDir, configFile});
let loaded;
try {
loaded = await loadConfigFile({projectDir, configFile});
} catch (error) {
if (!configFile.endsWith('.js') && !configFile.endsWith('.cjs') && !configFile.endsWith('.mjs')) {
throw new Error('Config files must have .js, .cjs or .mjs extensions');
}

throw error;
}

if (loaded !== null) {
({config: fileConf, fileForErrorMessage} = loaded);
}
Expand Down