@sugarat/theme 0.1.31 → 0.1.33

package/README.md

@@ -36,4 +36,7 @@ pnpm build
 * [vuepress-reco/vuepress-theme-reco-1.x](https://github.com/vuepress-reco/vuepress-theme-reco-1.x)
 * [@vue/theme](https://github.com/vuejs/theme)
 * [vitest](https://vitest.dev/)
-* [element-plus](https://github.com/element-plus/element-plus)
+* [element-plus](https://github.com/element-plus/element-plus)
+* [charles7c.github.io](https://github.com/Charles7c/charles7c.github.io)
+* [vitepress-blog-zaun](https://github.com/clark-cui/vitepress-blog-zaun)
+* [surmon](https://surmon.me/)

package/node.d.ts

@@ -68,6 +68,7 @@ declare namespace Theme {
          * 专栏&合集
          */
         album: string;
+        publish?: boolean;
     }
     interface PageData {
         route: string;
@@ -236,6 +237,10 @@ declare namespace Theme {
          */
         tabs?: boolean;
         works?: UserWorks;
+        /**
+         * https://mermaid.js.org/config/setup/modules/mermaidAPI.html#mermaidapi-configuration-defaults for options
+         */
+        mermaid?: any;
     }
     interface Config extends DefaultTheme.Config {
         blog?: BlogConfig;
@@ -250,6 +255,6 @@ declare function getDefaultTitle(content: string): string;
 declare function clearMatterContent(content: string): string;
 declare function getFileBirthTime(url: string): string;
 declare function getGitTimestamp(file: string): Promise<unknown>;
-declare function defineConfig(config: UserConfig<Theme.Config>): UserConfig<Theme.Config>;
+declare function defineConfig(config: UserConfig<Theme.Config>): UserConfig<any>;
 
 export { clearMatterContent, defineConfig, getDefaultTitle, getFileBirthTime, getGitTimestamp, getThemeConfig };

package/node.js

@@ -205,6 +205,9 @@ var tabsPlugin = (md) => {
   };
 };
 
+// src/node.ts
+var import_vitepress_plugin_mermaid = require("vitepress-plugin-mermaid");
+
 // src/utils/index.ts
 function formatDate(d, fmt = "yyyy-MM-dd hh:mm:ss") {
   if (!(d instanceof Date)) {
@@ -279,6 +282,10 @@ function getThemeConfig(cfg) {
     const wordCount = 100;
     meta.description = meta.description || getTextSummary(fileContent, wordCount);
     meta.cover = meta.cover || fileContent.match(/[!]\[.*?\]\((https:\/\/.+)\)/)?.[1] || "";
+    if (meta.publish === false) {
+      meta.hidden = true;
+      meta.recommend = false;
+    }
     return {
       route: `/${route}`,
       meta
@@ -346,6 +353,16 @@ function getThemeConfig(cfg) {
       }
     };
   }
+  if (cfg?.mermaid !== false) {
+    extraConfig.vite = {
+      ...extraConfig.vite,
+      resolve: {
+        alias: {
+          mermaid: "mermaid/dist/mermaid.esm.mjs"
+        }
+      }
+    };
+  }
   return {
     themeConfig: {
       blog: {
@@ -429,7 +446,19 @@ function defineConfig(config) {
       console.warn("https://theme.sugarat.top/config/global.html");
     }, 1200);
   }
-  return config;
+  const extendThemeConfig = config.extends?.themeConfig?.blog;
+  const resultConfig = extendThemeConfig.mermaid === false ? config : (0, import_vitepress_plugin_mermaid.withMermaid)({ ...config, mermaid: extendThemeConfig.mermaid });
+  if (!resultConfig.markdown)
+    resultConfig.markdown = {};
+  if (config.extends?.markdown?.config) {
+    const markdownExtendsConfigOriginal = config.extends?.markdown?.config;
+    const selfMarkdownConfig = resultConfig.markdown?.config;
+    resultConfig.markdown.config = (...rest) => {
+      selfMarkdownConfig?.(...rest);
+      markdownExtendsConfigOriginal?.(...rest);
+    };
+  }
+  return resultConfig;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sugarat/theme",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "简约风的 Vitepress 博客主题，sugarat vitepress blog theme",
   "main": "src/index.ts",
   "exports": {
@@ -34,11 +34,14 @@
   },
   "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",
+    "mermaid": "^10.2.4",
+    "vitepress-plugin-mermaid": "^2.0.13",
     "vue-command-palette": "^0.1.4"
   },
   "devDependencies": {

package/src/components/BlogList.vue

@@ -51,7 +51,7 @@ const activeTag = useActiveTag()
 const activeTagLabel = computed(() => activeTag.value.label)
 
 const wikiList = computed(() => {
-  const topList = docs.value.filter((v) => !!v.meta.top)
+  const topList = docs.value.filter((v) => !v.meta.hidden && !!v.meta.top)
   topList.sort((a, b) => {
     const aTop = a?.meta?.top
     const bTop = b?.meta.top

package/src/composables/config/index.ts

@@ -70,6 +70,8 @@ export namespace Theme {
      * 专栏&合集
      */
     album: string
+    // 是否发布
+    publish?: boolean
   }
   export interface PageData {
     route: string
@@ -255,6 +257,10 @@ export namespace Theme {
      */
     tabs?: boolean
     works?: UserWorks
+    /**
+     * https://mermaid.js.org/config/setup/modules/mermaidAPI.html#mermaidapi-configuration-defaults for options
+     */
+    mermaid?: any
   }
 
   export interface Config extends DefaultTheme.Config {

package/src/node.ts

@@ -6,6 +6,7 @@ import { execSync, spawn, spawnSync } from 'child_process'
 import path from 'path'
 import type { SiteConfig, UserConfig } from 'vitepress'
 import { tabsMarkdownPlugin } from 'vitepress-plugin-tabs'
+import { withMermaid } from 'vitepress-plugin-mermaid'
 import { formatDate } from './utils/index'
 import type { Theme } from './composables/config/index'
 
@@ -48,6 +49,7 @@ export function getThemeConfig(cfg?: Partial<Theme.BlogConfig>) {
       const meta: Partial<Theme.PageMeta> = {
         ...matter(fileContent).data
       }
+
       if (!meta.title) {
         meta.title = getDefaultTitle(fileContent)
       }
@@ -85,6 +87,13 @@ export function getThemeConfig(cfg?: Partial<Theme.BlogConfig>) {
         meta.cover ||
         fileContent.match(/[!]\[.*?\]\((https:\/\/.+)\)/)?.[1] ||
         ''
+
+      // 是否发布 默认发布
+      if (meta.publish === false) {
+        meta.hidden = true
+        meta.recommend = false
+      }
+
       return {
         route: `/${route}`,
         meta
@@ -169,6 +178,17 @@ export function getThemeConfig(cfg?: Partial<Theme.BlogConfig>) {
       }
     }
   }
+  // 流程图支持
+  if (cfg?.mermaid !== false) {
+    extraConfig.vite = {
+      ...extraConfig.vite,
+      resolve: {
+        alias: {
+          mermaid: 'mermaid/dist/mermaid.esm.mjs'
+        }
+      }
+    }
+  }
   return {
     themeConfig: {
       blog: {
@@ -301,7 +321,32 @@ export function defineConfig(config: UserConfig<Theme.Config>) {
       console.warn('https://theme.sugarat.top/config/global.html')
     }, 1200)
   }
-  return config
+  // @ts-ignore
+  const extendThemeConfig = config.extends?.themeConfig
+    ?.blog as Theme.BlogConfig
+
+  // 开关支持Mermaid
+  const resultConfig =
+    extendThemeConfig.mermaid === false
+      ? config
+      : withMermaid({ ...config, mermaid: extendThemeConfig.mermaid })
+
+  // 处理markdown插件
+  if (!resultConfig.markdown) resultConfig.markdown = {}
+  // @ts-ignore
+  if (config.extends?.markdown?.config) {
+    const markdownExtendsConfigOriginal =
+      // @ts-ignore
+      config.extends?.markdown?.config
+    const selfMarkdownConfig = resultConfig.markdown?.config
+
+    resultConfig.markdown.config = (...rest: any[]) => {
+      // @ts-ignore
+      selfMarkdownConfig?.(...rest)
+      markdownExtendsConfigOriginal?.(...rest)
+    }
+  }
+  return resultConfig
 }
 
 export { tabsMarkdownPlugin } from 'vitepress-plugin-tabs'

package/src/styles/index.scss

@@ -103,3 +103,24 @@ html[class='dark'] {
     word-break: break-all;
   }
 }
+
+::-webkit-scrollbar {
+  width: 5px;
+  height: 5px;
+}
+
+::-webkit-scrollbar-track-piece {
+  background-color: rgba(0, 0, 0, 0);
+}
+
+::-webkit-scrollbar-thumb:vertical {
+  height: 5px;
+  border-radius: 4px;
+  background-color: var(--el-color-primary);
+}
+
+::-webkit-scrollbar-thumb:horizontal {
+  width: 5px;
+  border-radius: 4px;
+  background-color: var(--el-color-primary);
+}