Skip to content

fix(#9198): fix merged twice bug when passing extended constructor to mixins - #9199

Merged
yyx990803 merged 1 commit into
vuejs:2.6from
hikerpig:bugfix/mergeOptions
Jan 10, 2019
Merged

fix(#9198): fix merged twice bug when passing extended constructor to mixins#9199
yyx990803 merged 1 commit into
vuejs:2.6from
hikerpig:bugfix/mergeOptions

Conversation

@hikerpig

@hikerpig hikerpig commented Dec 13, 2018

Copy link
Copy Markdown
Contributor

(#9198)

What kind of change does this PR introduce? (check at least one)

  • Bugfix
  • Feature
  • Code style update
  • Refactor
  • Build-related changes
  • Other, please describe:

Does this PR introduce a breaking change? (check one)

  • Yes
  • No

If yes, please describe the impact and migration path for existing applications:

The PR fulfills these requirements:

If adding a new feature, the PR's description includes:

  • A convincing reason for adding this feature (to avoid wasting your time, it's best to open a suggestion issue first and wait for approval before working on it)

Other information:


const vm = new Child()

expect(typeof vm.$options.methods.a).toBe('function')

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

what is this test for?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This test is to make sure the fix does not break normal inheritance from grandparent, in this test, mixin1 and Child

@yyx990803
yyx990803 changed the base branch from dev to 2.6 January 10, 2019 21:10
@yyx990803
yyx990803 merged commit 5371617 into vuejs:2.6 Jan 10, 2019
yyx990803 added a commit that referenced this pull request Jan 11, 2019
The fix landed in #9199 causes further extended constructors used as
mixins to drop options from its inheritance chain, so a different fix
is needed.
yyx990803 added a commit that referenced this pull request Jan 11, 2019
The fix landed in #9199 causes further extended constructors used as
mixins to drop options from its inheritance chain, so a different fix
is needed.
f2009 pushed a commit to f2009/vue that referenced this pull request Jan 25, 2019
f2009 pushed a commit to f2009/vue that referenced this pull request Jan 25, 2019
The fix landed in vuejs#9199 causes further extended constructors used as
mixins to drop options from its inheritance chain, so a different fix
is needed.
f2009 pushed a commit to f2009/vue that referenced this pull request Jan 25, 2019
f2009 pushed a commit to f2009/vue that referenced this pull request Jan 25, 2019
The fix landed in vuejs#9199 causes further extended constructors used as
mixins to drop options from its inheritance chain, so a different fix
is needed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants