Skip to content

Sync #7d7d50ed #1082

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 61 commits into from
May 28, 2025
Merged
Show file tree
Hide file tree
Changes from 60 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
52797e0
docs(forms): capitalize title (#3131)
iiio2 Jan 1, 2025
5de2d11
Update playground example for v-model modifiers (#3134)
koeliga Jan 1, 2025
b5ff5db
use PascalCase (#3123)
zhangenming Jan 5, 2025
48e2de2
chore(deps): bump @vue/repl from 4.4.2 to 4.4.3 (#3137)
dependabot[bot] Jan 5, 2025
185a5f3
docs: update template refs render function (#3126)
lequangdongg Jan 21, 2025
d6b50e8
docs: fix $el type in documentation to 'any' (#3139)
dariasavinova Jan 21, 2025
27b5615
Update component-basics.md - wrong highlight about `slot` (#3142)
MSKhodadady Jan 21, 2025
7c4dade
Error Capturing Caveats (#3141)
Gwynerva Jan 21, 2025
a06db6c
Update RendererOptions according to the latest source code (#3143)
linzhe141 Jan 21, 2025
a0d6271
docs(performance): INP replacement of FID (#3150)
GeoffreyParrier Jan 21, 2025
b74ed41
fix: update validator desc (#3152)
btea Jan 21, 2025
a8c26ae
chore(deps): bump vitepress from 1.5.0 to 1.6.0 (#3153)
dependabot[bot] Jan 21, 2025
cfeb41f
chore(deps): bump vitepress to v2-alpha (#3160)
brc-dd Jan 22, 2025
3735fb4
feat(*): add madvue banner (#3154)
IsraelOrtuno Jan 22, 2025
3c71226
Revert "chore(deps): bump vitepress to v2-alpha" (#3162)
brc-dd Jan 22, 2025
3f4d223
chore(deps): bump vitepress from 1.6.0 to 1.6.3 (#3163)
dependabot[bot] Jan 23, 2025
9f3814a
Add German language links to the translations page (#3157)
roma-marshall Jan 25, 2025
dfe4c91
Update German website URL (#3166)
Jinjiang Jan 28, 2025
9ecc385
Revert "feat(*): add madvue banner (#3154)"
yyx990803 Jan 30, 2025
c0e81ef
improvement composition-api-lifecycle type (#3159)
zhangenming Feb 3, 2025
7119fae
Change the way focus is set in skip link example code (#3164)
zacharesmer Feb 3, 2025
6f14d3e
theme: workaround adblock for sponsors
yyx990803 Feb 5, 2025
2c0b19e
chore(deps): bump @vue/repl from 4.4.3 to 4.5.0 (#3168)
dependabot[bot] Feb 18, 2025
899ec06
chore: bump node version on netlify (#3170)
iiio2 Feb 18, 2025
2e0dbe0
docs: update "Static Hoisting" to "Cache Static" (#3172)
Arman19941113 Feb 18, 2025
2b7d5e0
docs: clarify that :style can coexist with regular style attributes l…
babu-ch Feb 18, 2025
7cabdc9
docs: Clarify inject data when multiple parent provide the same key (…
kfina-planxy Feb 18, 2025
f3e9cfb
update monterail url
yyx990803 Feb 25, 2025
b6b270f
Add polish language to work in progress section (#3187)
szymonlicau Feb 25, 2025
72587eb
test perfops rom script
yyx990803 Feb 28, 2025
d770157
docs(themes): add NuxtUI Pro (#3195)
HugoRCD Mar 19, 2025
c707b2b
added banner for vueconf 2025 (#3203)
prpatel Mar 23, 2025
0cafdc5
docs(computed): correct parameter in computed example (#3206)
jh-leong Mar 31, 2025
2e07b40
docs: fix blockquote language (#3205)
ocmrz Mar 31, 2025
323abd5
docs: capitalize titles (#3199)
iiio2 Mar 31, 2025
99bc0a9
docs: fix grammar (#3192)
SirDaev Mar 31, 2025
0ebd878
docs: fix transition component casing (#3204)
ocmrz Mar 31, 2025
fab4e32
docs: clarify how inject() works with multiple providing components (…
AloisSeckar Apr 1, 2025
23118c9
chore(deps): bump @vue/repl from 4.5.0 to 4.5.1 (#3181)
dependabot[bot] Apr 1, 2025
0f8ba7e
docs(glossary): update "hoisting" and "cache static" (#3182)
Arman19941113 Apr 1, 2025
f3f5194
docs: update web-components.md NOTE code block (#3185)
veaba Apr 1, 2025
c9186a6
feat: Mark Polish translation as complete (#3191)
szymonlicau Apr 1, 2025
f2de153
Swapped Chrome Extension URL to a non-beta version (#3194)
GrzegorzWidla Apr 1, 2025
b70003e
docs(render-function#template-refs): Make useTemplateRef the default …
sofuxro Apr 1, 2025
b68ab1f
docs: remove list styles (#3209)
jay-es Apr 11, 2025
e35e97c
docs: reorder defineExpose explanation (#3210)
hiro-xre Apr 11, 2025
2859a45
docs: include example of `@vue-generic` directive (#3219)
G-Rath Apr 11, 2025
c281d13
Fix: Update Russian translation repository link in config.ts (#3220)
listar Apr 11, 2025
96ec3f9
feat(docs): add a plugin to generate documentation for LLMs (#3202)
okineadev Apr 11, 2025
7adfb64
fix: shorten variable names to avoid code block overflow (#3221)
AloisSeckar Apr 16, 2025
5a1e8c2
chore: add wails as an alternative desktop framework (#3190)
thisguymartin Apr 16, 2025
cfeabfb
docs: fixed typo (#3227)
hope-ag Apr 25, 2025
854be52
docs: variable name, not value of variable (#3224)
wuyuansushen May 2, 2025
0022e62
fix: removed todo mvc example (#3233)
NataliaTepluhina May 7, 2025
9880455
Update FAQ after Vue2 reached end of life (#3232)
dkoether May 7, 2025
d1b3d3b
docs: improve phrasing for provide/inject in plugins.md (#3230)
leoelz May 14, 2025
7d7d50e
docs: fix misplaced semicolon in crud example (#3234)
joceqo May 15, 2025
b3f2359
Merge branch 'upstream' into sync
KiritaniAyaka May 27, 2025
570c85b
chore: add todos
KiritaniAyaka May 27, 2025
e8be49d
fix: lint issue
KiritaniAyaka May 27, 2025
6d397af
Apply suggestions from code review
KiritaniAyaka May 28, 2025
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 @@ -98,6 +98,7 @@ dist/
# vitepress build output
.vitepress/dist
.vitepress/cache
.vitepress/.temp

# Serverless directories
.serverless/
Expand Down
47 changes: 23 additions & 24 deletions .vitepress/config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fs from 'fs'
import path from 'path'
import { defineConfigWithTheme, type Plugin } from 'vitepress'
import { defineConfigWithTheme, type HeadConfig, type Plugin } from 'vitepress'
import type { Config as ThemeConfig } from '@vue/theme'
import llmstxt from 'vitepress-plugin-llms'
import baseConfig from '@vue/theme/config'
Expand Down Expand Up @@ -497,10 +497,6 @@ export const sidebar: ThemeConfig['sidebar'] = {
text: '带过渡动效的列表',
link: '/examples/#list-transition'
},
{
text: 'TodoMVC',
link: '/examples/#todomvc'
}
]
},
{
Expand Down Expand Up @@ -601,6 +597,17 @@ const i18n: ThemeConfig['i18n'] = {
ariaSidebarNav: '侧边栏导航'
}

function inlineScript(file: string): HeadConfig {
return [
'script',
{},
fs.readFileSync(
path.resolve(__dirname, `./inlined-scripts/${file}`),
'utf-8'
)
]
}

export default defineConfigWithTheme<ThemeConfig>({
extends: baseConfig,

Expand Down Expand Up @@ -639,25 +646,11 @@ export default defineConfigWithTheme<ThemeConfig>({
'link',
{
rel: 'preconnect',
href: 'https://sponsors.vuejs.org'
href: 'https://automation.vuejs.org'
}
],
[
'script',
{},
fs.readFileSync(
path.resolve(__dirname, './inlined-scripts/restorePreference.js'),
'utf-8'
)
],
[
'script',
{},
fs.readFileSync(
path.resolve(__dirname, './inlined-scripts/uwu.js'),
'utf-8'
)
],
inlineScript('restorePreference.js'),
inlineScript('uwu.js'),
[
'script',
{
Expand All @@ -673,7 +666,8 @@ export default defineConfigWithTheme<ThemeConfig>({
src: 'https://vueschool.io/banner.js?affiliate=vuejs&type=top',
async: 'true'
}
]
],
inlineScript('perfops.js')
],

themeConfig: {
Expand Down Expand Up @@ -730,7 +724,7 @@ export default defineConfigWithTheme<ThemeConfig>({
{
link: 'https://ru.vuejs.org',
text: 'Русский',
repo: 'https://github.com/translation-gang/docs-ru'
repo: 'https://github.com/vuejs-translations/docs-ru'
},
{
link: 'https://cs.vuejs.org',
Expand All @@ -742,6 +736,11 @@ export default defineConfigWithTheme<ThemeConfig>({
text: '繁體中文',
repo: 'https://github.com/vuejs-translations/docs-zh-hk'
},
{
link: 'https://pl.vuejs.org',
text: 'Polski',
repo: 'https://github.com/vuejs-translations/docs-pl',
},
{
link: '/translations/',
text: '帮助我们翻译!',
Expand Down
9 changes: 9 additions & 0 deletions .vitepress/inlined-scripts/perfops.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
;((d) => {
window.rum = { key: 'a9efvfeu' }
var script = d.createElement('script')
script.src = '/rom3.min.js'
script.type = 'text/javascript'
script.defer = true
script.async = true
d.getElementsByTagName('head')[0].appendChild(script)
})(document)
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__ = ''
// restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
window.__VUE_BANNER_ID__ = 'vueconf2025'
restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
})()
92 changes: 79 additions & 13 deletions .vitepress/theme/components/Banner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,31 @@ function dismiss() {

<template>
<div class="banner" v-if="open">
<a target="_blank"></a>
<p class="vt-banner-text">
<span class="vt-text-primary">
Vueconf.US
</span>
<span class="vt-tagline"> · The official Vue.js conf</span>
<span class="vt-place"> · Tampa, USA</span>
<span class="vt-date"> · 19-21 May 2025</span>
<a target="_blank" class="vt-primary-action"
href="https://vueconf.us/?utm_source=vuejs&utm_content=top_banner">
Register
</a>
</p>
<button @click="dismiss">
<VTIconPlus class="close" />
</button>
<p class="vt-banner-text vt-coupon">
<span class="vt-text-primary">Use</span> VUEJSDOCS
<span class="vt-text-primary"> $200 off</span>
</p>
</div>
</template>

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

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


}

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

.close {
Expand All @@ -79,10 +94,61 @@ button {
fill: #fff;
transform: rotate(45deg);
}
/*
@media (max-width: 720px) {
a > span {

.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 10px;
font-weight: bold;
}

.vt-primary-action:hover {
text-decoration: none;
background: #c4d141;
}

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


}

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

.vt-time-now {
display: none;
}
}

@media (max-width: 560px) {

.vt-place {
display: none;
}
} */
.vt-date {
display: none;
}
}
</style>
22 changes: 11 additions & 11 deletions .vitepress/theme/components/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ onMounted(load)
</template>
</div>
</section>
<section v-else id="special-sponsor">
<section v-else id="special-spsr">
<span>
<a href="/sponsor/#tier-benefits">
中国区铂金赞助位现已空缺-立即咨询
Expand Down Expand Up @@ -107,7 +107,7 @@ onMounted(load)
</div>
</section>

<section id="sponsors">
<section id="spsrs">
<h2>Platinum Sponsors</h2>
<SponsorsGroup tier="platinum" placement="landing" />
<h2>Gold Sponsors</h2>
Expand Down Expand Up @@ -292,7 +292,7 @@ html:not(.dark) .accent,
flex: 1;
}

#special-sponsor span:first-child {
#special-spsr span:first-child {
text-align: right;
}

Expand All @@ -303,12 +303,12 @@ html:not(.dark) .accent,
padding: 0 24px;
}

#special-sponsor img {
#special-spsr img {
height: 42px;
margin: -6px 0;
}

.dark #special-sponsor img {
.dark #special-spsr img {
filter: grayscale(1) invert(1);
}

Expand Down Expand Up @@ -336,18 +336,18 @@ html:not(.dark) .accent,
background-color: transparent;
}

#sponsors {
#spsrs {
max-width: 900px;
margin: 0px auto;
}

#sponsors h2 {
#spsrs h2 {
font-size: 20px;
font-weight: 600;
margin-bottom: 1em;
}

#sponsors .sponsor-container {
#spsrs .spsr-container {
margin-bottom: 3em;
}

Expand Down Expand Up @@ -380,15 +380,15 @@ html:not(.dark) .accent,
font-size: 16px;
margin: 18px 0 30px;
}
#special-sponsor {
#special-spsr {
flex-direction: column;
height: auto;
}
#special-sponsor img {
#special-spsr img {
height: 36px;
margin: 8px 0;
}
#special-sponsor span {
#special-spsr span {
text-align: center !important;
}
#highlights h3 {
Expand Down
Loading