From 208c08983531e67acdc4a20a8840d420a4376691 Mon Sep 17 00:00:00 2001 From: Alexey Pyltsyn Date: Tue, 15 Jun 2021 16:33:41 +0300 Subject: [PATCH] fix(v2): respect base url in RSS feeds (#4962) --- .../generateBlogFeed.test.ts.snap | 20 +++++++++---------- .../src/__tests__/generateBlogFeed.test.ts | 2 +- .../src/blogUtils.ts | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/__snapshots__/generateBlogFeed.test.ts.snap b/packages/docusaurus-plugin-content-blog/src/__tests__/__snapshots__/generateBlogFeed.test.ts.snap index 8f1e5accc8..ab138ef1dd 100644 --- a/packages/docusaurus-plugin-content-blog/src/__tests__/__snapshots__/generateBlogFeed.test.ts.snap +++ b/packages/docusaurus-plugin-content-blog/src/__tests__/__snapshots__/generateBlogFeed.test.ts.snap @@ -5,32 +5,32 @@ exports[`blogFeed atom should not show feed without posts 1`] = `null`; exports[`blogFeed atom shows feed item for each post 1`] = ` " - https://docusaurus.io/blog + https://docusaurus.io/myBaseUrl/blog Hello Blog 2020-02-27T00:00:00.000Z https://github.com/jpmonette/feed - + Hello Blog - https://docusaurus.io/image/favicon.ico + https://docusaurus.io/myBaseUrl/image/favicon.ico Copyright <![CDATA[draft]]> draft - + 2020-02-27T00:00:00.000Z <![CDATA[date-matter]]> date-matter - + 2019-01-01T00:00:00.000Z <![CDATA[Happy 1st Birthday Slash! (translated)]]> Happy 1st Birthday Slash! (translated) - + 2018-12-14T00:00:00.000Z @@ -44,7 +44,7 @@ exports[`blogFeed rss shows feed item for each post 1`] = ` Hello Blog - https://docusaurus.io/blog + https://docusaurus.io/myBaseUrl/blog Hello Blog Thu, 27 Feb 2020 00:00:00 GMT https://validator.w3.org/feed/docs/rss2.html @@ -52,21 +52,21 @@ exports[`blogFeed rss shows feed item for each post 1`] = ` Copyright <![CDATA[draft]]> - https://docusaurus.io/blog/draft + https://docusaurus.io/myBaseUrl/blog/draft draft Thu, 27 Feb 2020 00:00:00 GMT <![CDATA[date-matter]]> - https://docusaurus.io/blog/date-matter + https://docusaurus.io/myBaseUrl/blog/date-matter date-matter Tue, 01 Jan 2019 00:00:00 GMT <![CDATA[Happy 1st Birthday Slash! (translated)]]> - https://docusaurus.io/blog/2018/12/14/Happy-First-Birthday-Slash + https://docusaurus.io/myBaseUrl/blog/2018/12/14/Happy-First-Birthday-Slash Happy 1st Birthday Slash! (translated) Fri, 14 Dec 2018 00:00:00 GMT diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/generateBlogFeed.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/generateBlogFeed.test.ts index 9a6d4aba39..1172014110 100644 --- a/packages/docusaurus-plugin-content-blog/src/__tests__/generateBlogFeed.test.ts +++ b/packages/docusaurus-plugin-content-blog/src/__tests__/generateBlogFeed.test.ts @@ -68,7 +68,7 @@ describe('blogFeed', () => { const generatedFilesDir = path.resolve(siteDir, '.docusaurus'); const siteConfig = { title: 'Hello', - baseUrl: '/', + baseUrl: '/myBaseUrl/', url: 'https://docusaurus.io', favicon: 'image/favicon.ico', }; diff --git a/packages/docusaurus-plugin-content-blog/src/blogUtils.ts b/packages/docusaurus-plugin-content-blog/src/blogUtils.ts index 9759e17d02..ff7f3ef333 100644 --- a/packages/docusaurus-plugin-content-blog/src/blogUtils.ts +++ b/packages/docusaurus-plugin-content-blog/src/blogUtils.ts @@ -72,8 +72,8 @@ export async function generateBlogFeed( } const {feedOptions, routeBasePath} = options; - const {url: siteUrl, title, favicon} = siteConfig; - const blogBaseUrl = normalizeUrl([siteUrl, routeBasePath]); + const {url: siteUrl, baseUrl, title, favicon} = siteConfig; + const blogBaseUrl = normalizeUrl([siteUrl, baseUrl, routeBasePath]); const updated = (blogPosts[0] && blogPosts[0].metadata.date) || @@ -86,7 +86,7 @@ export async function generateBlogFeed( language: feedOptions.language, link: blogBaseUrl, description: feedOptions.description || `${siteConfig.title} Blog`, - favicon: normalizeUrl([siteUrl, favicon]), + favicon: normalizeUrl([siteUrl, baseUrl, favicon]), copyright: feedOptions.copyright, });