valaxy-theme-yun 0.14.47 → 0.14.49

package/components/YunFuseSearch.vue

@@ -3,14 +3,9 @@ import type { UseFuseOptions } from '@vueuse/integrations/useFuse'
 import { useFuse } from '@vueuse/integrations/useFuse'
 import { computed, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useBodyScrollLock } from 'valaxy'
+import { useBodyScrollLock, useSiteConfig } from 'valaxy'
 import { useRouter } from 'vue-router'
-
-export interface FuseDataItem {
-  title: string
-  excerpt: string
-  link: string
-}
+import type { FuseListItem } from 'valaxy/types'
 
 const props = defineProps<{
   open: boolean
@@ -23,23 +18,28 @@ const { lockBodyScroll, unlockBodyScroll } = useBodyScrollLock(searchContainer)
 
 const { t } = useI18n()
 
-const fuseListData = ref<any[]>([])
-// const { data } = await useFetch('/fuse-list.json').get().json()
-// console.log(data)
+const fuseListData = ref<FuseListItem[]>([])
 
+const siteConfig = useSiteConfig()
 const keys = computed(() => {
-  const keys = ['title', 'excerpt']
-  return keys
+  const ks = siteConfig.value.fuse.options.keys || []
+  return ks.length === 0
+    ? ['title', 'tags', 'categories', 'excerpt']
+    : ks
 })
 
 const input = ref('')
 // todo export options
-const fuseOptions = computed<UseFuseOptions<FuseDataItem>>(() => ({
+const fuseOptions = computed<UseFuseOptions<FuseListItem>>(() => ({
   fuseOptions: {
+    ...siteConfig.value.fuse.options,
     keys: keys.value,
-  //   isCaseSensitive: isCaseSensitive.value,
-  //   threshold: exactMatch.value ? 0 : undefined,
+
+    // threshold: 0.99,
+    // ignoreLocation: true,
   },
+  includeMatches: true,
+  findAllMatches: true,
   // resultLimit: resultLimit.value,
   // matchAllWhenSearchEmpty: matchAllWhenSearchEmpty.value,
 }))
@@ -51,11 +51,14 @@ watch(() => props.open, async () => {
   if (!props.open)
     return
 
-  fetch('/fuse-list.json')
+  const fuseListDataPath = siteConfig.value.fuse.dataPath.startsWith('http')
+    ? siteConfig.value.fuse.dataPath
+    : `${import.meta.env.BASE_URL}${siteConfig.value.fuse.dataPath}`
+  fetch(fuseListDataPath)
     .then(res => res.json())
     .then((data) => {
       if (Array.isArray(data))
-        fuseListData.value = data as unknown as any[]
+        fuseListData.value = data
 
       searchInputRef.value?.focus()
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-yun",
-  "version": "0.14.47",
+  "version": "0.14.49",
   "author": {
     "email": "me@yunyoujun.cn",
     "name": "YunYouJun",
@@ -18,12 +18,12 @@
   "types": "types/index.d.ts",
   "dependencies": {
     "@iconify-json/ant-design": "^1.1.8",
-    "@iconify-json/simple-icons": "^1.1.64",
+    "@iconify-json/simple-icons": "^1.1.66",
     "animejs": "^3.2.1",
     "valaxy-addon-waline": "0.1.0"
   },
   "devDependencies": {
     "@types/animejs": "^3.1.7",
-    "valaxy": "0.14.47"
+    "valaxy": "0.14.49"
   }
 }

package/valaxy.config.ts

@@ -38,7 +38,6 @@ export default defineValaxyTheme<ThemeConfig>((options) => {
             'valaxy-addon-algolia',
             // adapt for twikoo
             'valaxy-addon-twikoo',
-            'valaxy-addon-twikoo/client/styles/index.scss',
             'valaxy-addon-waline',
           ],
         },