refactor($default-theme): simplify & reorganize

vuejs · Oct 5, 2018 · e231744 · e231744
1 parent 7345515
commit e231744
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 34 deletions.
diff --git a/packages/@vuepress/theme-default/components/NavLink.vue b/packages/@vuepress/theme-default/components/NavLink.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { isExternal, isMailto, isTel, ensureExt } from '../layouts/util'
+import { isExternal, isMailto, isTel, ensureExt } from '../util'
 
 export default {
   props: {

diff --git a/packages/@vuepress/theme-default/components/NavLinks.vue b/packages/@vuepress/theme-default/components/NavLinks.vue
@@ -35,7 +35,7 @@
 
 <script>
 import DropdownLink from './DropdownLink.vue'
-import { resolveNavLinkItem } from '../layouts/util'
+import { resolveNavLinkItem } from '../util'
 import NavLink from './NavLink.vue'
 
 export default {

diff --git a/packages/@vuepress/theme-default/components/Navbar.vue b/packages/@vuepress/theme-default/components/Navbar.vue
@@ -92,7 +92,6 @@ $navbar-horizontal-padding = 1.5rem
 .navbar
   padding $navbar-vertical-padding $navbar-horizontal-padding
   line-height $navbarHeight - 1.4rem
-  position relative
   a, span, img
     display inline-block
   .logo

diff --git a/packages/@vuepress/theme-default/components/Page.vue b/packages/@vuepress/theme-default/components/Page.vue
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import { resolvePage, normalize, outboundRE, endingSlashRE } from '../layouts/util'
+import { resolvePage, normalize, outboundRE, endingSlashRE } from '../util'
 
 export default {
   props: ['sidebarItems'],

diff --git a/packages/@vuepress/theme-default/components/Sidebar.vue b/packages/@vuepress/theme-default/components/Sidebar.vue
@@ -23,7 +23,7 @@
 import SidebarGroup from './SidebarGroup.vue'
 import SidebarLink from './SidebarLink.vue'
 import NavLinks from './NavLinks.vue'
-import { isActive } from '../layouts/util'
+import { isActive } from '../util'
 
 export default {
   components: { SidebarGroup, SidebarLink, NavLinks },

diff --git a/packages/@vuepress/theme-default/components/SidebarLink.vue b/packages/@vuepress/theme-default/components/SidebarLink.vue
@@ -1,5 +1,5 @@
 <script>
-import { isActive, hashRE, groupHeaders } from '../layouts/util'
+import { isActive, hashRE, groupHeaders } from '../util'
 
 export default {
   functional: true,

diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js
@@ -1,10 +1,24 @@
-const themePlugin = require('./plugin')
+const path = require('path')
 
 // Theme API.
-module.exports = {
+module.exports = (options, ctx) => ({
+  alias () {
+    const { themeConfig, siteConfig } = ctx
+    // resolve algolia
+    const isAlgoliaSearch = (
+      themeConfig.algolia ||
+      Object.keys(siteConfig.locales && themeConfig.locales || {})
+        .some(base => themeConfig.locales[base].algolia)
+    )
+    return {
+      '@AlgoliaSearchBox': isAlgoliaSearch
+        ? path.resolve(__dirname, 'src/AlgoliaSearchBox.vue')
+        : path.resolve(__dirname, 'noopModule.js')
+    }
+  },
+
   plugins: [
-    themePlugin,
     '@vuepress/active-header-links',
     '@vuepress/search'
   ]
-}
+})
diff --git a/packages/@vuepress/theme-default/layouts/Layout.vue b/packages/@vuepress/theme-default/layouts/Layout.vue
@@ -61,7 +61,7 @@ import Home from '../components/Home.vue'
 import Navbar from '../components/Navbar.vue'
 import Page from '../components/Page.vue'
 import Sidebar from '../components/Sidebar.vue'
-import { resolveSidebarItems } from './util'
+import { resolveSidebarItems } from '../util'
 
 export default {
   components: { Home, Page, Sidebar, Navbar },

diff --git a/packages/@vuepress/theme-default/plugin.js b/packages/@vuepress/theme-default/plugin.js
diff --git a/...s/@vuepress/theme-default/layouts/util.js → ...ges/@vuepress/theme-default/util/index.js b/...s/@vuepress/theme-default/layouts/util.js → ...ges/@vuepress/theme-default/util/index.js