Merge branch 'main' into async-translate

Author: nasty23-star

.vitepress/config.ts

@@ -1,12 +1,19 @@
 import fs from 'fs'
 import path from 'path'
-import { defineConfigWithTheme, type HeadConfig, 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'
 import { headerPlugin } from './headerMdPlugin'
 // import { textAdPlugin } from './textAdMdPlugin'
-import { groupIconMdPlugin,groupIconVitePlugin } from 'vitepress-plugin-group-icons'
+import {
+  groupIconMdPlugin,
+  groupIconVitePlugin
+} from 'vitepress-plugin-group-icons'
 
 const nav: ThemeConfig['nav'] = [
   {
@@ -47,9 +54,12 @@ const nav: ThemeConfig['nav'] = [
         text: 'Ресурсы',
         items: [
           { text: 'Партнёры', link: '/partners/' },
-          { text: 'Разработчики', link: '/developers/' },
           { text: 'Темы', link: '/ecosystem/themes' },
           { text: 'UI компоненты', link: 'https://ui-libs.vercel.app/' },
+          {
+            text: 'Plugins Collection',
+            link: 'https://www.vue-plugins.org/'
+          },
           {
             text: 'Сертификация',
             link: 'https://certificates.dev/vuejs/?ref=vuejs-nav'
@@ -97,7 +107,7 @@ const nav: ThemeConfig['nav'] = [
         text: 'Новости',
         items: [
           { text: 'Блог', link: 'https://blog.vuejs.org/' },
-          { text: 'Twitter', link: 'https://twitter.com/vuejs' },
+          { text: 'Twitter', link: 'https://x.com/vuejs' },
           { text: 'События', link: 'https://events.vuejs.org/' },
           { text: 'Рассылка', link: '/ecosystem/newsletters' }
         ]
@@ -128,13 +138,9 @@ const nav: ThemeConfig['nav'] = [
     link: '/sponsor/'
   },
   {
-    text: 'Эксперты',
-    badge: { text: 'NEW' },
-    activeMatch: `^/(partners|developers)/`,
-    items: [
-      { text: 'Партнёры', link: '/partners/' },
-      { text: 'Разработчики', link: '/developers/', badge: { text: 'NEW' } }
-    ]
+    text: 'Партнёры',
+    activeMatch: `^/partners/`,
+    link: '/partners/'
   }
 ]
 
@@ -497,7 +503,7 @@ export const sidebar: ThemeConfig['sidebar'] = {
         {
           text: 'List with Transitions',
           link: '/examples/#list-transition'
-        },
+        }
       ]
     },
     {
@@ -666,11 +672,10 @@ export default defineConfigWithTheme<ThemeConfig>({
     [
       'script',
       {
-        src: 'https://vueschool.io/banner.js?affiliate=vuejs&type=top',
+        src: 'https://media.bitterbrains.com/main.js?from=vuejs&type=top',
         async: 'true'
       }
-    ],
-    inlineScript('perfops.js')
+    ]
   ],
 
   themeConfig: {
@@ -747,7 +752,7 @@ export default defineConfigWithTheme<ThemeConfig>({
       {
         link: 'https://pl.vuejs.org',
         text: 'Polski',
-        repo: 'https://github.com/vuejs-translations/docs-pl',
+        repo: 'https://github.com/vuejs-translations/docs-pl'
       },
       {
         link: '/translations/',
@@ -759,7 +764,10 @@ export default defineConfigWithTheme<ThemeConfig>({
     algolia: {
       indexName: 'ru-vuejs',
       appId: '5RTQ6TI35H',
-      apiKey: 'c4095d6d1e93c25ca93b3ca0030338ef',
+      apiKey: '6c41323bbf7fa04b372c087ed69cc3ba',
+      searchParameters: {
+        facetFilters: ['version:v3']
+      }
     },
 
     // carbonAds: {
@@ -769,7 +777,7 @@ export default defineConfigWithTheme<ThemeConfig>({
 
     socialLinks: [
       { icon: 'github', link: 'https://github.com/vuejs/' },
-      { icon: 'twitter', link: 'https://twitter.com/vuejs' },
+      { icon: 'twitter', link: 'https://x.com/vuejs' },
       { icon: 'discord', link: 'https://discord.com/invite/vue' }
     ],
 
@@ -790,8 +798,7 @@ export default defineConfigWithTheme<ThemeConfig>({
   markdown: {
     theme: 'github-dark',
     config(md) {
-      md.use(headerPlugin)
-        .use(groupIconMdPlugin)
+      md.use(headerPlugin).use(groupIconMdPlugin)
       // .use(textAdPlugin)
     }
   },

.vitepress/inlined-scripts/perfops.js

@@ -8,6 +8,6 @@
   restore('vue-docs-prefer-composition', 'prefer-composition', true)
   restore('vue-docs-prefer-sfc', 'prefer-sfc', true)
 
-  window.__VUE_BANNER_ID__ = 'viteconf2025'
-  restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
+  // window.__VUE_BANNER_ID__ = ''
+  // restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
 })()

.vitepress/inlined-scripts/restorePreference.js

@@ -20,48 +20,12 @@ function dismiss() {
 }
 </script>
 
-
 <template>
   <div class="banner" v-if="open">
-    <svg style="margin-right: 0.5rem" width="20" height="20" viewBox="0 0 30 30" fill="none"
-      xmlns="http://www.w3.org/2000/svg">
-      <g>
-        <path
-          d="M20.3653 1.01733L11.1779 2.87249C11.0895 2.87249 11.0012 2.96082 11.0012 2.96082C10.9128 3.04916 10.9128 3.13751 10.9128 3.13751L10.3828 13.2083C10.3828 13.2967 10.3828 13.2967 10.3828 13.3851C10.3828 13.4734 10.4711 13.4734 10.4711 13.4734C10.4711 13.4734 10.5595 13.5618 10.6478 13.5618C10.7361 13.5618 10.7361 13.5618 10.8245 13.5618L13.3864 12.9433C13.6514 12.855 13.8281 13.12 13.8281 13.3851L13.033 17.3603C12.9447 17.6254 13.2097 17.8905 13.4748 17.8021L15.0648 17.272C15.3299 17.1837 15.5066 17.4487 15.5066 17.7137L14.2697 23.8976C14.1815 24.251 14.7115 24.5159 14.8882 24.1626L15.0648 23.8976L22.5738 8.08458C22.5738 7.90789 22.3088 7.55453 22.0438 7.64287L19.3935 8.17292C19.1286 8.26125 18.9519 7.99624 19.0402 7.73122L20.7187 1.45903C20.807 1.19401 20.6304 0.928988 20.3653 1.01733Z"
-          fill="url(#paint0_linear_648_13)" />
-        <path
-          d="M29.6424 3.75619C29.2891 3.22614 28.5824 2.96112 27.964 3.04945L20.985 4.37457L20.72 5.43465L28.2289 4.10955C28.494 4.02121 28.7591 4.19788 28.9357 4.37457C29.1124 4.63959 29.1124 4.90462 28.9357 5.16964L15.773 28.5799C15.6846 28.845 15.4196 28.9332 15.1545 28.9332C14.8896 28.9332 14.6245 28.7566 14.5361 28.5799L1.10836 5.08129C0.931674 4.90462 0.931674 4.55125 1.10836 4.37457C1.28504 4.19788 1.46172 4.10955 1.72674 4.10955C1.72674 4.10955 1.81508 4.10955 1.90342 4.10955L9.85411 5.523L9.94246 4.55125L1.99176 3.04945C1.28504 2.96112 0.666654 3.22614 0.313291 3.75619C-0.0400717 4.28623 -0.128412 4.99295 0.22495 5.61134L13.6528 29.1099C13.9178 29.64 14.5361 29.9933 15.1545 29.9933C15.773 29.9933 16.303 29.64 16.6563 29.1099L29.8191 5.61134C30.0842 4.99295 30.0842 4.28623 29.6424 3.75619Z"
-          fill="url(#paint1_linear_648_13)" />
-      </g>
-      <defs>
-        <linearGradient id="paint0_linear_648_13" x1="10.5947" y1="3.97762" x2="20.9471" y2="17.0584"
-          gradientUnits="userSpaceOnUse">
-          <stop stop-color="#B047FF" />
-          <stop offset="0.75" stop-color="#FFD0D0" />
-          <stop offset="0.9167" stop-color="#FFF3E6" />
-        </linearGradient>
-        <linearGradient id="paint1_linear_648_13" x1="8.078" y1="1.32911" x2="23.118" y2="18.0977"
-          gradientUnits="userSpaceOnUse">
-          <stop stop-color="#57CCFF" />
-          <stop offset="1" stop-color="#AF48FF" />
-        </linearGradient>
-      </defs>
-    </svg>
-    <p class="vt-banner-text">
-      <span class="vt-main">ViteConf 2025</span>
-      <span class="vt-tagline"> · First time <span style="font-weight: 900;">in-person</span></span>
-      <span class="vt-place"> · Amsterdam</span>
-      <span class="vt-date"> · Oct 09-10</span>
-      <a target="_blank" class="vt-primary-action"
-        href="https://viteconf.amsterdam/?utm_source=vuejs&utm_content=top_banner">
-        Register
-      </a>
-    </p>
+    <a target="_blank"></a>
     <button @click="dismiss">
       <VTIconPlus class="close" />
     </button>
-    <div class="glow glow--purple"></div>
-    <div class="glow glow--blue"></div>
   </div>
 </template>
 
@@ -82,80 +46,31 @@ html:not(.banner-dismissed) {
   height: var(--vt-banner-height);
   line-height: var(--vt-banner-height);
   text-align: center;
-  font-size: 12px;
-  color: white;
-  background: #262626;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  overflow: hidden;
-}
-
-.glow.glow--purple {
-  position: absolute;
-  bottom: -15%;
-  left: -75%;
-  width: 80%;
-  aspect-ratio: 1.5;
-  pointer-events: none;
-  border-radius: 100%;
-  background: linear-gradient(270deg, #7a23a1, #715ebde6 60% 80%, #bd34fe00);
-  filter: blur(15vw);
-  transform: none;
-  opacity: .6
-}
-
-.glow.glow--blue {
-  position: absolute;
-  bottom: -15%;
-  right: -40%;
-  width: 80%;
-  aspect-ratio: 1.5;
-  pointer-events: none;
-  border-radius: 100%;
-  background: linear-gradient(180deg, #61d9ff, #0000);
-  filter: blur(15vw);
-  transform: none;
-  opacity: .3
-}
-
-@media (min-width: 768px) {
-  .glow.glow--blue {
-    top: -15%;
-    right: -40%;
-    width: 80%;
-  }
-
-  .glow.glow--purple {
-    bottom: -15%;
-    left: -40%;
-    width: 80%;
-  }
-}
-
-@media (min-width: 1025px) {
-  .glow.glow--blue {
-    top: -15%;
-    right: -40%;
-    width: 80%;
-  }
-
-  .glow.glow--purple {
-    bottom: -15%;
-    left: -40%;
-    width: 80%;
-  }
+  font-size: 13px;
+  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%
+  );
 }
 
 .banner-dismissed .banner {
   display: none;
 }
 
+a:hover {
+  text-decoration: underline;
+}
+
 button {
   position: absolute;
   right: 0;
   top: 0;
-  padding: 5px 5px;
+  padding: 5px;
 }
 
 .close {
@@ -164,66 +79,10 @@ button {
   fill: #fff;
   transform: rotate(45deg);
 }
-
-.vt-banner-text {
-  color: #fff;
-  font-size: 12px;
-}
-
-.vt-main {
-  color: transparent;
-  background-image: linear-gradient(120deg, #b047ff 16%, #9499ff, #9499ff);
-  background-clip: text;
-}
-
-.vt-primary-action {
-  background: radial-gradient(141.42% 141.42% at 100% 0%, #ffffff80, #fff0), radial-gradient(140.35% 140.35% at 100% 94.74%, #bd34fe, #bd34fe00), radial-gradient(89.94% 89.94% at 18.42% 15.79%, #41d1ff, #41d1ff00);
-  color: #fff;
-  padding: 4px 8px;
-  border-radius: 5px;
-  font-size: 10px;
-  text-decoration: none;
-  margin: 0 10px;
-  transition: all .2s ease-in-out;
-
-  &:hover {
-    box-shadow: 0 1px #fffc inset;
-  }
-}
-
-
-@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: 4px 8px;
-  }
-
-  .vt-time-now {
-    display: none;
-  }
-}
-
-@media (max-width: 560px) {
-  .vt-place {
+/*
+@media (max-width: 720px) {
+  a > span {
     display: none;
   }
-}
-</style>
+} */
+</style>

.vitepress/theme/components/Banner.vue

@@ -4,7 +4,7 @@ import { computed, onMounted, ref, shallowRef } from 'vue'
 const props = withDefaults(
   defineProps<{
     items: Array<any>
-    filter?: (item: any) => boolean
+    filter?: (item: any) => boolean | undefined
     cardComponent: any
     showLinkToAll?: boolean
     shuffleItems?: boolean

.vitepress/theme/components/CardList.vue

@@ -45,7 +45,7 @@ import { VTLink } from '@vue/theme'
           href="https://news.vuejs.org/"
           no-icon
         >news.vuejs.org</VTLink>. Вы также можете зайти на социальную страницу в
-        <VTLink class="link" href="https://twitter.com/vuejs" no-icon>Twitter</VTLink>, или присоединяйтесь к нашему дому в
+        <VTLink class="link" href="https://x.com/vuejs" no-icon>Twitter</VTLink>, или присоединяйтесь к нашему дому в
         <VTLink class="link" href="https://discord.com/invite/vue" no-icon>Discord</VTLink>.
       </p>
     </div>

.vitepress/theme/components/NewsLetter.vue

@@ -13,7 +13,7 @@ const { page } = useData()
 type Source = 'url-query' | 'url-header' | 'default'
 let source: Source | false =
   inBrowser && localStorage.getItem(preferCompositionKey) === null
-    ? 'default'
+    ? 'default' as Source
     : false
 
 if (inBrowser) {
@@ -105,7 +105,7 @@ function dismiss() {
           Используйте переключатель для переключения между стилями API.
         </p>
       </template>
-      <template v-if="source && source.startsWith('url')">
+      <template v-else-if="source && source.startsWith('url')">
         <p>
           Показывается контент для
           {{ preferComposition ? 'Composition' : 'Options' }} API так как