Merge branch 'master' into patch-1

Author: GuiDevloper

assets/lifecycle-diagram.svg

@@ -1,7 +1,7 @@
 {
   "devDependencies": {
     "@vuepress/plugin-pwa": "^1.5.4",
-    "node-sass": "^4.13.1",
+    "sass": "^1.32.0",
     "sass-loader": "^8.0.2",
     "vuepress": "^1.5.4"
   },
@@ -14,7 +14,6 @@
     "@docsearch/css": "^1.0.0-alpha.27",
     "@docsearch/js": "^1.0.0-alpha.27",
     "algoliasearch": "^4.4.0",
-    "axios": "^0.19.1",
     "intersection-observer": "^0.11.0",
     "showdown": "^1.9.1"
   }

assets/scoped-slot-diagram.svg

@@ -1,15 +1,25 @@
 <script>
-const validBadges = ['new', 'breaking', 'removed', 'updated']
+const validBadges = {
+  new: 'new',
+  breaking: 'breaking',
+  removed: 'removed',
+  updated: 'updated'
+}
 
 export default {
   props: {
     badges: {
       type: Array,
       default: () => [],
       validator(value) {
-        return value.every(badge => validBadges.includes(badge))
+        return value.every(badge => Object.keys(validBadges).includes(badge))
       }
     }
+  },
+  data() {
+    return {
+      validBadges
+    }
   }
 }
 </script>
@@ -21,7 +31,7 @@ export default {
       :class="`migration-badge is-${badgeType}`"
       :key="`badge-type-${badgeType}`"
     >
-      {{ badgeType }}
+      {{ validBadges[badgeType] }}
     </span>
   </div>
 </template>

assets/slot-render-diagram.svg

@@ -11,9 +11,9 @@
     :data-pen-title="title"
     :data-embed-version="version"
     :style="`height: ${height}px`">
-    <span>See the Pen <a :href="href">{{ title }}</a>
-    by {{ name || user }} (<a :href="`https://codepen.io/${user}`">@{{user}}</a>)
-    on <a href="https://codepen.io">CodePen</a>.</span>
+    <span>Veja o exemplo <a :href="href">{{ title }}</a>
+    por {{ name || user }} (<a :href="`https://codepen.io/${user}`">@{{user}}</a>)
+    no <a href="https://codepen.io">CodePen</a>.</span>
   </p>
 </template>
 
@@ -44,7 +44,7 @@ export default {
 
     user: {
       type: String,
-      default: 'Vue',
+      default: 'vuejs-br',
     },
 
     name: {

package.json

@@ -18,20 +18,20 @@
       </div>
 
       <p class="modal-text">
-        Video by
+        Vídeo por
         <a
           href="https://www.vuemastery.com"
           target="_blank"
           rel="sponsored noopener"
-          title="Vue.js Courses on Vue Mastery"
+          title="Cursos de Vue.js na Vue Mastery"
           >Vue Mastery</a
-        >. Watch Vue Mastery’s free
+        >. Assista ao gratuito
         <a
           href="https://www.vuemastery.com/courses/intro-to-vue-3/intro-to-vue3"
           target="_blank"
           rel="sponsored noopener"
-          title="Vue.js Courses on Vue Mastery"
-          >Intro to Vue course</a
+          title="Cursos de Vue.js na Vue Mastery"
+          >Curso de Introdução ao Vue</a
         >.
       </p>
     </div>

src/.vuepress/components/MigrationBadges.vue

@@ -109,14 +109,14 @@ const members = [
       languages: ['hi', 'en'],
       work: {
         role: 'Software Engineer',
-        org: 'Myntra',
-        orgUrl: 'https://www.myntra.com/'
+        org: 'Grammarly',
+        orgUrl: 'https://grammarly.com/'
       },
       github: 'znck',
       twitter: 'znck0',
-      reposOfficial: ['rollup-plugin-vue', 'vue-issue-helper'],
-      reposPersonal: ['keynote', 'bootstrap-for-vue', 'vue-interop'],
-      links: ['https://znck.me', 'https://www.codementor.io/znck']
+      reposOfficial: ['rollup-plugin-vue', 'vue-next'],
+      reposPersonal: ['vue-developer-experience', 'prop-types', 'grammarly'],
+      links: ['https://znck.me']
     },
     {
       name: 'Linusborg',
@@ -248,11 +248,11 @@ const members = [
     {
       name: 'Natalia Tepluhina',
       title: 'Fox Tech Guru',
-      city: 'Kyiv, Ukraine',
+      city: 'Amsterdam, Netherlands',
       languages: ['uk', 'ru', 'en'],
       reposOfficial: ['vuejs.org', 'vue-cli'],
       work: {
-        role: 'Senior Frontend Engineer',
+        role: 'Staff Frontend Engineer',
         org: 'GitLab',
         orgUrl: 'https://gitlab.com/'
       },
@@ -299,6 +299,16 @@ const members = [
       twitter: 'KiaKing85',
       reposOfficial: ['vuex'],
       reposPersonal: ['vuex-orm/*']
+    },
+    {
+      name: 'Anthony Fu',
+      city: 'Taipei, Taiwan',
+      languages: ['zh', 'en'],
+      github: 'antfu',
+      twitter: 'antfu7',
+      reposOfficial: ['composition-api'],
+      reposPersonal: ['vueuse', 'vue-demi', 'vue-reactivity/*'],
+      links: ['https://antfu.me/']
     }
   ])
 )

src/.vuepress/components/common/codepen-snippet.vue

@@ -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,