chore: address comments

Author: ulivz

docs/config/README.md

@@ -103,7 +103,7 @@ Also, only enable this if you are able to deploy your site with SSL, since servi
 - Type: `Object`
 - Default: `undefined`
 
-Using `algolia` option allows you to disable the default built-in headers-based search and leverage the [algolia docsearch](https://github.com/algolia/docsearch), to enable this search, You have to provide at least `apiKey` and `indexName`:
+Using `algolia` option allows you to leverage [algolia docsearch](https://github.com/algolia/docsearch) to displace the default built-in headers-based search, to enable this search, you have to provide at least `apiKey` and `indexName`:
 
 ```js
 module.exports = {

docs/zh/config/README.md

@@ -102,7 +102,7 @@ module.exports = {
 - 类型: `Object`
 - 默认值: `undefined`
 
-使用 `algolia` 选项可以让你禁用掉默认的基于 headers 的搜索，从而使用 [algolia docsearch](https://github.com/algolia/docsearch)。为了使其生效，你必须提供至少 `apiKey` 和 `indexName` 这两个选项：
+使用 `algolia` 选项可以让你用 [algolia docsearch](https://github.com/algolia/docsearch) 取代默认的基于 headers 的搜索 。为了使其生效，你必须提供至少 `apiKey` 和 `indexName` 这两个选项：
 
 ```js
 module.exports = {
@@ -113,7 +113,7 @@ module.exports = {
 }
 ```
 
-其他可用的选项可以参考 [docsearch options](https://github.com/algolia/docsearch#docsearch-options)。
+其他可用的选项请参考 [docsearch options](https://github.com/algolia/docsearch#docsearch-options)。
 
 ### locales
 

lib/default-theme/Navbar.vue

@@ -13,15 +13,15 @@
     </router-link>
     <div class="links">
       <AlgoliaSearchBox v-if="isAlgoliaSearch" :options="algolia"/>
-      <SearchBox v-if="isSearch"/>
+      <SearchBox v-else-if="$site.themeConfig.search !== false"/>
       <NavLinks class="can-hide"/>
     </div>
   </header>
 </template>
 
 <script>
 import SidebarButton from './SidebarButton.vue'
-import AlgoliaSearchBox from './AlgoliaSearchBox.vue'
+import AlgoliaSearchBox from '@AlgoliaSearchBox'
 import SearchBox from './SearchBox.vue'
 import NavLinks from './NavLinks.vue'
 
@@ -34,9 +34,6 @@ export default {
     isAlgoliaSearch () {
       const algolia = this.algolia
       return algolia && algolia.apiKey && algolia.indexName
-    },
-    isSearch() {
-      return !this.isAlgoliaSearch && this.$site.themeConfig.search !== false
     }
   }
 }

lib/noop.js

@@ -0,0 +1 @@
+module.exports = {}

lib/prepare.js

@@ -112,6 +112,13 @@ async function resolveOptions (sourceDir) {
     !fs.existsSync(path.resolve(vuepressDir, 'theme'))
   )
 
+  // resolve algolia
+  const isAlgoliaSearch = (
+    siteConfig.algolia ||
+    Object.keys(siteConfig.locales && siteConfig.themeConfig && siteConfig.themeConfig.locales || {})
+      .some(base => siteConfig.themeConfig.locales[base].algolia)
+  )
+
   const options = {
     siteConfig,
     sourceDir,
@@ -124,6 +131,7 @@ async function resolveOptions (sourceDir) {
     themePath: null,
     notFoundPath: null,
     useDefaultTheme,
+    isAlgoliaSearch,
     markdown: createMarkdown(siteConfig)
   }
 

lib/webpack/createBaseConfig.js

@@ -7,6 +7,7 @@ module.exports = function createBaseConfig ({
   publicPath,
   themePath,
   notFoundPath,
+  isAlgoliaSearch,
   markdown
 }, { debug } = {}, isServer) {
   const Config = require('webpack-chain')
@@ -39,6 +40,9 @@ module.exports = function createBaseConfig ({
       .set('@source', sourceDir)
       .set('@app', path.resolve(__dirname, '../app'))
       .set('@temp', path.resolve(__dirname, '../app/.temp'))
+      .set('@AlgoliaSearchBox', isAlgoliaSearch
+        ? path.resolve(__dirname, '../default-theme/AlgoliaSearchBox.vue')
+        : path.resolve(__dirname, '../noop.js'))
       .end()
     .extensions
       .merge(['.js', '.jsx', '.vue', '.json'])