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.

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

fix(cli): when the user enters the same command #10474

Merged
merged 6 commits into from Oct 17, 2022
Merged
Changes from 3 commits
Commits
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
15 changes: 15 additions & 0 deletions packages/vite/src/node/cli.ts
Expand Up @@ -28,6 +28,11 @@ interface GlobalCLIOptions {
force?: boolean
}

const normalizeOptionsConfig: Record<string, (v: any[]) => any> = {
port: (v) => {
return v.find((p) => typeof p === 'number' || typeof p === 'string') || 5173
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe findLast should be used here? Because if the other options are arrays, the last value you select.

Copy link
Contributor Author

@yucccc yucccc Oct 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

}
}
/**
* removing global flags before passing as command specific sub-configs
*/
Expand All @@ -48,6 +53,16 @@ function cleanOptions<Options extends GlobalCLIOptions>(
delete ret.filter
delete ret.m
delete ret.mode
for (const [key, value] of Object.entries(ret)) {
if (Array.isArray(value)) {
// may need to define the final return of option by themselves,
// so they retain their implementation portal.
// If it is not customized, take the last item of InlineConfig as the final result.
ret[key as keyof Options] = normalizeOptionsConfig[key]
? normalizeOptionsConfig[key](value)
: value[value.length - 1]
}
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The logic here may be extracted and then applied to other options as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I'll try to modify it.

return ret
}

Expand Down