Skip to content

fix: pass --projectRoot argument to Metro #259

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

Merged
thymikee merged 2 commits into from
Mar 22, 2019
Merged

fix: pass --projectRoot argument to Metro #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e075a9
Fix ignored projectRoot argument
oblador Mar 22, 2019
7f900e5
fix loadMetroConfig types
thymikee Mar 22, 2019
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
1 change: 1 addition & 0 deletions packages/cli/src/commands/server/runServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ async function runServer(argv: Array<string>, ctx: ContextT, args: Args) {
port: args.port,
resetCache: args.resetCache,
watchFolders: args.watchFolders,
projectRoot: ctx.root,
sourceExts: args.sourceExts,
reporter,
});
Expand Down
19 changes: 4 additions & 15 deletions packages/cli/src/tools/loadMetroConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export const getDefaultConfig = (ctx: ContextT) => {
export type ConfigOptionsT = {|
maxWorkers?: number,
port?: number,
projectRoot?: string,
resetCache?: boolean,
watchFolders?: string[],
sourceExts?: string[],
Expand All @@ -85,20 +86,8 @@ export type ConfigOptionsT = {|
*
* This allows the CLI to always overwrite the file settings.
*/
export default (async function load(
ctx: ContextT,
// $FlowFixMe - troubles with empty object being inexact
options?: ConfigOptionsT = {},
) {
export default function load(ctx: ContextT, options?: ConfigOptionsT) {
const defaultConfig = getDefaultConfig(ctx);

const config = await loadConfig(
{
cwd: ctx.root,
...options,
},
defaultConfig,
);

return config;
});
return loadConfig({cwd: ctx.root, ...options}, defaultConfig);
}