valaxy-theme-yun 0.11.6 → 0.12.0

package/components/ValaxyMain.vue

@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import type { PageData, Post } from 'valaxy'
 import { useConfig, usePostTitle } from 'valaxy'
-import { useAddonWaline } from 'valaxy-addon-waline'
 import { StyleValue, computed, defineAsyncComponent } from 'vue'
 import { usePostProperty } from '../composables'
 
@@ -16,7 +15,8 @@ const title = usePostTitle(computed(() => props.frontmatter))
 
 const aside = computed(() => props.frontmatter.aside !== false)
 
-const YunWaline = useAddonWaline()
+// not import from 'valaxy-addon-waline' to judge
+const YunWaline = config.value.runtime.addons['valaxy-addon-waline']
   ? defineAsyncComponent(() => import('./YunWaline.vue'))
   : () => null
 

package/components/YunAside.vue

@@ -21,7 +21,7 @@ const app = useAppStore()
 
   <!--  -->
   <aside class="va-card aside" :class="app.isRightSidebarOpen && 'open'" m="l-4" text="center">
-    <div class="aside-container" flex="~ col">
+    <div class="aside-container" flex="~ col" overflow="auto">
       <h2 v-if="frontmatter.toc !== false" m="t-6 b-2" font="serif black">
         {{ t('sidebar.toc') }}
       </h2>

package/components/YunSearch.vue

@@ -1,11 +1,10 @@
 <script lang="ts" setup>
