From eec3048c83d791cdfa643cff55e4efe902f97432 Mon Sep 17 00:00:00 2001 From: ULIVZ <472590061@qq.com> Date: Wed, 6 Jun 2018 21:54:32 +0800 Subject: [PATCH] fix: make 'lastUpdated' backward compatible --- lib/prepare/resolvePlugin.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/prepare/resolvePlugin.js b/lib/prepare/resolvePlugin.js index 3266b21e..142ef459 100644 --- a/lib/prepare/resolvePlugin.js +++ b/lib/prepare/resolvePlugin.js @@ -14,7 +14,9 @@ module.exports = function (options) { const plugin = new Plugin(pluginContext) plugin - .use(lastUpdatedPlugin) + // 1. user plugin + .useByConfigs(siteConfig.plugins) + // 2. built-in plugins .use(enhanceAppPlugin) .use(registerGlobalComponentsPlugin, { baseDirs: [ @@ -22,12 +24,22 @@ module.exports = function (options) { path.resolve(themePath, 'components') ] }) - .useByConfigs(siteConfig.plugins) + // 1. whether to use active header links const { activeHeaderLinks = true } = themeConfig if (activeHeaderLinks) { plugin.use(activeHeaderLinksPlugin) } + // 2. whether to use last updated + const shouldUseLastUpdated = ( + themeConfig.lastUpdated || + Object.keys(siteConfig.locales && themeConfig.locales || {}) + .some(base => themeConfig.locales[base].lastUpdated) + ) + if (shouldUseLastUpdated) { + plugin.use(lastUpdatedPlugin) + } + return plugin } -- GitLab