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

Upstream sync #278

Merged
merged 47 commits into from
Dec 29, 2023
Merged

Upstream sync #278

merged 47 commits into from
Dec 29, 2023

Conversation

matrunchyk
Copy link
Collaborator

Perlover and others added 30 commits November 29, 2023 09:18
I think it's misprint and it's fix.
* Update introduction.md

Improved clarity in Prerequisites section and added relevant links.

* Update introduction.md

Added Next Steps section to end of document

* docs: Update src/guide/introduction.md

* docs: remove duplicate section on next steps

* style: remove extra new space

---------

Co-authored-by: Ben Hong <[email protected]>
Temporary replace vue-html blocks with html on template syntax page.
* docs: added events as props and typing with object based emits

* Apply suggestions from code review

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

* remove info

---------

Co-authored-by: Natalia Tepluhina <[email protected]>
…atedModules` (#2592)

* Note that verbatimModuleSyntax meets the suggested criteria for `isolatedModules`

See also vuejs/create-vue#401

* Update src/guide/typescript/overview.md

---------

Co-authored-by: Natalia Tepluhina <[email protected]>
* style: fix Special Sponsor loading

* feat: sync with contributor-covenant attribution
I believe it should point to the search element, as it already defines a role landmark: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/search
* Update composition-api.md

Add documentation for when types for `defineProps` are coming from an external file

* Update composition-api.md

* Update composition-api.md
dependabot bot and others added 7 commits December 26, 2023 08:12
Bumps [@vue/repl](https://github.com/vuejs/repl) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/vuejs/repl/releases)
- [Changelog](https://github.com/vuejs/repl/blob/main/CHANGELOG.md)
- [Commits](vuejs/repl@v3.0.1...v3.1.0)

---
updated-dependencies:
- dependency-name: "@vue/repl"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
# Conflicts:
#	.vitepress/config.ts
#	.vitepress/theme/components/Banner.vue
#	.vitepress/theme/components/Home.vue
#	.vitepress/theme/styles/index.css
#	src/api/built-in-components.md
#	src/api/composition-api-dependency-injection.md
#	src/api/options-misc.md
#	src/guide/best-practices/accessibility.md
#	src/guide/components/events.md
#	src/guide/components/provide-inject.md
#	src/guide/essentials/component-basics.md
#	src/guide/essentials/forms.md
#	src/guide/essentials/template-refs.md
#	src/guide/extras/ways-of-using-vue.md
#	src/guide/introduction.md
#	src/guide/quick-start.md
#	src/guide/scaling-up/testing.md
#	src/guide/typescript/composition-api.md
#	src/guide/typescript/overview.md
#	src/partners/partners.json
#	src/tutorial/src/step-5/description.md
Copy link

vercel bot commented Dec 28, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
docs-uk ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 28, 2023 8:27pm

src/about/coc.md Outdated Show resolved Hide resolved
Copy link
Collaborator

@maxdzin maxdzin left a comment

Choose a reason for hiding this comment

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

All done well.

@maxdzin maxdzin merged commit 17f9fbe into main Dec 29, 2023
3 checks passed
@maxdzin maxdzin deleted the upstream-sync branch December 29, 2023 08:00
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.