marge with vuejs/docs(7fe90c5) & solve conflict

.github/contributing/writing-guide.md

@@ -85,7 +85,7 @@ Writing documentation is an exercise in empathy. We're not describing an objecti
 
 ### Tips, Callouts, Alerts, and Line Highlights
 
-We have some dedicated styles to denote something that's worth highlighting in a particular way. These are captured [on this page](https://vitepress.vuejs.org/guide/markdown.html#custom-containers). **They are to be used sparingly.**
+We have some dedicated styles to denote something that's worth highlighting in a particular way. These are captured [on this page](https://vitepress.dev/guide/markdown#custom-containers). **They are to be used sparingly.**
 
 There is a certain temptation to abuse these styles, as one can simply add a change inside a callout. However, this breaks up the flow of reading for the user and should only be used in special circumstances. Wherever possible, we should attempt to create a narrative and flow within the page to respect the reader's cognitive load.
 

.vitepress/config.ts

@@ -657,6 +657,16 @@ export default defineConfigWithTheme<ThemeConfig>({
         text: 'Français',
         repo: 'https://github.com/vuejs-translations/docs-fr'
       },
+      {
+        link: 'https://ko.vuejs.org',
+        text: '한국어',
+        repo: 'https://github.com/vuejs-translations/docs-ko'
+      },
+      {
+        link: 'https://pt.vuejs.org',
+        text: 'Português',
+        repo: 'https://github.com/vuejs-translations/docs-pt'
+      },
       {
         link: '/translations/',
         text: 'অনুবাদ করতে সাহায্য করুন!',

.vitepress/theme/components/SponsorsGroup.vue

@@ -77,7 +77,7 @@ function track(interest?: boolean) {
       href="/sponsor/"
       class="sponsor-item action"
       @click="track(true)"
-      >Your logo</a
+      >Become a Sponsor</a
     >
   </div>
 </template>

README.md

@@ -19,7 +19,7 @@ pnpm run dev
 
 - VitePress ডকুমেন্টেশনে সমর্থিত [Markdown এক্সটেনশনগুলি](https://vitepress.vuejs.org/guide/markdown.html) এবং [Markdown এর ভিতরে Vue সিনট্যাক্স](https://vitepress.vuejs.org/guide/using-vue.html) কিভাবে ব্যবহার করা যায় দেখুন ।
 
-- সমর্থিত [মার্কডাউন এক্সটেনশন]-এ VitePres ডক্স দেখুন(https://vitepress.vuejs.org/guide/markdown)এবং [মার্কডাউনের ভিতরে Vue সিনট্যাক্স ব্যবহার করার ক্ষমতা](https://vitepress.vuejs.org/guide/using-vue).
+- Supported [Markdown এক্সটেনশন](https://vitepress.dev/guide/markdown) এবং [Markdown ভিতরে Vue সিনট্যাক্স ব্যবহার করার](https://vitepress.dev/guide/using-vue) বিষয়ে VitePress ডক্স দেখুন।
 
 ## থিম নিয়ে কাজ করুন
 

package.json

@@ -10,10 +10,10 @@
   },
   "dependencies": {
     "@vue/repl": "^1.5.0",
-    "@vue/theme": "^2.2.3",
+    "@vue/theme": "^2.2.4",
     "dynamics.js": "^1.1.5",
     "gsap": "^3.9.0",
-    "vitepress": "^1.0.0-beta.1",
+    "vitepress": "1.0.0-beta.7",
     "vue": "^3.3.4"
   },
   "devDependencies": {