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

Sync #4ba12e46 #743

Merged
merged 15 commits into from
Jul 18, 2023
Merged

Sync #4ba12e46 #743

merged 15 commits into from
Jul 18, 2023

Conversation

wxsms
Copy link
Member

@wxsms wxsms commented Jul 18, 2023

Description of Problem

vuejs/docs@ff263e7...4ba12e4

yyx990803 and others added 15 commits June 20, 2023 21:16
Bumps [vitepress](https://github.com/vuejs/vitepress) from 1.0.0-beta.1 to 1.0.0-beta.3.
- [Release notes](https://github.com/vuejs/vitepress/releases)
- [Changelog](https://github.com/vuejs/vitepress/blob/main/CHANGELOG.md)
- [Commits](vuejs/vitepress@v1.0.0-beta.1...v1.0.0-beta.3)

---
updated-dependencies:
- dependency-name: vitepress
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
removes an old example that used to document using defineOptions without a setup but now says the same thing twice
Added a key property to line 344 on the select option dynamic rendering.
This example was using a deprecated API (`@vnode-mounted`), so I updated it.
… (#2428)

I removed the section in the FAQ page that mentioned the consider to use Vue 2 due to the lack of stable versions for major ecosystem projects like Nuxt or Vuetify. The information was outdated as there are now stable versions available.
Bumps [vitepress](https://github.com/vuejs/vitepress) from 1.0.0-beta.3 to 1.0.0-beta.5.
- [Release notes](https://github.com/vuejs/vitepress/releases)
- [Changelog](https://github.com/vuejs/vitepress/blob/main/CHANGELOG.md)
- [Commits](vuejs/vitepress@v1.0.0-beta.3...v1.0.0-beta.5)

---
updated-dependencies:
- dependency-name: vitepress
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
# Conflicts:
#	README.md
#	pnpm-lock.yaml
#	src/about/faq.md
#	src/api/composition-api-dependency-injection.md
#	src/guide/components/attrs.md
#	src/guide/extras/reactivity-transform.md
#	src/guide/extras/ways-of-using-vue.md
#	src/guide/scaling-up/ssr.md
@wxsms wxsms added 从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录 labels Jul 18, 2023
@vercel
Copy link

vercel bot commented Jul 18, 2023

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

Name Status Preview Comments Updated (UTC)
cn-vuejs-org ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jul 18, 2023 7:32am

@Justineo Justineo merged commit 7b67182 into main Jul 18, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录
Projects
None yet
Development

Successfully merging this pull request may close these issues.