Synced recent (code) updates

_config.yml

@@ -188,4 +188,3 @@ alias:
   examples/svg.html: v2/examples/svg.html
   examples/todomvc.html: v2/examples/todomvc.html
   examples/tree-view.html: v2/examples/tree-view.html
-

package.json

@@ -2,27 +2,27 @@
   "name": "cn.vuejs.org",
   "private": true,
   "hexo": {
-    "version": "3.4.4"
+    "version": "3.7.0"
   },
   "scripts": {
     "start": "hexo server",
     "build": "node pre-deploy.js && hexo clean && hexo generate",
     "deploy": "npm run build && hexo deploy"
   },
   "dependencies": {
-    "hexo": "^3.4.2",
+    "hexo": "^3.6.0",
     "hexo-deployer-git": "0.3.1",
     "hexo-generator-alias": "git+https://github.com/chrisvfritz/vuejs.org-hexo-generator-alias.git",
     "hexo-generator-archive": "^0.1.5",
     "hexo-generator-category": "^0.1.3",
     "hexo-generator-feed": "^1.2.2",
     "hexo-generator-index": "^0.2.1",
     "hexo-generator-tag": "^0.2.0",
-    "hexo-offline": "^0.2.2",
+    "hexo-offline": "^0.2.3",
     "hexo-renderer-ejs": "^0.3.1",
     "hexo-renderer-marked": "^0.3.0",
     "hexo-renderer-stylus": "^0.3.3",
-    "hexo-server": "^0.2.2",
-    "request": "^2.83.0"
+    "hexo-server": "^0.3.1",
+    "request": "^2.85.0"
   }
-}
+}

themes/vue/_config.yml

@@ -17,8 +17,8 @@ platinum_sponsors:
     img: tooltwist.png
   - url: https://vueschool.io/?utm_source=Vuejs.org&utm_medium=Banner&utm_campaign=Sponsored%20Banner&utm_content=V1
     img: vueschool.png
-  - url: https://www.datacamp.com/careers?utm_source=vuejs&utm_medium=sidebar
-    img: datacamp.png
+  - url: https://vehikl.com/
+    img: vehikl.png
 
 platinum_sponsors_china:
   - url: https://xiaozhuanlan.com/
@@ -55,6 +55,10 @@ gold_sponsors:
     img: bmqb.png
   - url: https://codepilot.ai
     img: codepilot.png
+  - url: https://teamextension.io/
+    img: teamextension.png
+  - url: https://jsguru.io/
+    img: jsguru.png
 
 bronze_sponsors:
   - url: http://tighten.co/

themes/vue/layout/partials/toc.ejs

@@ -27,24 +27,8 @@
         <li><h3>更多</h3></li>
       <% } %>
     <% } %>
-    <% if (type === 'cookbook') { %>
-      <% if (p.order === 1.1) { %>
-        <li><h3>Vue Instance</h3></li>
-      <% } %>
-      <!-- Move cookbook sections here once they have -->
-      <!-- at least one recipe -->
-    <% } %>
     <li>
       <a href="<%- url_for(p.path) %>" class="sidebar-link<%- page.title === p.title ? ' current' : '' %><%- p.is_new ? ' new' : '' %>"><%- p.title %></a>
     </li>
   <% }) %>
-  <% if (type === 'cookbook') { %>
-    <li><h3>Components</h3></li>
-    <li><h4>Form Inputs</h4></li>
-    <li><h4>3rd-Party Integrations</h4></li>
-    <li><h3>Transitions</h3></li>
-    <li><h3>Directives</h3></li>
-    <li><h3>Vue Router</h3></li>
-    <li><h3>Vuex</h3></li>
-  <% } %>
 </ul>

themes/vue/source/css/_demo.styl

@@ -14,6 +14,11 @@
   h1
     margin: 0 0 .5em
     font-size: 1.8em
