@sugarat/theme 0.1.41 → 0.1.43

package/node.d.ts

@@ -208,8 +208,15 @@ declare namespace Theme {
         topTitle?: string;
         list: UserWork[];
     }
+    type ThemeColor = 'vp-default' | 'vp-green' | 'vp-yellow' | 'vp-red' | 'el-blue' | 'el-yellow' | 'el-green' | 'el-red';
     interface BlogConfig {
         blog?: false;
+        /**
+         * 内置一些主题色
+         * @default 'vp-default'
+         * 也可以自定义颜色，详见 TODO：文档
+         */
+        themeColor?: ThemeColor;
         pagesData: PageData[];
         srcDir?: string;
         author?: string;
@@ -260,22 +267,38 @@ declare namespace Theme {
          */
         RSS?: RSSOptions;
     }
-    type RSSOptions = FeedOptions & {
+    type RSSOptions = Omit<FeedOptions, 'id'> & {
+        id?: string;
+        /**
+         * 你的站点地址
+         * @example 'https://sugarat.top'
+         */
         baseUrl: string;
         /**
          * 线上访问的RSS地址
+         * @default
+         * @example https://sugarat.top/feed.rss
+         * ```ts
+         * `${baseUrl + VPConfig.site.base + (filename || 'feed.rss'}`
+         * ```
          */
-        url: string;
+        url?: string;
         /**
          * 输出的RSS文件名
          * @default 'feed.rss'
          */
         filename?: string;
         /**
-         * 是否展示RSS的图标
+         * RSS的图标展示
          * @default true
          */
-        showIcon?: boolean;
+        icon?: boolean;
+        /**
+         * 限制输出文件包含的文章数量
+         * @default 0
+         * @description (0 不限制；> 1 会按照日期排序对输出内容进行调整)
+         */
+        limit?: number;
     };
     interface Config extends DefaultTheme.Config {
         blog?: BlogConfig;

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.4_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.11_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) => {
@@ -352,6 +352,11 @@ function supportRunExtendsPlugin(config) {
       markdownExtendsConfigOriginal?.(...rest);
     };
   }
+  const inlineConfig = config.extends;
+  if (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}${(config.base || "/") + (RSS.filename || "feed.rss")}`;
+  }
 }
 
 // src/utils/node/theme.ts
@@ -430,13 +435,13 @@ function getArticles(cfg) {
 }
 function patchVPThemeConfig(cfg, vpThemeConfig = {}) {
   const RSS = cfg?.RSS;
-  if (RSS && RSS.showIcon !== false) {
+  if (RSS && RSS.icon !== false) {
     vpThemeConfig.socialLinks = [
       {
         icon: {
           svg: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 448 512"><path d="M400 32H48C21.49 32 0 53.49 0 80v352c0 26.51 21.49 48 48 48h352c26.51 0 48-21.49 48-48V80c0-26.51-21.49-48-48-48zM112 416c-26.51 0-48-21.49-48-48s21.49-48 48-48s48 21.49 48 48s-21.49 48-48 48zm157.533 0h-34.335c-6.011 0-11.051-4.636-11.442-10.634c-5.214-80.05-69.243-143.92-149.123-149.123c-5.997-.39-10.633-5.431-10.633-11.441v-34.335c0-6.535 5.468-11.777 11.994-11.425c110.546 5.974 198.997 94.536 204.964 204.964c.352 6.526-4.89 11.994-11.425 11.994zm103.027 0h-34.334c-6.161 0-11.175-4.882-11.427-11.038c-5.598-136.535-115.204-246.161-251.76-251.76C68.882 152.949 64 147.935 64 141.774V107.44c0-6.454 5.338-11.664 11.787-11.432c167.83 6.025 302.21 141.191 308.205 308.205c.232 6.449-4.978 11.787-11.432 11.787z" fill="currentColor"></path></svg>'
         },
-        link: RSS.url
+        link: RSS?.url
       }
     ];
   }
@@ -454,7 +459,7 @@ var import_fs2 = __toESM(require("fs"));
 var import_feed = require("feed");
 async function genFeed(config) {
   const blogCfg = config.userConfig.themeConfig.blog;
-  const posts = blogCfg.pagesData;
+  let posts = blogCfg.pagesData;
   const { RSS, authorList = [] } = blogCfg;
   if (!RSS)
     return;
@@ -469,14 +474,20 @@ async function genFeed(config) {
   console.log("=== feed: https://github.com/jpmonette/feed ===");
   const { base } = config.userConfig;
   const { baseUrl, filename } = RSS;
-  const feed = new import_feed.Feed(RSS);
+  const feed = new import_feed.Feed({
+    id: baseUrl,
+    link: baseUrl,
+    ...RSS
+  });
   posts.sort(
     (a, b) => +new Date(b.meta.date) - +new Date(a.meta.date)
   );
+  posts = posts.filter((v) => v.meta.layout !== "home").filter((v) => v.meta.hidden !== true);
+  if (void 0 !== RSS?.limit && RSS?.limit > 0) {
+    posts.splice(RSS.limit);
+  }
   for (const { route, meta } of posts) {
-    const { title, description, date, hidden } = meta;
-    if (hidden)
-      continue;
+    const { title, description, date } = meta;
     const author = meta.author ?? blogCfg.author;
     let link = `${baseUrl}${withBase(
       base || "",
@@ -505,9 +516,14 @@ async function genFeed(config) {
       date: new Date(date)
     });
   }
-  const RSSFile = import_path2.default.join(config.outDir, filename || "feed.rss");
+  const RSSFilename = filename || "feed.rss";
+  const RSSFile = import_path2.default.join(config.outDir, RSSFilename);
   (0, import_fs2.writeFileSync)(RSSFile, feed.rss2());
-  console.log("\u{1F389} RSS generated", filename || "feed.rss");
+  console.log("\u{1F389} RSS generated", RSSFilename);
+  console.log("rss filepath:", RSSFile);
+  console.log("rss url:", `${baseUrl}${config.site.base + RSSFilename}`);
+  console.log("include", posts.length, "posts");
+  console.log();
   console.log();
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sugarat/theme",
-  "version": "0.1.41",
+  "version": "0.1.43",
   "description": "简约风的 Vitepress 博客主题，sugarat vitepress blog theme",
   "main": "src/index.ts",
   "exports": {
@@ -51,7 +51,7 @@
     "sass": "^1.56.1",
     "tsup": " ^6.5.0",
     "typescript": "^4.8.2",
-    "vitepress": "1.0.0-rc.4",
+    "vitepress": "1.0.0-rc.11",
     "vitepress-plugin-tabs": "^0.2.0",
     "vue": "^3.3.4"
   },

package/src/components/BlogApp.vue

@@ -24,6 +24,7 @@ const { Layout } = Theme
     </template>
 
     <template #doc-before>
+      <slot name="doc-before" />
       <!-- 阅读时间分析 -->
       <ClientOnly>
         <BlogArticleAnalyze />
@@ -34,10 +35,12 @@ const { Layout } = Theme
 
     <!-- 自定义搜索，替代Algolia，未来择机移除 -->
     <template #nav-bar-content-before>
+      <slot name="nav-bar-content-before" />
       <BlogSearch />
     </template>
     <!-- 自定义首页 -->
     <template #home-hero-before v-if="isBlogTheme">
+      <slot name="home-hero-before" />
       <div class="home">
         <div class="header-banner">
           <BlogHomeBanner />
@@ -51,12 +54,66 @@ const { Layout } = Theme
       </div>
     </template>
     <template #sidebar-nav-after v-if="isBlogTheme">
+      <slot name="sidebar-nav-after" />
       <BlogSidebar />
     </template>
     <!-- 评论 -->
     <template #doc-after>
+      <slot name="doc-after" />
       <BlogComment />
     </template>
+
+    <!-- 透传默认主题的其它插槽 -->
+    <!-- navbar -->
+    <template #nav-bar-title-before
+      ><slot name="nav-bar-title-before"
+    /></template>
+    <template #nav-bar-title-after
+      ><slot name="nav-bar-title-after"
+    /></template>
+    <template #nav-bar-content-after
+      ><slot name="nav-bar-content-after"
+    /></template>
+    <template #nav-screen-content-before
+      ><slot name="nav-screen-content-before"
+    /></template>
+    <template #nav-screen-content-after
+      ><slot name="nav-screen-content-after"
+    /></template>
+
+    <!-- sidebar -->
+    <template #sidebar-nav-before><slot name="sidebar-nav-before" /></template>
+
+    <!-- content -->
+    <template #page-top><slot name="page-top" /></template>
+    <template #page-bottom><slot name="page-bottom" /></template>
+
+    <template #not-found><slot name="not-found" /></template>
+    <template #home-hero-info><slot name="home-hero-info" /></template>
+    <template #home-hero-image><slot name="home-hero-image" /></template>
+    <template #home-hero-after><slot name="home-hero-after" /></template>
+    <template #home-features-before
+      ><slot name="home-features-before"
+    /></template>
+    <template #home-features-after
+      ><slot name="home-features-after"
+    /></template>
+
+    <template #doc-footer-before><slot name="doc-footer-before" /></template>
+
+    <template #doc-top><slot name="doc-top" /></template>
+    <template #doc-bottom><slot name="doc-bottom" /></template>
+
+    <template #aside-top><slot name="aside-top" /></template>
+    <template #aside-bottom><slot name="aside-bottom" /></template>
+    <template #aside-outline-before
+      ><slot name="aside-outline-before"
+    /></template>
+    <template #aside-outline-after
+      ><slot name="aside-outline-after"
+    /></template>
+    <template #aside-ads-before><slot name="aside-ads-before" /></template>
+    <template #aside-ads-after><slot name="aside-ads-after" /></template>
   </Layout>
 </template>
 <style scoped lang="scss">

package/src/components/BlogArticleAnalyze.vue

@@ -206,7 +206,7 @@ watch(
   .link {
     color: var(--vp-c-text-2);
     &:hover {
-      color: var(--vp-c-brand);
+      color: var(--vp-c-brand-1);
       cursor: pointer;
     }
   }

package/src/components/BlogComment.vue

@@ -43,9 +43,9 @@
   </div>
 </template>
 <script setup lang="ts">
-import { useDark, useElementVisibility } from '@vueuse/core'
+import { useElementVisibility } from '@vueuse/core'
 import { useData, useRoute } from 'vitepress'
-import { computed, ref, watch } from 'vue'
+import { computed, nextTick, ref, watch } from 'vue'
 import { ElAffix, ElButton } from 'element-plus'
 import { Comment } from '@element-plus/icons-vue'
 import { useGiscusConfig } from '../composables/config/blog'
@@ -85,9 +85,7 @@ const show = computed(() => {
   )
 })
 
-const isDark = useDark({
-  storageKey: 'vitepress-theme-appearance'
-})
+const { isDark } = useData()
 
 const route = useRoute()
 const showComment = ref(true)
@@ -103,12 +101,30 @@ watch(
     immediate: true
   }
 )
+
+// TODO：可以优化，不需要重载
+watch(isDark, () => {
+  showComment.value = false
+  nextTick(() => {
+    showComment.value = true
+  })
+})
 </script>
 <style scoped lang="scss">
 .comment {
   width: 100%;
   text-align: center;
   padding: 40px 0;
+  :deep(.el-button.el-button--primary:hover) {
+    background-color: var(--vp-c-brand-2);
+    border-color: var(--vp-c-brand-2);
+    color: #fff;
+  }
+  :deep(.el-button.el-button--primary) {
+    background-color: var(--vp-c-brand-soft);
+    border-color: var(--vp-c-brand-2);
+    color: var(--vp-c-brand-2);
+  }
 }
 
 .hidden {

package/src/components/BlogHotArticle.vue

@@ -138,7 +138,7 @@ const showChangeBtn = computed(() => {
     }
 
     &:nth-child(3) .num {
-      background-color: #409eff;
+      background-color: var(--vp-c-brand-2);
       color: #fff;
       font-size: 12px;
       border-radius: 6px;

package/src/components/BlogList.vue

@@ -16,17 +16,19 @@
   </ul>
   <!-- 解决element-ui bug -->
   <ClientOnly>
-    <el-pagination
-      v-if="wikiList.length >= pageSize"
-      small
-      background
-      :default-current-page="1"
-      :current-page="currentPage"
-      @update:current-page="handleUpdatePageNum"
-      :page-size="pageSize"
-      :total="filterData.length"
-      layout="prev, pager, next, jumper"
-    />
+    <div class="el-pagination-wrapper">
+      <el-pagination
+        v-if="wikiList.length >= pageSize"
+        small
+        background
+        :default-current-page="1"
+        :current-page="currentPage"
+        @update:current-page="handleUpdatePageNum"
+        :page-size="pageSize"
+        :total="filterData.length"
+        layout="prev, pager, next, jumper"
+      />
+    </div>
   </ClientOnly>
 </template>
 <script setup lang="ts">
@@ -116,3 +118,20 @@ watch(
   }
 )
 </script>
+<style lang="scss" scoped>
+.el-pagination-wrapper {
+  :deep(.el-pagination li.is-active.number) {
+    background-color: var(--vp-c-brand-2);
+  }
+  :deep(.el-pagination button:hover) {
+    color: var(--vp-c-brand-2);
+  }
+
+  :deep(.el-pager li:not(.is-active):hover) {
+    color: var(--vp-c-brand-2);
+  }
+  :deep(.el-input__wrapper.is-focus) {
+    box-shadow: 0 0 0 1px var(--vp-c-brand-2) inset;
+  }
+}
+</style>

package/src/components/BlogPopover.vue

@@ -132,16 +132,21 @@ const PopoverValue = (
 
 <style lang="scss" scoped>
 .theme-blog-popover {
+  color: rgba(60, 60, 67);
   width: 258px;
   position: fixed;
   top: 80px;
   right: 20px;
   z-index: 19;
   box-sizing: border-box;
-  border: 1px solid var(--el-color-primary-light-3);
+  border: 1px solid var(--vp-c-brand-3);
   border-radius: 6px;
   background-color: rgba(var(--bg-gradient-home));
   box-shadow: var(--box-shadow);
+  :deep(.el-button.el-button--primary) {
+    background-color: var(--vp-c-brand-2);
+    border-color: var(--vp-c-brand-2);
+  }
 }
 @media screen and (min-width: 760px) and (max-width: 1140px) {
   .theme-blog-popover {
@@ -149,7 +154,7 @@ const PopoverValue = (
   }
 }
 .header {
-  background-color: var(--el-color-primary-light-3);
+  background-color: var(--vp-c-brand-3);
   color: #fff;
   padding: 6px 4px;
   display: flex;
@@ -207,7 +212,7 @@ const PopoverValue = (
   top: 80px;
   right: 10px;
   position: fixed;
-  background-color: var(--el-color-primary-light-3);
+  background-color: var(--vp-c-brand-3);
   padding: 8px;
   color: #fff;
   font-size: 12px;

package/src/components/BlogRecommendArticle.vue

@@ -191,7 +191,7 @@ const showChangeBtn = computed(() => {
       word-break: break-all;
       white-space: break-spaces;
       &.current {
-        color: var(--vp-c-brand);
+        color: var(--vp-c-brand-1);
       }
     }
 

package/src/components/BlogSearch.vue

@@ -362,7 +362,7 @@ const handleSelect = (target: any) => {
     }
 
     &:hover {
-      border: 1px solid var(--vp-c-brand);
+      border: 1px solid var(--vp-c-brand-1);
       border-radius: 6px;
     }
 
@@ -406,7 +406,7 @@ div[command-item] {
   }
   div[command-item] mark {
     background: none;
-    color: var(--vp-c-brand);
+    color: var(--vp-c-brand-1);
   }
 
   div[command-item][aria-selected='true'] mark,

package/src/components/UserWorks.vue

@@ -376,7 +376,7 @@ const handleChooseTag = (tag: string) => {
   }
   a {
     font-weight: 500;
-    color: var(--vp-c-brand);
+    color: var(--vp-c-brand-1);
   }
 }
 .works-container {

package/src/composables/config/blog.ts

@@ -13,6 +13,7 @@ import {
   reactive,
   ref
 } from 'vue'
+import { useColorMode } from '@vueuse/core'
 
 import type { Theme } from './index'
 
@@ -21,22 +22,13 @@ const configSymbol: InjectionKey<Ref<Theme.Config>> = Symbol('theme-config')
 const activeTagSymbol: InjectionKey<Ref<Theme.activeTag>> = Symbol('active-tag')
 
 const currentPageNum: InjectionKey<Ref<number>> = Symbol('home-page-num')
-const homeConfigSymbol: InjectionKey<Theme.HomeConfig> = Symbol('home-config')
 
 const userWorks: InjectionKey<Ref<Theme.UserWorks>> = Symbol('user-works')
 
 export function withConfigProvider(App: Component) {
   return defineComponent({
     name: 'ConfigProvider',
-    props: {
-      handleChangeSlogan: {
-        type: Function,
-        required: false
-      }
-    },
-    setup(props, { slots }) {
-      provide(homeConfigSymbol, props as Theme.HomeConfig)
-
+    setup(_, { slots }) {
       const { theme } = useData()
       const config = computed(() => resolveConfig(theme.value))
       provide(configSymbol, config)
@@ -59,6 +51,22 @@ export function withConfigProvider(App: Component) {
 
       const pageNum = ref(1)
       provide(currentPageNum, pageNum)
+
+      const mode = useColorMode({
+        attribute: 'theme',
+        modes: {
+          // 内置的颜色主题
+          'vp-default': 'vp-default',
+          'vp-green': 'vp-green',
+          'vp-yellow': 'vp-yellow',
+          'vp-red': 'vp-red',
+          'el-blue': 'el-blue',
+          'el-yellow': 'el-yellow',
+          'el-green': 'el-green',
+          'el-red': 'el-red'
+        }
+      })
+      mode.value = config.value.blog?.themeColor ?? 'vp-default'
       return () => h(App, null, slots)
     }
   })
@@ -77,9 +85,6 @@ export function useBlogConfig() {
 export function useBlogThemeMode() {
   return inject(configSymbol)!.value?.blog?.blog ?? true
 }
-export function useHomeConfig() {
-  return inject(homeConfigSymbol)!
-}
 
 export function useGiscusConfig() {
   const blogConfig = useConfig()
@@ -141,7 +146,7 @@ export function useActiveAnchor() {
   onMounted(() => {
     const { hash } = window.location
     if (hash) {
-      el.value = document.querySelector(decodeURIComponent(hash))
+      el.value = document.querySelector(decodeURIComponent(hash)) as any
     }
   })
   return el

package/src/composables/config/index.ts

@@ -228,8 +228,23 @@ export namespace Theme {
     topTitle?: string
     list: UserWork[]
   }
+  export type ThemeColor =
+    | 'vp-default'
+    | 'vp-green'
+    | 'vp-yellow'
+    | 'vp-red'
+    | 'el-blue'
+    | 'el-yellow'
+    | 'el-green'
+    | 'el-red'
   export interface BlogConfig {
     blog?: false
+    /**
+     * 内置一些主题色
+     * @default 'vp-default'
+     * 也可以自定义颜色，详见 TODO：文档
+     */
+    themeColor?: ThemeColor
     pagesData: PageData[]
     srcDir?: string
     author?: string
@@ -281,22 +296,38 @@ export namespace Theme {
     RSS?: RSSOptions
   }
 
-  export type RSSOptions = FeedOptions & {
+  export type RSSOptions = Omit<FeedOptions, 'id'> & {
+    id?: string
+    /**
+     * 你的站点地址
+     * @example 'https://sugarat.top'
+     */
     baseUrl: string
     /**
      * 线上访问的RSS地址
+     * @default
+     * @example https://sugarat.top/feed.rss
+     * ```ts
+     * `${baseUrl + VPConfig.site.base + (filename || 'feed.rss'}`
+     * ```
      */
-    url: string
+    url?: string
     /**
      * 输出的RSS文件名
      * @default 'feed.rss'
      */
     filename?: string
     /**
-     * 是否展示RSS的图标
+     * RSS的图标展示
      * @default true
      */
-    showIcon?: boolean
+    icon?: boolean
+    /**
+     * 限制输出文件包含的文章数量
+     * @default 0
+     * @description (0 不限制；> 1 会按照日期排序对输出内容进行调整)
+     */
+    limit?: number
   }
   export interface Config extends DefaultTheme.Config {
     blog?: BlogConfig

package/src/index.ts

@@ -14,6 +14,9 @@ import { withConfigProvider } from './composables/config/blog'
 import TimelinePage from './components/TimelinePage.vue'
 import UserWorksPage from './components/UserWorks.vue'
 
+// 内置一些特殊的主题色
+import './styles/theme/inline-theme.var.css'
+
 export const BlogTheme: Theme = {
   ...DefaultTheme,
   Layout: withConfigProvider(BlogApp),

package/src/styles/index.scss

@@ -8,7 +8,8 @@ html {
   --nav-bgc: rgba(255, 255, 255, 0.9);
   --badge-font-color: #4e5969;
   --description-font-color: #86909c;
-  --blog-theme-color: #409eff;
+  --blog-theme-color: var(--vp-c-brand-1);
+  // --blog-theme-color: #409eff;
 }
 
 html[class='dark'] {
@@ -105,8 +106,8 @@ html[class='dark'] {
 }
 
 ::-webkit-scrollbar {
-  width: 5px;
-  height: 5px;
+  width: 4px;
+  height: 4px;
 }
 
 ::-webkit-scrollbar-track-piece {
@@ -114,13 +115,13 @@ html[class='dark'] {
 }
 
 ::-webkit-scrollbar-thumb:vertical {
-  height: 5px;
+  height: 4px;
   border-radius: 4px;
-  background-color: var(--el-color-primary);
+  background-color: var(--vp-c-brand-1);
 }
 
 ::-webkit-scrollbar-thumb:horizontal {
-  width: 5px;
+  width: 4px;
   border-radius: 4px;
-  background-color: var(--el-color-primary);
+  background-color: var(--vp-c-brand-1);
 }

package/src/styles/scss/global.scss

@@ -24,7 +24,7 @@ ul {
 
   --lowContrast: #ffffff;
   --highContrast: #000000;
-  --vcp-c-brand: #44bd87;
+  --vcp-c-brand: var(--vp-c-brand-2);
   --vcp-c-accent: #35495e;
 
   --gray1: hsl(0, 0%, 98%);

package/src/styles/theme/inline-theme.var.css

@@ -0,0 +1,56 @@
+/* 所有变量：https://github.com/vuejs/vitepress/blob/main/src/client/theme-default/styles/vars.css */
+
+/* VitePress 绿色 */
+html[theme="vp-green"] {
+  --vp-c-brand-1: var(--vp-c-green-1);
+  --vp-c-brand-2: var(--vp-c-green-2);
+  --vp-c-brand-3: var(--vp-c-green-3);
+  --vp-c-brand-soft: var(--vp-c-green-soft);
+}
+/* VitePress 黄色 */
+html[theme="vp-yellow"]{
+  --vp-c-brand-1: var(--vp-c-yellow-1);
+  --vp-c-brand-2: var(--vp-c-yellow-2);
+  --vp-c-brand-3: var(--vp-c-yellow-3);
+  --vp-c-brand-soft: var(--vp-c-yellow-soft);
+}
+
+/* VitePress 红色 */
+html[theme="vp-red"]{
+  --vp-c-brand-1: var(--vp-c-red-1);
+  --vp-c-brand-2: var(--vp-c-red-2);
+  --vp-c-brand-3: var(--vp-c-red-3);
+  --vp-c-brand-soft: var(--vp-c-red-soft);
+}
+
+/* element plus 蓝色 */
+html[theme="el-blue"]{
+  --vp-c-brand-1: var(--el-color-primary);
+  --vp-c-brand-2: var(--el-color-primary-light-3);
+  --vp-c-brand-3: var(--el-color-primary-light-5);
+  --vp-c-brand-soft: var(--el-color-primary-light-9);
+}
+
+/* element plus 绿色 */
+html[theme="el-green"]{
+  --vp-c-brand-1: var(--el-color-success);
+  --vp-c-brand-2: var(--el-color-success-light-3);
+  --vp-c-brand-3: var(--el-color-success-light-5);
+  --vp-c-brand-soft: var(--el-color-success-light-9);
+}
+
+/* element plus 黄色 */
+html[theme="el-yellow"]{
+  --vp-c-brand-1: var(--el-color-warning);
+  --vp-c-brand-2: var(--el-color-warning-light-3);
+  --vp-c-brand-3: var(--el-color-warning-light-5);
+  --vp-c-brand-soft: var(--el-color-warning-light-9);
+}
+
+/* element plus 红色 */
+html[theme="el-red"]{
+  --vp-c-brand-1: var(--el-color-danger);
+  --vp-c-brand-2: var(--el-color-danger-light-3);
+  --vp-c-brand-3: var(--el-color-danger-light-5);
+  --vp-c-brand-soft: var(--el-color-danger-light-9);
+}

package/src/utils/node/genFeed.ts

@@ -9,7 +9,7 @@ import { pageMap } from './theme'
 
 export async function genFeed(config: SiteConfig) {
   const blogCfg: Theme.BlogConfig = config.userConfig.themeConfig.blog
-  const posts: Theme.PageData[] = blogCfg.pagesData
+  let posts: Theme.PageData[] = blogCfg.pagesData
   const { RSS, authorList = [] } = blogCfg
   if (!RSS) return
   const { createMarkdownRenderer } = await import('vitepress')
@@ -25,16 +25,30 @@ export async function genFeed(config: SiteConfig) {
   const { base } = config.userConfig
 
   const { baseUrl, filename } = RSS
-  const feed = new Feed(RSS)
+  const feed = new Feed({
+    id: baseUrl,
+    link: baseUrl,
+    ...RSS
+  })
 
   posts.sort(
     (a, b) =>
       +new Date(b.meta.date as string) - +new Date(a.meta.date as string)
   )
 
+  posts = posts
+    // 过滤掉 layout:home
+    .filter((v) => v.meta.layout !== 'home')
+    // 过滤掉不展示的
+    .filter((v) => v.meta.hidden !== true)
+
+  if (undefined !== RSS?.limit && RSS?.limit > 0) {
+    posts.splice(RSS.limit)
+  }
+
   for (const { route, meta } of posts) {
-    const { title, description, date, hidden } = meta
-    if (hidden) continue
+    const { title, description, date } = meta
+
     const author = meta.author ?? blogCfg.author
     let link = `${baseUrl}${withBase(
       base || '',
@@ -68,8 +82,13 @@ export async function genFeed(config: SiteConfig) {
       date: new Date(date)
     })
   }
-  const RSSFile = path.join(config.outDir, filename || 'feed.rss')
+  const RSSFilename = filename || 'feed.rss'
+  const RSSFile = path.join(config.outDir, RSSFilename)
   writeFileSync(RSSFile, feed.rss2())
-  console.log('🎉 RSS generated', filename || 'feed.rss')
+  console.log('🎉 RSS generated', RSSFilename)
+  console.log('rss filepath:', RSSFile)
+  console.log('rss url:', `${baseUrl}${config.site.base + RSSFilename}`)
+  console.log('include', posts.length, 'posts')
+  console.log()
   console.log()
 }

package/src/utils/node/mdPlugins.ts

@@ -92,4 +92,19 @@ export function supportRunExtendsPlugin(config: UserConfig<Theme.Config>) {
       markdownExtendsConfigOriginal?.(...rest)
     }
   }
+
+  // 特殊处理RSS，自动生成url(未来统一维护到 RSS插件里，待下一版主题架构升级)
+  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
+  ) {
+    const { RSS } = inlineConfig.themeConfig?.blog
+    inlineConfig.themeConfig.socialLinks[0].link = `${RSS.baseUrl}${
+      (config.base || '/') + (RSS.filename || 'feed.rss')
+    }`
+  }
 }

package/src/utils/node/theme.ts

@@ -127,15 +127,15 @@ export function patchVPThemeConfig(
   cfg?: Partial<Theme.BlogConfig>,
   vpThemeConfig: any = {}
 ) {
-  // 添加 icon
+  // 添加 RSS icon
   const RSS = cfg?.RSS
-  if (RSS && RSS.showIcon !== false) {
+  if (RSS && RSS.icon !== false) {
     vpThemeConfig.socialLinks = [
       {
         icon: {
           svg: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 448 512"><path d="M400 32H48C21.49 32 0 53.49 0 80v352c0 26.51 21.49 48 48 48h352c26.51 0 48-21.49 48-48V80c0-26.51-21.49-48-48-48zM112 416c-26.51 0-48-21.49-48-48s21.49-48 48-48s48 21.49 48 48s-21.49 48-48 48zm157.533 0h-34.335c-6.011 0-11.051-4.636-11.442-10.634c-5.214-80.05-69.243-143.92-149.123-149.123c-5.997-.39-10.633-5.431-10.633-11.441v-34.335c0-6.535 5.468-11.777 11.994-11.425c110.546 5.974 198.997 94.536 204.964 204.964c.352 6.526-4.89 11.994-11.425 11.994zm103.027 0h-34.334c-6.161 0-11.175-4.882-11.427-11.038c-5.598-136.535-115.204-246.161-251.76-251.76C68.882 152.949 64 147.935 64 141.774V107.44c0-6.454 5.338-11.664 11.787-11.432c167.83 6.025 302.21 141.191 308.205 308.205c.232 6.449-4.978 11.787-11.432 11.787z" fill="currentColor"></path></svg>'
         },
-        link: RSS.url
+        link: RSS?.url
       }
     ]
   }