@sugarat/theme 0.1.46 → 0.1.47

package/node.js

@@ -32,7 +32,7 @@ __export(node_exports, {
 });
 module.exports = __toCommonJS(node_exports);
 
-// ../../node_modules/.pnpm/vitepress-plugin-tabs@0.2.0_vitepress@1.0.0-rc.13_vue@3.3.4/node_modules/vitepress-plugin-tabs/dist/index.js
+// ../../node_modules/.pnpm/vitepress-plugin-tabs@0.2.0_vitepress@1.0.0-rc.14_vue@3.3.4/node_modules/vitepress-plugin-tabs/dist/index.js
 var tabsMarker = "=tabs";
 var tabsMarkerLen = tabsMarker.length;
 var ruleBlockTabs = (state, startLine, endLine, silent) => {
@@ -277,11 +277,11 @@ function aliasObjectToArray(obj) {
   }));
 }
 var EXTERNAL_URL_RE = /^[a-z]+:/i;
-function joinPath(base, path4) {
-  return `${base}${path4}`.replace(/\/+/g, "/");
+function joinPath(base, path3) {
+  return `${base}${path3}`.replace(/\/+/g, "/");
 }
-function withBase(base, path4) {
-  return EXTERNAL_URL_RE.test(path4) || path4.startsWith(".") ? path4 : joinPath(base, path4);
+function withBase(base, path3) {
+  return EXTERNAL_URL_RE.test(path3) || path3.startsWith(".") ? path3 : joinPath(base, path3);
 }
 
 // src/utils/node/mdPlugins.ts
@@ -450,8 +450,7 @@ function patchVPThemeConfig(cfg, vpThemeConfig = {}) {
 }
 
 // src/utils/node/vitePlugins.ts
-var import_path3 = __toESM(require("path"));
-var import_child_process2 = require("child_process");
+var import_vitepress_plugin_pagefind = require("vitepress-plugin-pagefind");
 
 // src/utils/node/genFeed.ts
 var import_path2 = __toESM(require("path"));
@@ -532,8 +531,11 @@ function getVitePlugins(cfg) {
   const plugins = [];
   const buildEndFn = [];
   plugins.push(inlineBuildEndPlugin(buildEndFn));
-  if (cfg?.search === "pagefind" || cfg?.search instanceof Object && cfg.search.mode === "pagefind") {
-    plugins.push(inlinePagefindPlugin(buildEndFn));
+  if (cfg && cfg.search !== false) {
+    const ops = cfg.search instanceof Object ? cfg.search : {};
+    plugins.push(
+      (0, import_vitepress_plugin_pagefind.pagefindPlugin)({ ...ops, customSearchQuery: import_vitepress_plugin_pagefind.chineseSearchOptimize })
+    );
   }
   buildEndFn.push(genFeed);
   return plugins;
@@ -543,40 +545,6 @@ function registerVitePlugins(vpCfg, plugins) {
     plugins
   };
 }
-function inlinePagefindPlugin(buildEndFn) {
-  buildEndFn.push(() => {
-    const ignore = [
-      "div.aside",
-      "a.header-anchor"
-    ];
-    const { log } = console;
-    log();
-    log("=== pagefind: https://pagefind.app/ ===");
-    const siteDir = import_path3.default.join(
-      process.argv.slice(2)?.[1] || ".",
-      ".vitepress/dist"
-    );
-    let command = `npx pagefind --site ${siteDir} --output-subdir "_pagefind"`;
-    if (ignore.length) {
-      command += ` --exclude-selectors "${ignore.join(", ")}"`;
-    }
-    log(command);
-    log();
-    (0, import_child_process2.execSync)(command, {
-      stdio: "inherit"
-    });
-  });
-  return {
-    name: "@sugarar/theme-plugin-pagefind",
-    enforce: "pre",
-    transform(code, id) {
-      if (id.endsWith("theme-default/Layout.vue")) {
-        return code.replace("<VPContent>", "<VPContent data-pagefind-body>");
-      }
-      return code;
-    }
-  };
-}
 function inlineBuildEndPlugin(buildEndFn) {
   let rewrite = false;
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sugarat/theme",
-  "version": "0.1.46",
+  "version": "0.1.47",
   "description": "简约风的 Vitepress 博客主题，sugarat vitepress blog theme",
   "main": "src/index.ts",
   "exports": {
@@ -43,6 +43,7 @@
     "highlight.js": "^11.7.0",
     "mermaid": "^10.2.4",
     "vitepress-plugin-mermaid": "^2.0.13",
+    "vitepress-plugin-pagefind": "0.2.9",
     "vue-command-palette": "^0.1.4"
   },
   "devDependencies": {
@@ -51,9 +52,10 @@
     "sass": "^1.56.1",
     "tsup": " ^6.5.0",
     "typescript": "^4.8.2",
-    "vitepress": "1.0.0-rc.13",
+    "vitepress": "1.0.0-rc.14",
     "vitepress-plugin-tabs": "^0.2.0",
-    "vue": "^3.3.4"
+    "vue": "^3.3.4",
+    "pagefind": "1.0.3"
   },
   "scripts": {
     "dev": "npm run build:node && npm run dev:docs",

package/src/components/BlogApp.vue

@@ -4,7 +4,7 @@ import BlogHomeInfo from './BlogHomeInfo.vue'
 import BlogHomeBanner from './BlogHomeBanner.vue'
 import BlogList from './BlogList.vue'
 import BlogComment from './BlogComment.vue'
-import BlogSearch from './BlogSearch.vue'
+// import BlogSearch from './BlogSearch.vue'
 import BlogSidebar from './BlogSidebar.vue'
 import BlogImagePreview from './BlogImagePreview.vue'
 import BlogArticleAnalyze from './BlogArticleAnalyze.vue'
@@ -34,10 +34,10 @@ const { Layout } = Theme
     </template>
 
     <!-- 自定义搜索，替代Algolia，未来择机移除 -->
-    <template #nav-bar-content-before>
+    <!-- <template #nav-bar-content-before>
       <slot name="nav-bar-content-before" />
       <BlogSearch />
-    </template>
+    </template> -->
     <!-- 自定义首页 -->
     <template #home-hero-before v-if="isBlogTheme">
       <slot name="home-hero-before" />

package/src/utils/node/vitePlugins.ts

@@ -1,6 +1,10 @@
 import type { SiteConfig } from 'vitepress'
 import path from 'path'
 import { execSync } from 'child_process'
+import {
+  pagefindPlugin,
+  chineseSearchOptimize
+} from 'vitepress-plugin-pagefind'
 import type { Theme } from '../../composables/config/index'
 import { genFeed } from './genFeed'
 
@@ -13,12 +17,18 @@ export function getVitePlugins(cfg?: Partial<Theme.BlogConfig>) {
   plugins.push(inlineBuildEndPlugin(buildEndFn))
 
   // 内置简化版的pagefind
-  if (
-    cfg?.search === 'pagefind' ||
-    (cfg?.search instanceof Object && cfg.search.mode === 'pagefind')
-  ) {
-    plugins.push(inlinePagefindPlugin(buildEndFn))
+  if (cfg && cfg.search !== false) {
+    const ops = cfg.search instanceof Object ? cfg.search : {}
+    plugins.push(
+      pagefindPlugin({ ...ops, customSearchQuery: chineseSearchOptimize })
+    )
   }
+  // 未来移除使用
+  // if (cfg && cfg.search !== undefined) {
+  //   console.log(
+  //     '已从内部移除 pagefind 支持，请单独安装 vitepress-plugin-pagefind 插件使用'
+  //   )
+  // }
 
   buildEndFn.push(genFeed)
   return plugins