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

docs(en): merge docs-next/master into vue-docs-next/main @ 334ea378 #51

Open
wants to merge 32 commits into
base: main
Choose a base branch
from

Conversation

docschina-bot
Copy link
Collaborator

此 PR 自动生成。

合并 vuejs/docs-next 的修改至本仓库(@ 334ea37

以下文件存在冲突,可能需要重新翻译:

请解决所有冲突后提交到此 pull request,可直接在 Github 修改、切换到 sync-334ea378 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。

禁止使用 Squash Merge 来合并此 Pull Request!

使用该操作会导致上游仓库的内容丢失,并致使下一次合并产生冲突。

LSViana and others added 30 commits October 26, 2021 10:12
…t()` (#1296)

* Update Introduction example to use `components` instead of `.component()`

* Replace SFC import with local component definition

This fixes what was mentioned by the reviewer: vuejs/docs#1296 (comment)

* Remove unnecessary import comment
* Remove app.js

* Fix typos, code style

Co-authored-by: Natalia Tepluhina <[email protected]>

* Fix typos

* Fix code style

* Fix code style

* Fix code style

* Fix code style

* Fix wrong async function

Co-authored-by: Natalia Tepluhina <[email protected]>
... in list of Online Playgrounds.

Components.studio supports standard Vue SFC component 
while WebComponents.dev supports Web Components wrapper via the `.ce.vue` as defined by Vue.

Thanks
* Update debugging-in-vscode.md

* DEL: removed any reference to debugger extensions
* fixed missing commas

* Update src/guide/introduction.md

Co-authored-by: Natalia Tepluhina <[email protected]>
remove strange markups
`app.config.isCustomElement` is deprecated and should be replaced with `app.config.compilerOptions.isCustomElement`
When executing command `npm run build:server` got an error: "ERROR  Build failed with errors."
…… (#1119)

* add vue school links to supplement component documentation with video courses

* link sfc doc to sfc intro lesson instead of course since only first lesson is free
* Update description about .number modifier

* Update src/guide/forms.md

Co-authored-by: Natalia Tepluhina <[email protected]>
* fix: Explain usage of custom directives with script-setup

* Update src/api/sfc-script-setup.md

Co-authored-by: skirtle <[email protected]>

* Update src/api/sfc-script-setup.md

Co-authored-by: skirtle <[email protected]>

Co-authored-by: skirtle <[email protected]>
* enclosed a word intended to clarify meaning of diff

* Update src/api/special-attributes.md

Co-authored-by: Natalia Tepluhina <[email protected]>
* Add Vue School Black Friday 21 banners

* Update Black Friday Vue School banner
Rationale: newcomers prefer official documentation over GitHub project
* update component-slots.md

* update component-slots.md
* Update Vue School banner for Cyber Monday

* Update mobile Cyber Monday banner
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.