@sugarat/theme 0.1.49 → 0.1.50

package/src/index.ts

@@ -5,7 +5,7 @@ import './styles/index.scss'
 import 'element-plus/dist/index.css'
 import 'element-plus/theme-chalk/dark/css-vars.css'
 
-import { Theme } from 'vitepress'
+import type { Theme } from 'vitepress'
 import DefaultTheme from 'vitepress/theme'
 import BlogApp from './components/BlogApp.vue'
 import { withConfigProvider } from './composables/config/blog'
@@ -22,7 +22,6 @@ export const BlogTheme: Theme = {
   Layout: withConfigProvider(BlogApp),
   enhanceApp(ctx) {
     DefaultTheme.enhanceApp(ctx)
-    // @ts-ignore
     ctx.app.component('TimelinePage', TimelinePage)
     ctx.app.component('UserWorksPage', UserWorksPage)
   }

package/src/node.ts

@@ -5,8 +5,8 @@ import type { Theme } from './composables/config/index'
 import {
   getMarkdownPlugins,
   registerMdPlugins,
-  wrapperCfgWithMermaid,
-  supportRunExtendsPlugin
+  supportRunExtendsPlugin,
+  wrapperCfgWithMermaid
 } from './utils/node/mdPlugins'
 import { getArticles, patchVPThemeConfig } from './utils/node/theme'
 import { getVitePlugins, registerVitePlugins } from './utils/node/vitePlugins'

package/src/styles/scss/global.scss

@@ -1,10 +1,5 @@
 @import 'highlight.scss';
 
-html,
-body,
-#app {
-  height: 100%;
-}
 body {
   margin: 0;
   padding: 0;

package/src/utils/client/index.ts

@@ -11,7 +11,7 @@ export function formatDate(d: any, fmt = 'yyyy-MM-dd hh:mm:ss') {
     'm+': d.getMinutes(), // 分
     's+': d.getSeconds(), // 秒
     'q+': Math.floor((d.getMonth() + 3) / 3), // 季度
-    S: d.getMilliseconds() // 毫秒
+    'S': d.getMilliseconds() // 毫秒
   }
   if (/(y+)/.test(fmt)) {
     fmt = fmt.replace(
@@ -65,8 +65,8 @@ export function formatShowDate(date: Date | string) {
   return formatDate(new Date(date), 'yyyy-MM-dd')
 }
 
-const pattern =
-  /[a-zA-Z0-9_\u0392-\u03c9\u00c0-\u00ff\u0600-\u06ff\u0400-\u04ff]+|[\u4e00-\u9fff\u3400-\u4dbf\uf900-\ufaff\u3040-\u309f\uac00-\ud7af]+/g
+const pattern
+  = /[a-zA-Z0-9_\u0392-\u03C9\u00C0-\u00FF\u0600-\u06FF\u0400-\u04FF]+|[\u4E00-\u9FFF\u3400-\u4DBF\uF900-\uFAFF\u3040-\u309F\uAC00-\uD7AF]+/g
 
 // copy from https://github.com/youngjuning/vscode-juejin-wordcount/blob/main/count-word.ts
 export default function countWord(data: string) {
@@ -76,9 +76,10 @@ export default function countWord(data: string) {
     return 0
   }
   for (let i = 0; i < m.length; i += 1) {
-    if (m[i].charCodeAt(0) >= 0x4e00) {
+    if (m[i].charCodeAt(0) >= 0x4E00) {
       count += m[i].length
-    } else {
+    }
+    else {
       count += 1
     }
   }
@@ -87,7 +88,7 @@ export default function countWord(data: string) {
 
 export function chineseSearchOptimize(input: string) {
   return input
-    .replace(/[\u4e00-\u9fa5]/g, ' $& ')
+    .replace(/[\u4E00-\u9FA5]/g, ' $& ')
     .replace(/\s+/g, ' ')
     .trim()
 }
@@ -105,7 +106,7 @@ export function getGithubUpdateTime(url: string) {
   }
   const [owner, repo] = match[1].split('/')
   return fetch(`https://api.github.com/repos/${owner}/${repo}`)
-    .then((res) => res.json())
+    .then(res => res.json())
     .then((res) => {
       return res.updated_at
     })
@@ -128,7 +129,7 @@ export function getGithubDirUpdateTime(
     baseUrl += `?path=${dir}`
   }
   return fetch(baseUrl)
-    .then((res) => res.json())
+    .then(res => res.json())
     .then((res) => {
       return [res].flat()[0].commit.committer.date
     })

package/src/utils/node/genFeed.ts

@@ -1,17 +1,18 @@
 /* eslint-disable no-console */
-import path from 'path'
-import fs, { writeFileSync } from 'fs'
+import path from 'node:path'
+import fs, { writeFileSync } from 'node:fs'
 import { Feed } from 'feed'
 import type { SiteConfig } from 'vitepress'
 import type { Theme } from '../../composables/config/index'
-import { withBase } from './index'
 import { pageMap } from './theme'
+import { withBase } from './index'
 
 export async function genFeed(config: SiteConfig) {
   const blogCfg: Theme.BlogConfig = config.userConfig.themeConfig.blog
   let posts: Theme.PageData[] = blogCfg.pagesData
   const { RSS, authorList = [] } = blogCfg
-  if (!RSS) return
+  if (!RSS)
+    return
   const { createMarkdownRenderer } = await import('vitepress')
 
   const mdRender = await createMarkdownRenderer(
@@ -38,9 +39,9 @@ export async function genFeed(config: SiteConfig) {
 
   posts = posts
     // 过滤掉 layout:home
-    .filter((v) => v.meta.layout !== 'home')
+    .filter(v => v.meta.layout !== 'home')
     // 过滤掉不展示的
-    .filter((v) => v.meta.hidden !== true)
+    .filter(v => v.meta.hidden !== true)
 
   if (undefined !== RSS?.limit && RSS?.limit > 0) {
     posts.splice(RSS.limit)
@@ -59,7 +60,7 @@ export async function genFeed(config: SiteConfig) {
     link = link.endsWith('/')
       ? link
       : `${link}${config?.cleanUrls ? '' : '.html'}`
-    const authorLink = authorList.find((v) => v.nickname === author)?.url
+    const authorLink = authorList.find(v => v.nickname === author)?.url
     let html
     const filepath = pageMap.get(route)
     if (filepath) {

package/src/utils/node/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable global-require */
 /* eslint-disable prefer-rest-params */
-import { spawn, spawnSync } from 'child_process'
+import { spawn, spawnSync } from 'node:child_process'
 import { formatDate } from '../client'
 
 export function clearMatterContent(content: string) {
@@ -15,7 +15,8 @@ export function clearMatterContent(content: string) {
     if (line.trim() === '---') {
       if (first___ === undefined) {
         first___ = pre.length
-      } else if (second___ === undefined) {
+      }
+      else if (second___ === undefined) {
         second___ = pre.length
       }
     }
@@ -30,8 +31,8 @@ export function clearMatterContent(content: string) {
   )
 }
 export function getDefaultTitle(content: string) {
-  const title =
-    clearMatterContent(content)
+  const title
+    = clearMatterContent(content)
       .split('\n')
       ?.find((str) => {
         return str.startsWith('# ')
@@ -53,7 +54,8 @@ export function getFileBirthTime(url: string) {
     if (infoStr) {
       date = new Date(infoStr)
     }
-  } catch (error) {
+  }
+  catch (error) {
     return formatDate(date)
   }
 
@@ -87,7 +89,7 @@ export function getTextSummary(text: string, count = 100) {
       // 除去加粗
       ?.replace(/\*\*(.*?)\*\*/g, '$1')
       ?.split('\n')
-      ?.filter((v) => !!v)
+      ?.filter(v => !!v)
       ?.slice(1)
       ?.join('\n')
       ?.replace(/>(.*)/, '')

package/src/utils/node/mdPlugins.ts

@@ -1,8 +1,8 @@
 /* eslint-disable global-require */
 import { tabsMarkdownPlugin } from 'vitepress-plugin-tabs'
 import type { UserConfig } from 'vitepress'
-import { aliasObjectToArray } from './index'
 import type { Theme } from '../../composables/config/index'
+import { aliasObjectToArray } from './index'
 
 export function getMarkdownPlugins(cfg?: Partial<Theme.BlogConfig>) {
   const markdownPlugin: any[] = []
@@ -38,33 +38,39 @@ export function registerMdPlugins(vpCfg: any, plugins: any[]) {
  * 流程图支持，配置mermaid
  */
 export function assignMermaid(config: any) {
-  if (!config?.mermaid) return
+  if (!config?.mermaid)
+    return
 
-  if (!config.vite) config.vite = {}
-  if (!config.vite.plugins) config.vite.plugins = []
+  if (!config.vite)
+    config.vite = {}
+  if (!config.vite.plugins)
+    config.vite.plugins = []
   const { MermaidPlugin } = require('vitepress-plugin-mermaid')
   config.vite.plugins.push(MermaidPlugin(config.mermaid))
-  if (!config.vite.resolve) config.vite.resolve = {}
-  if (!config.vite.resolve.alias) config.vite.resolve.alias = {}
+  if (!config.vite.resolve)
+    config.vite.resolve = {}
+  if (!config.vite.resolve.alias)
+    config.vite.resolve.alias = {}
 
   config.vite.resolve.alias = [
     ...aliasObjectToArray({
       ...config.vite.resolve.alias,
       'cytoscape/dist/cytoscape.umd.js': 'cytoscape/dist/cytoscape.esm.js',
-      mermaid: 'mermaid/dist/mermaid.esm.mjs'
+      'mermaid': 'mermaid/dist/mermaid.esm.mjs'
     }),
     { find: /^dayjs\/(.*).js/, replacement: 'dayjs/esm/$1' }
   ]
 }
 
 export function wrapperCfgWithMermaid(config: UserConfig<Theme.Config>): any {
-  // @ts-ignore
-  const extendThemeConfig = (config.extends?.themeConfig?.blog ||
-    {}) as Theme.BlogConfig
+  // eslint-disable-next-line ts/ban-ts-comment
+  // @ts-expect-error
+  const extendThemeConfig = (config.extends?.themeConfig?.blog
+    || {}) as Theme.BlogConfig
 
   // 开关支持Mermaid
-  const resultConfig =
-    extendThemeConfig.mermaid === false
+  const resultConfig
+    = extendThemeConfig.mermaid === false
       ? config
       : {
           ...config,
@@ -77,17 +83,18 @@ export function wrapperCfgWithMermaid(config: UserConfig<Theme.Config>): any {
 
 export function supportRunExtendsPlugin(config: UserConfig<Theme.Config>) {
   // 处理markdown插件
-  if (!config.markdown) config.markdown = {}
+  if (!config.markdown)
+    config.markdown = {}
   // 支持运行继承的markdown插件
-  // @ts-ignore
+  // @ts-expect-error
   if (config.extends?.markdown?.config) {
-    const markdownExtendsConfigOriginal =
-      // @ts-ignore
-      config.extends?.markdown?.config
+    const markdownExtendsConfigOriginal
+      // @ts-expect-error
+      = config.extends?.markdown?.config
     const selfMarkdownConfig = config.markdown?.config
 
     config.markdown.config = (...rest: any[]) => {
-      // @ts-ignore
+      // @ts-expect-error
       selfMarkdownConfig?.(...rest)
       markdownExtendsConfigOriginal?.(...rest)
     }
@@ -97,10 +104,10 @@ export function supportRunExtendsPlugin(config: UserConfig<Theme.Config>) {
   const inlineConfig = config.extends as UserConfig<Theme.Config>
 
   if (
-    inlineConfig.themeConfig?.blog?.RSS &&
-    inlineConfig.themeConfig?.blog?.RSS?.icon !== false &&
-    inlineConfig.themeConfig?.socialLinks?.length &&
-    !inlineConfig.themeConfig?.socialLinks?.[0].link
+    inlineConfig.themeConfig?.blog?.RSS
+    && inlineConfig.themeConfig?.blog?.RSS?.icon !== false
+    && inlineConfig.themeConfig?.socialLinks?.length
+    && !inlineConfig.themeConfig?.socialLinks?.[0].link
   ) {
     const { RSS } = inlineConfig.themeConfig?.blog
     inlineConfig.themeConfig.socialLinks[0].link = `${RSS.baseUrl}${

package/src/utils/node/theme.ts

@@ -1,11 +1,12 @@
 /* eslint-disable prefer-rest-params */
+import fs from 'node:fs'
+import path from 'node:path'
+import process from 'node:process'
 import glob from 'fast-glob'
 import matter from 'gray-matter'
-import fs from 'fs'
-import path from 'path'
 import type { Theme } from '../../composables/config/index'
-import { getDefaultTitle, getFileBirthTime, getTextSummary } from './index'
 import { formatDate } from '../client'
+import { getDefaultTitle, getFileBirthTime, getTextSummary } from './index'
 
 export function patchDefaultThemeSideBar(cfg?: Partial<Theme.BlogConfig>) {
   return cfg?.blog !== false && cfg?.recommend !== false
@@ -44,7 +45,8 @@ export function getArticles(cfg?: Partial<Theme.BlogConfig>) {
           ),
           ''
         )
-      } else {
+      }
+      else {
         route = route.replace(
           new RegExp(
             `^${path
@@ -75,7 +77,8 @@ export function getArticles(cfg?: Partial<Theme.BlogConfig>) {
         //   meta.date = formatDate(v)
         // })
         meta.date = getFileBirthTime(v)
-      } else {
+      }
+      else {
         const timeZone = cfg?.timeZone ?? 8
         meta.date = formatDate(
           new Date(`${new Date(meta.date).toUTCString()}+${timeZone}`)
@@ -83,8 +86,8 @@ export function getArticles(cfg?: Partial<Theme.BlogConfig>) {
       }
 
       // 处理tags和categories,兼容历史文章
-      meta.categories =
-        typeof meta.categories === 'string'
+      meta.categories
+        = typeof meta.categories === 'string'
           ? [meta.categories]
           : meta.categories
       meta.tags = typeof meta.tags === 'string' ? [meta.tags] : meta.tags
@@ -96,13 +99,13 @@ export function getArticles(cfg?: Partial<Theme.BlogConfig>) {
 
       // 获取摘要信息
       const wordCount = 100
-      meta.description =
-        meta.description || getTextSummary(fileContent, wordCount)
+      meta.description
+        = meta.description || getTextSummary(fileContent, wordCount)
 
       // 获取封面图
-      meta.cover =
-        meta.cover ??
-        (fileContent.match(/[!]\[.*?\]\((https:\/\/.+)\)/)?.[1] || '')
+      meta.cover
+        = meta.cover
+        ?? (fileContent.match(/[!]\[.*?\]\((https:\/\/.+)\)/)?.[1] || '')
 
       // 是否发布 默认发布
       if (meta.publish === false) {
@@ -115,7 +118,7 @@ export function getArticles(cfg?: Partial<Theme.BlogConfig>) {
         meta
       }
     })
-    .filter((v) => v.meta.layout !== 'home')
+    .filter(v => v.meta.layout !== 'home')
   return data as Theme.PageData[]
 }
 

package/src/utils/node/vitePlugins.ts

@@ -1,9 +1,10 @@
+import path from 'node:path'
+import { execSync } from 'node:child_process'
+import process from 'node:process'
 import type { SiteConfig } from 'vitepress'
-import path from 'path'
-import { execSync } from 'child_process'
 import {
-  pagefindPlugin,
-  chineseSearchOptimize
+  chineseSearchOptimize,
+  pagefindPlugin
 } from 'vitepress-plugin-pagefind'
 import type { Theme } from '../../composables/config/index'
 import { genFeed } from './genFeed'
@@ -101,8 +102,8 @@ export function inlineBuildEndPlugin(buildEndFn: any[]) {
       vitepressConfig.buildEnd = (siteCfg) => {
         selfBuildEnd?.(siteCfg)
         buildEndFn
-          .filter((fn) => typeof fn === 'function')
-          .forEach((fn) => fn(siteCfg))
+          .filter(fn => typeof fn === 'function')
+          .forEach(fn => fn(siteCfg))
       }
     }
   }

package/types/vue-shim.d.ts

@@ -1,5 +1,5 @@
 declare module '*.vue' {
-  import { ComponentOptions } from 'vue'
+  import type { ComponentOptions } from 'vue'
 
   const comp: ComponentOptions
   export default comp