@sugarat/theme 0.1.36 → 0.1.38

package/node.js

@@ -349,7 +349,7 @@ function getThemeConfig(cfg) {
     markdownPlugin.push(tabsPlugin);
   }
   if (cfg) {
-    cfg.mermaid = cfg?.mermaid ?? false;
+    cfg.mermaid = cfg?.mermaid ?? true;
   }
   if (cfg?.mermaid !== false) {
     const { MermaidMarkdown } = require("vitepress-plugin-mermaid");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sugarat/theme",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "description": "简约风的 Vitepress 博客主题，sugarat vitepress blog theme",
   "main": "src/index.ts",
   "exports": {
@@ -34,15 +34,15 @@
   },
   "dependencies": {
     "@mdit-vue/shared": "^0.12.0",
+    "@mermaid-js/mermaid-mindmap": "^9.3.0",
     "@vue/shared": "^3.2.45",
     "@vueuse/core": "^9.6.0",
     "fast-glob": "^3.2.12",
     "gray-matter": "^4.0.3",
     "highlight.js": "^11.7.0",
-    "vue-command-palette": "^0.1.4",
-    "@mermaid-js/mermaid-mindmap": "^9.3.0",
     "mermaid": "^10.2.4",
-    "vitepress-plugin-mermaid": "^2.0.13"
+    "vitepress-plugin-mermaid": "^2.0.13",
+    "vue-command-palette": "^0.1.4"
   },
   "devDependencies": {
     "@element-plus/icons-vue": "^2.1.0",
@@ -56,11 +56,11 @@
   },
   "scripts": {
     "dev": "npm run build:node && npm run dev:docs",
-    "dev:docs": "vitepress dev demo",
+    "dev:docs": "vitepress dev docs",
     "dev:node": "npx tsup src/node.ts --dts --out-dir=./ --watch",
     "build": "npm run build:node && npm run build:docs",
-    "build:docs": "vitepress build demo",
+    "build:docs": "vitepress build docs",
     "build:node": "npx tsup src/node.ts --dts --out-dir=./",
-    "serve": "vitepress serve demo"
+    "serve": "vitepress serve docs"
   }
 }

package/src/components/BlogApp.vue

@@ -32,7 +32,7 @@ const { Layout } = Theme
       <BlogImagePreview />
     </template>
 
-    <!-- 自定义搜索，临时替代Algolia -->
+    <!-- 自定义搜索，替代Algolia，未来择机移除 -->
     <template #nav-bar-content-before>
       <BlogSearch />
     </template>

package/src/components/BlogSearch.vue

@@ -32,7 +32,7 @@
             <Command.Group v-else :heading="headingText">
               <Command.Item
                 v-for="item in searchResult"
-                :data-value="withBase(item.route)"
+                :data-value="item.route"
                 :key="item.route"
                 @select="handleSelect"
               >
@@ -185,6 +185,13 @@ onMounted(() => {
 const searchModal = ref(false)
 const searchWords = ref('')
 const docs = useArticles()
+const docsMap = computed(() => {
+  const map = new Map<string, Theme.PageData.meta>()
+  docs.value.forEach((doc) => {
+    map.set(withBase(doc.route.replace(/index$/, '')), doc.meta)
+  })
+  return map
+})
 
 const keys = useMagicKeys({
   passive: false,
@@ -257,19 +264,25 @@ watch(
             const result = await Promise.all(
               search.results.map((v: any) => v.data())
             )
-            searchResult.value = []
-            docs.value.forEach((v) => {
-              const match = result.find((r) =>
-                r.url.startsWith(withBase(v.route))
-              )
-              if (match) {
-                searchResult.value.push({
-                  ...v,
+            searchResult.value = result.map((result) => {
+              const { url, excerpt } = result
+              const targetRoute = url.replace(/\.html$/, '')
+              const meta = docsMap.value.get(targetRoute)
+              if (meta) {
+                return {
+                  route: targetRoute,
                   meta: {
-                    ...v.meta,
-                    description: match.excerpt
+                    ...meta,
+                    description: excerpt
                   }
-                })
+                }
+              }
+              return {
+                route: url,
+                meta: {
+                  ...result.meta,
+                  description: excerpt
+                }
               }
             })
           })

package/src/node.ts

@@ -178,19 +178,11 @@ export function getThemeConfig(cfg?: Partial<Theme.BlogConfig>) {
 
   // 流程图支持
   if (cfg) {
-    cfg.mermaid = cfg?.mermaid ?? false
+    cfg.mermaid = cfg?.mermaid ?? true
   }
   if (cfg?.mermaid !== false) {
     const { MermaidMarkdown } = require('vitepress-plugin-mermaid')
     markdownPlugin.push(MermaidMarkdown)
-    // extraConfig.vite = {
-    //   ...extraConfig.vite,
-    //   resolve: {
-    //     alias: {
-    //       mermaid: 'mermaid/dist/mermaid.esm.mjs'
-    //     }
-    //   }
-    // }
   }
 
   // 注册markdown插件