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 #ff263e7d #723

Merged
merged 54 commits into from
Jul 18, 2023
Merged

Sync #ff263e7d #723

merged 54 commits into from
Jul 18, 2023

Conversation

wxsms
Copy link
Member

@wxsms wxsms commented Jun 15, 2023

Description of Problem

vuejs/docs@0da5428...ff263e7

yyx990803 and others added 30 commits June 6, 2023 10:58
* default to composition api

* support specifying api styles via query + handle links with api-specific hash
* docs(script-setup): updated outdated tip

* Update sfc-script-setup.md

---------

Co-authored-by: Evan You <[email protected]>
There is few situation where it miss the `\` symbol before the second star
Add more context about how multiple state changes can be included in a single update. I remember reading something like this on the Vue 2 doc, and that helped me understand this section of the doc which before I remembered this fact I got a little confused.
@vercel
Copy link

vercel bot commented Jun 15, 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 5, 2023 9:10am

.vitepress/config.ts Outdated Show resolved Hide resolved
src/api/application.md Show resolved Hide resolved
src/guide/components/props.md Outdated Show resolved Hide resolved
src/guide/components/provide-inject.md Outdated Show resolved Hide resolved
src/guide/extras/composition-api-faq.md Outdated Show resolved Hide resolved
src/guide/quick-start.md Outdated Show resolved Hide resolved
src/guide/components/v-model.md Outdated Show resolved Hide resolved
src/api/composition-api-lifecycle.md Outdated Show resolved Hide resolved
src/api/composition-api-lifecycle.md Outdated Show resolved Hide resolved
src/api/application.md Outdated Show resolved Hide resolved
src/api/built-in-components.md Outdated Show resolved Hide resolved
src/api/composition-api-lifecycle.md Outdated Show resolved Hide resolved
src/api/options-composition.md Show resolved Hide resolved
src/api/options-state.md Outdated Show resolved Hide resolved
src/guide/quick-start.md Show resolved Hide resolved
src/guide/scaling-up/tooling.md Outdated Show resolved Hide resolved
src/guide/scaling-up/tooling.md Outdated Show resolved Hide resolved
@veaba
Copy link
Member

veaba commented Jun 30, 2023

@wxsms 前面有个 deps bot 合并到 main 分支了,这里需要处理下冲突。

# Conflicts:
#	src/api/composition-api-lifecycle.md
@wxsms wxsms requested a review from Justineo July 5, 2023 09:09
@Justineo Justineo merged commit 596d119 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.