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 #a1771753 #903

Merged
merged 37 commits into from
Apr 27, 2024
Merged

Sync #a1771753 #903

merged 37 commits into from
Apr 27, 2024

Conversation

wxsms
Copy link
Member

@wxsms wxsms commented Apr 10, 2024

Description of Problem

vuejs/docs@a8cf7bf...a177175

NozomuIkuta and others added 30 commits March 17, 2024 12:32
* docs: fix typo - count should be model

* Update src/guide/components/v-model.md

Co-authored-by: Ben Hong <[email protected]>

---------

Co-authored-by: Ben Hong <[email protected]>
* Update quick-start.md

### Description
Update required node version to greater than 18.13

### Notes for Reviewers

As vue-cli rely on a more up to date nodejs version to parse args since v3.10:
- https://github.com/vuejs/create-vue/releases/tag/v3.10.0
- vuejs/create-vue#469

Based on nodejs changelog the value should be 18.13
https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V18.md#2023-01-05-version-18130-hydrogen-lts-danielleadams

* update: required nodejs version

Update node.js version to 18.11 (LTS)

* update: required nodejs version

* Update src/guide/quick-start.md

---------

Co-authored-by: Natalia Tepluhina <[email protected]>
Co-authored-by: 三咲智子 Kevin Deng <[email protected]>
Co-authored-by: Divyansh Singh <[email protected]>
Bumps [vitepress](https://github.com/vuejs/vitepress) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/vuejs/vitepress/releases)
- [Changelog](https://github.com/vuejs/vitepress/blob/main/CHANGELOG.md)
- [Commits](vuejs/vitepress@v1.0.0...v1.0.1)

---
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>
ExtractPublicPropTypes only supported in 3.3+.
Bumps [vitepress](https://github.com/vuejs/vitepress) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/vuejs/vitepress/releases)
- [Changelog](https://github.com/vuejs/vitepress/blob/main/CHANGELOG.md)
- [Commits](vuejs/vitepress@v1.0.1...v1.0.2)

---
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>
Using 'and' between declarative and component-based implies (grammatically speaking) a direct connection between the concepts, as if they are in some sense one. This is not the case. Also, the bit about complexity is over-wrought and clunky. I simplified it.
* fix: missing anchor

* fix: relative links
brc-dd and others added 3 commits April 9, 2024 14:41
# Conflicts:
#	pnpm-lock.yaml
#	src/about/community-guide.md
#	src/about/team/TeamPage.vue
#	src/api/composition-api-dependency-injection.md
#	src/api/sfc-css-features.md
#	src/api/utility-types.md
#	src/guide/built-ins/transition.md
#	src/guide/components/slots.md
#	src/guide/essentials/component-basics.md
#	src/guide/introduction.md
#	src/guide/quick-start.md
#	src/guide/scaling-up/tooling.md
#	src/guide/typescript/overview.md
#	src/translations/index.md
@wxsms wxsms added 从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录 labels Apr 10, 2024
Copy link

vercel bot commented Apr 10, 2024

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

Name Status Preview Comments Updated (UTC)
docs-zh-cn ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 16, 2024 2:23am

src/guide/components/slots.md Outdated Show resolved Hide resolved
src/guide/components/slots.md Outdated Show resolved Hide resolved
@veaba
Copy link
Member

veaba commented Apr 22, 2024

vuejs/docs#2781

这个 PR 删除了 .idea,舒服了,感谢 @skyclouds2001

😄

@Justineo Justineo merged commit add4637 into main Apr 27, 2024
7 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.

None yet