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 #85fc0ef2 #771

Merged
merged 17 commits into from
Oct 9, 2023
Merged

Sync #85fc0ef2 #771

merged 17 commits into from
Oct 9, 2023

Conversation

wxsms
Copy link
Member

@wxsms wxsms commented Oct 9, 2023

Description of Problem

vuejs/docs@7fe90c5...85fc0ef

jillztom and others added 16 commits September 18, 2023 20:52
* add translation link for bn.vuejs.org

* add indent as old file
* docs: consist usage of in-DOM template

* docs: consist usage of in-DOM template
It says that it will render the same result, and the last result was:
```vue-html
<div class="static active"></div>
```
But `static` is not present on this example
* Update v-model.md naming convention

kebab-case should be used when event is being listened to inside parent's template.

* Update v-model.md
…(#2385)

* docs: In-DOM Root Component Template does not support <script setup>

* docs: updated warning
:key="option.value" is unnecessary
Remove globalProperties code not relevant to provide/inject technique
Provide information and a place to find the right dom interface
Modifying data.value and error.value within watchEffect has the potential to trigger infinite re-renders.
# Conflicts:
#	src/api/built-in-special-attributes.md
#	src/api/sfc-script-setup.md
#	src/glossary/index.md
#	src/guide/built-ins/keep-alive.md
#	src/guide/built-ins/transition-group.md
#	src/guide/components/props.md
#	src/guide/components/registration.md
#	src/guide/essentials/class-and-style.md
#	src/guide/essentials/component-basics.md
#	src/guide/essentials/event-handling.md
#	src/guide/reusability/composables.md
#	src/guide/typescript/composition-api.md
#	src/translations/index.md
@wxsms wxsms added 从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录 labels Oct 9, 2023
@vercel
Copy link

vercel bot commented Oct 9, 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 Oct 9, 2023 2:37am

src/guide/typescript/composition-api.md Outdated Show resolved Hide resolved
@Justineo Justineo merged commit 5571b3e into main Oct 9, 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.