-import { defineAsyncComponent, onMounted, onUnmounted, ref } from 'vue'
+import { computed } from '@vue/reactivity'
+import { useConfig } from 'valaxy'
+import { onMounted, onUnmounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-const YunAlgoliaSearchBox = __ALGOLIA__
-  ? defineAsyncComponent(() => import('./YunAlgoliaSearchBox.vue'))
-  : () => null
-
+const config = useConfig()
 const { t } = useI18n()
 
 // to avoid loading the docsearch js upfront (which is more than 1/3 of the
@@ -18,8 +17,10 @@ function load() {
     loaded.value = true
 }
 
+const isAlgolia = computed(() => config.value.search.type === 'algolia')
+
 onMounted(() => {
-  if (!__ALGOLIA__)
+  if (!isAlgolia.value)
     return
 
   const handleSearchHotKey = (e: KeyboardEvent) => {
@@ -57,7 +58,7 @@ const trigger = () => {
       <!-- <div v-else text="!2xl" i-ri-close-line /> -->
     </button>
 
-    <YunAlgoliaSearchBox v-if="loaded" />
+    <AlgoliaSearchBox v-if="isAlgolia && loaded" />
   </div>
 </template>
 

package/layouts/layout.vue

@@ -40,4 +40,3 @@
 
   <YunBackToTop />
 </template>
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-yun",
-  "version": "0.11.6",
+  "version": "0.12.0",
   "author": {
     "email": "me@yunyoujun.cn",
     "name": "YunYouJun",
@@ -17,13 +17,11 @@
   "main": "node/index.ts",
   "types": "types/index.d.ts",
   "dependencies": {
-    "@docsearch/css": "^3.3.0",
-    "@docsearch/js": "^3.3.0",
     "@iconify-json/ant-design": "^1.1.4",
     "@iconify-json/simple-icons": "^1.1.37",
     "valaxy-addon-waline": "0.0.6"
   },
   "devDependencies": {
-    "valaxy": "0.11.6"
+    "valaxy": "0.12.0"
   }
 }

package/styles/common/markdown.scss

@@ -30,4 +30,10 @@ html.dark {
       margin-bottom: 0;
     }
   }
+
+  ol {
+    li {
+      list-style: decimal;
+    }
+  }
 }

package/components/YunAlgoliaSearchBox.vue

@@ -1,154 +0,0 @@
-<script setup lang="ts">
-import '@docsearch/css'
-import docsearch from '@docsearch/js'
-import type { DocSearchHit } from '@docsearch/react/dist/esm/types'
-import { onMounted } from 'vue'
-import type { AlgoliaSearchOptions } from 'valaxy'
-import { useConfig } from 'valaxy'
-import { useRoute, useRouter } from 'vue-router'
-
-const router = useRouter()
-const route = useRoute()
-const config = useConfig()
-
-onMounted(() => {
-  initialize(config.value.search.algolia)
-  setTimeout(poll, 16)
-})
-
-/**
- * poll until open
- */
-function poll() {
-  // programmatically open the search box after initialize
-  const e = new Event('keydown') as any
-
-  e.key = 'k'
-  e.metaKey = true
-
-  window.dispatchEvent(e)
-
-  setTimeout(() => {
-    if (!document.querySelector('.DocSearch-Modal'))
-      poll()
-  }, 16)
-}
-
-function initialize(userOptions: AlgoliaSearchOptions) {
-  // note: multi-lang search support is removed since the theme
-  // doesn't support multiple locales as of now.
-  const options = Object.assign({}, userOptions, {
-    container: '#docsearch',
-    navigator: {
-      navigate({ itemUrl }: { itemUrl: string }) {
-        const { pathname: hitPathname } = new URL(
-          window.location.origin + itemUrl,
-        )
-        // router doesn't handle same-page navigation so we use the native
-        // browser location API for anchor navigation
-        if (route.path === hitPathname)
-          window.location.assign(window.location.origin + itemUrl)
-
-        else
-          router.push(itemUrl)
-      },
-    },
-    transformItems(items: DocSearchHit[]) {
-      return items.map((item) => {
-        return Object.assign({}, item, {
-          url: getRelativePath(item.url),
-        })
-      })
-    },
-    hitComponent({ hit, children }: { hit: DocSearchHit; children: any }) {
-      const relativeHit = hit.url.startsWith('http')
-        ? getRelativePath(hit.url as string)
-        : hit.url
-      return {
-        __v: null,
-        type: 'a',
-        ref: undefined,
-        constructor: undefined,
-        key: undefined,
-        props: {
-          href: hit.url,
-          onClick(event: MouseEvent) {
-            if (isSpecialClick(event))
-              return
-
-            // we rely on the native link scrolling when user is already on
-            // the right anchor because Router doesn't support duplicated
-            // history entries.
-            if (route.path === relativeHit)
-              return
-
-            // if the hits goes to another page, we prevent the native link
-            // behavior to leverage the Router loading feature.
-            if (route.path !== relativeHit)
-              event.preventDefault()
-
-            router.push(relativeHit)
-          },
-          children,
-        },
-      }
-    },
-  })
-  docsearch(options)
-}
-
-function isSpecialClick(event: MouseEvent) {
-  return (
-    event.button === 1
-    || event.altKey
-    || event.ctrlKey
-    || event.metaKey
-    || event.shiftKey
-  )
-}
-
-function getRelativePath(absoluteUrl: string) {
-  const { pathname, hash } = new URL(absoluteUrl)
-  return pathname + hash
-}
-</script>
-
-<template>
-  <div id="docsearch" class="hidden" />
-</template>
-
-<style lang="scss">
-.DocSearch {
-  --docsearch-primary-color: var(--va-c-primary);
-  --docsearch-highlight-color: var(--docsearch-primary-color);
-  --docsearch-text-color: var(--va-c-text-primary);
-  --docsearch-muted-color: var(--va-c-text-light);
-  --docsearch-searchbox-focus-background: transparent;
-  --docsearch-searchbox-shadow: none;
-
-  --docsearch-key-gradient: transparent;
-  --docsearch-key-shadow: none;
-
-  --docsearch-modal-background: var(--va-c-bg-light);
-  --docsearch-footer-background: var(--va-c-bg);
-
-  input {
-    &::placeholder {
-      color: var(--va-c-text-dark);
-    }
-  }
-}
-
-.dark .DocSearch {
-  --docsearch-modal-shadow: none;
-  --docsearch-footer-shadow: none;
-  --docsearch-logo-color: var(--va-c-text-light);
-  --docsearch-hit-background: var(--va-c-bg-mute);
-  --docsearch-hit-color: var(--va-c-text-light);
-  --docsearch-hit-shadow: none;
-}
-
-.DocSearch-Form {
-  border: 1px solid var(--va-c-primary);
-}
-</style>