feat: spread out blog plugin options to theme options

.eslintrc.js

@@ -2,7 +2,8 @@ module.exports = {
   root: true,
 
   env: {
-    "node": true
+    "node": true,
+    "jest": true
   },
 
   extends: [

index.js

@@ -1,6 +1,11 @@
 const removeMd = require('remove-markdown')
 const path = require('path')
-module.exports = (themeConfig, ctx) => {
+const pick = require('lodash/pick')
+
+module.exports = themeConfig => {
+  /**
+   * Default theme configuration
+   */
   themeConfig = Object.assign(themeConfig, {
     nav: themeConfig.nav || [
       {
@@ -20,36 +25,54 @@ module.exports = (themeConfig, ctx) => {
     pwa: !!themeConfig.pwa,
   })
 
+  /**
+   * Configure blog plugin
+   */
   const defaultBlogPluginOptions = {
     directories: [
       {
         id: 'post',
         dirname: '_posts',
         path: '/',
-        pagination: {
-          lengthPerPage: 5,
-        },
       },
     ],
     frontmatters: [
       {
         id: 'tag',
         keys: ['tag', 'tags'],
         path: '/tag/',
-        pagination: {
-          lengthPerPage: 5,
-        },
       },
     ],
+    globalPagination: {
+      lengthPerPage: 5,
+    },
   }
 
   const { modifyBlogPluginOptions } = themeConfig
 
-  const blogPluginOptions =
-    typeof modifyBlogPluginOptions === 'function'
-      ? modifyBlogPluginOptions(defaultBlogPluginOptions)
-      : defaultBlogPluginOptions
+  let blogPluginOptions
 
+  if (modifyBlogPluginOptions === 'function') {
+    blogPluginOptions = modifyBlogPluginOptions(defaultBlogPluginOptions)
+  } else {
+    const properties = [
+      'directories',
+      'frontmatters',
+      'globalPagination',
+      'sitemap',
+      'comment',
+      'newsletter',
+    ]
+    blogPluginOptions = Object.assign(
+      {},
+      defaultBlogPluginOptions,
+      pick(themeConfig, properties)
+    )
+  }
+
+  /**
+   * Integrate plugins
+   */
   const plugins = [
     '@vuepress/plugin-nprogress',
     ['@vuepress/medium-zoom', true],
@@ -62,6 +85,9 @@ module.exports = (themeConfig, ctx) => {
     ['@vuepress/blog', blogPluginOptions],
   ]
 
+  /**
+   * Enable pwa
+   */
   if (themeConfig.pwa) {
     plugins.push([
       '@vuepress/pwa',

package.json

@@ -23,8 +23,8 @@
     "example:build": "vuepress build example --temp example/.temp",
     "example:dev": "vuepress dev example --temp example/.temp",
     "lint": "eslint . --ext .js,.vue",
-    "prepublishOnly": "npm run example:build && conventional-changelog -p angular -r 2 -i CHANGELOG.md -s",
-    "test": "npm run lint && jest"
+    "prepublishOnly": "npm run test && npm run example:build && conventional-changelog -p angular -r 2 -i CHANGELOG.md -s",
+    "test": "jest"
   },
   "husky": {
     "hooks": {
@@ -60,6 +60,7 @@
     "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-vue": "^6.0.1",
     "husky": "^3.1.0",
+    "jest": "^24.9.0",
     "lint-staged": "^9.5.0",
     "sort-package-json": "^1.31.0",
     "vuepress": "^1.2.0"

test/__snapshots__/config.spec.js.snap

@@ -0,0 +1,69 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should match snapshot without any configuration 1`] = `
+Object {
+  "nav": Array [
+    Object {
+      "link": "/",
+      "text": "Blog",
+    },
+    Object {
+      "link": "/tag/",
+      "text": "Tags",
+    },
+  ],
+  "pwa": false,
+  "summary": true,
+  "summaryLength": 200,
+}
+`;
+
+exports[`should match snapshot without any configuration 2`] = `
+Object {
+  "alias": Object {
+    "fonts": "/Users/billy/Desktop/vuepress-projects/vuepress-theme-blog/fonts",
+  },
+  "define": Object {
+    "THEME_BLOG_PAGINATION_COMPONENT": "Pagination",
+  },
+  "extendPageData": [Function],
+  "plugins": Array [
+    "@vuepress/plugin-nprogress",
+    Array [
+      "@vuepress/medium-zoom",
+      true,
+    ],
+    Array [
+      "@vuepress/search",
+      Object {
+        "searchMaxSuggestions": 10,
+      },
+    ],
+    Array [
+      "@vuepress/blog",
+      Object {
+        "directories": Array [
+          Object {
+            "dirname": "_posts",
+            "id": "post",
+            "path": "/",
+          },
+        ],
+        "frontmatters": Array [
+          Object {
+            "id": "tag",
+            "keys": Array [
+              "tag",
+              "tags",
+            ],
+            "path": "/tag/",
+          },
+        ],
+        "globalPagination": Object {
+          "lengthPerPage": 5,
+        },
+      },
+    ],
+  ],
+}
+`;

test/config.spec.js

@@ -0,0 +1,16 @@
+/**
+ * @jest-environment node
+ */
+
+const vuepressThemeBlog = require('../')
+
+test('should be a function', () => {
+  expect(typeof vuepressThemeBlog).toBe('function')
+})
+
+test('should match snapshot without any configuration', () => {
+  const themeConfig = {}
+  const config = vuepressThemeBlog(themeConfig)
+  expect(themeConfig).toMatchSnapshot()
+  expect(config).toMatchSnapshot()
+})