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 #6008, Add merge strategy for provide option #6025

Merged
merged 4 commits into from
Jul 7, 2017

Conversation

znck
Copy link
Member

@znck znck commented Jul 4, 2017

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:

@@ -183,6 +183,7 @@ strats.watch = function (parentVal: ?Object, childVal: ?Object): ?Object {
strats.props =
strats.methods =
strats.inject =
strats.provide =
Copy link
Member

Choose a reason for hiding this comment

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

This is actually not enough because provide can also be a function that returns an object.

I think we should make data strategy reusable and use it for provide
Other plugins like vuefire will also benefit from this 🙂

Copy link
Member Author

@znck znck Jul 4, 2017

Choose a reason for hiding this comment

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

Totally missed that. 😝 I'd add a failing test first.

@znck
Copy link
Member Author

znck commented Jul 5, 2017

Hey @posva! I guess I didn't miss anything this time.

@yyx990803 yyx990803 merged commit 306997e into vuejs:dev Jul 7, 2017
@yyx990803 yyx990803 mentioned this pull request Jul 7, 2017
13 tasks
@znck znck deleted the fix-6008-provide-options-not-merged branch July 7, 2017 07:01
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