fix: 修复 blog 的配置结构

Author: zyao89

theme/index.js

@@ -6,19 +6,13 @@ module.exports = (options, ctx) => {
     const defaultTheme = require('@vuepress/theme-default');
     const defaultThemeConfig = defaultTheme(options, ctx);
 
-    const siteConfig = ctx.siteConfig || {};
     const themeConfig = ctx.themeConfig = ctx.themeConfig || {};
-    const type = siteConfig.type || themeConfig.type || 'doc';
 
     const vuepressDir = ctx.vuepressDir;
     const iconsDir = path.resolve(vuepressDir, 'public', 'icons');
     const iconsLibDir = path.resolve(__dirname, 'icons');
     const svgIconsDir = themeConfig.svgIconsDir && path.resolve(vuepressDir, themeConfig.svgIconsDir) || iconsLibDir;
 
-    // blog config
-    const blogPlugin = require('./plugins/blog');
-    themeConfig.blogConfig = blogPlugin.initBlogConfig(ctx);
-
     const finalConfig = {
         define: {
             THEME_BUILD_DATE: moment().format('llll'),
@@ -107,7 +101,6 @@ module.exports = (options, ctx) => {
         },
         plugins: [
             ...require('./plugins/register')(ctx),
-            ...(type === 'blog' ? blogPlugin.registerPlugins(ctx) : []),
         ],
 
         // Blog https://github.com/meteorlxy/vuepress-theme-meteorlxy/blob/master/lib/plugins/blog/index.js
@@ -116,9 +109,6 @@ module.exports = (options, ctx) => {
             // if (!strippedContent) {
             //     return;
             // }
-            if (type === 'blog') {
-                blogPlugin.extendPageData($page, ctx);
-            }
         },
     };
 

theme/plugins/blog/enhanceAppFile.js

@@ -0,0 +1,4 @@
+
+export default ({ router }) => {
+    // console.warn('blog...', router);
+};

theme/plugins/blog/index.js

@@ -1,10 +1,12 @@
+const path = require('path');
+
 // 初始化默认值
-exports.initBlogConfig = require('./init');
+const initBlogConfig = require('./init');
 
-exports.extendPageData = require('./extendPageData');
+const extendPageData = require('./extendPageData');
 
 // blog plugin
-exports.registerPlugins = function(ctx) {
+const registerPlugins = function(ctx) {
     const themeConfig = ctx.themeConfig;
     const blogConfig = themeConfig.blogConfig;
 
@@ -22,3 +24,26 @@ exports.registerPlugins = function(ctx) {
 
     return plugins;
 };
+
+module.exports = (optins = {}, ctx) => {
+    const themeConfig = ctx.themeConfig;
+    // blog config
+    themeConfig.blogConfig = initBlogConfig(ctx);
+
+    console.warn(ctx.addPage);
+
+    return {
+        name: 'blog',
+
+        enhanceAppFiles: path.resolve(__dirname, 'enhanceAppFile.js'),
+
+        plugins: [
+            ...registerPlugins(ctx),
+        ],
+
+        // Blog https://github.com/meteorlxy/vuepress-theme-meteorlxy/blob/master/lib/plugins/blog/index.js
+        extendPageData($page) {
+            return extendPageData($page, ctx);
+        },
+    };
+};

theme/plugins/register.js

@@ -42,6 +42,11 @@ function registerPlugins(ctx) {
     const siteConfig = ctx.siteConfig || {};
     const isLocales = !!siteConfig.locales || !!themeConfig.locales || false;
 
+    const type = siteConfig.type || themeConfig.type || 'doc';
+    if (type === 'blog') {
+        plugins.push([ require('./blog'), true ]);
+    }
+
     // pwa
     if (themeConfig.pwa) {
         plugins.push([