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 #50f3f20a #932

Merged
merged 58 commits into from May 8, 2024
Merged

Sync #50f3f20a #932

merged 58 commits into from May 8, 2024

Conversation

wxsms
Copy link
Member

@wxsms wxsms commented May 6, 2024

Description of Problem

vuejs/docs@a177175...50f3f20

MrsLong and others added 30 commits April 10, 2024 11:34
Added "is" for clarity in the opening sentence.
Bumps [vue](https://github.com/vuejs/core) from 3.4.21 to 3.4.22.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](vuejs/core@v3.4.21...v3.4.22)

---
updated-dependencies:
- dependency-name: vue
  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>
* docs: rephrasing for understanding

* docs: rephrasing component basics

* docs: rephrased for better understanding

* docs: added comment to code

---------

Co-authored-by: 404answernotfound <[email protected]>
Bumps [vue](https://github.com/vuejs/core) from 3.4.22 to 3.4.23.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](vuejs/core@v3.4.22...v3.4.23)

---
updated-dependencies:
- dependency-name: vue
  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>
Bumps [vitepress](https://github.com/vuejs/vitepress) from 1.1.0 to 1.1.3.
- [Release notes](https://github.com/vuejs/vitepress/releases)
- [Changelog](https://github.com/vuejs/vitepress/blob/main/CHANGELOG.md)
- [Commits](vuejs/vitepress@v1.1.0...v1.1.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>
Co-authored-by: 小林 輝 <[email protected]>
Co-authored-by: Divyansh Singh <[email protected]>
Make the sentence more reader friendly.
Updated Image URLs and pricing
Bumps [vue](https://github.com/vuejs/core) from 3.4.23 to 3.4.25.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](vuejs/core@v3.4.23...v3.4.25)

---
updated-dependencies:
- dependency-name: vue
  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>
In the inline style are it was written 13 px instead of 30px for the font size. I re write it to 30px
* align play icon
* fix center horizontally
* update sfc-css-features.md

Update theme to reactive  property

* docs: make example consistent with ref recommendation as standard

---------

Co-authored-by: Ben Hong <[email protected]>
Bumps [@vue/repl](https://github.com/vuejs/repl) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/vuejs/repl/releases)
- [Changelog](https://github.com/vuejs/repl/blob/main/CHANGELOG.md)
- [Commits](vuejs/repl@v4.1.1...v4.1.2)

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

Signed-off-by: dependabot[bot] <[email protected]>
bencodezen and others added 13 commits May 1, 2024 12:35
…… (#2817)

* docs (#2528): add references to help people new to getter functions in docs

* docs: update links to have more specific sections to guide users to
docs: add docs for v-model update:* event
feat: add vuemastery free-weekend banner
* docs: add warning to custom-directives

* Update src/guide/reusability/custom-directives.md

---------

Co-authored-by: Natalia Tepluhina <[email protected]>
# Conflicts:
#	.vitepress/config.ts
#	.vitepress/theme/index.ts
#	LICENSE
#	pnpm-lock.yaml
#	src/api/built-in-components.md
#	src/api/component-instance.md
#	src/api/reactivity-core.md
#	src/api/sfc-script-setup.md
#	src/glossary/index.md
#	src/guide/best-practices/accessibility.md
#	src/guide/best-practices/performance.md
#	src/guide/built-ins/keep-alive.md
#	src/guide/components/attrs.md
#	src/guide/components/props.md
#	src/guide/components/slots.md
#	src/guide/components/v-model.md
#	src/guide/essentials/computed.md
#	src/guide/essentials/event-handling.md
#	src/guide/essentials/watchers.md
#	src/guide/extras/reactivity-in-depth.md
#	src/guide/reusability/composables.md
#	src/guide/reusability/custom-directives.md
#	src/guide/scaling-up/routing.md
#	src/tutorial/src/step-11/App/composition.js
#	src/tutorial/src/step-4/App/template.html
@wxsms wxsms added 从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录 labels May 6, 2024
Copy link

vercel bot commented May 6, 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 May 8, 2024 3:12am

</script>

<template>
<section id="hero">
<img id="uwu" alt="Vue.js Kawaii Logo by @icarusgkx" />
Copy link
Contributor

Choose a reason for hiding this comment

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

我们要同步这个彩蛋吗?

@vuejs-translations/zh-cn

Copy link
Member Author

Choose a reason for hiding this comment

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

个人觉得暂时无需特别处理,目前需要带上 ?uwu 才能显示该 logo,对正常使用无影响

src/api/component-instance.md Outdated Show resolved Hide resolved
src/api/reactivity-core.md Outdated Show resolved Hide resolved
src/glossary/index.md Outdated Show resolved Hide resolved
src/guide/built-ins/suspense.md Outdated Show resolved Hide resolved
src/guide/essentials/computed.md Outdated Show resolved Hide resolved
src/guide/essentials/watchers.md Outdated Show resolved Hide resolved
src/guide/reusability/composables.md Outdated Show resolved Hide resolved
@Justineo Justineo merged commit 21a6598 into main May 8, 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