Merge branch 'vuejs:main' into main

Author: Abdelaziz18003

.vitepress/theme/components/PreferenceSwitch.vue

@@ -11,9 +11,9 @@ import {
 
 const route = useRoute()
 const show = $computed(() =>
-  /^\/(guide|tutorial|examples)\//.test(route.path)
+  /^\/(guide|tutorial|examples|style-guide)\//.test(route.path)
 )
-const showSFC = $computed(() => !/^\/guide/.test(route.path))
+const showSFC = $computed(() => !/^\/guide|style-guide/.test(route.path))
 
 let isOpen = $ref(true)
 
@@ -206,11 +206,11 @@ function useToggleFn(
     font-size: 11px;
     padding: 8px 4px;
   }
-  
+
   .vt-switch {
     margin: auto;
   }
-  
+
   .switch-link {
     margin-left: auto;
   }

src/guide/built-ins/transition.md

@@ -91,7 +91,7 @@ There are six classes applied for enter / leave transitions.
 
 4. `v-leave-from`: Starting state for leave. Added immediately when a leaving transition is triggered, removed after one frame.
 
-5. `v-leave-active`: Active state for leave. Applied during the entire leaving phase. Added immediately when a leave transition is triggered, removed when the transition/animation finishes. This class can be used to define the duration, delay and easing curve for the leaving transition.
+5. `v-leave-active`: Active state for leave. Applied during the entire leaving phase. Added immediately when a leaving transition is triggered, removed when the transition/animation finishes. This class can be used to define the duration, delay and easing curve for the leaving transition.
 
 6. `v-leave-to`: Ending state for leave. Added one frame after a leaving transition is triggered (at the same time `v-leave-from` is removed), removed when the transition/animation finishes.
 

src/guide/essentials/reactivity-fundamentals.md

@@ -101,7 +101,7 @@ export default {
 <div>{{ state.count }}</div>
 ```
 
-Similarly, we can declare functions that mutate reactive state in the same scope and expose it as a method alongside the state:
+Similarly, we can declare functions that mutate reactive state in the same scope and expose them as methods alongside the state:
 
 ```js{7-9,14}
 import { reactive } from 'vue'

src/style-guide/rules-essential.md

@@ -43,6 +43,7 @@ Detailed [prop definitions](/guide/components/props.html#prop-validation) have t
 - In development, Vue will warn you if a component is ever provided incorrectly formatted props, helping you catch potential sources of error.
   :::
 
+<div class="options-api">
 <div class="style-example style-example-bad">
 <h3>Bad</h3>
 
@@ -81,6 +82,47 @@ props: {
 }
 ```
 
+</div>
+</div>
+
+<div class="composition-api">
+<div class="style-example style-example-bad">
+<h3>Bad</h3>
+
+```js
+// This is only OK when prototyping
+const props = defineProps(['status'])
+```
+
+</div>
+
+<div class="style-example style-example-good">
+<h3>Good</h3>
+
+```js
+const props = defineProps({
+  status: String
+})
+```
+
+```js
+// Even better!
+
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+
+    validator: (value) => {
+      return ['syncing', 'synced', 'version-conflict', 'error'].includes(
+        value
+      )
+    }
+  }
+})
+```
+
+</div>
 </div>
 
 ## Use keyed `v-for` {#use-keyed-v-for}
@@ -339,99 +381,3 @@ Beyond the `scoped` attribute, using unique class names can help ensure that 3rd
 ```
 
 </div>
-
-## Avoid exposing private functions in mixins {#avoid-exposing-private-functions-in-mixins}
-
-Always use the `$_` prefix for custom private properties in a plugin, mixin, etc that should not be considered public API. Then to avoid conflicts with code by other authors, also include a named scope (e.g. `$_yourPluginName_`).
-
-::: details Detailed Explanation
-Vue uses the `_` prefix to define its own private properties, so using the same prefix (e.g. `_update`) risks overwriting an instance property. Even if you check and Vue is not currently using a particular property name, there is no guarantee a conflict won't arise in a later version.
-
-As for the `$` prefix, its purpose within the Vue ecosystem is special instance properties that are exposed to the user, so using it for _private_ properties would not be appropriate.
-
-Instead, we recommend combining the two prefixes into `$_`, as a convention for user-defined private properties that guarantee no conflicts with Vue.
-:::
-
-<div class="style-example style-example-bad">
-<h3>Bad</h3>
-
-```js
-const myGreatMixin = {
-  // ...
-  methods: {
-    update() {
-      // ...
-    }
-  }
-}
-```
-
-```js
-const myGreatMixin = {
-  // ...
-  methods: {
-    _update() {
-      // ...
-    }
-  }
-}
-```
-
-```js
-const myGreatMixin = {
-  // ...
-  methods: {
-    $update() {
-      // ...
-    }
-  }
-}
-```
-
-```js
-const myGreatMixin = {
-  // ...
-  methods: {
-    $_update() {
-      // ...
-    }
-  }
-}
-```
-
-</div>
-
-<div class="style-example style-example-good">
-<h3>Good</h3>
-
-```js
-const myGreatMixin = {
-  // ...
-  methods: {
-    $_myGreatMixin_update() {
-      // ...
-    }
-  }
-}
-```
-
-```js
-// Even better!
-const myGreatMixin = {
-  // ...
-  methods: {
-    publicMethod() {
-      // ...
-      myPrivateFunction()
-    }
-  }
-}
-
-function myPrivateFunction() {
-  // ...
-}
-
-export default myGreatMixin
-```
-
-</div>