@sugarat/theme 0.1.40 → 0.1.41

package/node.js

@@ -369,6 +369,7 @@ function patchDefaultThemeSideBar(cfg) {
     ]
   } : void 0;
 }
+var pageMap = /* @__PURE__ */ new Map();
 function getArticles(cfg) {
   const srcDir = cfg?.srcDir || process.argv.slice(2)?.[1] || ".";
   const files = import_fast_glob.default.sync(`${srcDir}/**/*.md`, { ignore: ["node_modules"] });
@@ -389,9 +390,13 @@ function getArticles(cfg) {
         ""
       );
     }
+    pageMap.set(`/${route}`, v);
     const fileContent = import_fs.default.readFileSync(v, "utf-8");
+    const { data: frontmatter, excerpt } = (0, import_gray_matter.default)(fileContent, {
+      excerpt: true
+    });
     const meta = {
-      ...(0, import_gray_matter.default)(fileContent).data
+      ...frontmatter
     };
     if (!meta.title) {
       meta.title = getDefaultTitle(fileContent);
@@ -445,14 +450,21 @@ var import_child_process2 = require("child_process");
 
 // src/utils/node/genFeed.ts
 var import_path2 = __toESM(require("path"));
-var import_fs2 = require("fs");
+var import_fs2 = __toESM(require("fs"));
 var import_feed = require("feed");
-function genFeed(config) {
+async function genFeed(config) {
   const blogCfg = config.userConfig.themeConfig.blog;
   const posts = blogCfg.pagesData;
   const { RSS, authorList = [] } = blogCfg;
   if (!RSS)
     return;
+  const { createMarkdownRenderer } = await import("vitepress");
+  const mdRender = await createMarkdownRenderer(
+    config.srcDir,
+    config.markdown,
+    config.site.base,
+    config.logger
+  );
   console.log();
   console.log("=== feed: https://github.com/jpmonette/feed ===");
   const { base } = config.userConfig;
@@ -466,13 +478,24 @@ function genFeed(config) {
     if (hidden)
       continue;
     const author = meta.author ?? blogCfg.author;
-    const link = `${baseUrl}${withBase(base || "", route)}.html`;
+    let link = `${baseUrl}${withBase(
+      base || "",
+      route.replace(/(^|\/)index$/, "$1")
+    )}`;
+    link = link.endsWith("/") ? link : `${link}${config?.cleanUrls ? "" : ".html"}`;
     const authorLink = authorList.find((v) => v.nickname === author)?.url;
+    let html;
+    const filepath = pageMap.get(route);
+    if (filepath) {
+      const fileContent = import_fs2.default.readFileSync(filepath, "utf-8");
+      html = mdRender.render(fileContent);
+    }
     feed.addItem({
       title,
       id: link,
       link,
       description,
+      content: html,
       author: [
         {
           name: author,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sugarat/theme",
-  "version": "0.1.40",
+  "version": "0.1.41",
   "description": "简约风的 Vitepress 博客主题，sugarat vitepress blog theme",
   "main": "src/index.ts",
   "exports": {
@@ -58,10 +58,10 @@
   "scripts": {
     "dev": "npm run build:node && npm run dev:docs",
     "dev:docs": "vitepress dev docs",
-    "dev:node": "npx tsup src/node.ts --dts --out-dir=./ --watch",
+    "dev:node": "npx tsup src/node.ts --dts --out-dir=./ --watch --external vitepress",
     "build": "npm run build:node && npm run build:docs",
     "build:docs": "vitepress build docs",
-    "build:node": "npx tsup src/node.ts --dts --out-dir=./",
+    "build:node": "npx tsup src/node.ts --dts --out-dir=./ --external vitepress",
     "serve": "vitepress serve docs"
   }
 }

package/src/utils/node/genFeed.ts

@@ -1,16 +1,25 @@
 /* eslint-disable no-console */
 import path from 'path'
-import { writeFileSync } from 'fs'
+import fs, { writeFileSync } from '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'
 
-export function genFeed(config: SiteConfig) {
+export async function genFeed(config: SiteConfig) {
   const blogCfg: Theme.BlogConfig = config.userConfig.themeConfig.blog
   const posts: Theme.PageData[] = blogCfg.pagesData
   const { RSS, authorList = [] } = blogCfg
   if (!RSS) return
+  const { createMarkdownRenderer } = await import('vitepress')
+
+  const mdRender = await createMarkdownRenderer(
+    config.srcDir,
+    config.markdown,
+    config.site.base,
+    config.logger
+  )
   console.log()
   console.log('=== feed: https://github.com/jpmonette/feed ===')
   const { base } = config.userConfig
@@ -27,16 +36,29 @@ export function genFeed(config: SiteConfig) {
     const { title, description, date, hidden } = meta
     if (hidden) continue
     const author = meta.author ?? blogCfg.author
-    const link = `${baseUrl}${withBase(base || '', route)}.html`
+    let link = `${baseUrl}${withBase(
+      base || '',
+      // 移除末尾的index
+      route.replace(/(^|\/)index$/, '$1')
+    )}`
+    // 补全后缀
+    link = link.endsWith('/')
+      ? link
+      : `${link}${config?.cleanUrls ? '' : '.html'}`
     const authorLink = authorList.find((v) => v.nickname === author)?.url
+    let html
+    const filepath = pageMap.get(route)
+    if (filepath) {
+      const fileContent = fs.readFileSync(filepath, 'utf-8')
+      html = mdRender.render(fileContent)
+    }
+
     feed.addItem({
       title,
       id: link,
-      // TODO: 待定，添加transform
       link,
       description,
-      // TODO: 待定，文章多的时候，会导致 RSS 文件过大
-      // content: html,
+      content: html,
       author: [
         {
           name: author,

package/src/utils/node/theme.ts

@@ -20,6 +20,9 @@ export function patchDefaultThemeSideBar(cfg?: Partial<Theme.BlogConfig>) {
     : undefined
 }
 
+// hack：RSS用
+export const pageMap = new Map<string, string>()
+
 export function getArticles(cfg?: Partial<Theme.BlogConfig>) {
   const srcDir = cfg?.srcDir || process.argv.slice(2)?.[1] || '.'
   const files = glob.sync(`${srcDir}/**/*.md`, { ignore: ['node_modules'] })
@@ -51,11 +54,17 @@ export function getArticles(cfg?: Partial<Theme.BlogConfig>) {
           ''
         )
       }
+      // hack：RSS使用
+      pageMap.set(`/${route}`, v)
 
       const fileContent = fs.readFileSync(v, 'utf-8')
+      // TODO：摘要生成优化
+      const { data: frontmatter, excerpt } = matter(fileContent, {
+        excerpt: true
+      })
 
       const meta: Partial<Theme.PageMeta> = {
-        ...matter(fileContent).data
+        ...frontmatter
       }
 
       if (!meta.title) {