@docusaurus/plugin-content-blog 0.0.0-5863 → 0.0.0-5864

package/lib/feed.js

@@ -21,8 +21,11 @@ async function generateBlogFeed({ blogPosts, options, siteConfig, outDir, locale
         return null;
     }
     const { feedOptions, routeBasePath } = options;
-    const { url: siteUrl, baseUrl, title, favicon } = siteConfig;
-    const blogBaseUrl = (0, utils_1.normalizeUrl)([siteUrl, baseUrl, routeBasePath]);
+    const { url: siteUrl, baseUrl, title, favicon, trailingSlash } = siteConfig;
+    const blogBaseUrl = (0, utils_common_1.applyTrailingSlash)((0, utils_1.normalizeUrl)([siteUrl, baseUrl, routeBasePath]), {
+        trailingSlash,
+        baseUrl,
+    });
     const blogPostsForFeed = feedOptions.limit === false || feedOptions.limit === null
         ? blogPosts
         : blogPosts.slice(0, feedOptions.limit);
@@ -48,15 +51,18 @@ async function generateBlogFeed({ blogPosts, options, siteConfig, outDir, locale
     return feed;
 }
 async function defaultCreateFeedItems({ blogPosts, siteConfig, outDir, }) {
-    const { url: siteUrl } = siteConfig;
+    const { url: siteUrl, baseUrl, trailingSlash } = siteConfig;
     function toFeedAuthor(author) {
         return { name: author.name, link: author.url, email: author.email };
     }
     return Promise.all(blogPosts.map(async (post) => {
         const { metadata: { title: metadataTitle, permalink, date, description, authors, tags, }, } = post;
-        const content = await (0, utils_1.readOutputHTMLFile)(permalink.replace(siteConfig.baseUrl, ''), outDir, siteConfig.trailingSlash);
+        const content = await (0, utils_1.readOutputHTMLFile)(permalink.replace(baseUrl, ''), outDir, trailingSlash);
         const $ = (0, cheerio_1.load)(content);
-        const blogPostAbsoluteUrl = (0, utils_1.normalizeUrl)([siteUrl, permalink]);
+        const blogPostAbsoluteUrl = (0, utils_common_1.applyTrailingSlash)((0, utils_1.normalizeUrl)([siteUrl, permalink]), {
+            trailingSlash,
+            baseUrl,
+        });
         const toAbsoluteUrl = (src) => String(new URL(src, blogPostAbsoluteUrl));
         // Make links and image urls absolute
         // See https://github.com/facebook/docusaurus/issues/9136

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-blog",
-  "version": "0.0.0-5863",
+  "version": "0.0.0-5864",
   "description": "Blog plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-content-blog.d.ts",
@@ -31,13 +31,13 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "0.0.0-5863",
-    "@docusaurus/logger": "0.0.0-5863",
-    "@docusaurus/mdx-loader": "0.0.0-5863",
-    "@docusaurus/types": "0.0.0-5863",
-    "@docusaurus/utils": "0.0.0-5863",
-    "@docusaurus/utils-common": "0.0.0-5863",
-    "@docusaurus/utils-validation": "0.0.0-5863",
+    "@docusaurus/core": "0.0.0-5864",
+    "@docusaurus/logger": "0.0.0-5864",
+    "@docusaurus/mdx-loader": "0.0.0-5864",
+    "@docusaurus/types": "0.0.0-5864",
+    "@docusaurus/utils": "0.0.0-5864",
+    "@docusaurus/utils-common": "0.0.0-5864",
+    "@docusaurus/utils-validation": "0.0.0-5864",
     "cheerio": "^1.0.0-rc.12",
     "feed": "^4.2.2",
     "fs-extra": "^11.1.1",
@@ -59,5 +59,5 @@
   "devDependencies": {
     "@total-typescript/shoehorn": "^0.1.2"
   },
-  "gitHead": "8a2e5a97b3258f37311ef8d7bb890770e8027867"
+  "gitHead": "05370c4a2c51890ddf0d02e4dd143a75cbc6f696"
 }

package/src/feed.ts

@@ -11,7 +11,10 @@ import logger from '@docusaurus/logger';
 import {Feed, type Author as FeedAuthor} from 'feed';
 import * as srcset from 'srcset';
 import {normalizeUrl, readOutputHTMLFile} from '@docusaurus/utils';
-import {blogPostContainerID} from '@docusaurus/utils-common';
+import {
+  blogPostContainerID,
+  applyTrailingSlash,
+} from '@docusaurus/utils-common';
 import {load as cheerioLoad} from 'cheerio';
 import type {DocusaurusConfig} from '@docusaurus/types';
 import type {
@@ -40,8 +43,14 @@ async function generateBlogFeed({
   }
 
   const {feedOptions, routeBasePath} = options;
-  const {url: siteUrl, baseUrl, title, favicon} = siteConfig;
-  const blogBaseUrl = normalizeUrl([siteUrl, baseUrl, routeBasePath]);
+  const {url: siteUrl, baseUrl, title, favicon, trailingSlash} = siteConfig;
+  const blogBaseUrl = applyTrailingSlash(
+    normalizeUrl([siteUrl, baseUrl, routeBasePath]),
+    {
+      trailingSlash,
+      baseUrl,
+    },
+  );
 
   const blogPostsForFeed =
     feedOptions.limit === false || feedOptions.limit === null
@@ -85,7 +94,7 @@ async function defaultCreateFeedItems({
   siteConfig: DocusaurusConfig;
   outDir: string;
 }): Promise<BlogFeedItem[]> {
-  const {url: siteUrl} = siteConfig;
+  const {url: siteUrl, baseUrl, trailingSlash} = siteConfig;
 
   function toFeedAuthor(author: Author): FeedAuthor {
     return {name: author.name, link: author.url, email: author.email};
@@ -105,13 +114,19 @@ async function defaultCreateFeedItems({
       } = post;
 
       const content = await readOutputHTMLFile(
-        permalink.replace(siteConfig.baseUrl, ''),
+        permalink.replace(baseUrl, ''),
         outDir,
-        siteConfig.trailingSlash,
+        trailingSlash,
       );
       const $ = cheerioLoad(content);
 
-      const blogPostAbsoluteUrl = normalizeUrl([siteUrl, permalink]);
+      const blogPostAbsoluteUrl = applyTrailingSlash(
+        normalizeUrl([siteUrl, permalink]),
+        {
+          trailingSlash,
+          baseUrl,
+        },
+      );
 
       const toAbsoluteUrl = (src: string) =>
         String(new URL(src, blogPostAbsoluteUrl));