Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions packages/cli-plugin-metro/src/tools/loadMetroConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,11 @@ export default async function loadMetroConfig(
overrideConfig.reporter = options.reporter;
}

const projectConfig = await resolveConfig(undefined, ctx.root);
const cwd = ctx.root;
const projectConfig = await resolveConfig(options.config, cwd);

if (projectConfig.isEmpty) {
throw new CLIError(`No metro config found in ${ctx.root}`);
throw new CLIError(`No Metro config found in ${cwd}`);
}

logger.debug(`Reading Metro config from ${projectConfig.filepath}`);
Expand All @@ -119,7 +120,10 @@ This warning will be removed in future (https://github.com/facebook/metro/issues
}

return mergeConfig(
await loadConfig({cwd: ctx.root, ...options}),
await loadConfig({
cwd,
...options,
}),
overrideConfig,
);
}