+  h2
+    padding: 0
+    border: none
+  h2, h3, h4, h5, h6
+    margin: 1em 0
   ul, ol
     padding-left: 1.5em
     padding-bottom: .2em !important
@@ -34,13 +39,13 @@
   p
     margin: 0 !important
     padding: 0 !important
-    &:first-child
-      margin-top: 0
-    &:last-child
-      margin-bottom: 0
   textarea
     width: 100%
     resize: vertical
+  > :first-child
+    margin-top: 0
+  > :last-child
+    margin-bottom: 0
 
 
 
@@ -67,4 +72,4 @@ ul#demo, ul.demo
     page-break-inside: avoid
     padding: 1em
     margin-bottom: 1em
-    border-width: 2px
+    border-width: 2px

themes/vue/source/css/_sponsors-sidebar.styl

@@ -3,14 +3,14 @@
   font-size: .85em
   .logo
     color: $light
-    margin-top: 6px
+    margin-top: 10px
     text-align: center
     font-weight: bold
     display block
     &:first-child
       margin-top: 12px
     &:last-child
-      margin-bottom: 12px
+      margin-bottom: 14px
   img, a
     width: 125px
 
@@ -25,9 +25,12 @@
   text-align: center
   margin-bottom: 20px
 
+#sidebar-sponsors-special
+  margin-topL: -10px
+
 @media screen and (min-width: 1300px)
-  #sidebar-sponsors
-    position fixed
-    z-index 99
-    top 90px
-    right 20px
+  #sidebar-sponsors-platinum
+    position: fixed
+    z-index: 99
+    top: 90px
+    right: 20px

themes/vue/source/js/common.js

