vuejs-id patch 231 conflict #232
Merged
Conversation
This file contains hidden or 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
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>
* 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 vuejs#1018 * Add onActivated and onDeactivated hooks addresses vuejs#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 (vuejs#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
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
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.
Description of Problem
Proposed Solution
Additional Information