@rspress/plugin-rss 2.0.0-beta.16 → 2.0.0-beta.18

package/dist/index.d.ts

@@ -21,15 +21,14 @@ export declare interface FeedChannel extends PartialPartial<FeedOptions, 'title'
      * to match pages that should be listed in this feed
      * if RegExp is given, it will match against the route path of each page
      **/
-    test: RegExp | string | (RegExp | string)[] | ((item: PageIndexInfo, base: string) => boolean);
+    test: RegExp | string | (RegExp | string)[] | ((item: PageIndexInfo) => boolean);
     /**
      * a function to modify feed item
      * @param item pre-generated feed item
      * @param page page data
-     * @param base base path of the rspress site
      * @returns modified feed item
      */
-    item?: (item: FeedItem, page: PageIndexInfo, base: string) => FeedItem | PromiseLike<FeedItem>;
+    item?: (item: FeedItem, page: PageIndexInfo) => FeedItem | PromiseLike<FeedItem>;
     /**
      * feed level output config
      */
@@ -151,6 +150,6 @@ declare interface ResolvedOutput {
     sorting: (left: FeedItem, right: FeedItem) => number;
 }
 
-export declare function testPage(test: FeedChannel['test'], page: PageIndexInfo, base?: string): boolean;
+export declare function testPage(test: FeedChannel['test'], page: PageIndexInfo): boolean;
 
 export { }

package/dist/index.js

@@ -40,7 +40,7 @@ function generateFeedItem(page, siteUrl) {
         id: selectNonNullishProperty(fm.slug, fm.id, page.routePath) || '',
         title: selectNonNullishProperty(fm.title, page.title) || '',
         author: toAuthors(fm.author),
-        link: resolve(siteUrl, selectNonNullishProperty(fm.permalink, page.routePath) || ''),
+        link: resolve(siteUrl, selectNonNullishProperty(fm.permalink, page.routePath)?.replace(/^\//, '') || ''),
         description: selectNonNullishProperty(fm.description) || '',
         content: selectNonNullishProperty(fm.summary, page._html) || '',
         date: toDate(fm.date || fm.published_at),
@@ -74,11 +74,11 @@ const PluginName = '@rspress/plugin-rss';
 const PluginComponents = {
     FeedsAnnotations: '@rspress/plugin-rss/FeedsAnnotations'
 };
-function testPage(test, page, base = '/') {
-    if (Array.isArray(test)) return test.some((item)=>testPage(item, page, base));
-    if ('function' == typeof test) return test(page, base);
+function testPage(test, page) {
+    if (Array.isArray(test)) return test.some((item)=>testPage(item, page));
+    if ('function' == typeof test) return test(page);
     const routePath = page.routePath;
-    const pureRoutePath = `/${routePath.startsWith(base) ? routePath.slice(base.length) : routePath}`.replace(/^\/+/, '/');
+    const pureRoutePath = `/${routePath}`.replace(/^\/+/, '/');
     if ('string' == typeof test) return [
         routePath,
         pureRoutePath
@@ -87,7 +87,7 @@ function testPage(test, page, base = '/') {
         routePath,
         pureRoutePath
     ].some((path)=>test.test(path));
-    throw new Error('test must be of `RegExp` or `string` or `(page: PageIndexInfo, base: string) => boolean`');
+    throw new Error('test must be of `RegExp` or `string` or `(page: PageIndexInfo) => boolean`');
 }
 function getDefaultFeedOption() {
     return {
@@ -173,10 +173,10 @@ class FeedsSet {
         return this.feeds.slice(0);
     }
 }
-function getRssItems(feeds, page, config, siteUrl) {
-    return Promise.all(feeds.filter((options)=>testPage(options.test, page, config.base)).map(async (options)=>{
+function getRssItems(feeds, page, siteUrl) {
+    return Promise.all(feeds.filter((options)=>testPage(options.test, page)).map(async (options)=>{
         const after = options.item || ((feed)=>feed);
-        const item = await after(generateFeedItem(page, siteUrl), page, siteUrl);
+        const item = await after(generateFeedItem(page, siteUrl), page);
         return {
             ...item,
             channel: options.id
@@ -186,7 +186,6 @@ function getRssItems(feeds, page, config, siteUrl) {
 function pluginRss(pluginRssOptions) {
     const feedsSet = new FeedsSet();
     let _rssWorkaround = null;
-    let _config;
     return {
         name: PluginName,
         globalUIComponents: Object.values(PluginComponents),
@@ -196,12 +195,11 @@ function pluginRss(pluginRssOptions) {
                 return;
             }
             _rssWorkaround = {};
-            _config = config;
             feedsSet.set(pluginRssOptions, config);
         },
         async extendPageData (pageData) {
             if (!_rssWorkaround) return;
-            _rssWorkaround[pageData.routePath] = _rssWorkaround[pageData.routePath] || getRssItems(feedsSet.get(), pageData, _config, pluginRssOptions.siteUrl);
+            _rssWorkaround[pageData.routePath] = _rssWorkaround[pageData.routePath] || getRssItems(feedsSet.get(), pageData, pluginRssOptions.siteUrl);
             const feeds = await _rssWorkaround[pageData.routePath];
             const showRssList = new Set(concatArray(pageData.frontmatter['link-rss']));
             for (const feed of feeds)showRssList.add(feed.channel);
@@ -229,7 +227,6 @@ function pluginRss(pluginRssOptions) {
                 await writeFile(path, output.getContent(feed));
             }
             _rssWorkaround = null;
-            _config = null;
         }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspress/plugin-rss",
-  "version": "2.0.0-beta.16",
+  "version": "2.0.0-beta.18",
   "description": "A plugin for rss generation for rspress",
   "bugs": "https://github.com/web-infra-dev/rspress/issues",
   "repository": {
@@ -25,19 +25,19 @@
   ],
   "dependencies": {
     "feed": "^4.2.2",
-    "@rspress/shared": "2.0.0-beta.16"
+    "@rspress/shared": "2.0.0-beta.18"
   },
   "devDependencies": {
-    "@rslib/core": "0.10.0",
+    "@rslib/core": "0.10.3",
     "@types/node": "^22.8.1",
     "@types/react": "^19.1.8",
     "react": "^19.1.0",
     "rsbuild-plugin-publint": "^0.3.2",
     "typescript": "^5.8.2",
-    "@rspress/runtime": "2.0.0-beta.16"
+    "@rspress/runtime": "2.0.0-beta.18"
   },
   "peerDependencies": {
-    "rspress": "^2.0.0-beta.16"
+    "rspress": "^2.0.0-beta.18"
   },
   "engines": {
     "node": ">=18.0.0"