@sugarat/theme 0.1.18 → 0.1.20

package/node.js

@@ -120,40 +120,44 @@ function getThemeConfig(cfg) {
   const extraConfig = {};
   if (cfg?.search === "pagefind" || cfg?.search instanceof Object && cfg.search.mode === "pagefind") {
     checkKeys.push("vite");
-    let flag = true;
-    let originLog = null;
+    let resolveConfig;
     extraConfig.vite = {
       plugins: [
         {
           name: "@sugarar/theme-plugin-pagefind",
           enforce: "pre",
-          buildEnd() {
-            const { log } = console;
-            if (flag) {
-              flag = false;
-              originLog = log;
-              Object.defineProperty(console, "log", {
-                value() {
-                  if (`${arguments[0]}`.includes("build complete")) {
-                    console.log = originLog;
-                    setTimeout(() => {
-                      originLog();
-                      originLog("=== pagefind: https://pagefind.app/ ===");
-                      const command = `npx pagefind --source ${import_path.default.join(
-                        process.argv.slice(2)?.[1] || ".",
-                        ".vitepress/dist"
-                      )}`;
-                      originLog(command);
-                      originLog();
-                      (0, import_child_process.execSync)(command, {
-                        stdio: "inherit"
-                      });
-                    }, 100);
-                  }
-                  return log.apply(this, arguments);
-                }
-              });
+          configResolved(config) {
+            if (resolveConfig) {
+              return;
+            }
+            resolveConfig = config;
+            const vitepressConfig = config.vitepress;
+            if (!vitepressConfig) {
+              return;
             }
+            const selfBuildEnd = vitepressConfig.buildEnd;
+            vitepressConfig.buildEnd = (siteConfig) => {
+              selfBuildEnd?.(siteConfig);
+              const ignore = [
+                "div.aside",
+                "a.header-anchor"
+              ];
+              const { log } = console;
+              log();
+              log("=== pagefind: https://pagefind.app/ ===");
+              let command = `npx pagefind --source ${import_path.default.join(
+                process.argv.slice(2)?.[1] || ".",
+                ".vitepress/dist"
+              )}`;
+              if (ignore.length) {
+                command += ` --exclude-selectors "${ignore.join(", ")}"`;
+              }
+              log(command);
+              log();
+              (0, import_child_process.execSync)(command, {
+                stdio: "inherit"
+              });
+            };
           },
           transform(code, id) {
             if (id.endsWith("theme-default/Layout.vue")) {
@@ -214,7 +218,7 @@ function clearMatterContent(content) {
 function getFileBirthTime(url) {
   let date = new Date();
   try {
-    const infoStr = (0, import_child_process.execSync)(`git log -1 --pretty="%ci" ${url}`).toString("utf-8").trim();
+    const infoStr = (0, import_child_process.spawnSync)("git", ["log", "-1", '--pretty="%ci"', url]).stdout?.toString().replace(/["']/g, "").trim();
     if (infoStr) {
       date = new Date(infoStr);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sugarat/theme",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "简约风的 Vitepress 博客主题，sugarat vitepress blog theme",
   "main": "src/index.ts",
   "exports": {
@@ -8,6 +8,7 @@
       "types": "./node.d.ts",
       "default": "./node.js"
     },
+    "./package.json": "./package.json",
     ".": "./src/index.ts"
   },
   "files": [

package/src/components/BlogComment.vue

@@ -11,7 +11,6 @@
       class="comment-btn"
       target="main"
       position="bottom"
-      @change="handleVisibleChange"
       :offset="40"
     >
       <el-button

package/src/components/BlogSearch.vue

@@ -132,7 +132,7 @@ import { computed, nextTick, ref, watch, onBeforeMount, onMounted } from 'vue'
 import { Command } from 'vue-command-palette'
 import { useRoute, useRouter, withBase } from 'vitepress'
 import { useMagicKeys, useWindowSize } from '@vueuse/core'
-import { formatDate } from '../utils'
+import { chineseSearchOptimize, formatDate } from '../utils'
 import { useArticles, useBlogConfig } from '../composables/config/blog'
 import { Theme } from '../composables/config'
 import LogoPagefind from './LogoPagefind.vue'
@@ -158,7 +158,7 @@ const openSearch = computed(() =>
 )
 
 const addInlineScript = () => {
-  const scriptText = `import('/_pagefind/pagefind.js')
+  const scriptText = `import('${withBase('/_pagefind/pagefind.js')}')
         .then((module) => {
           window.__pagefind__ = module
         })
@@ -247,14 +247,16 @@ watch(
       } else {
         // @ts-ignore
         await window?.__pagefind__
-          ?.search?.(searchWords.value)
+          ?.search?.(chineseSearchOptimize(searchWords.value))
           .then(async (search: any) => {
             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(v.route))
+              const match = result.find((r) =>
+                r.url.startsWith(withBase(v.route))
+              )
               if (match) {
                 searchResult.value.push({
                   ...v,

package/src/node.ts

@@ -2,9 +2,9 @@
 import glob from 'fast-glob'
 import matter from 'gray-matter'
 import fs from 'fs'
-import { execSync, spawn } from 'child_process'
+import { execSync, spawn, spawnSync } from 'child_process'
 import path from 'path'
-import type { UserConfig } from 'vitepress'
+import type { SiteConfig, UserConfig } from 'vitepress'
 import { formatDate } from './utils/index'
 import type { Theme } from './composables/config/index'
 
@@ -91,40 +91,52 @@ export function getThemeConfig(cfg?: Partial<Theme.BlogConfig>) {
     (cfg?.search instanceof Object && cfg.search.mode === 'pagefind')
   ) {
     checkKeys.push('vite')
-    let flag = true
-    let originLog: any = null
+
+    let resolveConfig: any
     extraConfig.vite = {
       plugins: [
         {
           name: '@sugarar/theme-plugin-pagefind',
           enforce: 'pre',
-          buildEnd() {
-            const { log } = console
-            // TODO: hack
-            if (flag) {
-              flag = false
-              originLog = log
-              Object.defineProperty(console, 'log', {
-                value() {
-                  if (`${arguments[0]}`.includes('build complete')) {
-                    console.log = originLog
-                    setTimeout(() => {
-                      originLog()
-                      originLog('=== pagefind: https://pagefind.app/ ===')
-                      const command = `npx pagefind --source ${path.join(
-                        process.argv.slice(2)?.[1] || '.',
-                        '.vitepress/dist'
-                      )}`
-                      originLog(command)
-                      originLog()
-                      execSync(command, {
-                        stdio: 'inherit'
-                      })
-                    }, 100)
-                  }
-                  // @ts-ignore
-                  return log.apply(this, arguments)
-                }
+          configResolved(config: any) {
+            if (resolveConfig) {
+              return
+            }
+            resolveConfig = config
+
+            const vitepressConfig: SiteConfig = config.vitepress
+            if (!vitepressConfig) {
+              return
+            }
+
+            // 添加 自定义 vitepress 的钩子
+            const selfBuildEnd = vitepressConfig.buildEnd
+            vitepressConfig.buildEnd = (siteConfig: any) => {
+              // 调用自己的
+              selfBuildEnd?.(siteConfig)
+              // 调用pagefind
+              const ignore: string[] = [
+                // 侧边栏内容
+                'div.aside',
+                // 标题锚点
+                'a.header-anchor'
+              ]
+              const { log } = console
+              log()
+              log('=== pagefind: https://pagefind.app/ ===')
+              let command = `npx pagefind --source ${path.join(
+                process.argv.slice(2)?.[1] || '.',
+                '.vitepress/dist'
+              )}`
+
+              if (ignore.length) {
+                command += ` --exclude-selectors "${ignore.join(', ')}"`
+              }
+
+              log(command)
+              log()
+              execSync(command, {
+                stdio: 'inherit'
               })
             }
           },
@@ -207,8 +219,9 @@ export function getFileBirthTime(url: string) {
 
   try {
     // 参考 vitepress 中的 getGitTimestamp 实现
-    const infoStr = execSync(`git log -1 --pretty="%ci" ${url}`)
-      .toString('utf-8')
+    const infoStr = spawnSync('git', ['log', '-1', '--pretty="%ci"', url])
+      .stdout?.toString()
+      .replace(/["']/g, '')
       .trim()
     if (infoStr) {
       date = new Date(infoStr)

package/src/utils/index.ts

@@ -82,3 +82,10 @@ export default function countWord(data: string) {
   }
   return count
 }
+
+export function chineseSearchOptimize(input: string) {
+  return input
+    .replace(/[\u4e00-\u9fa5]/g, ' $& ')
+    .replace(/\s+/g, ' ')
+    .trim()
+}