@@ -1,4 +1,5 @@
 (function () {
+  // initHashLevelRedirects()
   initMobileMenu()
   initVideoModal()
   if (PAGE_TYPE) {
@@ -8,6 +9,95 @@
     initLocationHashFuzzyMatching()
   }
 
+  // Most redirects should be specified in Hexo's
+  // _config.yml. However, it can't handle hash-level
+  // redirects, such as:
+  //
+  // /foo#hello -> /bar#hello
+  //
+  // For these cases where a section on one page has
+  // moved to a perhaps differently-named section on
+  // another page, we need this.
+  function initHashLevelRedirects() {
+    checkForHashRedirect(/components\.html$/, {
+      'What-are-Components': '/v2/guide/components.html',
+      'Using-Components': '/v2/guide/components-registration.html',
+      'Global-Registration':
+        '/v2/guide/components-registration.html#Global-Registration',
+      'Local-Registration':
+        '/v2/guide/components-registration.html#Local-Registration',
+      'Composing-Components':
+        '/v2/guide/components.html#Organizing-Components',
+      Props:
+        '/v2/guide/components.html#Passing-Data-to-Child-Components-with-Props',
+      'Passing-Data-with-Props':
+        '/v2/guide/components.html#Passing-Data-to-Child-Components-with-Props',
+      'camelCase-vs-kebab-case':
+        '/v2/guide/components-props.html#Prop-Casing-camelCase-vs-kebab-case',
+      'Dynamic-Props':
+        '/v2/guide/components-props.html#Static-and-Dynamic-Props',
+      'Literal-vs-Dynamic':
+        '/v2/guide/components-props.html#Static-and-Dynamic-Props',
+      'One-Way-Data-Flow':
+        '/v2/guide/components-props.html#One-Way-Data-Flow',
+      'Prop-Validation': '/v2/guide/components-props.html#Prop-Validation',
+      'Non-Prop-Attributes':
+        '/v2/guide/components-props.html#Non-Prop-Attributes',
+      'Replacing-Merging-with-Existing-Attributes':
+        '/v2/guide/components-props.html#Replacing-Merging-with-Existing-Attributes',
+      'Custom-Events':
+        '/v2/guide/components.html#Sending-Messages-to-Parents-with-Events',
+      'Using-v-on-with-Custom-Events':
+        '/v2/guide/components.html#Sending-Messages-to-Parents-with-Events',
+      'Binding-Native-Events-to-Components':
+        '/v2/guide/components-custom-events.html#Binding-Native-Events-to-Components',
+      'sync-Modifier':
+        '/v2/guide/components-custom-events.html#sync-Modifier',
+      'Form-Input-Components-using-Custom-Events':
+        '/v2/guide/components-custom-events.html#Binding-Native-Events-to-Components',
+      'Customizing-Component-v-model':
+        '/v2/guide/components-custom-events.html#Customizing-Component-v-model',
+      'Non-Parent-Child-Communication': '/v2/guide/state-management.html',
+      'Compilation-Scope':
+        '/v2/guide/components-slots.html#Compilation-Scope',
+      'Single-Slot': '/v2/guide/components-slots.html#Slot-Content',
+      'Named-Slots': '/v2/guide/components-slots.html#Named-Slots',
+      'Scoped-Slots': '/v2/guide/components-slots.html#Scoped-Slots',
+      'Dynamic-Components': '/v2/guide/components.html#Dynamic-Components',
+      'keep-alive':
+        '/v2/guide/components-dynamic-async.html#keep-alive-with-Dynamic-Components',
+      Misc: '/v2/guide/components-edge-cases.html',
+      'Authoring-Reusable-Components':
+        '/v2/guide/components.html#Organizing-Components',
+      'Child-Component-Refs':
+        '/v2/guide/components-edge-cases.html#Accessing-Child-Component-Instances-amp-Child-Elements',
+      'Async-Components':
+        '/v2/guide/components-dynamic-async.html#Async-Components',
+      'Advanced-Async-Components':
+        '/v2/guide/components-dynamic-async.html#Handling-Loading-State',
+      'Component-Naming-Conventions':
+        '/v2/guide/components-registration.html#Component-Names',
+      'Recursive-Components':
+        '/v2/guide/components-edge-cases.html#Recursive-Components',
+      'Circular-References-Between-Components':
+        '/v2/guide/components-edge-cases.html#Circular-References-Between-Components',
+      'Inline-Templates':
+        '/v2/guide/components-edge-cases.html#Inline-Templates',
+      'X-Templates': '/v2/guide/components-edge-cases.html#X-Templates',
+      'Cheap-Static-Components-with-v-once':
+        '/v2/guide/components-edge-cases.html#Cheap-Static-Components-with-v-once'
+    })
+    function checkForHashRedirect(pageRegex, redirects) {
+      // Abort if the current page doesn't match the page regex
+      if (!pageRegex.test(window.location.pathname)) return
+
+      var redirectPath = redirects[window.location.hash.slice(1)]
+      if (redirectPath) {
+        window.location.href = window.location.origin + redirectPath
+      }
+    }
+  }
+
   function initApiSpecLinks () {
     var apiContent = document.querySelector('.content.api')
     if (apiContent) {
@@ -260,7 +350,17 @@
       }, true)
 
       // make links clickable
-      allHeaders.forEach(makeHeaderClickable)
+      allHeaders
+        .filter(function(el) {
+          if (!el.querySelector('a')) {
+            return false
+          }
+          var demos = [].slice.call(document.querySelectorAll('demo'))
+          return !demos.some(function(demoEl) {
+            return demoEl.contains(el)
+          })
+        })
+        .forEach(makeHeaderClickable)
 
       smoothScroll.init({
         speed: 400,
@@ -421,7 +521,7 @@
       .replace(rControl, '')
       // Replace special characters
       .replace(rSpecial, separator)
-      // Remove continous separators
+      // Remove continuous separators
       .replace(new RegExp(escapedSep + '{2,}', 'g'), separator)
       // Remove prefixing and trailing separtors
       .replace(new RegExp('^' + escapedSep + '+|' + escapedSep + '+$', 'g'), '')