Merge branch 'master' of github.com:vuejs/docs-next

Author: NataliaTepluhina

README.md

@@ -11,7 +11,7 @@ See the [Vue Docs Writing Guide](https://v3.vuejs.org/guide/writing-guide.html)
 1. Clone repository
 
 ```bash
-git clone git@github.com:vuejs/docs-next.git
+git clone git@github.com:vuejs/docs.git
 ```
 
 2. Install dependencies

src/.vuepress/components/community/themes/theme-data.js

@@ -127,51 +127,79 @@ export default [
   },
   {
     name: 'PrimeVue',
-    description: `The open-source UI component library [PrimeVue](https://www.primefaces.org/primevue/#/?af_id=4218) offers over 50 flexible components to build your apps with! They have a ton of different component themes and Vue-CLI application templates available to get the look&feel that suits you best.`,
+    description: `The open-source UI component library [PrimeVue](https://www.primefaces.org/primevue/#/?af_id=4218) offers over 80 flexible components to build your apps with! They have a ton of different component themes and Vue-CLI application templates available to get the look&feel that suits you best.`,
     seeMoreUrl: 'https://www.primefaces.org/primevue/#/?af_id=4218',
     products: [
       {
-        name: 'Sapphire',
+        name: 'Freya',
+        price: 59,
+        description: 'Premium Admin Template',
+        url: 'https://www.primefaces.org/layouts/freya-vue?af_id=4218',
+        image: 'https://www.primefaces.org/vue-templates/freya.jpg'
+      },
+      {
+        name: 'Diamond',
+        price: 59,
+        description: 'PrimeOne Design Admin Template',
+        url: 'https://www.primefaces.org/layouts/diamond-vue?af_id=4218',
+        image: 'https://www.primefaces.org/vue-templates/diamond.jpg'
+      },
+      {
+        name: 'Ultima',
         price: 79,
         description: 'Material Design Admin Template',
+        url: 'https://www.primefaces.org/layouts/ultima-vue?af_id=4218',
+        image: 'https://www.primefaces.org/vue-templates/ultima.jpg'
+      },
+      {
+        name: 'Sapphire',
+        price: 49,
+        description: 'Material Design Admin Template',
         url: 'https://www.primefaces.org/layouts/sapphire-vue?af_id=4218',
         image: 'https://www.primefaces.org/vue-templates/sapphire.jpg'
       },
       {
         name: 'Avalon',
-        price: 79,
+        price: 49,
         description: 'Bootstrap Inspired Admin Template',
         url: 'https://www.primefaces.org/layouts/avalon-vue?af_id=4218',
         image: 'https://www.primefaces.org/vue-templates/avalon.jpg'
       },
       {
         name: 'Serenity',
-        price: 79,
+        price: 49,
         description: 'Material Design Admin Template',
         url: 'https://www.primefaces.org/layouts/serenity-vue?af_id=4218',
         image: 'https://www.primefaces.org/vue-templates/serenity.jpg'
       },
       {
         name: 'Apollo',
-        price: 79,
+        price: 49,
         description: 'Admin Template with a Dark Mode',
         url: 'https://www.primefaces.org/layouts/apollo-vue?af_id=4218',
         image: 'https://www.primefaces.org/vue-templates/apollo.jpg'
       },
       {
         name: 'Babylon',
-        price: 79,
+        price: 49,
         description: 'Admin Template with Extensive Options',
         url: 'https://www.primefaces.org/layouts/babylon-vue?af_id=4218',
         image: 'https://www.primefaces.org/vue-templates/babylon.jpg'
       },
       {
         name: 'Roma',
-        price: 59,
+        price: 39,
         description: 'Admin Template with a Clean Design System',
         url: 'https://www.primefaces.org/layouts/roma-vue?af_id=4218',
         image: 'https://www.primefaces.org/vue-templates/roma.jpg'
       },
+      {
+        name: 'Prestige',
+        price: 39,
+        description: 'Highly Customizable Admin Template',
+        url: 'https://www.primefaces.org/layouts/prestige-vue?af_id=4218',
+        image: 'https://www.primefaces.org/vue-templates/prestige.jpg'
+      },
       {
         name: 'Sigma',
         price: 0,

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

@@ -11,7 +11,7 @@ export const labels = {
 // Repos are in alphabetical order by the language code
 // You may need to clear your sessionStorage when adding a new item to this list
 export const repos = [
-  { lang: 'en-us', owner: 'vuejs', repo: 'docs-next', branch: 'master', url: 'https://v3.vuejs.org/' },
+  { lang: 'en-us', owner: 'vuejs', repo: 'docs', branch: 'master', url: 'https://v3.vuejs.org/' },
   { lang: 'fr', owner: 'demahom18', repo: 'docs-next', branch: 'master', url: 'https://vue3-fr.netlify.app' },
   { lang: 'id', owner: 'vuejs-id', repo: 'docs-next', branch: 'indonesian' },
   { lang: 'ja', owner: 'vuejs-jp', repo: 'ja.vuejs.org', branch: 'lang-ja', url: 'https://v3.ja.vuejs.org/' },

src/.vuepress/config.js

@@ -423,23 +423,28 @@ module.exports = {
           // Translation maintainers: Please include the link below to the English documentation
           // {
           //   text: 'English',
-          //   link: 'https://v3.vuejs.org/'
+          //   link: 'https://v3.vuejs.org/',
+          //   isTranslation: true
           // },
           {
             text: '中文',
-            link: 'https://v3.cn.vuejs.org/'
+            link: 'https://v3.cn.vuejs.org/',
+            isTranslation: true
           },
           {
             text: '한국어',
-            link: 'https://v3.ko.vuejs.org/'
+            link: 'https://v3.ko.vuejs.org/',
+            isTranslation: true
           },
           {
             text: '日本語',
-            link: 'https://v3.ja.vuejs.org/'
+            link: 'https://v3.ja.vuejs.org/',
+            isTranslation: true
           },
           {
             text: 'Русский',
-            link: 'https://v3.ru.vuejs.org/'
+            link: 'https://v3.ru.vuejs.org/ru/',
+            isTranslation: true
           },
           {
             text: 'More Translations',
@@ -448,7 +453,7 @@ module.exports = {
         ]
       }
     ],
-    repo: 'vuejs/docs-next',
+    repo: 'vuejs/docs',
     editLinks: false,
     editLinkText: 'Edit this on GitHub!',
     lastUpdated: 'Last updated',

src/.vuepress/theme/components/NavLink.vue

@@ -22,8 +22,26 @@
 </template>
 
 <script>
+import Vue from 'vue'
 import { isExternal, isMailto, isTel, ensureExt } from '../util'
 
+const pageLocation = Vue.observable({ path: '/' })
+
+let initPath = () => {
+  initPath = () => {}
+
+  const updatePath = () => {
+    pageLocation.path = location.pathname
+  }
+
+  updatePath()
+
+  // There is no event for detecting navigation but these cover most cases
+  for (const event of ['focusin', 'scroll', 'mouseover', 'keydown']) {
+    window.addEventListener(event, updatePath)
+  }
+}
+
 export default {
   name: 'NavLink',
 
@@ -35,7 +53,13 @@ export default {
 
   computed: {
     link () {
-      return ensureExt(this.item.link)
+      let link = ensureExt(this.item.link)
+
+      if (this.item.isTranslation) {
+        link = link.replace(/\/$/, '') + pageLocation.path
+      }
+
+      return link
     },
 
     exact () {
@@ -68,7 +92,7 @@ export default {
     },
 
     rel () {
-      if (this.isNonHttpURI) {
+      if (this.isNonHttpURI || this.item.isTranslation) {
         return null
       }
       if (this.item.rel) {
@@ -82,6 +106,10 @@ export default {
     focusoutAction () {
       this.$emit('focusout')
     }
+  },
+
+  mounted () {
+    initPath()
   }
 }
 </script>

src/.vuepress/theme/layouts/404.vue

@@ -3,7 +3,13 @@
     <div class="theme-default-content">
       <h1>404</h1>
 
-      <blockquote>{{ getMsg() }}</blockquote>
+      <blockquote>
+        <p>Whoops! This page doesn't exist.</p>
+      </blockquote>
+
+      <p v-show="isTranslation">
+        New pages are added to the documentation all the time. This page might not be included in all of the translations yet.
+      </p>
 
       <RouterLink to="/">
         Take me home.
@@ -13,17 +19,22 @@
 </template>
 
 <script>
-const msgs = [
-  `There's nothing here.`,
-  `How did we get here?`,
-  `That's a Four-Oh-Four.`,
-  `Looks like we've got some broken links.`
-]
+import { repos } from '../../components/guide/contributing/translations-data.js'
 
 export default {
-  methods: {
-    getMsg () {
-      return msgs[Math.floor(Math.random() * msgs.length)]
+  data () {
+    return {
+      isTranslation: false
+    }
+  },
+
+  mounted () {
+    const toOrigin = url => (String(url).match(/https?:\/\/[^/]+/) || [])[0]
+    const referrer = toOrigin(document.referrer)
+
+    // Did we get here from a translation?
+    if (referrer && referrer !== location.origin && repos.some(({ url }) => toOrigin(url) === referrer)) {
+      this.isTranslation = true
     }
   }
 }

src/api/global-api.md

@@ -63,6 +63,8 @@ const app = createApp(
 </div>
 ```
 
+The root props are raw props, much like those passed to [`h`](#h) to create a VNode. In addition to component props, they can also include attributes and event listeners to be applied to the root component.
+
 ### Typing
 
 ```ts

src/guide/contributing/translations.md

@@ -16,7 +16,7 @@ Thank you to everyone who has contributed to these translations. Your hard work
 
 ## How can I get involved with translations?
 
-The first step is to check whether there is an existing translation for the relevant language. In addition to the table above, a good place to start is [this pinned issue](https://github.com/vuejs/docs-next/issues/478), which is used to keep track of the various translation initiatives happening in the community.
+The first step is to check whether there is an existing translation for the relevant language. In addition to the table above, a good place to start is [this pinned issue](https://github.com/vuejs/docs/issues/478), which is used to keep track of the various translation initiatives happening in the community.
 
 If there's already an active translation then there are various ways you can help out. The GitHub repository should be a good place to start gathering information about how a particular translation is managed and who does what. All translation repositories should allow you to file issues and open Pull Requests if you have suggestions for improving the translation.
 
@@ -32,7 +32,7 @@ The documentation is constantly being updated. Many changes are small and don't
 
 When you first start a translation, you may want to use a personal GitHub repository. That's fine, so long as it's publicly accessible and open to contributions from others. Make sure the *Issues* tab is enabled in the repository's settings. You can migrate the repository to a shared organization at a later stage.
 
-Once you start a translation, be sure to add it to [the pinned issue](https://github.com/vuejs/docs-next/issues/478) so that the rest of the community can find it.
+Once you start a translation, be sure to add it to [the pinned issue](https://github.com/vuejs/docs/issues/478) so that the rest of the community can find it.
 
 We also encourage you to update the root-level `README.md` at an early stage. Most translations add extra information to help potential contributors get involved.