Merge branch 'master' into migration-build-flags

Author: yyx990803

src/.vuepress/components/guide/contributing/translations-data.js

@@ -17,6 +17,6 @@ export const repos = [
   { lang: 'ja', owner: 'vuejs-jp', repo: 'ja.vuejs.org', branch: 'lang-ja', url: 'https://v3.ja.vuejs.org/' },
   { lang: 'ko', owner: 'vuejs-kr', repo: 'docs-next', branch: 'rootKoKr', url: 'https://v3.ko.vuejs.org/'  },
   { lang: 'pt-br', owner: 'vuejs-br', repo: 'docs-next', branch: 'master', url: 'https://vuejsbr-docs-next.netlify.app/' },
-  { lang: 'ru', owner: 'translation-gang', repo: 'docs-next', branch: 'master' },
+  { lang: 'ru', owner: 'translation-gang', repo: 'docs-next', branch: 'master', url: 'https://v3.ru.vuejs.org/' },
   { lang: 'zh-cn', owner: 'vuejs', repo: 'docs-next-zh-cn', branch: 'master', url: 'https://v3.cn.vuejs.org/' }
 ]

src/.vuepress/config.js

@@ -6,7 +6,8 @@ const sidebar = {
       children: [
         '/cookbook/',
         '/cookbook/editable-svg-icons',
-        '/cookbook/debugging-in-vscode'
+        '/cookbook/debugging-in-vscode',
+        '/cookbook/automatic-global-registration-of-base-components'
       ]
     }
   ],
@@ -202,6 +203,7 @@ const sidebar = {
         '/guide/migration/slots-unification',
         '/guide/migration/suspense',
         '/guide/migration/transition',
+        '/guide/migration/transition-as-root',
         '/guide/migration/transition-group',
         '/guide/migration/v-on-native-modifier-removed',
         '/guide/migration/v-model',
@@ -435,6 +437,10 @@ module.exports = {
             text: '日本語',
             link: 'https://v3.ja.vuejs.org/'
           },
+          {
+            text: 'Русский',
+            link: 'https://v3.ru.vuejs.org/'
+          },
           {
             text: 'More Translations',
             link: '/guide/contributing/translations#community-translations'

src/.vuepress/theme/styles/index.styl

@@ -115,7 +115,7 @@ ul, ol
   padding-left 1.2em
 
 strong
-  font-weight 500
+  font-weight 600
 
 h1, h2, h3, h4, h5, h6
   font-weight 500

src/api/application-api.md

@@ -329,14 +329,14 @@ setTimeout(() => app.unmount(), 5000)
   export default {
     install(app) {
       const version = Number(app.version.split('.')[0])
-      
+
       if (version < 3) {
         console.warn('This plugin requires Vue 3')
       }
-      
+
       // ...
     }
   }
   ```
-  
+
 - **See also**: [Global API - version](/api/global-api.html#version)

src/api/built-in-components.md

@@ -14,7 +14,7 @@ const { KeepAlive, Teleport, Transition, TransitionGroup } = Vue
 import { KeepAlive, Teleport, Transition, TransitionGroup } from 'vue'
 ```
 
-`<component>` and `<slot>` are component-like features of template syntax. They are not true components and they can't be imported like the components shown above. 
+`<component>` and `<slot>` are component-like features of template syntax. They are not true components and they can't be imported like the components shown above.
 
 ## component
 
@@ -45,13 +45,13 @@ import { KeepAlive, Teleport, Transition, TransitionGroup } from 'vue'
 
   ```js
   const { Transition, TransitionGroup } = Vue
-  
+
   const Component = {
     components: {
       Transition,
       TransitionGroup
     },
-    
+
     template: `
       <component :is="isGroup ? 'TransitionGroup' : 'Transition'">
         ...
@@ -60,7 +60,7 @@ import { KeepAlive, Teleport, Transition, TransitionGroup } from 'vue'
   }
   ```
 
-  Registration is not required if you pass the component itself to `is` rather than its name.  
+  Registration is not required if you pass the component itself to `is` rather than its name.
 
 - **See also:** [Dynamic Components](../guide/component-dynamic-async.html)
 
@@ -180,7 +180,7 @@ import { KeepAlive, Teleport, Transition, TransitionGroup } from 'vue'
 
   When wrapped around a dynamic component, `<keep-alive>` caches the inactive component instances without destroying them. Similar to `<transition>`, `<keep-alive>` is an abstract component: it doesn't render a DOM element itself, and doesn't show up in the component parent chain.
 
-  When a component is toggled inside `<keep-alive>`, its `activated` and `deactivated` lifecycle hooks will be invoked accordingly.
+  When a component is toggled inside `<keep-alive>`, its `activated` and `deactivated` lifecycle hooks will be invoked accordingly, providing an alternative to `mounted` and `unmounted`, which are not called. (This applies to the direct child of `<keep-alive>` as well as to all of its descendants.)
 
   Primarily used to preserve component state or avoid re-rendering.
 

src/api/composition-api.md

@@ -117,6 +117,9 @@ The component instance context is also set during the synchronous execution of l
   - `errorCaptured` -> `onErrorCaptured`
   - `renderTracked` -> `onRenderTracked`
   - `renderTriggered` -> `onRenderTriggered`
+  - `activated` -> `onActivated`
+  - `deactivated` -> `onDeactivated`
+
 
 - **See also**: [Composition API lifecycle hooks](../guide/composition-api-lifecycle-hooks.html)
 

src/api/global-api.md

@@ -96,7 +96,7 @@ Accepts three arguments: `type`, `props` and `children`
 
 - **Details:**
 
-  An HTML tag name, a component or an async component. Using function returning null would render a comment. This parameter is required
+  An HTML tag name, a component, an async component, or a functional component. Using function returning null would render a comment. This parameter is required
 
 #### props
 

src/api/instance-methods.md

@@ -122,7 +122,7 @@
 - **Option: deep**
 
   To also detect nested value changes inside Objects, you need to pass in `deep: true` in the options argument. This option also can be used to watch array mutations.
-  
+
   > Note: when mutating (rather than replacing) an Object or an Array and watch with deep option, the old value will be the same as new value because they reference the same Object/Array. Vue doesn't keep a copy of the pre-mutate value.
 
   ```js

src/api/options-assets.md

@@ -9,6 +9,7 @@
   A hash of directives to be made available to the component instance.
 
 - **Usage:**
+
   ```js
   const app = createApp({})
 
@@ -35,6 +36,7 @@
   A hash of components to be made available to the component instance.
 
 - **Usage:**
+
   ```js
   const Foo = {
     template: `<div>Foo</div>`

src/api/refs-api.md

@@ -217,7 +217,7 @@ isReactive(foo.value) // false
 
 ## `triggerRef`
 
-Execute any effects tied to a  [`shallowRef`](#shallowref) manually.
+Execute any effects tied to a [`shallowRef`](#shallowref) manually.
 
 ```js
 const shallow = shallowRef({