From 63f014fce558813db12f562811185fab385f74b6 Mon Sep 17 00:00:00 2001 From: Endilie Yacop Sucipto Date: Thu, 14 Mar 2019 16:03:42 +0800 Subject: [PATCH] fix: relative path markdown linking on versioned docs (#1281) --- v1/lib/server/docs.js | 5 ++++- v1/lib/version.js | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/v1/lib/server/docs.js b/v1/lib/server/docs.js index dd9549c175..4ca9ef5d73 100644 --- a/v1/lib/server/docs.js +++ b/v1/lib/server/docs.js @@ -73,8 +73,11 @@ function mdToHtmlify(oldContent, mdToHtml, metadata) { let mdMatch = mdRegex.exec(modifiedLine); while (mdMatch !== null) { /* Replace it to correct html link */ + const docsSource = metadata.version + ? metadata.source.replace(/version-.*?\//, '') + : metadata.source; let htmlLink = - mdToHtml[resolve(metadata.source, mdMatch[1])] || mdToHtml[mdMatch[1]]; + mdToHtml[resolve(docsSource, mdMatch[1])] || mdToHtml[mdMatch[1]]; if (htmlLink) { htmlLink = getPath(htmlLink, siteConfig.cleanUrl); htmlLink = htmlLink.replace('/en/', `/${metadata.language}/`); diff --git a/v1/lib/version.js b/v1/lib/version.js index 119fdf90db..42862184fe 100755 --- a/v1/lib/version.js +++ b/v1/lib/version.js @@ -53,6 +53,15 @@ if (env.versioning.missingVersionsPage) { process.exit(1); } +if (version.includes('/')) { + console.error( + `${chalk.red( + 'Invalid version number specified! Do not include slash (/). Try something like: 1.0.0', + )}`, + ); + process.exit(1); +} + if (typeof version === 'undefined') { console.error( `${chalk.yellow(