Skip to content

[pull] master from vuejs:master #231

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

Closed
wants to merge 31 commits into from
Closed

[pull] master from vuejs:master #231

wants to merge 31 commits into from

Conversation

pull[bot]
Copy link

@pull pull bot commented May 10, 2021

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

wenfangdu and others added 2 commits May 10, 2021 05:17
improved multi-root component custom directive warning's clarity

changed confusing † to *
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.7 to 1.5.1.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](unshiftio/url-parse@1.4.7...1.5.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels May 10, 2021
Alex-Sokolov and others added 26 commits May 11, 2021 06:58
* Update key-attribute.md

* Update key-attribute.md
* Update config.js

* Update translations-data.js
* docs: add automatic global registration to cookbook

* fix(docs): use @ instead v-on at Cookbook

Co-authored-by: Natalia Tepluhina <[email protected]>

* fix(docs): use lowercased webpack

* fix(docs): fix styleguide link

Co-authored-by: skirtle <[email protected]>

Co-authored-by: Natalia Tepluhina <[email protected]>
Co-authored-by: skirtle <[email protected]>
* Add onActivated and onDeactivated to the list

addresses  #1018

* Add onActivated and onDeactivated hooks

addresses  #1018
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update custom-directive.md

Optimization. I think it'll be better.

* Update src/guide/custom-directive.md

Co-authored-by: Natalia Tepluhina <[email protected]>
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.15.0 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](browserslist/browserslist@4.15.0...4.16.6)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Change time-travel demo gif url from master to legacy branch
…de (#1063)

* The description of `this` in setup is inconsistent with the source code

* More accurate description of `this` in the setup function

Co-authored-by: skirtle <[email protected]>

* fix:Removed some formatted commas

Co-authored-by: coderwhy <[email protected]>
Co-authored-by: skirtle <[email protected]>
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](mafintosh/dns-packet@v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Previously, the docs did not make clear that the activated hook is called for the entire component tree that is kept alive, and that mounted and unmounted are not called anywhere in that tree.
* add link for Class Binding lesson

* add link for Event Handling lesson

* Add link for Computed Properties lesson

* Add link for Conditional Rendering lesson

* Add link for List Rendering lesson

* Add link to Methods lesson

* Add link to Form Input lesson

* Add link to Using Vue Devtools with Vue.js 3 lesson
dependabot bot and others added 3 commits June 8, 2021 02:53
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add VueSchool Summer Sale banner

* Update VueSchool Summer Sale banner
@mandaputtra
Copy link
Member

Merged by this #232

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.