baseUrl in config sets part 2 and normalize rss paths

CHANGELOG.md

@@ -7,6 +7,7 @@
 * Added `version` alias information to config
 * Fixed bug preventing user specified `buildEnd` and `transformPageData` from running after theme's
 * Fixed bug preventing `mvb` from correctly setting the `mvbase`
+* Fixed duplicate `//` in generated `rss` feed
 * Improved `mvb` and `root` link normalization
 * Improved `VPLVersionLink` to only need `version` input
 * Updated to [[email protected]](https://github.com/vuejs/vitepress/blob/main/CHANGELOG.md)

config/landov3.js

@@ -65,6 +65,7 @@ export default function({
     'https://localhost',
     'http://docs.lando.dev',
     'https://docs.lando.dev',
+    getBaseUrl(),
   );
 
   // if plugin then add netlify stuff
@@ -94,7 +95,7 @@ export default function({
       }],
     },
     sitemap: {
-      hostname: 'https://docs.lando.dev/',
+      hostname: getBaseUrl() ?? 'https://docs.lando.dev/',
       lastmodDateOnly: false,
       transformItems: items => {
         for (const item of items) {
@@ -108,8 +109,8 @@ export default function({
     themeConfig: {
       alert: false,
       autometa: {
-        canonicalUrl: 'https://docs.lando.dev',
-        image: `${baseUrl}images/hero.png`,
+        canonicalUrl: getBaseUrl() ?? 'https://docs.lando.dev/',
+        image: 'https://docs.lando.dev/images/icon.png',
         x: '@devwithlando',
       },
       carbonAds: {

config/landov4.js

@@ -65,6 +65,7 @@ export default function({
     'https://localhost',
     'http://docs.lando.dev',
     'https://docs.lando.dev',
+    getBaseUrl(),
   );
 
   // if plugin then add netlify stuff
@@ -94,7 +95,7 @@ export default function({
       }],
     },
     sitemap: {
-      hostname: 'https://docs.lando.dev/',
+      hostname: getBaseUrl() ?? 'https://docs.lando.dev/',
       lastmodDateOnly: false,
       transformItems: items => {
         for (const item of items) {
@@ -108,8 +109,8 @@ export default function({
     themeConfig: {
       alert: false,
       autometa: {
-        canonicalUrl: 'https://docs.lando.dev',
-        image: `${baseUrl}images/hero.png`,
+        canonicalUrl: getBaseUrl() ?? 'https://docs.lando.dev/',
+        image: 'https://docs.lando.dev/images/icon.png',
         x: '@devwithlando',
       },
       carbonAds: {

node/generate-feeds.js

@@ -7,6 +7,8 @@ import {default as createContentLoader} from '../utils/create-content-loader.js'
 import Debug from 'debug';
 import {Feed} from 'feed';
 
+const normalizeUrl = url => url.replace(/([^:]\/)\/+/g, '$1');
+
 // helper to normalize things
 const normalizeConfig = (config = {}, feed = 'feed') => {
   // pluralize
@@ -52,11 +54,11 @@ export default async function(siteConfig, {debug = Debug('@lando/generate-feeds'
     const feed = new Feed({
       title: config.title ?? site.title ?? '',
       description: config.description ?? config.description ?? '',
-      id: config.id ?? href,
-      link: config.link ?? href,
+      id: normalizeUrl(config.id ?? href),
+      link: normalizeUrl(config.link ?? href),
       language: config.language ?? 'en',
       image: config.image ?? '',
-      favicon: config.favicon ?? `${href}/favicon.ico`,
+      favicon: normalizeUrl(config.favicon ?? `${href}/favicon.ico`),
       copyright: config.copyright ?? '',
     });
 
@@ -70,8 +72,8 @@ export default async function(siteConfig, {debug = Debug('@lando/generate-feeds'
       // initial payload
       const data = {
         title,
-        id: `${href}${url}`,
-        link: `${href}${url}`,
+        id: normalizeUrl(`${href}${url}`),
+        link: normalizeUrl(`${href}${url}`),
         description: excerpt !== '' ? excerpt : summary,
         content: html,
         date: new Date(timestamp),