markdown: Fix linking to dovecotlinks pages in CE

This was due to the code ignoring the srcDir config when building
links.

Author: slusarz

.vitepress/local.js.dist

@@ -35,7 +35,7 @@ export const watch_paths = []
 // This is the same format as VitePress' 'rewrite' setting:
 //   https://vitepress.dev/reference/site-config#rewrites
 //
-// Default: {}
+// Default: { 'docs/:path(.*)': ':path' }
 export const source_path_translations = {}
 
 // A listing of paths containing man files.

lib/markdown.js

@@ -1,11 +1,10 @@
 import deflistPlugin from 'markdown-it-deflist'
 import { createMarkdownRenderer } from 'vitepress'
-import { loadData, loadDovecotLinks } from './utility.js'
+import { loadData, loadDovecotLinks, resolveURL } from './utility.js'
 
 export async function dovecotMdExtend(md) {
 	md.use(deflistPlugin)
 	md.use(dovecot_markdown, {
-		base: globalThis.VITEPRESS_CONFIG.site.base,
 		dovecotlinks: await loadDovecotLinks(),
 		updates: (await loadData('updates')).updates
 	})
@@ -90,11 +89,6 @@ function dovecot_markdown(md, opts) {
 		return true
 	}
 
-	function add_base(url) {
-		return (opts.base.endsWith('/') ? opts.base.slice(0, -1) : opts.base)
-			+ '/' + url
-	}
-
 	function dovecot_open(tokens, index, mdOpts, env) {
 		const token = tokens[index]
 		const mode = token.attrGet('mode')
@@ -133,43 +127,36 @@ function dovecot_markdown(md, opts) {
 			}
 
 			return '<code><a href="' +
-				add_base('core/summaries/' + page + '.html#' + env.inner) +
+				resolveURL('core/summaries/' + page + '.html#' + env.inner) +
 				'">'
 
 		case 'link':
 			let url = '#'
 			env.inner = false
 
-			if (opts.dovecotlinks[parts[1]]) {
-				const d = opts.dovecotlinks[parts[1]]
-				env.inner = parts[2] ? parts[2] : (d.text ? d.text : false)
-				if (d.url) {
-					if (d.url.startsWith('http')) {
-						url = d.url
-					} else {
-						url = add_base(d.url)
-					}
-				}
-			} else {
+			if (!opts.dovecotlinks[parts[1]]) {
 				throw new Error('Dovecot link missing: ' + parts[1])
 			}
 
-			return '<a href="' + url + '">'
+			const d = opts.dovecotlinks[parts[1]]
+			env.inner = parts[2] ? parts[2] : (d.text ? d.text : false)
+
+			return '<a href="' + d.url + '">'
 
 		case 'man':
 			env.inner = parts[1]
 			hash = parts[2] ? parts[2] : false;
 			env.args = parts[3] ? parts[3] : 1;
 
 			return '<code><a href="' +
-				add_base('core/man/' + env.inner + '.' + env.args) +
+				resolveURL('core/man/' + env.inner + '.' + env.args) +
 				'.html' + (hash ? '#' + hash : '') + '">'
 
 		case 'plugin':
 			env.inner = parts[1]
 
 			return '<a href="' +
-				add_base('core/plugins/' + env.inner.replaceAll('-', '_') +
+				resolveURL('core/plugins/' + env.inner.replaceAll('-', '_') +
 				'.html' + (parts[2] ? '#' + parts[2] : '')) + '">'
 
 		case 'removed':
@@ -217,7 +204,7 @@ function dovecot_markdown(md, opts) {
 			}
 
 			return '<code><a href="' +
-				add_base('core/settings/variables.html' + hash) + '">'
+				resolveURL('core/settings/variables.html' + hash) + '">'
 
 		default:
 			throw new Error('Unknown dovecot markdown command: ' + mode)

lib/utility.js

@@ -88,17 +88,20 @@ export async function frontmatterIter(callback) {
 	const sf = await sourceFiles()
 	const files = sf.flatMap((x) => fg.sync(x))
 	let spt = []
+	let spt_conf = { 'docs/:path(.*)': ':path' }
 
 	if (fs.existsSync(local_conf)) {
 		const data = await import(local_conf)
 		if (data.source_path_translations) {
-			spt = Object.entries(data.source_path_translations).map(([from, to]) => ({
-				toPath: compile(`/${to}`, { validate: false }),
-				matchUrl: match(from.startsWith('^') ? new RegExp(from) : from)
-			}))
+			spt_conf = data.source_path_translations
 		}
 	}
 
+	spt = Object.entries(spt_conf).map(([from, to]) => ({
+		toPath: compile(`/${to}`, { validate: false }),
+		matchUrl: match(from.startsWith('^') ? new RegExp(from) : from)
+	}))
+
 	for (let f of files) {
 		const str = fs.readFileSync(f, 'utf8')
 		const data = matter(str).data
@@ -129,7 +132,7 @@ export async function loadDovecotLinks() {
 			}
 
 			links[k] = {
-				url: f.substring(0, f.lastIndexOf('.')) + '.html'
+				url: resolveURL(f.substring(0, f.lastIndexOf('.')) + '.html')
 			}
 
 			if ((typeof v) == 'object') {
@@ -148,3 +151,8 @@ export async function loadDovecotLinks() {
 	/* Merge the two lists together. */
 	return { ...links, ...data.links_overrides }
 }
+
+export function resolveURL(url) {
+	const base = globalThis.VITEPRESS_CONFIG.site.base
+	return (base.endsWith('/') ? base.slice(0, -1) : base) + '/' + url
+}