Skip to content

Commit

Permalink
fix: Fix loading Metro config from alternative config path
Browse files Browse the repository at this point in the history
  • Loading branch information
huntie committed Aug 2, 2023
1 parent 0cbed3d commit 0c95dec
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 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,17 @@ 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}`);
if (options.config) {
throw new CLIError(
`No metro config found at configured config path '${options.config}'`,
);
}

throw new CLIError(`No metro config found in ${cwd}`);
}

logger.debug(`Reading Metro config from ${projectConfig.filepath}`);
Expand All @@ -119,7 +126,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,
);
}

0 comments on commit 0c95dec

Please sign in to comment.