Refactor mdToHtml out

facebook · Jul 12, 2018 · 816b11c · 816b11c
1 parent a7a214f
commit 816b11c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 48 deletions.
diff --git a/lib/server/generate.js b/lib/server/generate.js
@@ -103,23 +103,7 @@ async function execute() {
 
   const buildDir = join(CWD, 'build', siteConfig.projectName);
 
-  // mdToHtml is a map from a markdown file name to its html link, used to
-  // change relative markdown links that work on GitHub into actual site links
-  const mdToHtml = {};
-  Object.keys(Metadata).forEach(id => {
-    const metadata = Metadata[id];
-    if (metadata.language !== 'en' || metadata.original_id) {
-      return;
-    }
-    let htmlLink =
-      siteConfig.baseUrl + metadata.permalink.replace('/next/', '/');
-    if (htmlLink.includes('/docs/en/')) {
-      htmlLink = htmlLink.replace('/docs/en/', '/docs/en/VERSION/');
-    } else {
-      htmlLink = htmlLink.replace('/docs/', '/docs/VERSION/');
-    }
-    mdToHtml[metadata.source] = htmlLink;
-  });
+  const mdToHtml = metadataUtils.mdToHtml(Metadata, siteConfig.baseUrl);
 
   const DocsLayout = require('../core/DocsLayout.js');
   const Redirect = require('../core/Redirect.js');
@@ -171,14 +155,9 @@ async function execute() {
           ? `/${metadata.version}/`
           : '/'
       );
-      // replace relative links without "./"
-      rawContent = rawContent.replace(
-        new RegExp(`\\]\\(${key}`, 'g'),
-        `](${link}`
-      );
-      // replace relative links with "./"
+      // replace relative links with & without "./"
       rawContent = rawContent.replace(
-        new RegExp(`\\]\\(\\./${key}`, 'g'),
+        new RegExp(`\\]\\((${key}|\\./${key})`, 'g'),
         `](${link}`
       );
     });

diff --git a/lib/server/metadataUtils.js b/lib/server/metadataUtils.js
@@ -63,6 +63,27 @@ function extractMetadata(content) {
   return {metadata, rawContent: both.content};
 }
 
+// mdToHtml is a map from a markdown file name to its html link, used to
+// change relative markdown links that work on GitHub into actual site links
+function mdToHtml(Metadata, baseUrl) {
+  const result = {};
+  Object.keys(Metadata).forEach(id => {
+    const metadata = Metadata[id];
+    if (metadata.language !== 'en' || metadata.original_id) {
+      return;
+    }
+    let htmlLink = baseUrl + metadata.permalink.replace('/next/', '/');
+    if (htmlLink.includes('/docs/en/')) {
+      htmlLink = htmlLink.replace('/docs/en/', '/docs/en/VERSION/');
+    } else {
+      htmlLink = htmlLink.replace('/docs/', '/docs/VERSION/');
+    }
+    result[metadata.source] = htmlLink;
+  });
+  return result;
+}
+
 module.exports = {
   extractMetadata,
+  mdToHtml,
 };
diff --git a/lib/server/server.js b/lib/server/server.js
@@ -193,23 +193,7 @@ function execute(port, options) {
       links[metadata.permalink] = id;
     });
 
-    // mdToHtml is a map from a markdown file name to its html link, used to
-    // change relative markdown links that work on GitHub into actual site links
-    const mdToHtml = {};
-    Object.keys(Metadata).forEach(id => {
-      const metadata = Metadata[id];
-      if (metadata.language !== 'en' || metadata.original_id) {
-        return;
-      }
-      let htmlLink =
-        siteConfig.baseUrl + metadata.permalink.replace('/next/', '/');
-      if (htmlLink.includes('/docs/en/')) {
-        htmlLink = htmlLink.replace('/docs/en/', '/docs/en/VERSION/');
-      } else {
-        htmlLink = htmlLink.replace('/docs/', '/docs/VERSION/');
-      }
-      mdToHtml[metadata.source] = htmlLink;
-    });
+    const mdToHtml = metadataUtils.mdToHtml(Metadata, siteConfig.baseUrl);
 
     const metadata = Metadata[links[url]];
     if (!metadata) {
@@ -259,14 +243,9 @@ function execute(port, options) {
           ? `/${metadata.version}/`
           : '/'
       );
-      // replace relative links without "./"
-      rawContent = rawContent.replace(
-        new RegExp(`\\]\\(${key}`, 'g'),
-        `](${link}`
-      );
-      // replace relative links with "./"
+      // replace relative links with & without "./"
       rawContent = rawContent.replace(
-        new RegExp(`\\]\\(\\./${key}`, 'g'),
+        new RegExp(`\\]\\((${key}|\\./${key})`, 'g'),
         `](${link}`
       );
     });