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 #f9c82f48 #1054

Merged
merged 89 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from 86 commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
f5e512d
fix(typo): typo in composition-api (#3011)
ilyaliao Sep 10, 2024
5162a1e
fix(typo): typo in async components (#3010)
KiritaniAyaka Sep 10, 2024
9dea184
Revert "feat(*): add vuetoronto banner (#2992)"
yyx990803 Sep 11, 2024
eb0871f
upgrade pnpm
yyx990803 Sep 11, 2024
6fcf44c
docs: fix typo in 3.4 example of v-model before defineModel (#3014)
zhangenming Sep 11, 2024
558d2e7
chore(deps): update @vue/theme (#3019)
Justineo Sep 14, 2024
cf2bcd1
chore(deps): bump vue from 3.5.0 to 3.5.5
dependabot[bot] Sep 14, 2024
9c3535f
chore(deps): bump @vue/repl from 4.3.1 to 4.4.1
dependabot[bot] Sep 14, 2024
17bd491
Vuejsde conf banner september 16 22 2024 (#2798)
antony-k1208 Sep 16, 2024
f3b6dcf
docs: move Playwright to recommended frameworks (#3006)
Skn0tt Sep 16, 2024
e20eb77
docs: missed return value type for useModel() (#3005)
altrusl Sep 16, 2024
27dd985
docs: fixes in 3.5 updates on reactivity-api page (#3016)
AloisSeckar Sep 16, 2024
1128a40
docs: add omitted anchors for 3.5 (#3020)
AloisSeckar Sep 16, 2024
481de31
docs (#2874): update quick start instructions for yarn v1 (#2993)
bencodezen Sep 16, 2024
1fb260a
fix: createVnode() -> createVNode() (#3021)
Allihol Sep 16, 2024
b3b1b89
docs: update a11y docs for landmarks (#2996)
ranjbarreza Sep 16, 2024
ac7a921
docs (#2194): fix issue with autofocus on custom directives page (#2994)
bencodezen Sep 16, 2024
a961225
v-model.number: clarify unexpected behavior (#2975)
simon04 Sep 16, 2024
5094e84
Add developers pages, Proxify as a partner (#2985)
29avet1 Sep 23, 2024
699ca8e
chore(deps): bump @vue/repl from 4.4.1 to 4.4.2 (#3025)
dependabot[bot] Sep 26, 2024
808ad46
chore(deps): bump vue from 3.5.5 to 3.5.8 (#3036)
dependabot[bot] Sep 26, 2024
e61a1c0
fix(guide/suspense): missing v3.3+ badge in suspensible prop (#3002)
ferferga Sep 26, 2024
6b3dda5
Fix grammar in general.md (#3023)
tyler-mcdonald Sep 26, 2024
15bae50
Fix base on https://github.com/vuejs/docs/pull/2994 (#3027)
tisma95 Sep 26, 2024
2ec007b
docs: fix broken links to dts-test files (#3034)
haoqunjiang Sep 26, 2024
fd16694
Update plugins.md on how to bundle a plugin. (#3004)
luckydonald Sep 26, 2024
9ff4a35
docs: fix broken link to Playwright Component Testing (#3042)
bamnet Sep 27, 2024
b1a6899
chore(deps): bump vue from 3.5.8 to 3.5.9 (#3039)
dependabot[bot] Sep 27, 2024
4567e55
feat(guide/computed): add previous to computed (#3001)
ferferga Sep 27, 2024
e45d0e2
chore(deps): bump vue from 3.5.9 to 3.5.10
dependabot[bot] Sep 27, 2024
b15177c
docs(developers): remove duplicate text (#3043)
tisma95 Sep 28, 2024
622e7e5
docs: remove unnecessary line break (#3032)
jay-es Sep 28, 2024
cfcf01e
docs(api): format WatchSource type (#3037)
Aimony Sep 28, 2024
d1b5bc8
Revert "Vuejsde conf banner september 16 22 2024 (#2798)"
yyx990803 Sep 30, 2024
391b3ca
Revert "chore: viteconf 24 cta (#2953)"
yyx990803 Oct 9, 2024
132227d
chore(deps): bump vitepress from 1.3.4 to 1.4.0
dependabot[bot] Oct 7, 2024
42cf8e0
chore(deps): bump vue from 3.5.10 to 3.5.12
dependabot[bot] Oct 12, 2024
cf3a17a
chore: bump deps
brc-dd Oct 12, 2024
646093a
chore: update deps in package.json too
brc-dd Oct 12, 2024
a681541
docs: update ref attribute example (#2991)
Thy3634 Oct 14, 2024
756b51d
Update KeyboardEvent.key MDN URL (#3045)
yanquanfahei Oct 14, 2024
08feb34
docs: fix required version for useTemplateRef (#3049)
robbertlokhorst Oct 14, 2024
96b9b7c
docs: improve clarity on using refs (#3051)
seeniOlabode Oct 14, 2024
a62b914
Update template-syntax.md (#3054)
xahiru Oct 14, 2024
017ce15
docs(essentials/template-refs): fix typo (#3065)
Jiangmenghao Oct 15, 2024
a9c6189
chore(deps): bump vitepress from 1.4.0 to 1.4.1 (#3066)
dependabot[bot] Oct 15, 2024
17041a2
docs: Correct indentation of a code sample in composition-api-helpers…
bryceandy Oct 15, 2024
78d61f2
doc(fix vuejs/core#11367):add a warn about '~' in src-imports (#3061)
Bayn-Web Oct 18, 2024
b66b1d2
add useCssModule example (#3070)
runyasak Oct 29, 2024
7c7e701
docs: capitalize text (#3074)
iiio2 Oct 29, 2024
cf84ce1
fix: Tutorial Syntax Highlight (#3078)
babu-ch Oct 29, 2024
e419207
Update transition-group.md - add detail about prop moveClass (#3075)
femans Oct 29, 2024
2d1235b
Update useId link (#3083)
Kiku-CN Oct 29, 2024
929aff0
Update Natalia's role
NataliaTepluhina Oct 30, 2024
6dd2f7a
special sponsor vacancy handling
yyx990803 Nov 1, 2024
18eaa5e
fix data tier issue in ssr build
yyx990803 Nov 2, 2024
f7a57b8
bump vitepress
yyx990803 Nov 2, 2024
58c4b89
Add VueToronto banner to the docs (#3099)
jillztom Nov 8, 2024
597abd1
Improvements to partnership page (#3095)
dionvogliqi Nov 11, 2024
f7a80d4
move hcy and rahul to team emiriti
yyx990803 Nov 11, 2024
dcf9415
add funding.json
yyx990803 Nov 13, 2024
901fa8e
Revert "Add VueToronto banner to the docs (#3099)"
yyx990803 Nov 15, 2024
8061bb2
chore(deps): bump vitepress from 1.4.3 to 1.5.0 (#3091)
dependabot[bot] Nov 19, 2024
b266b81
Update the transition group (#3092)
tisma95 Nov 19, 2024
6e1090c
docs: align custom-directive example with content (#3093)
biomousavi Nov 19, 2024
1cea431
Corrected and improved docs on type definitions for Custom Elements. …
trusktr Nov 19, 2024
0773ed4
Refactor api.data.ts: Add comments and improve code clarity (#3098)
anjiri1684 Nov 19, 2024
0d6ad76
fix: Vue 3.x targets ES2016+, not ES2015 (#3100)
haoqunjiang Nov 19, 2024
b1b5555
chore(deps): bump vue from 3.5.12 to 3.5.13 (#3107)
dependabot[bot] Nov 19, 2024
ce19be8
fix(example): fix repo and branches names in fetching example (#3102)
midskyey Nov 19, 2024
797839b
docs: add explanation for mouse button event modifiers (#3090)
midskyey Nov 19, 2024
ab958c8
add vuemastery banner black friday 2024 (#3104)
i5dr0id Nov 20, 2024
8ce9c23
docs: add missing anchor (#3109)
jay-es Nov 25, 2024
5936eef
docs(computed): remove semicolons (#3117)
iiio2 Nov 25, 2024
ac1682b
docs: update angular signals link (#3116)
kuncevic Nov 25, 2024
d600fe1
docs: update link to volar wiki #3110 (#3111)
tisma95 Nov 25, 2024
4e94b68
docs: fix typo (#3108)
emmanuel-ferdman Nov 25, 2024
524de31
docs: make `v-model` code example more readable (#3069)
FloEdelmann Nov 25, 2024
129c27c
docs: correct usage examples of `useTemplateRef` (#3031)
DamianGlowala Nov 25, 2024
d0a13f7
update special sponsorship link in sidebar
yyx990803 Nov 25, 2024
f9c82f4
add testing sponsor lambdatest
yyx990803 Nov 25, 2024
7d926de
Merge branch 'upstream' into sync
veaba Dec 6, 2024
72e4a4c
chore: update pnpm-lock.yml
veaba Dec 6, 2024
e1c63d8
fix: home page css style
veaba Dec 6, 2024
57f375a
docs: zhlint format
veaba Dec 6, 2024
28529a5
ci: zhlint disabled event-handling.md
veaba Dec 6, 2024
3d583df
Update src/guide/built-ins/transition-group.md
veaba Dec 9, 2024
02de657
Apply suggestions from code review
veaba Dec 9, 2024
768b987
Update src/guide/reusability/custom-directives.md
Jinjiang Dec 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,5 @@ src/tutorial/data.json
draft.md

# IDEs
# folders created by IDE
.idea
11 changes: 8 additions & 3 deletions .vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const nav: ThemeConfig['nav'] = [
text: '资源',
items: [
{ text: '合作伙伴', link: '/partners/' },
{ text: '开发者', link: '/developers/' },
{ text: '主题', link: '/ecosystem/themes' },
{ text: 'UI 组件', link: 'https://ui-libs.vercel.app/' },
{
Expand Down Expand Up @@ -125,9 +126,13 @@ const nav: ThemeConfig['nav'] = [
link: '/sponsor/'
},
{
text: '合作伙伴',
link: '/partners/',
activeMatch: `^/partners/`
text: '专家',
badge: { text: '新' },
activeMatch: `^/(partners|developers)/`,
items: [
{ text: '合作伙伴', link: '/partners/' },
{ text: '开发者', link: '/developers/', badge: { text: '新' } }
]
}
]

Expand Down
4 changes: 2 additions & 2 deletions .vitepress/inlined-scripts/restorePreference.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
restore('vue-docs-prefer-composition', 'prefer-composition', true)
restore('vue-docs-prefer-sfc', 'prefer-sfc', true)

window.__VUE_BANNER_ID__ = 'vt2024_1'
restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
// window.__VUE_BANNER_ID__ = ''
// restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
})()
88 changes: 13 additions & 75 deletions .vitepress/theme/components/Banner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,16 @@ function dismiss() {

<template>
<div class="banner" v-if="open">
<p class="vt-banner-text">
<span class="vt-text-primary">VueConf Toronto</span>
<span class="vt-tagline"> - Join the premier Vue.js conference</span>
| 18-20 Nov 2024 <span class="vt-place"> - Toronto, Canada</span>
<a
target="_blank"
class="vt-primary-action"
href="https://vuetoronto.com/?utm_source=vuejs&utm_content=top_banner"
>
Register
</a>
</p>
<a target="_blank"></a>
<button @click="dismiss">
<VTIconPlus class="close" />
</button>
<p class="vt-banner-text vt-coupon">
<span class="vt-text-primary">Use code</span> VUEJS
<span class="vt-text-primary">to get 15% off</span>
</p>
</div>
</template>

<style>
html:not(.banner-dismissed) {
--vt-banner-height: 60px;
--vt-banner-height: 30px;
}
</style>

Expand All @@ -65,10 +50,12 @@ html:not(.banner-dismissed) {
font-weight: 600;
color: #fff;
background-color: var(--vt-c-green);
background: #11252b;
display: flex;
justify-content: center;
align-items: center;
background: linear-gradient(
90deg,
rgba(66, 184, 131, 1) 0%,
rgba(39, 179, 137, 1) 19%,
rgba(100, 126, 255, 1) 100%
);
}

.banner-dismissed .banner {
Expand All @@ -83,7 +70,7 @@ button {
position: absolute;
right: 0;
top: 0;
padding: 20px 10px;
padding: 5px;
}

.close {
Expand All @@ -92,59 +79,10 @@ button {
fill: #fff;
transform: rotate(45deg);
}

.vt-banner-text {
color: #fff;
font-size: 16px;
}

.vt-text-primary {
color: #75c05e;
}

.vt-primary-action {
background: #75c05e;
color: #121c1a;
padding: 8px 15px;
border-radius: 5px;
font-size: 14px;
text-decoration: none;
margin: 0 20px;
font-weight: bold;
}
.vt-primary-action:hover {
text-decoration: none;
background: #5a9f45;
}

@media (max-width: 1280px) {
.banner .vt-banner-text {
font-size: 14px;
}
.vt-tagline {
display: none;
}
}

@media (max-width: 780px) {
.vt-tagline {
display: none;
}
.vt-coupon {
display: none;
}
.vt-primary-action {
margin: 0 10px;
padding: 7px 10px;
}
.vt-time-now {
display: none;
}
}

@media (max-width: 560px) {
.vt-place {
/*
@media (max-width: 720px) {
a > span {
display: none;
}
}
} */
</style>
73 changes: 73 additions & 0 deletions .vitepress/theme/components/CallToActionSection.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<script setup lang="ts">
withDefaults(defineProps<{
title?: string
description?: string
link?: string
linkText?: string
showDivider?: boolean
}>(), {
showDivider: true
})
</script>

<template>
<section class="cta-section">
<div v-if="showDivider" class="cta-divider"></div>
<div class="cta-content">
<h2 v-if="title" class="cta-title">{{ title }}</h2>
<p v-if="description" class="cta-description">{{ description }}</p>
<a v-if="link" :href="link" target="_blank" class="cta-link">{{ linkText }}</a>
<slot></slot>
</div>
</section>
</template>

<style scoped>
.cta-section {
text-align: center;
max-width: 688px;
margin: 0 auto;
}

.cta-divider {
width: 100px;
margin: 0 auto;
border-top: 1px solid var(--vt-c-divider-light);
}

.cta-content {
padding: 28px 28px 96px;
}

.cta-title {
font-size: 34px;
font-weight: 600;
letter-spacing: -0.5px;
line-height: 1.2;
margin: 0.5em 0 1em;
}

.cta-description {
color: var(--vt-c-text-2);
}

.cta-link {
margin-top: 2em;
display: inline-block;
padding: 12px 24px;
background-color: var(--vt-c-bg-mute);
color: var(--vt-c-text-code);
font-weight: 600;
border-radius: 6px;
text-decoration: none;
transition: background-color 0.5s, color 0.5s;
}

.cta-link:hover {
background-color: var(--vt-c-gray-light-4);
}

.dark .cta-link:hover {
background-color: var(--vt-c-gray-dark-3);
}
</style>
105 changes: 105 additions & 0 deletions .vitepress/theme/components/CardList.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<script setup lang="ts">
import { computed, onMounted, ref, shallowRef } from 'vue'

const props = withDefaults(
defineProps<{
items: Array<any>
filter?: (item: any) => boolean
cardComponent: any
showLinkToAll?: boolean
shuffleItems?: boolean
browseLinkText?: string
browseLinkUrl?: string
splitBy?: string
}>(),
{
showLinkToAll: false,
shuffleItems: false,
splitBy: 'platinum'
}
)

const isMounted = ref(false)
const items = shallowRef([...props.items])

const filteredItems = computed(() =>
props.filter ? items.value.filter(props.filter) : items.value
)

onMounted(() => {
isMounted.value = true
items.value = processItems([...items.value], props.splitBy, props.shuffleItems)
})

function processItems(items: Array<any>, splitBy: string, shouldShuffle: boolean) {
const splitItems = items.filter(item => item[splitBy])
const otherItems = items.filter(item => !item[splitBy])

if (shouldShuffle) {
shuffleArray(splitItems)
shuffleArray(otherItems)
}

return [...splitItems, ...otherItems]
}

function shuffleArray(array: Array<any>) {
for (let i = array.length - 1; i > 0; i--) {
const j = Math.floor(Math.random() * (i + 1)); // don't remove semicolon
[array[i], array[j]] = [array[j], array[i]]
}
}
</script>

<template>
<div v-show="isMounted" class="card-list">
<!-- to skip SSG since the partners are shuffled -->
<ClientOnly>
<component
:is="cardComponent"
v-for="item in filteredItems"
:key="item.id || item.name"
:data="item"
/>
</ClientOnly>

<a
v-if="showLinkToAll && filteredItems.length % 2"
:href="browseLinkUrl"
class="browse-all-link"
>
{{ browseLinkText }}
</a>
</div>
</template>

<style scoped>
.card-list {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}

.browse-all-link {
display: block;
width: 48.5%;
margin-bottom: 36px;
padding-top: 240px;
font-size: 1.2em;
text-align: center;
color: var(--vt-c-text-2);
border: 1px solid var(--vt-c-divider-light);
border-radius: 4px;
transition: color 0.5s ease;
}

.browse-all-link:hover {
color: var(--vt-c-text-1);
}

@media (max-width: 768px) {
.browse-all-link {
display: none;
}
}
</style>
Loading
Loading