@docusaurus/plugin-content-blog 0.0.0-5635 → 0.0.0-5636

package/lib/feed.js

@@ -12,6 +12,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const feed_1 = require("feed");
+const srcset = tslib_1.__importStar(require("srcset"));
 const utils_1 = require("@docusaurus/utils");
 const utils_common_1 = require("@docusaurus/utils-common");
 const cheerio_1 = require("cheerio");
@@ -55,11 +56,34 @@ async function defaultCreateFeedItems({ blogPosts, siteConfig, outDir, }) {
         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 $ = (0, cheerio_1.load)(content);
-        const link = (0, utils_1.normalizeUrl)([siteUrl, permalink]);
+        const blogPostAbsoluteUrl = (0, utils_1.normalizeUrl)([siteUrl, permalink]);
+        const toAbsoluteUrl = (src) => String(new URL(src, blogPostAbsoluteUrl));
+        // Make links and image urls absolute
+        // See https://github.com/facebook/docusaurus/issues/9136
+        $(`div#${utils_common_1.blogPostContainerID} a, div#${utils_common_1.blogPostContainerID} img`).each((_, elm) => {
+            if (elm.tagName === 'a') {
+                const { href } = elm.attribs;
+                if (href) {
+                    elm.attribs.href = toAbsoluteUrl(href);
+                }
+            }
+            else if (elm.tagName === 'img') {
+                const { src, srcset: srcsetAttr } = elm.attribs;
+                if (src) {
+                    elm.attribs.src = toAbsoluteUrl(src);
+                }
+                if (srcsetAttr) {
+                    elm.attribs.srcset = srcset.stringify(srcset.parse(srcsetAttr).map((props) => ({
+                        ...props,
+                        url: toAbsoluteUrl(props.url),
+                    })));
+                }
+            }
+        });
         const feedItem = {
             title: metadataTitle,
-            id: link,
-            link,
+            id: blogPostAbsoluteUrl,
+            link: blogPostAbsoluteUrl,
             date,
             description,
             // Atom feed demands the "term", while other feeds use "name"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-blog",
-  "version": "0.0.0-5635",
+  "version": "0.0.0-5636",
   "description": "Blog plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-content-blog.d.ts",
@@ -19,18 +19,19 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "0.0.0-5635",
-    "@docusaurus/logger": "0.0.0-5635",
-    "@docusaurus/mdx-loader": "0.0.0-5635",
-    "@docusaurus/types": "0.0.0-5635",
-    "@docusaurus/utils": "0.0.0-5635",
-    "@docusaurus/utils-common": "0.0.0-5635",
-    "@docusaurus/utils-validation": "0.0.0-5635",
+    "@docusaurus/core": "0.0.0-5636",
+    "@docusaurus/logger": "0.0.0-5636",
+    "@docusaurus/mdx-loader": "0.0.0-5636",
+    "@docusaurus/types": "0.0.0-5636",
+    "@docusaurus/utils": "0.0.0-5636",
+    "@docusaurus/utils-common": "0.0.0-5636",
+    "@docusaurus/utils-validation": "0.0.0-5636",
     "cheerio": "^1.0.0-rc.12",
     "feed": "^4.2.2",
     "fs-extra": "^11.1.1",
     "lodash": "^4.17.21",
     "reading-time": "^1.5.0",
+    "srcset": "^4.0.0",
     "tslib": "^2.6.0",
     "unist-util-visit": "^2.0.3",
     "utility-types": "^3.10.0",
@@ -43,5 +44,5 @@
   "engines": {
     "node": ">=16.14"
   },
-  "gitHead": "b9b37df155d491fa570c242f7c151c7b5e4fb7e6"
+  "gitHead": "92ff1f7e897e6c77823f5c09dc9b89761c3cd83c"
 }

package/src/feed.ts

@@ -9,6 +9,7 @@ import path from 'path';
 import fs from 'fs-extra';
 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 {load as cheerioLoad} from 'cheerio';
@@ -110,11 +111,41 @@ async function defaultCreateFeedItems({
       );
       const $ = cheerioLoad(content);
 
-      const link = normalizeUrl([siteUrl, permalink]);
+      const blogPostAbsoluteUrl = normalizeUrl([siteUrl, permalink]);
+
+      const toAbsoluteUrl = (src: string) =>
+        String(new URL(src, blogPostAbsoluteUrl));
+
+      // Make links and image urls absolute
+      // See https://github.com/facebook/docusaurus/issues/9136
+      $(`div#${blogPostContainerID} a, div#${blogPostContainerID} img`).each(
+        (_, elm) => {
+          if (elm.tagName === 'a') {
+            const {href} = elm.attribs;
+            if (href) {
+              elm.attribs.href = toAbsoluteUrl(href);
+            }
+          } else if (elm.tagName === 'img') {
+            const {src, srcset: srcsetAttr} = elm.attribs;
+            if (src) {
+              elm.attribs.src = toAbsoluteUrl(src);
+            }
+            if (srcsetAttr) {
+              elm.attribs.srcset = srcset.stringify(
+                srcset.parse(srcsetAttr).map((props) => ({
+                  ...props,
+                  url: toAbsoluteUrl(props.url),
+                })),
+              );
+            }
+          }
+        },
+      );
+
       const feedItem: BlogFeedItem = {
         title: metadataTitle,
-        id: link,
-        link,
+        id: blogPostAbsoluteUrl,
+        link: blogPostAbsoluteUrl,
         date,
         description,
         // Atom feed demands the "term", while other feeds use "name"