Merge remote-tracking branch 'origin/upstream' into sync

# Conflicts:
#	.vitepress/theme/components/NewsLetter.vue
#	.vitepress/theme/index.ts
#	pnpm-lock.yaml
#	src/about/community-guide.md
#	src/api/options-lifecycle.md
#	src/guide/best-practices/production-deployment.md
#	src/guide/built-ins/suspense.md
#	src/guide/built-ins/transition-group.md
#	src/guide/built-ins/transition.md
#	src/guide/extras/composition-api-faq.md
#	src/guide/extras/reactivity-in-depth.md
#	src/guide/extras/render-function.md
#	src/guide/extras/ways-of-using-vue.md
#	src/guide/extras/web-components.md
#	src/guide/quick-start.md
#	src/guide/reusability/custom-directives.md
#	src/guide/scaling-up/tooling.md
#	src/guide/typescript/composition-api.md
#	src/guide/typescript/overview.md

Author: wxsms

.gitignore

@@ -15,6 +15,7 @@
 .Trashes
 .VolumeIcon.icns
 .com.apple.timemachine.donotpresent
+.idea
 
 # Directories potentially created on remote AFP share
 .AppleDB

.idea/.gitignore

@@ -760,7 +760,7 @@ export default defineConfigWithTheme<ThemeConfig>({
     socialLinks: [
       { icon: 'github', link: 'https://github.com/vuejs/' },
       { icon: 'twitter', link: 'https://twitter.com/vuejs' },
-      { icon: 'discord', link: 'https://discord.com/invite/HBherRA' }
+      { icon: 'discord', link: 'https://discord.com/invite/vue' }
     ],
 
     editLink: {

.idea/aws.xml

@@ -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__ = 'vueconfus2024'
+  restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
 })()

.idea/codeStyles/Project.xml

@@ -22,16 +22,30 @@ 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"> - Join the official Vue.js conference</span>
+      | May 15-17, 2024 <span class="vt-place"> - New Orleans, USA</span>
+      <a
+        target="_blank"
+        class="vt-primary-action"
+        href="https://vueconf.us?utm_source=vuejs&utm_content=top_banner"
+      >Register <span class="vt-time-now">Now</span></a
+      >
+    </p>
     <button @click="dismiss">
       <VTIconPlus class="close" />
     </button>
+    <p class="vt-banner-text vt-coupon">
+      <span class="vt-text-primary">Use code</span> VUEJSDOCS
+      <span class="vt-text-primary">to get $100 off!</span>
+    </p>
   </div>
 </template>
 
 <style>
 html:not(.banner-dismissed) {
-  --vt-banner-height: 30px;
+  --vt-banner-height: 60px;
 }
 </style>
 
@@ -50,12 +64,10 @@ 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: #11252b;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
 .banner-dismissed .banner {
@@ -70,7 +82,7 @@ button {
   position: absolute;
   right: 0;
   top: 0;
-  padding: 5px;
+  padding: 20px 10px;
 }
 
 .close {
@@ -79,10 +91,59 @@ 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 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 {
     display: none;
   }
-} */
+}
 </style>

.idea/codeStyles/codeStyleConfig.xml

@@ -44,9 +44,9 @@ import { VTLink } from '@vue/theme'
           class="link"
           href="https://news.vuejs.org/"
           no-icon
-          >news.vuejs.org</VTLink> 阅读之前的期刊并收听我们的播客。你也可以在 
+          >news.vuejs.org</VTLink> 阅读之前的期刊并收听我们的播客。你也可以在
         <VTLink class="link" href="https://twitter.com/vuejs" no-icon>Twitter</VTLink> 关注我们，或加入我们的
-        <VTLink class="link" href="https://chat.vuejs.org/" no-icon>Discord</VTLink> 家园。
+        <VTLink class="link" href="https://discord.com/invite/vue" no-icon>Discord</VTLink> 家园。
       </p>
     </div>
   </section>

.idea/docs.iml

@@ -15,7 +15,7 @@
     "preinstall": "npx only-allow pnpm"
   },
   "dependencies": {
-    "@vue/repl": "^3.0.0",
+    "@vue/repl": "^4.0.1",
     "@vue/theme": "^2.2.5",
     "dynamics.js": "^1.1.5",
     "gsap": "^3.9.0",