From 44b12011e2ee3ded49382f614b591f4e5f9a8b4d Mon Sep 17 00:00:00 2001 From: Evan You Date: Mon, 23 Apr 2018 17:36:33 -0400 Subject: [PATCH] fix: algolia regression (close #228) --- lib/prepare.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/prepare.js b/lib/prepare.js index 5cfebde040..a2a4c16708 100644 --- a/lib/prepare.js +++ b/lib/prepare.js @@ -120,10 +120,11 @@ async function resolveOptions (sourceDir) { ) // resolve algolia + const themeConfig = siteConfig.themeConfig || {} const isAlgoliaSearch = ( - siteConfig.themeConfig.algolia || - Object.keys(siteConfig.locales && siteConfig.themeConfig && siteConfig.themeConfig.locales || {}) - .some(base => siteConfig.themeConfig.locales[base].algolia) + themeConfig.algolia || + Object.keys(siteConfig.locales && themeConfig.locales || {}) + .some(base => themeConfig.locales[base].algolia) ) const options = { @@ -218,7 +219,7 @@ async function resolveOptions (sourceDir) { description: siteConfig.description || '', base: siteConfig.base || '/', pages: pagesData, - themeConfig: siteConfig.themeConfig || {}, + themeConfig, locales: siteConfig.locales }