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

[pull] master from vuejs:master #300

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

[pull] master from vuejs:master #300

wants to merge 26 commits into from

Conversation

pull[bot]
Copy link

@pull pull bot commented Dec 4, 2021

See Commits and Changes for more details.


Created by pull[bot]

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

The Firefox-beta link leads to the v6.0.0-beta.2, and this updates it to v6.0.0-beta.20
@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Dec 4, 2021
pieer and others added 25 commits December 6, 2021 21:17
* Add Vue mastery banner winter promotion

* Update name storage

* Remove Vue School banner

* Update promotion banner url

Co-authored-by: Evan You <[email protected]>
* Update Prop Mutation Docs to be more clear around mutation

* Update src/guide/component-props.md

Co-authored-by: Natalia Tepluhina <[email protected]>
* Fixed grammatical error in theme-data.js

In the Flatlogic description, the phrase "how real applications is built" is grammatically incorrect since "applications" is a plural noun but "is" refers to a singular noun. I changed it to "how real applications are built."

In the PrimeVue description, the phrase "look&feel" (which lacked spaces between the words and punctuation) has been changed to "look & feel".

* Update theme-data.js

In the Flatlogic description, "Check the admin dashboard templates" has been changed to "Check out the admin dashboard templates."
Just try to make it clearer on what could be done after the inheritance is disabled.
* update transitions-overview.md

* update transitions-overview.md
)

* chore(installation guide): add installation guide using pmpm

* chore(installation guide): add installation guide using pmpm

* chore(vite installation guide): commit suggestion

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

* chore(vite installation guide): commit suggestion

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

Co-authored-by: skirtle <[email protected]>
* Update vue mastery banner

* Remove Vue mastery promotion banner
Co-authored-by: Vladislav Sholokhov <[email protected]>
…md (#1388)

* Fixed grammatical error in theme-data.js

In the Flatlogic description, the phrase "how real applications is built" is grammatically incorrect since "applications" is a plural noun but "is" refers to a singular noun. I changed it to "how real applications are built."

In the PrimeVue description, the phrase "look&feel" (which lacked spaces between the words and punctuation) has been changed to "look & feel".

* Update theme-data.js

In the Flatlogic description, "Check the admin dashboard templates" has been changed to "Check out the admin dashboard templates."

* Fix grammar and introduce the component method

* Add missing 'a'

* Update introduction to include reviewer's changes

Removed all use of the app.component() method from the introduction so as to not confuse readers.
* update global-api.md

* update
Update "Add Todo" to "Add todo" so it matches what is in the code.
Using `git clone [email protected]...` notation may lead to an error `Permission denied (publickey) fatal: Could not read from remote repository.` if a user doesn't have a public SSH key stored in their github account. Using `git clone https://` is a 100% error-free solution (it doesn't require any SSH keys).
* Add missing period and change "a" to "an"

* fix: change "interprets" to "interpret"

Since "mustaches" is plural, the verb "to interpret" must also be conjugated in its plural form.
* Updated: Typos in a11y-basics file

* Updated README file

* Update README

* Fixed: Typos, Grammer and Punctuations in coc, community & cookbook

* Update editable-svg-icons.md
* Update composition-api-setup.md

From the source code, when the setup function is called, the component instance is already created using the createComponentInstance function.

* Update src/guide/composition-api-setup.md

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

Co-authored-by: Natalia Tepluhina <[email protected]>
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.1 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.13.1...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* add clarification about type exports in SFCs

Latest vue / volar / vue-tsc complains when exporting additional types from SFCs (even though it worked previously). It seems this may be the intended behaviour, but was a bit unclear in these docs, so this change specifically calls out exporting types.

* Update sfc-script-setup.md
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.