Skip to content

fix(runtime-core): optional props from Mixin/Extends are treated as r…#2048

Merged
yyx990803 merged 2 commits into
vuejs:masterfrom
wonderful-panda:fix-2039
Sep 16, 2020
Merged

fix(runtime-core): optional props from Mixin/Extends are treated as r…#2048
yyx990803 merged 2 commits into
vuejs:masterfrom
wonderful-panda:fix-2039

Conversation

@wonderful-panda
Copy link
Copy Markdown
Contributor

…equired (#2039)

@yyx990803
Copy link
Copy Markdown
Member

Thanks for the PR! Unfortunately, after merging #1883, I wasn't able to resolve the conflicts in a way that passes all the tests (specifically I couldn't get props with default from mixins to be made optional). Would you mind rebase your PR on top of master? Thanks!

@wonderful-panda
Copy link
Copy Markdown
Contributor Author

Thank you. Rebased and pushed now.

BTW, ExtraPropTypes no longer needs second parameter (MakeDefaultRequired). It can be removed for now.

@yyx990803 yyx990803 merged commit 89e9ab8 into vuejs:master Sep 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants