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 #a8cf7bf4 #888

Merged
merged 31 commits into from Apr 2, 2024
Merged

Sync #a8cf7bf4 #888

merged 31 commits into from Apr 2, 2024

Conversation

wxsms
Copy link
Member

@wxsms wxsms commented Mar 14, 2024

wxsms and others added 29 commits February 27, 2024 09:05
Bumps [vue](https://github.com/vuejs/core) from 3.4.19 to 3.4.20.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](vuejs/core@v3.4.19...v3.4.20)

---
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 [vue](https://github.com/vuejs/core) from 3.4.20 to 3.4.21.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](vuejs/core@v3.4.20...v3.4.21)

---
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>
* refactor: upgrade @vue/repl

* chore: upgrade
Bumps [@vue/repl](https://github.com/vuejs/repl) from 4.0.1 to 4.1.1.
- [Release notes](https://github.com/vuejs/repl/releases)
- [Changelog](https://github.com/vuejs/repl/blob/main/CHANGELOG.md)
- [Commits](vuejs/repl@v4.0.1...v4.1.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
added reference link in Wrappixel's template
# Conflicts:
#	.vitepress/theme/components/NewsLetter.vue
#	.vitepress/theme/index.ts
#	pnpm-lock.yaml
#	src/about/community-guide.md
#	src/api/options-lifecycle.md
#	src/guide/best-practices/production-deployment.md
#	src/guide/built-ins/suspense.md
#	src/guide/built-ins/transition-group.md
#	src/guide/built-ins/transition.md
#	src/guide/extras/composition-api-faq.md
#	src/guide/extras/reactivity-in-depth.md
#	src/guide/extras/render-function.md
#	src/guide/extras/ways-of-using-vue.md
#	src/guide/extras/web-components.md
#	src/guide/quick-start.md
#	src/guide/reusability/custom-directives.md
#	src/guide/scaling-up/tooling.md
#	src/guide/typescript/composition-api.md
#	src/guide/typescript/overview.md
@wxsms wxsms added the 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录 label Mar 14, 2024
Copy link

vercel bot commented Mar 14, 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 2, 2024 9:31am

@veaba
Copy link
Member

veaba commented Mar 15, 2024

这个 .idea 貌似多余了,是 英文仓库那边同步过来的,这需要在英文库那边先处理下。

# Conflicts:
#	src/guide/built-ins/transition.md
@Justineo Justineo merged commit afb1d15 into main Apr 2, 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