feat: support saber 0.5

BREAKING CHANGE: require saber 0.5 or above
saberland · May 8, 2019 · 20acb8c · 20acb8c
1 parent aa7a53a
commit 20acb8c
Show file tree

Hide file tree

Showing 7 changed files with 278 additions and 132 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ theme: minima
 This theme is better working with following plugins:
 
 - `saber-plugin-query-posts`: Inject `posts` to homepage's `page` prop, generate tag pages
-- `saber-plugin-generate-feed`: Generate JSON feed at `/feed.json`.
+- `saber-plugin-feed`: Generate feed.
 
 ```bash
 yarn add saber-plugin-query-posts saber-plugin-generate-feed
@@ -28,7 +28,7 @@ yarn add saber-plugin-query-posts saber-plugin-generate-feed
 ```yml
 plugins:
   - resolve: saber-plugin-query-posts
-  - resolve: saber-plugin-generate-feed
+  - resolve: saber-plugin-feed
     options:
       atomFeed: true
 ```

diff --git a/example/saber-config.yml b/example/saber-config.yml
@@ -20,6 +20,6 @@ themeConfig:
 
 plugins:
   - resolve: saber-plugin-query-posts
-  - resolve: saber-plugin-generate-feed
+  - resolve: saber-plugin-feed
     options: 
       atomFeed: true
diff --git a/package.json b/package.json
@@ -12,16 +12,19 @@
     "generate:example": "saber generate example"
   },
   "devDependencies": {
-    "saber": "^0.3.4",
-    "saber-plugin-generate-feed": "^0.1.1",
-    "saber-plugin-query-posts": "^0.0.7",
+    "saber": "^0.5.0",
+    "saber-plugin-feed": "^0.3.0",
+    "saber-plugin-query-posts": "^0.2.0",
     "sass": "^1.17.3",
     "sass-loader": "^7.1.0",
     "vue-compile": "^0.5.1"
   },
   "dependencies": {
     "tinydate": "^1.0.1"
   },
+  "peerDependencies": {
+    "saber": "^0.5.0"
+  },
   "keywords": [
     "saber",
     "saber-theme",

diff --git a/src/components/Social.vue b/src/components/Social.vue
@@ -84,8 +84,8 @@
         </svg>
       </a>
     </li>
-    <li v-if="social.rss && feedLink">
-      <a :href="feedLink" title="rss">
+    <li v-if="social.rss && $feed">
+      <a :href="$feed.permalink" title="rss">
         <svg class="svg-icon grey">
           <use :xlink:href="getSvg('rss')"></use>
         </svg>
@@ -95,16 +95,9 @@
 </template>
 
 <script>
-import variables from 'saber/variables'
 import getSvg from '../utils/getSvg'
 
 export default {
-  data() {
-    return {
-      feedLink: variables.feedLink
-    }
-  },
-
   computed: {
     social() {
       return this.$themeConfig.social

diff --git a/src/components/Wrap.vue b/src/components/Wrap.vue
@@ -39,19 +39,19 @@ export default {
           content: description
         }
       ].filter(Boolean),
-      link: variables.feedLink
+      link: this.$feed
         ? [
             {
               rel: 'alternate',
               title: `${this.siteTitle} - Feed`,
               type: `application/${
-                variables.feedLinkType === 'atom'
+                this.$feed.type === 'atom'
                   ? 'atom+xml'
-                  : variables.feedLinkType === 'rss'
+                  : this.$feed.type === 'rss'
                   ? 'rss+xml'
                   : 'json'
               }`,
-              href: variables.feedLink
+              href: this.$feed.permalink
             }
           ].filter(Boolean)
         : []

diff --git a/src/layouts/default.vue b/src/layouts/default.vue
@@ -38,18 +38,17 @@
         >Next →</router-link>
       </div>
 
-      <p class="feed-subscribe" v-if="feedLink">
+      <p class="feed-subscribe" v-if="$feed">
         <svg class="svg-icon orange">
           <use :xlink:href="getSvg('rss')"></use>
         </svg>
-        <a :href="feedLink">Subscribe</a>
+        <a :href="$feed.permalink">Subscribe</a>
       </p>
     </div>
   </Wrap>
 </template>
 
 <script>
-import variables from 'saber/variables'
 import formatDate from '../utils/formatDate'
 import Wrap from '../components/Wrap.vue'
 import getSvg from '../utils/getSvg'
@@ -61,12 +60,6 @@ export default {
 
   props: ['page'],
 
-  data() {
-    return {
-      feedLink: variables.feedLink
-    }
-  },
-
   methods: {
     formatDate,
     getSvg