Refactor + add more tests (Part 1) (#847)

* Refactor mdToHtml out * Refactor routing + move it to server instead of core * Refactor & Add more tests for server utils * Refactor isSeparateCss function from server & generate * Refactor insertTableOfContents from server & generate + add tests * undo small nits
2025-05-30 01:17:07 +02:00 · 2018-07-14 02:31:37 +08:00 · 2018-07-14 02:31:37 +08:00 · defcbcc8ee
commit defcbcc8ee
parent a7a214fb3a
14 changed files with 322 additions and 235 deletions
--- a/lib/server/tests/routing.test.js
+++ b/lib/server/tests/routing.test.js
@ -0,0 +1,188 @@
+/**
+ * Copyright (c) 2017-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+const routing = require('../routing');
+
+describe('Blog routing', () => {
+  const blogRegex = routing.blog('/');
+  const blogRegex2 = routing.blog('/react/');
+
+  test('valid blog', () => {
+    expect('/blog/test.html').toMatch(blogRegex);
+    expect('/react/blog/test.html').toMatch(blogRegex2);
+  });
+
+  test('invalid blog', () => {
+    expect('/react/blog/test.html').not.toMatch(blogRegex);
+    expect('/blog/test.html').not.toMatch(blogRegex2);
+  });
+
+  test('assets not classified as blog', () => {
+    expect('/blog/assets/any.png').not.toMatch(blogRegex);
+    expect('/react/blog/assets/any.png').not.toMatch(blogRegex2);
+  });
+
+  test('docs not classified as blog', () => {
+    expect('/docs/en/blog.html').not.toMatch(blogRegex);
+    expect('/docs/en/blog/blog.html').not.toMatch(blogRegex);
+    expect('/react/docs/en/blog.html').not.toMatch(blogRegex2);
+    expect('/react/docs/en/blog/blog.html').not.toMatch(blogRegex2);
+  });
+});
+
+describe('Docs routing', () => {
+  const docsRegex = routing.docs('/');
+  const docsRegex2 = routing.docs('/reason/');
+
+  test('valid docs', () => {
+    expect('/docs/en/test.html').toMatch(docsRegex);
+    expect('/reason/docs/en/test.html').toMatch(docsRegex2);
+  });
+
+  test('invalid docs', () => {
+    expect('/reason/docs/en/test.html').not.toMatch(docsRegex);
+    expect('/docs/en/test.html').not.toMatch(docsRegex2);
+  });
+
+  test('assets not classified as docs', () => {
+    expect('/docs/en/notvalid.png').not.toMatch(docsRegex);
+    expect('/reason/docs/en/notvalid.png').not.toMatch(docsRegex2);
+  });
+
+  test('blog not classified as docs', () => {
+    expect('/blog/docs.html').not.toMatch(docsRegex);
+    expect('/blog/docs/docs.html').not.toMatch(docsRegex);
+    expect('/reason/blog/docs.html').not.toMatch(docsRegex2);
+    expect('/reason/blog/docs/docs.html').not.toMatch(docsRegex2);
+  });
+});
+
+describe('Dot routing', () => {
+  const dotRegex = routing.dotfiles();
+
+  test('valid url with dot after last slash', () => {
+    expect('/docs/en/test.23').toMatch(dotRegex);
+    expect('/robots.hai.2').toMatch(dotRegex);
+    expect('/blog/1.2.3').toMatch(dotRegex);
+    expect('/this.is.my').toMatch(dotRegex);
+  });
+
+  test('html file is invalid', () => {
+    expect('/docs/en.html').not.toMatch(dotRegex);
+    expect('/users.html').not.toMatch(dotRegex);
+    expect('/blog/asdf.html').not.toMatch(dotRegex);
+    expect('/end/1234/asdf.html').not.toMatch(dotRegex);
+    expect('/test/lol.huam.html').not.toMatch(dotRegex);
+  });
+
+  test('extension-less url is not valid', () => {
+    expect('/reason/test').not.toMatch(dotRegex);
+    expect('/asdff').not.toMatch(dotRegex);
+    expect('/blog/asdf.ghg/').not.toMatch(dotRegex);
+    expect('/end/1234.23.55/').not.toMatch(dotRegex);
+  });
+});
+
+describe('Feed routing', () => {
+  const feedRegex = routing.feed('/');
+  const feedRegex2 = routing.feed('/reason/');
+
+  test('valid feed url', () => {
+    expect('/blog/atom.xml').toMatch(feedRegex);
+    expect('/blog/feed.xml').toMatch(feedRegex);
+    expect('/reason/blog/atom.xml').toMatch(feedRegex2);
+    expect('/reason/blog/feed.xml').toMatch(feedRegex2);
+  });
+
+  test('invalid feed url', () => {
+    expect('/blog/blog/feed.xml').not.toMatch(feedRegex);
+    expect('/blog/test.xml').not.toMatch(feedRegex);
+    expect('/reason/blog/atom.xml').not.toMatch(feedRegex);
+    expect('/reason/blog/feed.xml').not.toMatch(feedRegex);
+    expect('/blog/feed.xml/test.html').not.toMatch(feedRegex);
+    expect('/blog/atom.xml').not.toMatch(feedRegex2);
+    expect('/blog/feed.xml').not.toMatch(feedRegex2);
+    expect('/reason/blog/test.xml').not.toMatch(feedRegex2);
+    expect('/reason/blog/blog/feed.xml').not.toMatch(feedRegex2);
+    expect('/reason/blog/blog/atom.xml').not.toMatch(feedRegex2);
+  });
+
+  test('not a feed', () => {
+    expect('/blog/atom').not.toMatch(feedRegex);
+    expect('/reason/blog/feed').not.toMatch(feedRegex2);
+  });
+});
+
+describe('Extension-less url routing', () => {
+  const noExtRegex = routing.noExtension();
+
+  test('valid no extension url', () => {
+    expect('/test').toMatch(noExtRegex);
+    expect('/reason/test').toMatch(noExtRegex);
+  });
+
+  test('url with file extension', () => {
+    expect('/robots.txt').not.toMatch(noExtRegex);
+    expect('/reason/robots.txt').not.toMatch(noExtRegex);
+    expect('/docs/en/docu.html').not.toMatch(noExtRegex);
+    expect('/reason/robots.html').not.toMatch(noExtRegex);
+    expect('/blog/atom.xml').not.toMatch(noExtRegex);
+    expect('/reason/sitemap.xml').not.toMatch(noExtRegex);
+    expect('/main.css').not.toMatch(noExtRegex);
+    expect('/reason/custom.css').not.toMatch(noExtRegex);
+  });
+});
+
+describe('Page routing', () => {
+  const pageRegex = routing.page('/');
+  const pageRegex2 = routing.page('/reason/');
+
+  test('valid page url', () => {
+    expect('/index.html').toMatch(pageRegex);
+    expect('/en/help.html').toMatch(pageRegex);
+    expect('/reason/index.html').toMatch(pageRegex2);
+    expect('/reason/ro/users.html').toMatch(pageRegex2);
+  });
+
+  test('docs not considered as page', () => {
+    expect('/docs/en/test.html').not.toMatch(pageRegex);
+    expect('/reason/docs/en/test.html').not.toMatch(pageRegex2);
+  });
+
+  test('blog not considered as page', () => {
+    expect('/blog/index.html').not.toMatch(pageRegex);
+    expect('/reason/blog/index.html').not.toMatch(pageRegex2);
+  });
+
+  test('not a page', () => {
+    expect('/yangshun.jpg').not.toMatch(pageRegex);
+    expect('/reason/endilie.png').not.toMatch(pageRegex2);
+  });
+});
+
+describe('Sitemap routing', () => {
+  const sitemapRegex = routing.sitemap('/');
+  const sitemapRegex2 = routing.sitemap('/reason/');
+
+  test('valid sitemap url', () => {
+    expect('/sitemap.xml').toMatch(sitemapRegex);
+    expect('/reason/sitemap.xml').toMatch(sitemapRegex2);
+  });
+
+  test('invalid sitemap url', () => {
+    expect('/reason/sitemap.xml').not.toMatch(sitemapRegex);
+    expect('/reason/sitemap.xml.html').not.toMatch(sitemapRegex);
+    expect('/sitemap/sitemap.xml').not.toMatch(sitemapRegex);
+    expect('/reason/sitemap/sitemap.xml').not.toMatch(sitemapRegex);
+    expect('/sitemap.xml').not.toMatch(sitemapRegex2);
+  });
+
+  test('not a sitemap', () => {
+    expect('/sitemap').not.toMatch(sitemapRegex);
+    expect('/reason/sitemap').not.toMatch(sitemapRegex2);
+  });
+});
--- a/lib/server/tests/utils.test.js
+++ b/lib/server/tests/utils.test.js
@ -8,6 +8,24 @@ const path = require('path');
 const fs = require('fs');
 const utils = require('../utils');

+jest.mock('../env', () => ({
+  translation: {
+    enabled: true,
+    enabledLanguages: () => [
+      {
+        enabled: true,
+        name: 'English',
+        tag: 'en',
+      },
+      {
+        enabled: true,
+        name: '日本語',
+        tag: 'ja',
+      },
+    ],
+  },
+}));
+
 describe('server utils', () => {
  test('minify css', () => {
    const testCss = fs.readFileSync(
@ -21,4 +39,44 @@ describe('server utils', () => {
    utils.minifyCss(testCss).then(css => expect(css).toMatchSnapshot());
    utils.minifyCss(notCss).catch(e => expect(e).toMatchSnapshot());
  });
+
+  test('getLanguage', () => {
+    const testDocEnglish = path.join('translated_docs', 'en', 'test.md');
+    const testDocJapanese = path.join('translated_docs', 'ja', 'test.md');
+    const testDocJapaneseInSubfolder = path.join(
+      'translated_docs',
+      'ja',
+      'en',
+      'test.md'
+    );
+    const testDocInSubfolder = path.join('docs', 'ro', 'test.md');
+    const testDocNoLanguage = path.join('docs', 'test.md');
+    expect(utils.getLanguage(testDocEnglish, 'translated_docs')).toBe('en');
+    expect(utils.getLanguage(testDocJapanese, 'translated_docs')).toBe('ja');
+    expect(
+      utils.getLanguage(testDocJapaneseInSubfolder, 'translated_docs')
+    ).toBe('ja');
+    expect(utils.getLanguage(testDocInSubfolder, 'docs')).toBeNull();
+    expect(utils.getLanguage(testDocNoLanguage, 'docs')).toBeNull();
+  });
+
+  test('getSubdir', () => {
+    const docA = path.join('docs', 'endiliey', 'a.md');
+    const docB = path.join('docs', 'nus', 'hackers', 'b.md');
+    const docC = path.join('docs', 'c.md');
+    const docD = path.join('website', 'translated_docs', 'wow', 'd.md');
+    const docE = path.join('website', 'translated_docs', 'lol', 'lah', 'e.md');
+    const docsDir = path.join('docs');
+    const translatedDir = path.join('website', 'translated_docs');
+    expect(utils.getSubDir(docA, docsDir)).toEqual('endiliey');
+    expect(utils.getSubDir(docA, translatedDir)).toBeNull();
+    expect(utils.getSubDir(docB, docsDir)).toEqual('nus/hackers');
+    expect(utils.getSubDir(docB, translatedDir)).toBeNull();
+    expect(utils.getSubDir(docC, docsDir)).toBeNull();
+    expect(utils.getSubDir(docC, translatedDir)).toBeNull();
+    expect(utils.getSubDir(docD, docsDir)).toBeNull();
+    expect(utils.getSubDir(docD, translatedDir)).toEqual('wow');
+    expect(utils.getSubDir(docE, docsDir)).toBeNull();
+    expect(utils.getSubDir(docE, translatedDir)).toEqual('lol/lah');
+  });
 });
--- a/lib/server/generate.js
+++ b/lib/server/generate.js
@ -14,9 +14,9 @@ async function execute() {
  const fs = require('fs-extra');
  const readMetadata = require('./readMetadata.js');
  const path = require('path');
-  const getTOC = require('../core/getTOC');
-  const utils = require('../core/utils.js');
-  const serverUtils = require('./utils');
+  const {insertTOC} = require('../core/toc');
+  const {getPath} = require('../core/utils.js');
+  const {minifyCss, isSeparateCss} = require('./utils');
  const React = require('react');
  const mkdirp = require('mkdirp');
  const glob = require('glob');
@ -53,36 +53,6 @@ async function execute() {
    }
  }

-  const TABLE_OF_CONTENTS_TOKEN = '<AUTOGENERATED_TABLE_OF_CONTENTS>';
-
-  // takes the content of a doc article and returns the content with a table of
-  // contents inserted
-  const insertTableOfContents = rawContent => {
-    const filterRe = /^`[^`]*`/;
-    const headers = getTOC(rawContent, 'h3', null);
-
-    const tableOfContents = headers
-      .filter(header => filterRe.test(header.rawContent))
-      .map(header => `  - [${header.rawContent}](#${header.hashLink})`)
-      .join('\n');
-
-    return rawContent.replace(TABLE_OF_CONTENTS_TOKEN, tableOfContents);
-  };
-
-  // returns true if a file should be excluded from concatentation to
-  // default Docusaurus styles
-  function isSeparateCss(file) {
-    if (!siteConfig.separateCss) {
-      return false;
-    }
-    for (let i = 0; i < siteConfig.separateCss.length; i++) {
-      if (file.includes(siteConfig.separateCss[i])) {
-        return true;
-      }
-    }
-    return false;
-  }
-
  console.log('generate.js triggered...');

  // array of tags of enabled languages
@ -103,23 +73,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');
@ -154,16 +108,14 @@ async function execute() {
    const language = metadata.language;

    // generate table of contents if appropriate
-    if (rawContent && rawContent.indexOf(TABLE_OF_CONTENTS_TOKEN) !== -1) {
-      rawContent = insertTableOfContents(rawContent);
-    }
+    rawContent = insertTOC(rawContent);

    const defaultVersion = env.versioning.defaultVersion;

    // replace any links to markdown files to their website html links
    Object.keys(mdToHtml).forEach(key => {
      let link = mdToHtml[key];
-      link = utils.getPath(link, siteConfig.cleanUrl);
+      link = getPath(link, siteConfig.cleanUrl);
      link = link.replace('/en/', `/${language}/`);
      link = link.replace(
        '/VERSION/',
@ -171,14 +123,9 @@ async function execute() {
          ? `/${metadata.version}/`
          : '/'
      );
-      // replace relative links without "./"
+      // replace relative links with & without "./"
      rawContent = rawContent.replace(
-        new RegExp(`\\]\\(${key}`, 'g'),
-        `](${link}`
-      );
-      // replace relative links with "./"
-      rawContent = rawContent.replace(
-        new RegExp(`\\]\\(\\./${key}`, 'g'),
+        new RegExp(`\\]\\((${key}|\\./${key})`, 'g'),
        `](${link}`
      );
    });
@ -204,10 +151,7 @@ async function execute() {
      env.translation.enabled &&
      metadata.permalink.indexOf('docs/en') !== -1
    ) {
-      const redirectlink = utils.getPath(
-        metadata.permalink,
-        siteConfig.cleanUrl
-      );
+      const redirectlink = getPath(metadata.permalink, siteConfig.cleanUrl);
      const redirectComp = (
        <Redirect
          metadata={metadata}
@ -391,7 +335,10 @@ async function execute() {
    // Remember the nuance of glob: https://www.npmjs.com/package/glob#windows
    const normalizedFile = path.normalize(file);
    // parse css files to replace colors and fonts according to siteConfig
-    if (normalizedFile.match(/\.css$/) && !isSeparateCss(normalizedFile)) {
+    if (
+      normalizedFile.match(/\.css$/) &&
+      !isSeparateCss(normalizedFile, siteConfig.separateCss)
+    ) {
      const mainCss = join(buildDir, 'css', 'main.css');
      let cssContent = fs.readFileSync(normalizedFile, 'utf8');
      cssContent = `${fs.readFileSync(mainCss, 'utf8')}\n${cssContent}`;
@ -445,7 +392,7 @@ async function execute() {
  // Use cssnano to minify the final combined CSS.
  const mainCss = join(buildDir, 'css', 'main.css');
  const cssContent = fs.readFileSync(mainCss, 'utf8');
-  const css = await serverUtils.minifyCss(cssContent);
+  const css = await minifyCss(cssContent);
  fs.writeFileSync(mainCss, css);

  // compile/copy pages from user
--- 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,
 };
--- a/lib/server/routing.js
+++ b/lib/server/routing.js
@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2017-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+function blog(baseUrl) {
+  return new RegExp(`^${baseUrl}blog/.*html$`);
+}
+
+function docs(baseUrl) {
+  return new RegExp(`^${baseUrl}docs/.*html$`);
+}
+
+function dotfiles() {
+  return /(?!.*html$)^\/.*\.[^\n/]+$/;
+}
+
+function feed(baseUrl) {
+  return new RegExp(`^${baseUrl}blog/(feed.xml|atom.xml)$`);
+}
+
+function noExtension() {
+  return /\/[^.]*\/?$/;
+}
+
+function page(baseUrl) {
+  const gr = regex => regex.toString().replace(/(^\/|\/$)/gm, '');
+  return new RegExp(
+    `(?!${gr(docs(baseUrl))}|${gr(blog(baseUrl))})^${baseUrl}.*.html$`
+  );
+}
+
+function sitemap(baseUrl) {
+  return new RegExp(`^${baseUrl}sitemap.xml$`);
+}
+
+module.exports = {
+  blog,
+  docs,
+  dotfiles,
+  feed,
+  page,
+  noExtension,
+  sitemap,
+};
--- a/lib/server/server.js
+++ b/lib/server/server.js
@ -18,17 +18,9 @@ function execute(port, options) {
  const request = require('request');
  const fs = require('fs-extra');
  const path = require('path');
-  const getTOC = require('../core/getTOC');
-  const utils = require('../core/utils');
-  const {
-    blogRouting,
-    docsRouting,
-    dotRouting,
-    feedRouting,
-    pageRouting,
-    noExtRouting,
-    sitemapRouting,
-  } = require('../core/routing');
+  const {insertTOC} = require('../core/toc');
+  const {getPath} = require('../core/utils');
+  const {isSeparateCss} = require('./utils');
  const mkdirp = require('mkdirp');
  const glob = require('glob');
  const chalk = require('chalk');
@ -41,6 +33,7 @@ function execute(port, options) {

  const feed = require('./feed');
  const sitemap = require('./sitemap');
+  const routing = require('./routing');

  const CWD = process.cwd();

@ -101,32 +94,6 @@ function execute(port, options) {
    }
  }

-  const TABLE_OF_CONTENTS_TOKEN = '<AUTOGENERATED_TABLE_OF_CONTENTS>';
-
-  const insertTableOfContents = rawContent => {
-    const filterRe = /^`[^`]*`/;
-    const headers = getTOC(rawContent, 'h3', null);
-
-    const tableOfContents = headers
-      .filter(header => filterRe.test(header.rawContent))
-      .map(header => `  - [${header.rawContent}](#${header.hashLink})`)
-      .join('\n');
-
-    return rawContent.replace(TABLE_OF_CONTENTS_TOKEN, tableOfContents);
-  };
-
-  function isSeparateCss(file) {
-    if (!siteConfig.separateCss) {
-      return false;
-    }
-    for (let i = 0; i < siteConfig.separateCss.length; i++) {
-      if (file.includes(siteConfig.separateCss[i])) {
-        return true;
-      }
-    }
-    return false;
-  }
-
  function requestFile(url, res, notFoundCallback) {
    request.get(url, (error, response, body) => {
      if (!error) {
@ -183,7 +150,7 @@ function execute(port, options) {
  const app = express();

  // handle all requests for document pages
-  app.get(docsRouting(siteConfig.baseUrl), (req, res, next) => {
+  app.get(routing.docs(siteConfig.baseUrl), (req, res, next) => {
    const url = req.path.toString().replace(siteConfig.baseUrl, '');

    // links is a map from a permalink to an id for each document
@ -193,23 +160,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) {
@ -242,16 +193,14 @@ function execute(port, options) {
    ).rawContent;

    // generate table of contents if appropriate
-    if (rawContent && rawContent.indexOf(TABLE_OF_CONTENTS_TOKEN) !== -1) {
-      rawContent = insertTableOfContents(rawContent);
-    }
+    rawContent = insertTOC(rawContent);

    const defaultVersion = env.versioning.defaultVersion;

    // replace any links to markdown files to their website html links
    Object.keys(mdToHtml).forEach(key => {
      let link = mdToHtml[key];
-      link = utils.getPath(link, siteConfig.cleanUrl);
+      link = getPath(link, siteConfig.cleanUrl);
      link = link.replace('/en/', `/${language}/`);
      link = link.replace(
        '/VERSION/',
@ -259,14 +208,9 @@ function execute(port, options) {
          ? `/${metadata.version}/`
          : '/'
      );
-      // replace relative links without "./"
+      // replace relative links with & without "./"
      rawContent = rawContent.replace(
-        new RegExp(`\\]\\(${key}`, 'g'),
-        `](${link}`
-      );
-      // replace relative links with "./"
-      rawContent = rawContent.replace(
-        new RegExp(`\\]\\(\\./${key}`, 'g'),
+        new RegExp(`\\]\\((${key}|\\./${key})`, 'g'),
        `](${link}`
      );
    });
@ -305,7 +249,7 @@ function execute(port, options) {
    res.send(renderToStaticMarkupWithDoctype(docComp));
  });

-  app.get(sitemapRouting(siteConfig.baseUrl), (req, res) => {
+  app.get(routing.sitemap(siteConfig.baseUrl), (req, res) => {
    sitemap((err, xml) => {
      if (err) {
        res.status(500).send('Sitemap error');
@ -316,7 +260,7 @@ function execute(port, options) {
    });
  });

-  app.get(feedRouting(siteConfig.baseUrl), (req, res, next) => {
+  app.get(routing.feed(siteConfig.baseUrl), (req, res, next) => {
    res.set('Content-Type', 'application/rss+xml');
    const file = req.path
      .toString()
@ -331,7 +275,7 @@ function execute(port, options) {
  });

  // Handle all requests for blog pages and posts.
-  app.get(blogRouting(siteConfig.baseUrl), (req, res, next) => {
+  app.get(routing.blog(siteConfig.baseUrl), (req, res, next) => {
    // Regenerate the blog metadata in case it has changed. Consider improving
    // this to regenerate on file save rather than on page request.
    reloadMetadataBlog();
@ -421,7 +365,7 @@ function execute(port, options) {
  });

  // handle all other main pages
-  app.get(pageRouting(siteConfig.baseUrl), (req, res, next) => {
+  app.get(routing.page(siteConfig.baseUrl), (req, res, next) => {
    // Look for user-provided HTML file first.
    let htmlFile = req.path.toString().replace(siteConfig.baseUrl, '');
    htmlFile = join(CWD, 'pages', htmlFile);
@ -541,7 +485,7 @@ function execute(port, options) {
    const files = glob.sync(join(CWD, 'static', '**', '*.css'));

    files.forEach(file => {
-      if (isSeparateCss(file)) {
+      if (isSeparateCss(file, siteConfig.separateCss)) {
        return;
      }
      cssContent = `${cssContent}\n${fs.readFileSync(file, {
@ -596,7 +540,7 @@ function execute(port, options) {

  // "redirect" requests to pages ending with "/" or no extension so that,
  // for example, request to "blog" returns "blog/index.html" or "blog.html"
-  app.get(noExtRouting(), (req, res, next) => {
+  app.get(routing.noExtension(), (req, res, next) => {
    const slash = req.path.toString().endsWith('/') ? '' : '/';
    const requestUrl = `http://localhost:${port}${req.path}`;
    requestFile(`${requestUrl + slash}index.html`, res, () => {
@ -612,7 +556,7 @@ function execute(port, options) {

  // handle special cleanUrl case like '/blog/1.2.3' & '/blog.robots.hai'
  // where we should try to serve 'blog/1.2.3.html' & '/blog.robots.hai.html'
-  app.get(dotRouting(), (req, res, next) => {
+  app.get(routing.dotfiles(), (req, res, next) => {
    if (!siteConfig.cleanUrl) {
      next();
      return;
--- a/lib/server/utils.js
+++ b/lib/server/utils.js
@ -9,23 +9,14 @@ const cssnano = require('cssnano');
 const path = require('path');
 const escapeStringRegexp = require('escape-string-regexp');

-// Return the subdirectory path from a reference directory
-// Example:
-//  (file: 'docs/projectA/test.md', refDir: 'docs')
-//  returns 'projectA'
 function getSubDir(file, refDir) {
-  let subDir = path.dirname(path.relative(refDir, file));
-  subDir = subDir.replace('\\', '/');
-  return subDir !== '.' ? subDir : null;
+  const subDir = path.dirname(path.relative(refDir, file)).replace('\\', '/');
+  return subDir !== '.' && !subDir.includes('..') ? subDir : null;
 }

-// Get the corresponding enabled language locale of a file.
-// Example:
-//  (file: '/website/translated_docs/ko/projectA/test.md', refDir: 'website/translated_docs')
-//  returns 'ko'
 function getLanguage(file, refDir) {
  const regexSubFolder = new RegExp(
-    `/${escapeStringRegexp(path.basename(refDir))}/(.*)/.*/`
+    `${escapeStringRegexp(path.basename(refDir))}/(.*?)/.*`
  );
  const match = regexSubFolder.exec(file);

@ -42,6 +33,18 @@ function getLanguage(file, refDir) {
  return null;
 }

+function isSeparateCss(file, separateDirs) {
+  if (!separateDirs) {
+    return false;
+  }
+  for (let i = 0; i < separateDirs.length; i++) {
+    if (file.includes(separateDirs[i])) {
+      return true;
+    }
+  }
+  return false;
+}
+
 function minifyCss(cssContent) {
  return cssnano
    .process(cssContent, {
@ -54,5 +57,6 @@ function minifyCss(cssContent) {
 module.exports = {
  getSubDir,
  getLanguage,
+  isSeparateCss,
  minifyCss,
 };