fix #8865: skip mixins and extends if child is already merged #8870
Conversation
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
KaelWD
commented
Oct 18, 2018
src/core/util/options.js
Outdated
| @@ -379,10 +379,10 @@ export function mergeOptions ( | |||
| normalizeInject(child, vm) | |||
| normalizeDirectives(child) | |||
| const extendsFrom = child.extends | |||
| if (extendsFrom) { | |||
| if (extendsFrom && !child._base) { | |||
There was a problem hiding this comment.
Not sure if there's some other flag that's supposed to be used for this, but the presence of _base seemed like a decent indicator at a glance.
posva
reviewed
Oct 20, 2018
Co-Authored-By: KaelWD <[email protected]>
f2009
pushed a commit
to f2009/vue
that referenced
this pull request
Jan 25, 2019
aJean
pushed a commit
to aJean/vue
that referenced
this pull request
Aug 19, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What kind of change does this PR introduce? (check at least one)
Does this PR introduce a breaking change? (check one)
If yes, please describe the impact and migration path for existing applications:
The PR fulfills these requirements:
devbranch for v2.x (or to a previous version branch), not themasterbranchfix #xxx[,#xxx], where "xxx" is the issue number)If adding a new feature, the PR's description includes:
Other information:
fixes #8865