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
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
aa8692e
fix(cli): when the user enters the same command
yucccc c4a0423
chore: correct typescript type
yucccc a7d8400
fix: type error
yucccc 790fa2a
fix: sanitize all options
yucccc 5dfd193
fix: port find last
yucccc 8a7420f
fix(cli): When the options are repeated, take the last one.
yucccc File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
} | ||
} | ||
/** | ||
* removing global flags before passing as command specific sub-configs | ||
*/ | ||
|
@@ -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] | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. OK, I'll try to modify it. |
||
return ret | ||
} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok