Skip to content

Sync 5c154aa1 #1214

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

Merged
merged 19 commits into from
Jul 18, 2022
Merged

Sync 5c154aa1 #1214

merged 19 commits into from
Jul 18, 2022

Conversation

Jinjiang
Copy link
Member

vuejs/v2.vuejs.org@2a5a7f2...5c154aa

注:

  1. 忽略了所有首页 banner 的更新
  2. 忽略了 v3 redirect 的更新
  3. 赞助商信息同步到了英文版最新的 API,但是数据的有效性有待 @yyx990803 确认 (比如稀土的图片自定义高度数据没有了,旧版的数据是 54px),另外我在更新的时候发现了一个赞助商展示的 bug,一并提交到了英文站 Fix special sponsors display v2.vuejs.org#2956

忽略的 v3 redirect 相关提交
vuejs/v2.vuejs.org@8a97e57
vuejs/v2.vuejs.org@2414b24
vuejs/v2.vuejs.org@955e7fd

忽略的 algolia 参数相关提交
vuejs/v2.vuejs.org@346310c

忽略的首页 banner 相关提交
vuejs/v2.vuejs.org@2e12128
vuejs/v2.vuejs.org@3c39ec1
vuejs/v2.vuejs.org@2a5528f
vuejs/v2.vuejs.org@f55fafa

谢谢

yyx990803 and others added 17 commits July 13, 2022 00:16
* fix: url of v3.x document

- change url of v3.x document by `vuejs.org` instead `v3.vuejs.org`

* fix: url of v3.x document

* fix: url of v3.x document
Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.6.2 to 6.12.6.
- [Release notes](https://github.com/ajv-validator/ajv/releases)
- [Commits](ajv-validator/ajv@v6.6.2...v6.12.6)

---
updated-dependencies:
- dependency-name: ajv
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.7 to 1.19.8.
- [Release notes](https://github.com/medialize/URI.js/releases)
- [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md)
- [Commits](medialize/URI.js@v1.19.7...v1.19.8)

---
updated-dependencies:
- dependency-name: urijs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Right now official Vue Style Guide suggests you use global components when you deal with base components. This can lead to confusion with new developers coming to a project, IDE assistance and testing. This PR removes this recommendation so it's always obvious how components are imported.
@Jinjiang Jinjiang requested review from yyx990803 and Justineo July 12, 2022 18:42
@Justineo Justineo merged commit f0b47de into master Jul 18, 2022
@Justineo Justineo deleted the sync-5c154aa1 branch July 18, 2022 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants