From 19efb7c352d34eb4ab3847797ebdae08484b19dd Mon Sep 17 00:00:00 2001
From: Santiago Garcia da Rosa <santiago@Santiagos-MacBook-Pro.local>
Date: Sat, 26 Oct 2019 22:37:04 -0500
Subject: [PATCH 01/46] feat(v2): highlight items in the table of content

---
 .../src/theme/DocItem/index.js                | 69 ++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/packages/docusaurus-theme-classic/src/theme/DocItem/index.js b/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
index eeb7cfc311ed..f594d2569fc0 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import React from 'react';
+import React, {useEffect} from 'react';
 
 import Head from '@docusaurus/Head';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
@@ -14,7 +14,74 @@ import DocPaginator from '@theme/DocPaginator';
 
 import styles from './styles.module.css';
 
+let headersCache = [];
+let tableOfContentLinksCache = [];
+let lastActiveTableOfContentLink;
+
+function getActiveHeader() {
+  const TOP_OFFSET = 80;
+  let index = 0;
+  let activeHeader;
+  while (index < headersCache.length && !activeHeader) {
+    const header = headersCache[index];
+    const {top} = header.getBoundingClientRect();
+    if (top > 0 && top <= TOP_OFFSET) {
+      activeHeader = header;
+    }
+    index += 1;
+  }
+  return activeHeader;
+}
+
+function highlightTableOfContentLink(tableOfContentLink) {
+  if (lastActiveTableOfContentLink) {
+    lastActiveTableOfContentLink.classList.remove('contents__link--active');
+  }
+  tableOfContentLink.classList.add('contents__link--active');
+  lastActiveTableOfContentLink = tableOfContentLink;
+}
+
+function setActiveTableOfContentLink() {
+  const activeHeader = getActiveHeader();
+  if (activeHeader) {
+    let index = 0;
+    let itemHighlighted = false;
+    while (index < tableOfContentLinksCache.length && !itemHighlighted) {
+      const tableOfContentLink = tableOfContentLinksCache[index];
+      if (activeHeader.innerText.indexOf(tableOfContentLink.innerText) > -1) {
+        highlightTableOfContentLink(tableOfContentLink);
+        itemHighlighted = true;
+      }
+      index += 1;
+    }
+  }
+}
+
+function addEventListeners() {
+  document.addEventListener('scroll', setActiveTableOfContentLink);
+  document.addEventListener('resize', setActiveTableOfContentLink);
+  document.addEventListener('hashchange', setActiveTableOfContentLink);
+}
+
+function removeEventListeners() {
+  document.removeEventListener('scroll', setActiveTableOfContentLink);
+  document.removeEventListener('resize', setActiveTableOfContentLink);
+  document.removeEventListener('hashchange', setActiveTableOfContentLink);
+}
+
+function componentLoaded() {
+  headersCache = document.querySelectorAll('h2, h3');
+  tableOfContentLinksCache = document.querySelectorAll('.contents__link');
+  setActiveTableOfContentLink();
+  addEventListeners();
+}
+
 function Headings({headings, isChild}) {
+  useEffect(() => {
+    componentLoaded();
+    return removeEventListeners;
+  });
+
   if (!headings.length) return null;
   return (
     <ul className={isChild ? '' : 'contents contents__left-border'}>

From 4f44e36798ecc211a414f80408e57c645b5e5b34 Mon Sep 17 00:00:00 2001
From: Santiago Garcia da Rosa <santiago@Santiagos-MacBook-Pro.local>
Date: Sat, 26 Oct 2019 22:43:55 -0500
Subject: [PATCH 02/46] refactor: move string to const

---
 packages/docusaurus-theme-classic/src/theme/DocItem/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/docusaurus-theme-classic/src/theme/DocItem/index.js b/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
index f594d2569fc0..196e8a076b14 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
@@ -34,10 +34,11 @@ function getActiveHeader() {
 }
 
 function highlightTableOfContentLink(tableOfContentLink) {
+  const cssClass = 'contents__link--active';
   if (lastActiveTableOfContentLink) {
-    lastActiveTableOfContentLink.classList.remove('contents__link--active');
+    lastActiveTableOfContentLink.classList.remove(cssClass);
   }
-  tableOfContentLink.classList.add('contents__link--active');
+  tableOfContentLink.classList.add(cssClass);
   lastActiveTableOfContentLink = tableOfContentLink;
 }
 

From c23f981f679d669f319e70d8f62def1a13c0afed Mon Sep 17 00:00:00 2001
From: Pawel Kadluczka <moozzyk@users.noreply.github.com>
Date: Sun, 27 Oct 2019 00:44:53 -0700
Subject: [PATCH 03/46] refactor(v2): Convert sitemap plugin to TypeScript
 (#1894)

* Convert sitemap plugin to TypeScript

Test - enabled the sitemap plugin in the v2 website and verified that
the sitemap is created after running `docusaurus build`.

* Addressing review comments
---
 .eslintignore                                 |  1 +
 .gitignore                                    |  1 +
 .prettierignore                               |  1 +
 CHANGELOG-2.x.md                              |  2 ++
 .../docusaurus-plugin-sitemap/package.json    |  6 +++-
 ...eSitemap.test.js => createSitemap.test.ts} | 19 ++++++----
 .../src/createSitemap.js                      | 33 -----------------
 .../src/createSitemap.ts                      | 36 +++++++++++++++++++
 .../src/{index.js => index.ts}                | 24 +++++++------
 .../docusaurus-plugin-sitemap/src/types.ts    | 12 +++++++
 .../docusaurus-plugin-sitemap/tsconfig.json   |  9 +++++
 11 files changed, 94 insertions(+), 50 deletions(-)
 rename packages/docusaurus-plugin-sitemap/src/__tests__/{createSitemap.test.js => createSitemap.test.ts} (70%)
 delete mode 100644 packages/docusaurus-plugin-sitemap/src/createSitemap.js
 create mode 100644 packages/docusaurus-plugin-sitemap/src/createSitemap.ts
 rename packages/docusaurus-plugin-sitemap/src/{index.js => index.ts} (61%)
 create mode 100644 packages/docusaurus-plugin-sitemap/src/types.ts
 create mode 100644 packages/docusaurus-plugin-sitemap/tsconfig.json

diff --git a/.eslintignore b/.eslintignore
index bda9362a870f..a8ca421a6ce2 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -16,3 +16,4 @@ packages/docusaurus-init/lib/
 packages/docusaurus-plugin-content-blog/lib/
 packages/docusaurus-plugin-content-docs/lib/
 packages/docusaurus-plugin-content-pages/lib/
+packages/docusaurus-plugin-sitemap/lib/
diff --git a/.gitignore b/.gitignore
index 929727c2751f..e230c5dcf9a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ packages/docusaurus-init/lib/
 packages/docusaurus-plugin-content-blog/lib/
 packages/docusaurus-plugin-content-docs/lib/
 packages/docusaurus-plugin-content-pages/lib/
+packages/docusaurus-plugin-sitemap/lib/
diff --git a/.prettierignore b/.prettierignore
index 7499928e82e3..a74d4b9bb16f 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -8,3 +8,4 @@ packages/docusaurus-init/lib/
 packages/docusaurus-plugin-content-blog/lib/
 packages/docusaurus-plugin-content-docs/lib/
 packages/docusaurus-plugin-content-pages/lib/
+packages/docusaurus-plugin-sitemap/lib/
\ No newline at end of file
diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index 98889efbae93..b6cec6facd92 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Convert sitemap plugin to TypeScript
+
 ## 2.0.0-alpha.31
 
 - Footer is now sticky/ pinned to the bottom of the viewport in desktop browsers. 
diff --git a/packages/docusaurus-plugin-sitemap/package.json b/packages/docusaurus-plugin-sitemap/package.json
index af6761849d76..ee12645ea186 100644
--- a/packages/docusaurus-plugin-sitemap/package.json
+++ b/packages/docusaurus-plugin-sitemap/package.json
@@ -2,12 +2,16 @@
   "name": "@docusaurus/plugin-sitemap",
   "version": "2.0.0-alpha.31",
   "description": "Simple sitemap generation plugin for Docusaurus",
-  "main": "src/index.js",
+  "main": "lib/index.js",
+  "scripts": {
+    "tsc": "tsc"
+  },
   "publishConfig": {
     "access": "public"
   },
   "license": "MIT",
   "dependencies": {
+    "@docusaurus/types": "^2.0.0-alpha.30",
     "sitemap": "^3.2.2"
   },
   "peerDependencies": {
diff --git a/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.js b/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts
similarity index 70%
rename from packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.js
rename to packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts
index f5cf466f0940..1f849716fc6b 100644
--- a/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.js
+++ b/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts
@@ -6,23 +6,30 @@
  */
 
 import createSitemap from '../createSitemap';
+import {DocusaurusConfig} from '@docusaurus/types';
+import DEFAULT_OPTIONS from '../index';
 
 describe('createSitemap', () => {
   test('simple site', () => {
-    const sitemap = createSitemap({
-      siteConfig: {
+    const sitemap = createSitemap(
+      {
         url: 'https://example.com',
+      } as DocusaurusConfig,
+      ['/', '/test'],
+      {
+        cacheTime: 600,
+        changefreq: 'daily',
+        priority: 0.7,
       },
-      routesPaths: ['/', '/test'],
-    });
-    expect(sitemap).toContain(
+    );
+    expect(sitemap.toString()).toContain(
       `<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">`,
     );
   });
 
   test('empty site', () => {
     expect(() => {
-      createSitemap({});
+      createSitemap({} as any, [], {} as any);
     }).toThrowErrorMatchingInlineSnapshot(
       `"Url in docusaurus.config.js cannot be empty/undefined"`,
     );
diff --git a/packages/docusaurus-plugin-sitemap/src/createSitemap.js b/packages/docusaurus-plugin-sitemap/src/createSitemap.js
deleted file mode 100644
index f9cc6318007e..000000000000
--- a/packages/docusaurus-plugin-sitemap/src/createSitemap.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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 sitemap = require('sitemap');
-
-module.exports = function createSitemap({
-  siteConfig = {},
-  routesPaths,
-  options = {},
-}) {
-  const {url: hostname} = siteConfig;
-  if (!hostname) {
-    throw new Error('Url in docusaurus.config.js cannot be empty/undefined');
-  }
-
-  const urls = routesPaths.map(routesPath => ({
-    url: routesPath,
-    changefreq: options.changefreq,
-    priority: options.priority,
-  }));
-
-  return sitemap
-    .createSitemap({
-      hostname,
-      cacheTime: options.cacheTime,
-      urls,
-    })
-    .toString();
-};
diff --git a/packages/docusaurus-plugin-sitemap/src/createSitemap.ts b/packages/docusaurus-plugin-sitemap/src/createSitemap.ts
new file mode 100644
index 000000000000..50aa2be44e7c
--- /dev/null
+++ b/packages/docusaurus-plugin-sitemap/src/createSitemap.ts
@@ -0,0 +1,36 @@
+/**
+ * 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.
+ */
+
+import sitemap, {SitemapItemOptions} from 'sitemap';
+import {PluginOptions} from './types';
+import {DocusaurusConfig} from '@docusaurus/types';
+
+export default function createSitemap(
+  siteConfig: DocusaurusConfig,
+  routesPaths: string[],
+  options: PluginOptions,
+) {
+  const {url: hostname} = siteConfig;
+  if (!hostname) {
+    throw new Error('Url in docusaurus.config.js cannot be empty/undefined');
+  }
+
+  const urls = routesPaths.map(
+    routesPath =>
+      ({
+        url: routesPath,
+        changefreq: options.changefreq,
+        priority: options.priority,
+      } as SitemapItemOptions),
+  );
+
+  return sitemap.createSitemap({
+    hostname,
+    cacheTime: options.cacheTime,
+    urls,
+  });
+}
diff --git a/packages/docusaurus-plugin-sitemap/src/index.js b/packages/docusaurus-plugin-sitemap/src/index.ts
similarity index 61%
rename from packages/docusaurus-plugin-sitemap/src/index.js
rename to packages/docusaurus-plugin-sitemap/src/index.ts
index eb43d8338480..0394d40eb08a 100644
--- a/packages/docusaurus-plugin-sitemap/src/index.js
+++ b/packages/docusaurus-plugin-sitemap/src/index.ts
@@ -5,30 +5,34 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-const fs = require('fs');
-const path = require('path');
+import fs from 'fs';
+import path from 'path';
+import {PluginOptions} from './types';
+import createSitemap from './createSitemap';
+import {LoadContext, Props} from '@docusaurus/types';
 
-const createSitemap = require('./createSitemap');
-
-const DEFAULT_OPTIONS = {
+const DEFAULT_OPTIONS: PluginOptions = {
   cacheTime: 600 * 1000, // 600 sec - cache purge period
   changefreq: 'weekly',
   priority: 0.5,
 };
 
-module.exports = function(context, opts) {
+export default function pluginSitemap(
+  _context: LoadContext,
+  opts: Partial<PluginOptions>,
+) {
   const options = {...DEFAULT_OPTIONS, ...opts};
 
   return {
     name: 'docusaurus-plugin-sitemap',
 
-    async postBuild({siteConfig = {}, routesPaths = [], outDir}) {
+    async postBuild({siteConfig, routesPaths, outDir}: Props) {
       // Generate sitemap
-      const generatedSitemap = createSitemap({
+      const generatedSitemap = createSitemap(
         siteConfig,
         routesPaths,
         options,
-      }).toString();
+      ).toString();
 
       // Write sitemap file
       const sitemapPath = path.join(outDir, 'sitemap.xml');
@@ -39,4 +43,4 @@ module.exports = function(context, opts) {
       });
     },
   };
-};
+}
diff --git a/packages/docusaurus-plugin-sitemap/src/types.ts b/packages/docusaurus-plugin-sitemap/src/types.ts
new file mode 100644
index 000000000000..418f15aa0f0a
--- /dev/null
+++ b/packages/docusaurus-plugin-sitemap/src/types.ts
@@ -0,0 +1,12 @@
+/**
+ * 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.
+ */
+
+export interface PluginOptions {
+  cacheTime: number;
+  changefreq: string;
+  priority: number;
+}
diff --git a/packages/docusaurus-plugin-sitemap/tsconfig.json b/packages/docusaurus-plugin-sitemap/tsconfig.json
new file mode 100644
index 000000000000..f5902ba1089b
--- /dev/null
+++ b/packages/docusaurus-plugin-sitemap/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "incremental": true,
+    "tsBuildInfoFile": "./lib/.tsbuildinfo",
+    "rootDir": "src",
+    "outDir": "lib"
+  }
+}

From fabaf7772b83cce0abc4f0433d4edddf74d3303f Mon Sep 17 00:00:00 2001
From: Endi <endiliey@gmail.com>
Date: Sun, 27 Oct 2019 21:09:19 +0700
Subject: [PATCH 04/46] perf(v2): significantly reduce bundle size & initial
 html payload (#1898)

* perf(v2): reduce bundle size significantly with super short chunk name and registry

* changelog

* use hash:8 as id for better long term caching

* even shorter filename. slice contenthash
---
 CHANGELOG-2.x.md                              |  1 +
 .../src/__tests__/index.test.ts               | 14 ++++++++++++
 packages/docusaurus-utils/src/index.ts        | 22 +++++++++++++------
 .../src/client/exports/ComponentCreator.js    |  8 ++++---
 packages/docusaurus/src/server/index.ts       |  9 ++++----
 packages/docusaurus/src/server/routes.ts      |  3 ++-
 packages/docusaurus/src/webpack/base.ts       |  8 +++----
 7 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index b6cec6facd92..5ba3a327a42b 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Convert sitemap plugin to TypeScript
+- Significantly reduce main bundle size and initial HTML payload on production build. Generated JS files from webpack is also shorter in name.
 
 ## 2.0.0-alpha.31
 
diff --git a/packages/docusaurus-utils/src/__tests__/index.test.ts b/packages/docusaurus-utils/src/__tests__/index.test.ts
index 464b6587bcd6..2c0b770b1749 100644
--- a/packages/docusaurus-utils/src/__tests__/index.test.ts
+++ b/packages/docusaurus-utils/src/__tests__/index.test.ts
@@ -108,6 +108,20 @@ describe('load utils', () => {
     Object.keys(secondAssert).forEach(str => {
       expect(genChunkName(str, undefined, 'blog')).toBe(secondAssert[str]);
     });
+
+    // Only generate short unique id
+    const thirdAssert = {
+      a: '0cc175b9',
+      b: '92eb5ffe',
+      c: '4a8a08f0',
+      d: '8277e091',
+    };
+    Object.keys(thirdAssert).forEach(str => {
+      expect(genChunkName(str, undefined, undefined, true)).toBe(
+        thirdAssert[str],
+      );
+    });
+    expect(genChunkName('d', undefined, undefined, true)).toBe('8277e091');
   });
 
   test('idx', () => {
diff --git a/packages/docusaurus-utils/src/index.ts b/packages/docusaurus-utils/src/index.ts
index ccc87cd2d8d0..01c73cdd368f 100644
--- a/packages/docusaurus-utils/src/index.ts
+++ b/packages/docusaurus-utils/src/index.ts
@@ -101,19 +101,27 @@ export function genChunkName(
   modulePath: string,
   prefix?: string,
   preferredName?: string,
+  shortId?: boolean,
 ): string {
   let chunkName: string | undefined = chunkNameCache.get(modulePath);
   if (!chunkName) {
-    let str = modulePath;
-    if (preferredName) {
-      const shortHash = createHash('md5')
+    if (shortId) {
+      chunkName = createHash('md5')
         .update(modulePath)
         .digest('hex')
-        .substr(0, 3);
-      str = `${preferredName}${shortHash}`;
+        .substr(0, 8);
+    } else {
+      let str = modulePath;
+      if (preferredName) {
+        const shortHash = createHash('md5')
+          .update(modulePath)
+          .digest('hex')
+          .substr(0, 3);
+        str = `${preferredName}${shortHash}`;
+      }
+      const name = str === '/' ? 'index' : docuHash(str);
+      chunkName = prefix ? `${prefix}---${name}` : name;
     }
-    const name = str === '/' ? 'index' : docuHash(str);
-    chunkName = prefix ? `${prefix}---${name}` : name;
     chunkNameCache.set(modulePath, chunkName);
   }
   return chunkName;
diff --git a/packages/docusaurus/src/client/exports/ComponentCreator.js b/packages/docusaurus/src/client/exports/ComponentCreator.js
index 46ab1b15dcf4..d82095d67021 100644
--- a/packages/docusaurus/src/client/exports/ComponentCreator.js
+++ b/packages/docusaurus/src/client/exports/ComponentCreator.js
@@ -56,9 +56,11 @@ function ComponentCreator(path) {
     }
 
     const chunkRegistry = registry[target] || {};
-    optsLoader[keys.join('.')] = chunkRegistry.loader;
-    optsModules.push(chunkRegistry.module);
-    optsWebpack.push(chunkRegistry.webpack);
+    /* eslint-disable prefer-destructuring */
+    optsLoader[keys.join('.')] = chunkRegistry[0];
+    optsModules.push(chunkRegistry[1]);
+    optsWebpack.push(chunkRegistry[2]);
+    /* eslint-enable prefer-destructuring */
   }
 
   traverseChunk(chunkNames, []);
diff --git a/packages/docusaurus/src/server/index.ts b/packages/docusaurus/src/server/index.ts
index 0b9270e4ac51..f97654b9a37e 100644
--- a/packages/docusaurus/src/server/index.ts
+++ b/packages/docusaurus/src/server/index.ts
@@ -117,11 +117,10 @@ export async function load(siteDir: string): Promise<Props> {
     `export default {
 ${Object.keys(registry)
   .map(
-    key => `  '${key}': {
-    'loader': ${registry[key].loader},
-    'module': ${JSON.stringify(registry[key].modulePath)},
-    'webpack': require.resolveWeak(${JSON.stringify(registry[key].modulePath)}),
-  },`,
+    key =>
+      `  '${key}': [${registry[key].loader}, ${JSON.stringify(
+        registry[key].modulePath,
+      )}, require.resolveWeak(${JSON.stringify(registry[key].modulePath)})],`,
   )
   .join('\n')}};\n`,
   );
diff --git a/packages/docusaurus/src/server/routes.ts b/packages/docusaurus/src/server/routes.ts
index 520f22a9e0a2..6f2bfa86194d 100644
--- a/packages/docusaurus/src/server/routes.ts
+++ b/packages/docusaurus/src/server/routes.ts
@@ -24,6 +24,7 @@ function getModulePath(target: Module): string {
 }
 
 export async function loadRoutes(pluginsRouteConfigs: RouteConfig[]) {
+  const isProd = process.env.NODE_ENV === 'production';
   const routesImports = [
     `import React from 'react';`,
     `import ComponentCreator from '@docusaurus/ComponentCreator';`,
@@ -82,7 +83,7 @@ export async function loadRoutes(pluginsRouteConfigs: RouteConfig[]) {
       }
 
       const modulePath = getModulePath(value as Module);
-      const chunkName = genChunkName(modulePath, prefix, name);
+      const chunkName = genChunkName(modulePath, prefix, name, isProd);
       const loader = `() => import(/* webpackChunkName: '${chunkName}' */ ${JSON.stringify(
         modulePath,
       )})`;
diff --git a/packages/docusaurus/src/webpack/base.ts b/packages/docusaurus/src/webpack/base.ts
index 866071e858de..bbbca0c38381 100644
--- a/packages/docusaurus/src/webpack/base.ts
+++ b/packages/docusaurus/src/webpack/base.ts
@@ -32,8 +32,8 @@ export function createBaseConfig(
     output: {
       pathinfo: false,
       path: outDir,
-      filename: isProd ? '[name].[contenthash].js' : '[name].js',
-      chunkFilename: isProd ? '[name].[contenthash].js' : '[name].js',
+      filename: isProd ? '[name].[contenthash:8].js' : '[name].js',
+      chunkFilename: isProd ? '[name].[contenthash:8].js' : '[name].js',
       publicPath: baseUrl,
     },
     // Don't throw warning when asset created is over 250kb
@@ -157,8 +157,8 @@ export function createBaseConfig(
     },
     plugins: [
       new MiniCssExtractPlugin({
-        filename: isProd ? '[name].[contenthash].css' : '[name].css',
-        chunkFilename: isProd ? '[name].[contenthash].css' : '[name].css',
+        filename: isProd ? '[name].[contenthash:8].css' : '[name].css',
+        chunkFilename: isProd ? '[name].[contenthash:8].css' : '[name].css',
       }),
     ],
   };

From 84462e218edcce5070c4df67012ebbc4a250e040 Mon Sep 17 00:00:00 2001
From: Endi <endiliey@gmail.com>
Date: Sun, 27 Oct 2019 21:11:09 +0700
Subject: [PATCH 05/46] fix(v2): align search icon on small width device
 (#1893)

* fix(v2): align search icon on small width device

* nits

* nits
---
 CHANGELOG-2.x.md                                             | 5 +++--
 .../src/theme/SearchBar/styles.css                           | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index 5ba3a327a42b..cdc9f020ceb3 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -2,7 +2,8 @@
 
 ## Unreleased
 
-- Convert sitemap plugin to TypeScript
+- Slightly adjust search icon position to be more aligned on small width device.
+- Convert sitemap plugin to TypeScript.
 - Significantly reduce main bundle size and initial HTML payload on production build. Generated JS files from webpack is also shorter in name.
 
 ## 2.0.0-alpha.31
@@ -14,8 +15,8 @@
 - Fix search bar focus bug. When you put the focus on search input, previously the focus will remain although we have clicked to other area outside of the search input.
 - New themeConfig option `sidebarCollapsible`. It is on by default. If explicitly set to `false`, all doc items in sidebar is expanded. Otherwise, it will still be a collapsible sidebar.
 - Disable adding hashes to the generated class names of CSS modules in dev mode. Generating unique identifiers takes some time, which can be saved since including paths to files in class names is enough to avoid collisions.
+- Fix showing sidebar category with empty items.
 - Update infima from 0.2.0-alpha.2 to 0.2.0-alpha.3
-  - Fix showing sidebar category with empty items.
   - Fix pagination nav and right sidebar color contrast ratio
   - Fix sidebar arrow color in dark mode
   - Fix footer mobile issue
diff --git a/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/styles.css b/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/styles.css
index d076d93c8d0b..7bf33eef231c 100644
--- a/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/styles.css
+++ b/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/styles.css
@@ -74,6 +74,7 @@
 
   .search-icon {
     display: inline;
+    vertical-align: sub;
   }
 
 }

From 01f4d9a9553ca8267c85ffdccb6edfbb731a3f0a Mon Sep 17 00:00:00 2001
From: Wei Gao <wgao19@gmail.com>
Date: Mon, 28 Oct 2019 04:02:59 +0800
Subject: [PATCH 06/46] refactor(v2): refactor dark toggle into a hook (#1899)

* change(v2): refactor dark toggle into a theme

* follow how themes resolve files

* let theme hook to pick up default theme by itself
---
 CHANGELOG-2.x.md                              | 14 ++++---
 .../src/theme/Navbar/index.js                 | 32 ++++------------
 .../src/theme/hooks/theme.js                  | 38 +++++++++++++++++++
 3 files changed, 54 insertions(+), 30 deletions(-)
 create mode 100644 packages/docusaurus-theme-classic/src/theme/hooks/theme.js

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index cdc9f020ceb3..7ae5ecdecec7 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -5,13 +5,14 @@
 - Slightly adjust search icon position to be more aligned on small width device.
 - Convert sitemap plugin to TypeScript.
 - Significantly reduce main bundle size and initial HTML payload on production build. Generated JS files from webpack is also shorter in name.
+- Refactor dark toggle into a hook.
 
 ## 2.0.0-alpha.31
 
-- Footer is now sticky/ pinned to the bottom of the viewport in desktop browsers. 
+- Footer is now sticky/ pinned to the bottom of the viewport in desktop browsers.
 - Footer is now also displayed in docs page for consistency.
 - Remove empty doc sidebar container if sidebar for a particular doc page does not exist. Otherwise, it will cause an additional empty space.
-- Default PostCSS loader now only polyfills stage 3+ features (previously it was stage 2) like Create React App. Stage 2 CSS is considered relatively unstable and subject to change while Stage 3 features will likely become a standard. 
+- Default PostCSS loader now only polyfills stage 3+ features (previously it was stage 2) like Create React App. Stage 2 CSS is considered relatively unstable and subject to change while Stage 3 features will likely become a standard.
 - Fix search bar focus bug. When you put the focus on search input, previously the focus will remain although we have clicked to other area outside of the search input.
 - New themeConfig option `sidebarCollapsible`. It is on by default. If explicitly set to `false`, all doc items in sidebar is expanded. Otherwise, it will still be a collapsible sidebar.
 - Disable adding hashes to the generated class names of CSS modules in dev mode. Generating unique identifiers takes some time, which can be saved since including paths to files in class names is enough to avoid collisions.
@@ -27,11 +28,12 @@
 
 - Fix babel transpilation include/exclude logic to be more efficient. This also fix a very weird bug `TypeError: Cannot assign to read only property 'exports' of object '#<Object>'`.([#1868](https://github.com/facebook/docusaurus/pull/1868))
 
-If you are still encountering the error. Please check whether you use `module.exports` for your `.js` file instead of doing `export` (mixing CJS and ES). See https://github.com/webpack/webpack/issues/4039#issuecomment-477779322 and https://github.com/webpack/webpack/issues/4039#issuecomment-273804003 for more context. 
+If you are still encountering the error. Please check whether you use `module.exports` for your `.js` file instead of doing `export` (mixing CJS and ES). See https://github.com/webpack/webpack/issues/4039#issuecomment-477779322 and https://github.com/webpack/webpack/issues/4039#issuecomment-273804003 for more context.
 
 ## 2.0.0-alpha.29
 
-**HOTFIX for 2.0.0-alpha.28**. 
+**HOTFIX for 2.0.0-alpha.28**.
+
 - Fix missing `core-js` dependencies on `@docusaurus/core`.
 - Fix wrong `@babel/env` preset configuration that causes build compilation error.
 - New UI for webpack compilation progress bar.
@@ -46,7 +48,7 @@ If you are still encountering the error. Please check whether you use `module.ex
 - Fix logo URL in footer to be appended with baseUrl automatically.
 - Add the option `--no-open` for `start` command.
 - Set `@babel/env` useBuiltins to `usage`. This will automatically use browserlist and import polyfills required.
-- Modified TerserWebpackPlugin `terserOptions` for better cross-browser compatibility. 
+- Modified TerserWebpackPlugin `terserOptions` for better cross-browser compatibility.
 - **BREAKING** `withBaseUrl` is renamed to `useBaseUrl` because its a React Hooks. Make sure you import/rename it correctly. Eg: `import useBaseUrl from '@docusaurus/useBaseUrl`;
 - Fix potential security vulnerability because we're exposing the directory structure of the host machine.
 - Upgrade dependencies.
@@ -56,7 +58,7 @@ If you are still encountering the error. Please check whether you use `module.ex
 - Add `@theme/Tabs` which can be used to implement multi-language code tabs.
 - Implement `custom_edit_url` and `hide_title` markdown header for docusaurus v1 feature parity.
 - Reduce memory usage and slightly faster production build.
-- Misc dependency upgrades. 
+- Misc dependency upgrades.
 
 ## 2.0.0-alpha.26
 
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
index 15f1f2bb8a10..fd4f323679cb 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import React, {useCallback, useState, useEffect} from 'react';
+import React, {useCallback, useState} from 'react';
 import Toggle from 'react-toggle';
 
 import Link from '@docusaurus/Link';
@@ -17,6 +17,8 @@ import SearchBar from '@theme/SearchBar';
 
 import classnames from 'classnames';
 
+import useTheme from '@theme/hooks/theme';
+
 import styles from './styles.module.css';
 
 function NavLink(props) {
@@ -47,11 +49,7 @@ function Navbar() {
   const context = useDocusaurusContext();
   const [sidebarShown, setSidebarShown] = useState(false);
   const [isSearchBarExpanded, setIsSearchBarExpanded] = useState(false);
-  const currentTheme =
-    typeof document !== 'undefined'
-      ? document.querySelector('html').getAttribute('data-theme')
-      : '';
-  const [theme, setTheme] = useState(currentTheme);
+  const [theme, setTheme] = useTheme();
   const {siteConfig = {}} = context;
   const {baseUrl, themeConfig = {}} = siteConfig;
   const {algolia, navbar = {}} = themeConfig;
@@ -64,24 +62,10 @@ function Navbar() {
     setSidebarShown(false);
   }, [setSidebarShown]);
 
-  useEffect(() => {
-    try {
-      const localStorageTheme = localStorage.getItem('theme');
-      setTheme(localStorageTheme);
-    } catch (err) {
-      console.error(err);
-    }
-  }, []);
-
-  const onToggleChange = e => {
-    const nextTheme = e.target.checked ? 'dark' : '';
-    setTheme(nextTheme);
-    try {
-      localStorage.setItem('theme', nextTheme);
-    } catch (err) {
-      console.error(err);
-    }
-  };
+  const onToggleChange = useCallback(
+    e => setTheme(e.target.checked ? 'dark' : ''),
+    [setTheme],
+  );
 
   const logoUrl = useBaseUrl(logo.src);
   return (
diff --git a/packages/docusaurus-theme-classic/src/theme/hooks/theme.js b/packages/docusaurus-theme-classic/src/theme/hooks/theme.js
new file mode 100644
index 000000000000..60e27c52cd20
--- /dev/null
+++ b/packages/docusaurus-theme-classic/src/theme/hooks/theme.js
@@ -0,0 +1,38 @@
+/**
+ * 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.
+ */
+import * as React from 'react';
+
+const useTheme = () => {
+  const [theme, setTheme] = React.useState(
+    typeof document !== 'undefined'
+      ? document.querySelector('html').getAttribute('data-theme')
+      : '',
+  );
+  React.useEffect(() => {
+    try {
+      setTheme(localStorage.getItem('theme'));
+    } catch (err) {
+      console.error(err);
+    }
+  }, [setTheme]);
+
+  const setThemeSyncWithLocalStorage = React.useCallback(
+    nextTheme => {
+      try {
+        localStorage.setItem('theme', nextTheme);
+        setTheme(nextTheme);
+      } catch (err) {
+        console.error(err);
+      }
+    },
+    [setTheme],
+  );
+
+  return [theme, setThemeSyncWithLocalStorage];
+};
+
+export default useTheme;

From 98679b58f8a6557e2f96e29d9e03eb58469e16c1 Mon Sep 17 00:00:00 2001
From: Endi <endiliey@gmail.com>
Date: Mon, 28 Oct 2019 03:10:51 +0700
Subject: [PATCH 07/46] perf(v2): reduce memory usage consumption (#1900)

---
 CHANGELOG-2.x.md                          |  1 +
 packages/docusaurus/package.json          |  2 +-
 packages/docusaurus/src/webpack/server.ts |  2 +-
 yarn.lock                                 | 58 ++++++++---------------
 4 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index 7ae5ecdecec7..46c03adf1659 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Reduce memory usage consumption.
 - Slightly adjust search icon position to be more aligned on small width device.
 - Convert sitemap plugin to TypeScript.
 - Significantly reduce main bundle size and initial HTML payload on production build. Generated JS files from webpack is also shorter in name.
diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json
index f13116dfae50..0ca4a998b4e8 100644
--- a/packages/docusaurus/package.json
+++ b/packages/docusaurus/package.json
@@ -71,7 +71,7 @@
     "react-router-dom": "^5.1.2",
     "semver": "^6.3.0",
     "shelljs": "^0.8.3",
-    "static-site-generator-webpack-plugin": "^3.4.2",
+    "@endiliey/static-site-generator-webpack-plugin": "^4.0.0",
     "std-env": "^2.2.1",
     "style-loader": "^1.0.0",
     "terser-webpack-plugin": "^2.1.3",
diff --git a/packages/docusaurus/src/webpack/server.ts b/packages/docusaurus/src/webpack/server.ts
index 75d5105ce83b..7c69287e7b99 100644
--- a/packages/docusaurus/src/webpack/server.ts
+++ b/packages/docusaurus/src/webpack/server.ts
@@ -6,7 +6,7 @@
  */
 
 import path from 'path';
-import StaticSiteGeneratorPlugin from 'static-site-generator-webpack-plugin';
+import StaticSiteGeneratorPlugin from '@endiliey/static-site-generator-webpack-plugin';
 import {Configuration} from 'webpack';
 import merge from 'webpack-merge';
 
diff --git a/yarn.lock b/yarn.lock
index 99ef5d855cb4..fd828c9a8a8e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1076,6 +1076,17 @@
   dependencies:
     loader-utils "^1.2.3"
 
+"@endiliey/static-site-generator-webpack-plugin@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@endiliey/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.0.tgz#94bfe58fd83aeda355de797fcb5112adaca3a6b1"
+  integrity sha512-3MBqYCs30qk1OBRC697NqhGouYbs71D1B8hrk/AFJC6GwF2QaJOQZtA1JYAaGSe650sZ8r5ppRTtCRXepDWlng==
+  dependencies:
+    bluebird "^3.7.1"
+    cheerio "^0.22.0"
+    eval "^0.1.4"
+    url "^0.11.0"
+    webpack-sources "^1.4.3"
+
 "@evocateur/libnpmaccess@^3.1.2":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz#ecf7f6ce6b004e9f942b098d92200be4a4b1c845"
@@ -3867,15 +3878,10 @@ bluebird@3.0.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.0.5.tgz#2ff9d07c9b3edb29d6d280fe07528365e7ecd392"
   integrity sha1-L/nQfJs+2ynW0oD+B1KDZefs05I=
 
-bluebird@^3.0.5, bluebird@^3.5.1, bluebird@^3.5.3:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
-  integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
-
-bluebird@^3.5.5:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
-  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
+bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5, bluebird@^3.7.1:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de"
+  integrity sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==
 
 bmp-js@^0.1.0:
   version "0.1.0"
@@ -6562,10 +6568,10 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-eval@^0.1.0:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/eval/-/eval-0.1.3.tgz#051deb8fa00580f452572580e3147f5d4a9bf5a5"
-  integrity sha512-lDBa3hl9YynB+3J7aNPaajAapr+7ZiAylqFeUmx/r9s7I0tkkUJFLw2CQ2oMRYGg/rL7g4IYkZenbKaQGKPnGQ==
+eval@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/eval/-/eval-0.1.4.tgz#e05dbe0dab4b9330215cbb7bf4886eb24bd58700"
+  integrity sha512-npGsebJejyjMRnLdFu+T/97dnigqIU0Ov3IGrZ8ygd1v7RL1vGkEKtvyWZobqUH1AQgKlg0Yqqe2BtMA9/QZLw==
   dependencies:
     require-like ">= 0.1.1"
 
@@ -14625,11 +14631,6 @@ sort-keys@^2.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-list-map@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
-  integrity sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE=
-
 source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
@@ -14667,7 +14668,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.3:
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -14829,17 +14830,6 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-static-site-generator-webpack-plugin@^3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-3.4.2.tgz#ad9fd0a4fb8b6f439a7a66018320b459bdb6d916"
-  integrity sha512-39Kn+fZDVjolLYuX5y1rDvksJIW0QEUaEC/AVO/UewNXxGzoSQI1UYnRsL+ocAcN5Yti6d6rJgEL0qZ5tNXfdw==
-  dependencies:
-    bluebird "^3.0.5"
-    cheerio "^0.22.0"
-    eval "^0.1.0"
-    url "^0.11.0"
-    webpack-sources "^0.2.0"
-
 "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
@@ -16291,14 +16281,6 @@ webpack-merge@^4.2.2:
   dependencies:
     lodash "^4.17.15"
 
-webpack-sources@^0.2.0:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
-  integrity sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s=
-  dependencies:
-    source-list-map "^1.1.1"
-    source-map "~0.5.3"
-
 webpack-sources@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"

From f14b6eee39e3c21f2b8ae5abb4650804d834b024 Mon Sep 17 00:00:00 2001
From: blitz137 <43609419+blitz137@users.noreply.github.com>
Date: Sun, 27 Oct 2019 15:17:30 -0500
Subject: [PATCH 08/46] misc(v1): use primary color for hovered items in table
 of contents (#1871)

* fix issue#1752

when element in side nav is hovered over the color changes.

* Update main.css
---
 packages/docusaurus-1.x/lib/static/css/main.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/docusaurus-1.x/lib/static/css/main.css b/packages/docusaurus-1.x/lib/static/css/main.css
index 38ad9224f792..77759e12b512 100644
--- a/packages/docusaurus-1.x/lib/static/css/main.css
+++ b/packages/docusaurus-1.x/lib/static/css/main.css
@@ -1977,7 +1977,8 @@ input::placeholder {
   color: #717171;
 }
 
-.onPageNav .toc-headings > li > a.active {
+.onPageNav .toc-headings > li > a.active,
+.onPageNav .toc-headings > li > a.hover {
   font-weight: 600;
   color: $primaryColor;
 }

From 421598eb65985274b9bf0442ad40de778eca78e8 Mon Sep 17 00:00:00 2001
From: Jacob Sarnowski <hello@jsarnowski.com>
Date: Sun, 27 Oct 2019 21:19:52 +0100
Subject: [PATCH 09/46] fix(v1): mobile safari search input misalignment in
 header (#1895)

---
 packages/docusaurus-1.x/lib/static/css/main.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/docusaurus-1.x/lib/static/css/main.css b/packages/docusaurus-1.x/lib/static/css/main.css
index 77759e12b512..e808532f145f 100644
--- a/packages/docusaurus-1.x/lib/static/css/main.css
+++ b/packages/docusaurus-1.x/lib/static/css/main.css
@@ -843,7 +843,7 @@ input[type='search'] {
   padding-left: 10px;
   position: absolute;
   right: 10px;
-  top: 15px;
+  top: 10px;
 }
 
 .navSearchWrapper:before {
@@ -1382,6 +1382,7 @@ input::placeholder {
     transition: background-color 0.2s cubic-bezier(0.68, -0.55, 0.265, 1.55),
       width 0.2s cubic-bezier(0.68, -0.55, 0.265, 1.55), color 0.2s ease;
     width: 100%;
+    height: 30px;
   }
 
   .reactNavSearchWrapper input#search_input_react:focus,

From 812a30be5727d88ae62a7c15473796a9b2bc1297 Mon Sep 17 00:00:00 2001
From: Yunus Rahbar <yrahbar@fb.com>
Date: Sun, 27 Oct 2019 14:36:45 -0700
Subject: [PATCH 10/46] misc(v2): v1 backward compatibility for USE_SSH env var
 (#1880)

* misc(v2): address comments

* misc(v2): update CHANGELOG
---
 CHANGELOG-2.x.md                           | 1 +
 packages/docusaurus/src/commands/deploy.ts | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index 46c03adf1659..db9ce20328bd 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -7,6 +7,7 @@
 - Convert sitemap plugin to TypeScript.
 - Significantly reduce main bundle size and initial HTML payload on production build. Generated JS files from webpack is also shorter in name.
 - Refactor dark toggle into a hook.
+- Changed the way we read the `USE_SSH` env variable during deployment to be the same as in v1.
 
 ## 2.0.0-alpha.31
 
diff --git a/packages/docusaurus/src/commands/deploy.ts b/packages/docusaurus/src/commands/deploy.ts
index b5863e8c6d3b..57f0a5cd6f25 100644
--- a/packages/docusaurus/src/commands/deploy.ts
+++ b/packages/docusaurus/src/commands/deploy.ts
@@ -67,9 +67,10 @@ export async function deploy(siteDir: string): Promise<void> {
     process.env.GITHUB_HOST || siteConfig.githubHost || 'github.com';
 
   const useSSH = process.env.USE_SSH;
-  const remoteBranch = useSSH
-    ? `git@${githubHost}:${organizationName}/${projectName}.git`
-    : `https://${gitUser}@${githubHost}/${organizationName}/${projectName}.git`;
+  const remoteBranch =
+    useSSH && useSSH.toLowerCase() === 'true'
+      ? `git@${githubHost}:${organizationName}/${projectName}.git`
+      : `https://${gitUser}@${githubHost}/${organizationName}/${projectName}.git`;
 
   // Check if this is a cross-repo publish
   const currentRepoUrl = shell

From 9c69dfd240b49f3359f4ea8bf7964ec9b4936ed8 Mon Sep 17 00:00:00 2001
From: Alexey Pyltsyn <lex61rus@gmail.com>
Date: Mon, 28 Oct 2019 01:19:28 +0300
Subject: [PATCH 11/46] feat(v2): allow line highlighting (#1860)

* feat(v2): allow line highlighting

* Refactor: use parse-numeric-range for parsing

* Add line highlighting for live code blocks

* feat(v2): add sticky footer (#1855)

* feat(v2): add sticky footer

* Update CHANGELOG-2.x.md

* Update CHANGELOG-2.x.md

* fix(v2): remove empty doc sidebar container (#1870)

* docs: showcase user Amphora (#1873)

* Add Amphora Data link to users

Adds Amphora Data to the list of users

* Add Amphora Data logo

* fix case of image path

* Move Image into users directory

* use black amphora image

* fix(v2): fix search input blur on desktop (#1874)

* docs(v2): showcase user mbt-bundle (#1875)

* feat(v2): postcss should only use stage 3 features instead of stage 2 (#1872)

* feat(v2): add ability expand all items in doc sidebar (#1876)

* feat(v2): add ability expand all items in doc sidebar

* Fix tests

* Refactor: use themeConfig

* Improve docs

* Revert unnecessary  changes

* Refactor: better consistency

* Revert extra change

* Refactor: use useDocusaurusContext to get config value

* chore(v2): update changelog

* chore(v2): update showcase and broken link

* perf(v2): disable hash for css modules localident in dev (#1882)

* perf(v2): disable hash for css modules localident in dev

* changelog

* feat(v2): display footer in docs page for consistency (#1883)

* feat(v2): display footer in docs page

* nits

* address review

* nits

* docs(v2): fix format inline code (#1888)

* docs(v2): add docs on useful client api (#1890)

* docs(v2): add docs on useful client api

* Update docusaurus-core.md

* Update website/docs/docusaurus-core.md

* Update website/docs/docusaurus-core.md

* Update website/docs/docusaurus-core.md

* Update website/docs/docusaurus-core.md

* docs(v2): update config docs (#1885)

* fix(v2): do not show categories with empty items (#1891)

* styles(v2): update infima and fix styles (#1892)

* fix(v2): wrong css class

* v2.0.0-alpha.31

* chore(v2): update docs and changelog

* docs(v2): update plugins, presets and themes docs (#1889)

* docs(v2): update plugins, presets and themes docs

* ideal image plugin

* proof reading

* Merge master

* refactor(v2): Convert sitemap plugin to TypeScript (#1894)

* Convert sitemap plugin to TypeScript

Test - enabled the sitemap plugin in the v2 website and verified that
the sitemap is created after running `docusaurus build`.

* Addressing review comments

* perf(v2): significantly reduce bundle size & initial html payload (#1898)

* perf(v2): reduce bundle size significantly with super short chunk name and registry

* changelog

* use hash:8 as id for better long term caching

* even shorter filename. slice contenthash

* fix(v2): align search icon on small width device (#1893)

* fix(v2): align search icon on small width device

* nits

* nits

* refactor(v2): refactor dark toggle into a hook (#1899)

* change(v2): refactor dark toggle into a theme

* follow how themes resolve files

* let theme hook to pick up default theme by itself

* perf(v2): reduce memory usage consumption (#1900)

* misc(v1): use primary color for hovered items in table of contents (#1871)

* fix issue#1752

when element in side nav is hovered over the color changes.

* Update main.css

* fix(v1): mobile safari search input misalignment in header (#1895)

* misc(v2): v1 backward compatibility for USE_SSH env var (#1880)

* misc(v2): address comments

* misc(v2): update CHANGELOG
---
 CHANGELOG-2.x.md                              |  1 +
 .../docusaurus-theme-classic/package.json     |  1 +
 .../src/theme/CodeBlock/index.js              | 32 +++++++++++----
 .../package.json                              |  1 +
 .../src/theme/CodeBlock/index.js              | 39 +++++++++++++++----
 yarn.lock                                     |  5 +++
 6 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index db9ce20328bd..e8139d26401a 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -8,6 +8,7 @@
 - Significantly reduce main bundle size and initial HTML payload on production build. Generated JS files from webpack is also shorter in name.
 - Refactor dark toggle into a hook.
 - Changed the way we read the `USE_SSH` env variable during deployment to be the same as in v1.
+- Add highlight specific lines in code blocks.
 
 ## 2.0.0-alpha.31
 
diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json
index bdac8087f0b8..1d41e20657db 100644
--- a/packages/docusaurus-theme-classic/package.json
+++ b/packages/docusaurus-theme-classic/package.json
@@ -13,6 +13,7 @@
     "classnames": "^2.2.6",
     "clipboard": "^2.0.4",
     "infima": "0.2.0-alpha.3",
+    "parse-numeric-range": "^0.0.2",
     "prism-react-renderer": "^1.0.2",
     "react-toggle": "^4.1.1"
   },
diff --git a/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.js b/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.js
index 1914e65b7856..1703b57b484c 100644
--- a/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.js
@@ -10,10 +10,13 @@ import classnames from 'classnames';
 import Highlight, {defaultProps} from 'prism-react-renderer';
 import defaultTheme from 'prism-react-renderer/themes/palenight';
 import Clipboard from 'clipboard';
+import rangeParser from 'parse-numeric-range';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import styles from './styles.module.css';
 
-export default ({children, className: languageClassName}) => {
+const highlightLinesRangeRegex = /{([\d,-]+)}/;
+
+export default ({children, className: languageClassName, metastring}) => {
   const {
     siteConfig: {
       themeConfig: {prismTheme},
@@ -22,7 +25,12 @@ export default ({children, className: languageClassName}) => {
   const [showCopied, setShowCopied] = useState(false);
   const target = useRef(null);
   const button = useRef(null);
+  let highlightLines = [];
 
+  if (metastring && highlightLinesRangeRegex.test(metastring)) {
+    const highlightLinesRange = metastring.match(highlightLinesRangeRegex)[1];
+    highlightLines = rangeParser.parse(highlightLinesRange).filter(n => n > 0);
+  }
   useEffect(() => {
     let clipboard;
 
@@ -61,13 +69,21 @@ export default ({children, className: languageClassName}) => {
             ref={target}
             className={classnames(className, styles.codeBlock)}
             style={style}>
-            {tokens.map((line, i) => (
-              <div key={i} {...getLineProps({line, key: i})}>
-                {line.map((token, key) => (
-                  <span key={key} {...getTokenProps({token, key})} />
-                ))}
-              </div>
-            ))}
+            {tokens.map((line, i) => {
+              const lineProps = getLineProps({line, key: i});
+
+              if (highlightLines.includes(i + 1)) {
+                lineProps.className = `${lineProps.className} highlight-line`;
+              }
+
+              return (
+                <div key={i} {...lineProps}>
+                  {line.map((token, key) => (
+                    <span key={key} {...getTokenProps({token, key})} />
+                  ))}
+                </div>
+              );
+            })}
           </pre>
           <button
             ref={button}
diff --git a/packages/docusaurus-theme-live-codeblock/package.json b/packages/docusaurus-theme-live-codeblock/package.json
index af39c3d2849d..e3f565310e98 100644
--- a/packages/docusaurus-theme-live-codeblock/package.json
+++ b/packages/docusaurus-theme-live-codeblock/package.json
@@ -11,6 +11,7 @@
     "@philpl/buble": "^0.19.7",
     "classnames": "^2.2.6",
     "clipboard": "^2.0.4",
+    "parse-numeric-range": "^0.0.2",
     "prism-react-renderer": "^1.0.2",
     "react-live": "^2.2.1"
   },
diff --git a/packages/docusaurus-theme-live-codeblock/src/theme/CodeBlock/index.js b/packages/docusaurus-theme-live-codeblock/src/theme/CodeBlock/index.js
index 9e14e2fbc08e..93b2c083bfc9 100644
--- a/packages/docusaurus-theme-live-codeblock/src/theme/CodeBlock/index.js
+++ b/packages/docusaurus-theme-live-codeblock/src/theme/CodeBlock/index.js
@@ -10,11 +10,20 @@ import classnames from 'classnames';
 import Highlight, {defaultProps} from 'prism-react-renderer';
 import defaultTheme from 'prism-react-renderer/themes/palenight';
 import Clipboard from 'clipboard';
+import rangeParser from 'parse-numeric-range';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import Playground from '@theme/Playground';
 import styles from './styles.module.css';
 
-export default ({children, className: languageClassName, live, ...props}) => {
+const highlightLinesRangeRegex = /{([\d,-]+)}/;
+
+export default ({
+  children,
+  className: languageClassName,
+  live,
+  metastring,
+  ...props
+}) => {
   const {
     siteConfig: {
       themeConfig: {prismTheme},
@@ -23,6 +32,12 @@ export default ({children, className: languageClassName, live, ...props}) => {
   const [showCopied, setShowCopied] = useState(false);
   const target = useRef(null);
   const button = useRef(null);
+  let highlightLines = [];
+
+  if (metastring && highlightLinesRangeRegex.test(metastring)) {
+    const highlightLinesRange = metastring.match(highlightLinesRangeRegex)[1];
+    highlightLines = rangeParser.parse(highlightLinesRange).filter(n => n > 0);
+  }
 
   useEffect(() => {
     let clipboard;
@@ -73,13 +88,21 @@ export default ({children, className: languageClassName, live, ...props}) => {
             ref={target}
             className={classnames(className, styles.codeBlock)}
             style={style}>
-            {tokens.map((line, i) => (
-              <div key={i} {...getLineProps({line, key: i})}>
-                {line.map((token, key) => (
-                  <span key={key} {...getTokenProps({token, key})} />
-                ))}
-              </div>
-            ))}
+            {tokens.map((line, i) => {
+              const lineProps = getLineProps({line, key: i});
+
+              if (highlightLines.includes(i + 1)) {
+                lineProps.className = `${lineProps.className} highlight-line`;
+              }
+
+              return (
+                <div key={i} {...lineProps}>
+                  {line.map((token, key) => (
+                    <span key={key} {...getTokenProps({token, key})} />
+                  ))}
+                </div>
+              );
+            })}
           </pre>
           <button
             ref={button}
diff --git a/yarn.lock b/yarn.lock
index fd828c9a8a8e..5537455d1139 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11842,6 +11842,11 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse-numeric-range@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/parse-numeric-range/-/parse-numeric-range-0.0.2.tgz#b4f09d413c7adbcd987f6e9233c7b4b210c938e4"
+  integrity sha1-tPCdQTx6282Yf26SM8e0shDJOOQ=
+
 parse-path@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.1.tgz#0ec769704949778cb3b8eda5e994c32073a1adff"

From 3172602201f551f16dcbface6d2da2ff995daa68 Mon Sep 17 00:00:00 2001
From: Agus Fikri Suyuthi <40247655+ikrydev@users.noreply.github.com>
Date: Mon, 28 Oct 2019 09:09:14 +0700
Subject: [PATCH 12/46] docs(v1): remove user Vasern (#1901)

---
 website-1.x/data/users.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/website-1.x/data/users.js b/website-1.x/data/users.js
index dcedc2e4de27..5ebd772c6a96 100644
--- a/website-1.x/data/users.js
+++ b/website-1.x/data/users.js
@@ -743,13 +743,6 @@ module.exports = [
     fbOpenSource: false,
     pinned: false,
   },
-  {
-    caption: 'Vasern',
-    image: 'https://vasern.com/img/vasern.svg',
-    infoLink: 'https://vasern.com/',
-    fbOpenSource: false,
-    pinned: false,
-  },
   {
     caption: 'Verdaccio',
     image: '/img/users/verdaccio-tiny@2x.png',

From 3f4c805016bd00e59a286aed73eb788fa82b0923 Mon Sep 17 00:00:00 2001
From: Agus Fikri Suyuthi <40247655+ikrydev@users.noreply.github.com>
Date: Mon, 28 Oct 2019 10:06:11 +0700
Subject: [PATCH 13/46] misc: update URLs to non-HTML versions (#1902)

* Update README.md - Fix Broken Link

* misc: update URLs to non-HTML versions
---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 39e7b2a101ce..e2b253329606 100644
--- a/README.md
+++ b/README.md
@@ -19,15 +19,15 @@
 
 Docusaurus is a project for easily building, deploying, and maintaining open source project websites.
 
-- **Simple to Start** Docusaurus is built to be easy to [get up and running](https://docusaurus.io/docs/en/installation.html) in as little time possible. We've built Docusaurus to handle the website build process so you can focus on your project.
-- **Localizable** Docusaurus ships with [localization support](https://docusaurus.io/docs/en/translation.html) via CrowdIn. Empower and grow your international community by translating your documentation.
-- **Customizable** While Docusaurus ships with the key pages and sections you need to get started, including a home page, a docs section, a [blog](https://docusaurus.io/docs/en/blog.html), and additional support pages, it is also [customizable](https://docusaurus.io/docs/en/custom-pages.html) as well to ensure you have a site that is [uniquely yours](https://docusaurus.io/docs/en/api-pages.html).
+- **Simple to Start** Docusaurus is built to be easy to [get up and running](https://docusaurus.io/docs/en/installation/) in as little time possible. We've built Docusaurus to handle the website build process so you can focus on your project.
+- **Localizable** Docusaurus ships with [localization support](https://docusaurus.io/docs/en/translation/) via CrowdIn. Empower and grow your international community by translating your documentation.
+- **Customizable** While Docusaurus ships with the key pages and sections you need to get started, including a home page, a docs section, a [blog](https://docusaurus.io/docs/en/adding-blog/), and additional support pages, it is also [customizable](https://docusaurus.io/docs/en/custom-pages/) as well to ensure you have a site that is [uniquely yours](https://docusaurus.io/docs/en/api-pages/).
 
 ## Installation
 
 Docusaurus is available as the [`docusaurus` package](https://www.npmjs.com/package/docusaurus) on [npm](https://www.npmjs.com).
 
-We have also released the [`docusaurus-init` package](https://www.npmjs.com/package/docusaurus-init) to make [getting started](https://docusaurus.io/docs/en/installation.html) with Docusaurus even easier.
+We have also released the [`docusaurus-init` package](https://www.npmjs.com/package/docusaurus-init) to make [getting started](https://docusaurus.io/docs/en/installation/) with Docusaurus even easier.
 
 ## Contributing
 

From b6667a072cd9b61d54175b42ab6e63be26935f63 Mon Sep 17 00:00:00 2001
From: Yangshun Tay <tay.yang.shun@gmail.com>
Date: Tue, 29 Oct 2019 00:06:39 +0800
Subject: [PATCH 14/46] misc(v2): improve index page SEO score

---
 website/src/pages/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/src/pages/index.js b/website/src/pages/index.js
index 34d77942c45a..0a2c46a3faf1 100644
--- a/website/src/pages/index.js
+++ b/website/src/pages/index.js
@@ -104,8 +104,8 @@ function Home() {
           <a href="https://github.com/facebook/docusaurus/issues/789">
             Docusaurus 2
           </a>
-          , contribute to its roadmap by suggesting features or giving feedback{' '}
-          <Link to={useBaseUrl('/feedback')}>here</Link>!
+          , contribute to its roadmap by suggesting features or{' '}
+          <Link to={useBaseUrl('/feedback')}>giving feedback</Link>!
         </div>
       </div>
       <div

From 7714afb00f837ebead0328526779bc20f3b6885f Mon Sep 17 00:00:00 2001
From: Endi <endiliey@gmail.com>
Date: Tue, 29 Oct 2019 01:37:30 +0700
Subject: [PATCH 15/46] fix(v2): accessing /docs or /docs/xxxx should not be
 empty (#1903)

* fix(v2): nested routes should have wildcard/ not found page too

* better fix

* nits

* space
---
 CHANGELOG-2.x.md                                       |  1 +
 .../src/theme/DocPage/index.js                         | 10 ++++++++++
 packages/docusaurus/src/client/exports/router.js       |  8 ++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 packages/docusaurus/src/client/exports/router.js

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index e8139d26401a..d6f8436f07cf 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -9,6 +9,7 @@
 - Refactor dark toggle into a hook.
 - Changed the way we read the `USE_SSH` env variable during deployment to be the same as in v1.
 - Add highlight specific lines in code blocks.
+- Fix accessing `docs/` or `/docs/xxxx` that does not match any existing doc page should return 404 (Not found) page, not blank page.
 
 ## 2.0.0-alpha.31
 
diff --git a/packages/docusaurus-theme-classic/src/theme/DocPage/index.js b/packages/docusaurus-theme-classic/src/theme/DocPage/index.js
index 635ec18cc254..05d069aa1138 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocPage/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/DocPage/index.js
@@ -13,9 +13,15 @@ import renderRoutes from '@docusaurus/renderRoutes';
 import Layout from '@theme/Layout';
 import DocSidebar from '@theme/DocSidebar';
 import MDXComponents from '@theme/MDXComponents';
+import NotFound from '@theme/NotFound';
+import {matchPath} from '@docusaurus/router';
 
 import styles from './styles.module.css';
 
+function matchingRouteExist(routes, pathname) {
+  return routes.some(route => matchPath(pathname, route));
+}
+
 function DocPage(props) {
   const {route, docsMetadata, location} = props;
   const {permalinkToSidebar, docsSidebars} = docsMetadata;
@@ -23,6 +29,10 @@ function DocPage(props) {
   const {siteConfig: {themeConfig = {}} = {}} = useDocusaurusContext();
   const {sidebarCollapsible = true} = themeConfig;
 
+  if (!matchingRouteExist(route.routes, location.pathname)) {
+    return <NotFound {...props} />;
+  }
+
   return (
     <Layout>
       <div className={styles.docPage}>
diff --git a/packages/docusaurus/src/client/exports/router.js b/packages/docusaurus/src/client/exports/router.js
new file mode 100644
index 000000000000..3d8a171d1ea1
--- /dev/null
+++ b/packages/docusaurus/src/client/exports/router.js
@@ -0,0 +1,8 @@
+/**
+ * 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.
+ */
+
+export * from 'react-router-dom';

From f635f9aba22895baca36d3af05c8b7cb3e46d13b Mon Sep 17 00:00:00 2001
From: Yangshun Tay <tay.yang.shun@gmail.com>
Date: Tue, 29 Oct 2019 14:59:24 +0800
Subject: [PATCH 16/46] docs(v2): code block line highlighting (#1904)

* docs(v2): code block line highlighting

* misc: update CHANGELOG

* misc: respond to review

* docs: add line highlighting to the template
---
 CHANGELOG-2.x.md                              |  2 +-
 .../templates/classic/docs/doc1.md            |  6 ++
 .../templates/classic/src/css/custom.css      |  7 ++
 .../src/theme/CodeBlock/index.js              |  3 +-
 .../src/theme/CodeBlock/index.js              |  2 +-
 website/docs/advanced-themes.md               |  7 +-
 website/docs/blog.md                          |  4 +-
 website/docs/configuration.md                 |  6 +-
 website/docs/deployment.md                    |  4 +-
 website/docs/docusaurus-core.md               | 12 +--
 website/docs/lifecycle-apis.md                |  6 +-
 website/docs/markdown-features.mdx            | 85 ++++++++++++++++---
 website/docs/migrating-from-v1-to-v2.md       | 45 ++++++----
 website/docs/presets.md                       |  9 +-
 website/docs/search.md                        |  2 +-
 website/docs/sidebar.md                       |  6 +-
 website/docs/styling-layout.md                |  8 +-
 website/docs/using-plugins.md                 |  9 +-
 website/docs/using-themes.md                  |  5 +-
 website/src/css/custom.css                    |  7 ++
 20 files changed, 166 insertions(+), 69 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index d6f8436f07cf..188033449c79 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -8,8 +8,8 @@
 - Significantly reduce main bundle size and initial HTML payload on production build. Generated JS files from webpack is also shorter in name.
 - Refactor dark toggle into a hook.
 - Changed the way we read the `USE_SSH` env variable during deployment to be the same as in v1.
-- Add highlight specific lines in code blocks.
 - Fix accessing `docs/` or `/docs/xxxx` that does not match any existing doc page should return 404 (Not found) page, not blank page.
+- Added code block line highlighting feature (thanks @lex111)! If you have previously swizzled the `CodeBlock` theme component, it is recommended to update your source code to have this feature.
 
 ## 2.0.0-alpha.31
 
diff --git a/packages/docusaurus-init/templates/classic/docs/doc1.md b/packages/docusaurus-init/templates/classic/docs/doc1.md
index a350ace5a639..8fddcad47912 100644
--- a/packages/docusaurus-init/templates/classic/docs/doc1.md
+++ b/packages/docusaurus-init/templates/classic/docs/doc1.md
@@ -110,6 +110,12 @@ No language indicated, so no syntax highlighting.
 But let's throw in a <b>tag</b>.
 ```
 
+```js {2}
+function highlightMe() {
+  console.log('This line can be highlighted!');
+}
+```
+
 ---
 
 ## Tables
diff --git a/packages/docusaurus-init/templates/classic/src/css/custom.css b/packages/docusaurus-init/templates/classic/src/css/custom.css
index a7470eafc7ba..e719d7f09c83 100644
--- a/packages/docusaurus-init/templates/classic/src/css/custom.css
+++ b/packages/docusaurus-init/templates/classic/src/css/custom.css
@@ -21,3 +21,10 @@
   --ifm-color-primary-lighter: rgb(102, 212, 189);
   --ifm-color-primary-lightest: rgb(146, 224, 208);
 }
+
+.docusaurus-highlight-code-line {
+  background-color: rgb(72, 77, 91);
+  display: block;
+  margin: 0 calc(-1 * var(--ifm-pre-padding));
+  padding: 0 var(--ifm-pre-padding);
+}
diff --git a/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.js b/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.js
index 1703b57b484c..044710053c8a 100644
--- a/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.js
@@ -31,6 +31,7 @@ export default ({children, className: languageClassName, metastring}) => {
     const highlightLinesRange = metastring.match(highlightLinesRangeRegex)[1];
     highlightLines = rangeParser.parse(highlightLinesRange).filter(n => n > 0);
   }
+
   useEffect(() => {
     let clipboard;
 
@@ -73,7 +74,7 @@ export default ({children, className: languageClassName, metastring}) => {
               const lineProps = getLineProps({line, key: i});
 
               if (highlightLines.includes(i + 1)) {
-                lineProps.className = `${lineProps.className} highlight-line`;
+                lineProps.className = `${lineProps.className} docusaurus-highlight-code-line`;
               }
 
               return (
diff --git a/packages/docusaurus-theme-live-codeblock/src/theme/CodeBlock/index.js b/packages/docusaurus-theme-live-codeblock/src/theme/CodeBlock/index.js
index 93b2c083bfc9..097801fb0549 100644
--- a/packages/docusaurus-theme-live-codeblock/src/theme/CodeBlock/index.js
+++ b/packages/docusaurus-theme-live-codeblock/src/theme/CodeBlock/index.js
@@ -92,7 +92,7 @@ export default ({
               const lineProps = getLineProps({line, key: i});
 
               if (highlightLines.includes(i + 1)) {
-                lineProps.className = `${lineProps.className} highlight-line`;
+                lineProps.className = `${lineProps.className} docusaurus-highlight-code-line`;
               }
 
               return (
diff --git a/website/docs/advanced-themes.md b/website/docs/advanced-themes.md
index fe5f555c66aa..eeef0bb49288 100644
--- a/website/docs/advanced-themes.md
+++ b/website/docs/advanced-themes.md
@@ -19,10 +19,10 @@ To summarize:
 
 ## Writing customized Docusaurus themes
 
-A Docusaurus theme normally includes an `index.js` file where you hook up to the lifecycle methods, alongside with a `theme/` directory of components. A typical Docusaurus theme folder looks like this:
+A Docusaurus theme normally includes an `index.js` file where you hook up to the lifecycle methods, alongside with a `theme/` directory of components. A typical Docusaurus `theme` folder looks like this:
 
-```shell
-.
+```shell {5-7}
+website
 ├── package.json
 └── src
     ├── index.js
@@ -32,6 +32,7 @@ A Docusaurus theme normally includes an `index.js` file where you hook up to the
 ```
 
 There are two lifecycle methods that are essential to theme implementation:
+
 - [getThemePath](lifecycle-apis.md#getthemepath)
 - [getClientModules](lifecycle-apis.md#getclientmodules)
 
diff --git a/website/docs/blog.md b/website/docs/blog.md
index 7d37f8bab40d..e211b9b02862 100644
--- a/website/docs/blog.md
+++ b/website/docs/blog.md
@@ -56,7 +56,7 @@ The only required field is `title`; however, we provide options to add author in
 
 Use the `<!--truncate-->` marker in your blog post to represent what will be shown as the summary when viewing all published blog posts. Anything above `<!--truncate-->` will be part of the summary. For example:
 
-```md
+```md {9}
 ---
 title: Truncation Example
 ---
@@ -82,7 +82,7 @@ You can run your Docusaurus 2 site without a landing page and instead have your
 
 **Note:** Make sure there's no `index.js` page in `src/pages` or else there will be two files mapping to the same route!
 
-```js
+```js {10}
 // docusaurus.config.js
 module.exports = {
   // ...
diff --git a/website/docs/configuration.md b/website/docs/configuration.md
index 48b4ca0a2e4a..d58bfc3226ca 100644
--- a/website/docs/configuration.md
+++ b/website/docs/configuration.md
@@ -36,8 +36,6 @@ It is recommended to check the [deployment docs](deployment.md) for more informa
 
 ### Themes, Plugins, and Presets configurations
 
-
-
 _This section is a work in progress. [Welcoming PRs](https://github.com/facebook/docusaurus/issues/1640)._
 
 <!--
@@ -59,7 +57,7 @@ Docusaurus guards `docusaurus.config.js` from unknown fields. To add a custom fi
 
 Example:
 
-```js
+```js {3-6}
 // docusaurus.config.js
 module.exports = {
   customFields: {
@@ -75,7 +73,7 @@ Your configuration object will be made available to all the components of your s
 
 Basic Example:
 
-```jsx
+```jsx {2,5-6}
 import React from 'react';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 
diff --git a/website/docs/deployment.md b/website/docs/deployment.md
index c4dc7925106f..4c15a35bb226 100644
--- a/website/docs/deployment.md
+++ b/website/docs/deployment.md
@@ -56,7 +56,7 @@ You may refer to GitHub Pages' documentation [User, Organization, and Project Pa
 
 Example:
 
-```jsx
+```jsx {3-6}
 module.exports = {
   ...
   url: 'https://endiliey.github.io', // Your website URL
@@ -102,7 +102,7 @@ References:
 
 To deploy your Docusaurus 2 sites to [Netlify](https://www.netlify.com/), first make sure the following options are properly configured:
 
-```js
+```js {3-4}
 // docusaurus.config.js
 module.exports = {
   url: 'https://docusaurus-2.netlify.com', // url to your site with no trailing slash
diff --git a/website/docs/docusaurus-core.md b/website/docs/docusaurus-core.md
index 85e2501ee2af..dcb919eef87e 100644
--- a/website/docs/docusaurus-core.md
+++ b/website/docs/docusaurus-core.md
@@ -11,7 +11,7 @@ This reusable React component will manage all of your changes to the document he
 
 Usage Example:
 
-```jsx
+```jsx {2,6,11}
 import React from 'react';
 import Head from '@docusaurus/Head';
 
@@ -29,7 +29,7 @@ const MySEO = () => (
 
 Nested or latter components will override duplicate usages:
 
-```jsx
+```jsx {2,5,8,11}
 <Parent>
   <Head>
     <title>My Title</title>
@@ -60,7 +60,7 @@ This component enables linking to internal pages as well as a powerful performan
 
 The component is a wrapper around react-router’s `<NavLink>` component that adds useful enhancements specific to Docusaurus. All props are passed through to react-router’s `<NavLink>` component.
 
-```jsx
+```jsx {2,7}
 import React from 'react';
 import Link from '@docusaurus/Link';
 
@@ -89,7 +89,7 @@ The target location to navigate to. Example: `/docs/introduction`.
 
 The class to give the `<Link>` when it is active. The default given class is `active`. This will be joined with the `className` prop.
 
-```jsx
+```jsx {1}
 <Link to="/faq" activeClassName="selected">
   FAQs
 </Link>
@@ -107,7 +107,7 @@ interface DocusaurusContext {
 
 Usage example:
 
-```jsx
+```jsx {2,5}
 import React from 'react';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 
@@ -126,7 +126,7 @@ React Hook to automatically append `baseUrl` to a string automatically. This is
 
 Example usage:
 
-```jsx
+```jsx {3,11}
 import React, {useEffect} from 'react';
 import Link from '@docusaurus/Link';
 import useBaseUrl from '@docusaurus/useBaseUrl';
diff --git a/website/docs/lifecycle-apis.md b/website/docs/lifecycle-apis.md
index c7d5c70d83e7..20ad9a5e83eb 100644
--- a/website/docs/lifecycle-apis.md
+++ b/website/docs/lifecycle-apis.md
@@ -125,7 +125,7 @@ Example:
 
 ```js
 async postBuild({siteConfig = {}, routesPaths = [], outDir}) {
-  // Print out to console all the rendered routes 
+  // Print out to console all the rendered routes
   routesPaths.map(route => {
     console.log(route);
   })
@@ -157,8 +157,8 @@ If you use the folder directory above, your `getThemePath` can be:
 
 ```js
 // my-theme/src/index.js
-
 const path = require('path');
+
 module.exports = function(context, options) {
   return {
     name: 'name-of-my-theme',
@@ -177,8 +177,8 @@ As an example, to make your theme load a `customCss` object from `options` passe
 
 ```js
 // my-theme/src/index.js
-
 const path = require('path');
+
 module.exports = function(context, options) {
   const {customCss} = options || {};
   return {
diff --git a/website/docs/markdown-features.mdx b/website/docs/markdown-features.mdx
index e2136f2d1522..b8952620047d 100644
--- a/website/docs/markdown-features.mdx
+++ b/website/docs/markdown-features.mdx
@@ -120,7 +120,6 @@ keywords:
   - docusaurus
 image: https://i.imgur.com/mErPwqL.png
 ---
-
 ```
 
 ### Embedding React components
@@ -202,13 +201,11 @@ Use the matching language meta string for your code block, and Docusaurus will p
 console.log('Every repo must come with a mascot.');
 ```
 
-By default, the Prism [syntax highlighting theme](https://github.com/FormidableLabs/prism-react-renderer#theming)
-we use is [Palenight](https://github.com/FormidableLabs/prism-react-renderer/blob/master/src/themes/palenight.js).
-You can change this to another theme by passing `prismTheme` as `themeConfig` in your docusaurus.config.js.
+By default, the Prism [syntax highlighting theme](https://github.com/FormidableLabs/prism-react-renderer#theming) we use is [Palenight](https://github.com/FormidableLabs/prism-react-renderer/blob/master/src/themes/palenight.js). You can change this to another theme by passing `prismTheme` as `themeConfig` in your docusaurus.config.js.
 
 For example, if you prefer to use the `dracula` highlighting theme:
 
-```js
+```js {4}
 // docusaurus.config.js
 module.exports = {
   themeConfig: {
@@ -217,13 +214,9 @@ module.exports = {
 };
 ```
 
-By default, Docusaurus comes with this subset of
-[commonly used languages](https://github.com/FormidableLabs/prism-react-renderer/blob/master/src/vendor/prism/includeLangs.js).
+By default, Docusaurus comes with this subset of [commonly used languages](https://github.com/FormidableLabs/prism-react-renderer/blob/master/src/vendor/prism/includeLangs.js).
 
-To add syntax highlighting for any of the other
-[Prism supported languages](https://prismjs.com/#supported-languages),
-install the `prismjs` npm package, then swizzle the `CodeBlock`
-component and add the desired language(s) there.
+To add syntax highlighting for any of the other [Prism supported languages](https://prismjs.com/#supported-languages), install the `prismjs` npm package, then swizzle the `CodeBlock` component and add the desired language(s) there.
 
 For example, if you want to add highlighting for the `powershell` language:
 
@@ -234,6 +227,72 @@ import Prism from 'prism-react-renderer/prism';
 require('prismjs/components/prism-powershell');
 ```
 
+### Line highlighting
+
+You can bring emphasis to certain lines of code by specifying line ranges after the language meta string (leave a space after the language).
+
+    ```jsx {3}
+    function HighlightSomeText(highlight) {
+      if (highlight) {
+        return 'This text is highlighted!';
+      }
+
+      return 'Nothing highlighted';
+    }
+    ```
+
+```jsx {3}
+function HighlightSomeText(highlight) {
+  if (highlight) {
+    return 'This text is highlighted!';
+  }
+
+  return 'Nothing highlighted';
+}
+```
+
+To accomplish this, Docusaurus adds the `docusaurus-highlight-code-line` class to the highlighted lines. You will need to define your own styling for this CSS, possibly in your `src/css/custom.css` with a custom background color which is dependent on your selected syntax highlighting theme. The color given below works for the default highlighting theme (Palenight), so if you are using another theme will have to tweak the color accordingly.
+
+```css
+/* /src/css/custom.css */
+.docusaurus-highlight-code-line {
+  background-color: rgb(72, 77, 91);
+  display: block;
+  margin: 0 calc(-1 * var(--ifm-pre-padding));
+  padding: 0 var(--ifm-pre-padding);
+}
+```
+
+To highlight multiple lines, separate the line numbers by commas or use the range syntax to select a chunk of lines. This feature uses the `parse-number-range` library and you can find [more syntax](<(https://www.npmjs.com/package/parse-numeric-range)>) on their project details.
+
+    ```jsx {1,4-6,11}
+    import React from 'react';
+
+    function MyComponent(props) {
+      if (props.isBar) {
+        return <div>Bar</div>;
+      }
+
+      return <div>Foo</div>;
+    }
+
+    export default MyComponent;
+    ```
+
+```jsx {1,4-6,11}
+import React from 'react';
+
+function MyComponent(props) {
+  if (props.isBar) {
+    return <div>Bar</div>;
+  }
+
+  return <div>Foo</div>;
+}
+
+export default MyComponent;
+```
+
 ### Interactive code editor
 
 (Powered by [React Live](https://github.com/FormidableLabs/react-live))
@@ -248,10 +307,10 @@ npm i @docusaurus/theme-live-codeblock
 
 You will also need to add the plugin to your `docusaurus.config.js`.
 
-```diff
+```js {3}
 module.exports = {
   ...
-+ themes: ['@docusaurus/theme-live-codeblock'],
+  themes: ['@docusaurus/theme-live-codeblock'],
   ...
 }
 ```
diff --git a/website/docs/migrating-from-v1-to-v2.md b/website/docs/migrating-from-v1-to-v2.md
index fbd569a37338..760d7f5d7d14 100644
--- a/website/docs/migrating-from-v1-to-v2.md
+++ b/website/docs/migrating-from-v1-to-v2.md
@@ -49,13 +49,14 @@ Meanwhile, CLI commands are renamed to `docusaurus <command>` (instead of `docus
 
 The `"scripts"` section of your `package.json` should be updated as follows:
 
-```json
+```json {3-6}
 {
   "scripts": {
     "start": "docusaurus start",
     "build": "docusaurus build",
     "swizzle": "docusaurus swizzle",
     "deploy": "docusaurus deploy"
+    ...
   }
 }
 ```
@@ -125,7 +126,7 @@ No actions needed.
 
 Deprecated. We wrote a custom CSS framework for Docusaurus 2 called Infima which uses CSS variables for theming. The docs are not quite ready yet and we will update here when it is. To overwrite Infima' CSS variables, create your own CSS file (e.g. `./src/css/custom.css`) and import it globally by passing it as an option to `@docusaurus/preset-classic`:
 
-```diff
+```js {8-10}
 // docusaurus.config.js
 module.exports = {
   // ...
@@ -133,9 +134,9 @@ module.exports = {
     [
       '@docusaurus/preset-classic',
       {
-+       theme: {
-+         customCss: require.resolve('./src/css/custom.css'),
-+       },
+        theme: {
+          customCss: require.resolve('./src/css/custom.css'),
+        },
       },
     ],
   ],
@@ -168,6 +169,7 @@ Site meta info such as assets, SEO, copyright info are now handled by themes. To
 ```jsx
 // docusaurus.config.js
 module.exports = {
+  // ...
   themeConfig: {
     footer: {
       logo: {
@@ -179,7 +181,7 @@ module.exports = {
     image: 'img/docusaurus.png',
     // Equivalent to `docsSideNavCollapsible`
     sidebarCollapsible: false,
-    ...
+    // ...
   },
 };
 ```
@@ -200,9 +202,10 @@ headerLinks: [
 
 Now, these two fields are both handled by the theme:
 
-```jsx
+```jsx {7-20}
 // docusaurus.config.js
 module.exports = {
+  // ...
   themeConfig: {
     navbar: {
       title: 'Docusaurus',
@@ -221,23 +224,24 @@ module.exports = {
         {to: 'blog', label: 'Blog', position: 'left'},
       ],
     },
-    ...
+    // ...
   },
 };
 ```
 
 #### `algolia`
 
-```jsx
+```jsx {5-9}
 // docusaurus.config.js
 module.exports = {
+  // ...
   themeConfig: {
     algolia: {
       apiKey: '47ecd3b21be71c5822571b9f59e52544',
       indexName: 'docusaurus-2',
       algoliaOptions: { ... },
     },
-    ...
+    // ...
   },
 };
 ```
@@ -246,9 +250,10 @@ module.exports = {
 
 Deprecated. Pass it as a blog option to `@docusaurus/preset-classic` instead:
 
-```jsx
+```jsx {9}
 // docusaurus.config.js
 module.exports = {
+  // ...
   presets: [
     [
       '@docusaurus/preset-classic',
@@ -256,7 +261,7 @@ module.exports = {
         blog: {
           postsPerPage: 10,
         },
-        ...
+        // ...
       },
     ],
   ],
@@ -271,9 +276,10 @@ Deprecated. Create a `CNAME` file in your `static` folder instead with your cust
 
 Deprecated. Pass it as an option to `@docusaurus/preset-classic` docs instead:
 
-```jsx
+```jsx {9-22}
 // docusaurus.config.js
 module.exports = {
+  // ...
   presets: [
     [
       '@docusaurus/preset-classic',
@@ -282,7 +288,8 @@ module.exports = {
           // Equivalent to `customDocsPath`.
           path: 'docs',
           // Equivalent to `editUrl`
-          editUrl: 'https://github.com/facebook/docusaurus/edit/master/website/docs/',
+          editUrl:
+            'https://github.com/facebook/docusaurus/edit/master/website/docs/',
           // Equivalent to `docsUrl`.
           routeBasePath: 'docs',
           // Remark and Rehype plugins passed to MDX. Replaces `markdownOptions` and `markdownPlugins`.
@@ -293,7 +300,7 @@ module.exports = {
           // Equivalent to `enableUpdateTime`.
           showLastUpdateTime: true,
         },
-        ...
+        // ...
       },
     ],
   ],
@@ -302,26 +309,30 @@ module.exports = {
 
 #### `gaTrackingId`
 
-```jsx
+```jsx {6}
 // docusaurus.config.js
 module.exports = {
+  // ...
   themeConfig: {
     googleAnalytics: {
       trackingID: 'UA-141789564-1',
     },
+    // ...
   },
 };
 ```
 
 #### `gaGtag`
 
-```jsx
+```jsx {6}
 // docusaurus.config.js
 module.exports = {
+  // ...
   themeConfig: {
     gtag: {
       trackingID: 'UA-141789564-1',
     },
+    // ...
   },
 };
 ```
diff --git a/website/docs/presets.md b/website/docs/presets.md
index 920035eb454d..ab1ee6539af3 100644
--- a/website/docs/presets.md
+++ b/website/docs/presets.md
@@ -15,20 +15,22 @@ npm install --save docusaurus-preset-name
 
 Then, add it in your site's `docusaurus.config.js`'s `presets` option:
 
-```jsx
+```jsx {4}
 // docusaurus.config.js
 module.exports = {
+  // ...
   presets: ['@docusaurus/preset-xxxx'],
 };
 ```
 
 To load presets from your local directory, specify how to resolve them:
 
-```jsx
+```jsx {6}
 // docusaurus.config.js
 const path = require('path');
 
 module.exports = {
+  // ...
   presets: [path.resolve(__dirname, '/path/to/docusaurus-local-presets')],
 };
 ```
@@ -48,9 +50,10 @@ module.exports = function preset(context, opts = {}) {
 
 then in your Docusaurus config, you may configure the preset instead:
 
-```jsx
+```jsx {4}
 // docusaurus.config.js
 module.exports = {
+  // ...
   presets: ['@docusaurus/preset-a'],
 };
 ```
diff --git a/website/docs/search.md b/website/docs/search.md
index 3635d8c8b6ae..a4f48860675e 100644
--- a/website/docs/search.md
+++ b/website/docs/search.md
@@ -18,7 +18,7 @@ Algolia DocSearch works by crawling the content of your website every 24 hours a
 
 To connect your docs with Algolia, add an `algolia` field in your `themeConfig`. Note that you will need algolia API key and algolia index. You can [apply for DocSearch here](https://community.algolia.com/docsearch/).
 
-```jsx
+```jsx {4-8}
 // docusaurus.config.js
 themeConfig: {
     // ....
diff --git a/website/docs/sidebar.md b/website/docs/sidebar.md
index 30fe1a91eec8..efa628c12634 100644
--- a/website/docs/sidebar.md
+++ b/website/docs/sidebar.md
@@ -5,7 +5,7 @@ title: Sidebar
 
 To generate a sidebar to your Docusaurus site, you need to define a file that exports a sidebar object and pass that into the `@docusaurus/plugin-docs` plugin directly or via `@docusaurus/preset-classic`.
 
-```js
+```js {9-10}
 // docusaurus.config.js
 module.exports = {
   // ...
@@ -83,8 +83,8 @@ For example, `greeting.md` id is `greeting` and `guide/hello.md` id is `guide/he
 
 ```bash
 website # root directory of your site
-├── docs
-   └── greeting.md
+└── docs
+   ├── greeting.md
    └── guide
       └── hello.md
 ```
diff --git a/website/docs/styling-layout.md b/website/docs/styling-layout.md
index 965dbf7f525d..2cc96873e3c0 100644
--- a/website/docs/styling-layout.md
+++ b/website/docs/styling-layout.md
@@ -8,7 +8,7 @@ description: A Docusaurus site is a pre-rendered single-page React application.
 
 If you're using `@docusaurus/preset-classic`, you can create your own CSS files (e.g. `/src/css/custom.css`) and import them globally by passing it as an option into the preset.
 
-```diff
+```js {8-10}
 // docusaurus.config.js
 module.exports = {
   // ...
@@ -16,9 +16,9 @@ module.exports = {
     [
       '@docusaurus/preset-classic',
       {
-+       theme: {
-+         customCss: require.resolve('./src/css/custom.css'),
-+       },
+        theme: {
+          customCss: require.resolve('./src/css/custom.css'),
+        },
       },
     ],
   ],
diff --git a/website/docs/using-plugins.md b/website/docs/using-plugins.md
index 481083d1d86c..995b8ebd5cbf 100644
--- a/website/docs/using-plugins.md
+++ b/website/docs/using-plugins.md
@@ -18,20 +18,22 @@ npm install --save docusaurus-plugin-name
 
 Then you add it in your site's `docusaurus.config.js`'s `plugins` option:
 
-```jsx
+```jsx {4}
 // docusaurus.config.js
 module.exports = {
+  // ...
   plugins: ['@docusaurus/plugin-content-pages'],
 };
 ```
 
 Docusaurus can also load plugins from your local directory, you can do something like the following:
 
-```jsx
+```jsx {6}
 // docusaurus.config.js
 const path = require('path');
 
 module.exports = {
+  // ...
   plugins: [path.resolve(__dirname, '/path/to/docusaurus-local-plugin')],
 };
 ```
@@ -42,9 +44,10 @@ For the most basic usage of plugins, you can provide just the plugin name or the
 
 However, plugins can have options specified by wrapping the name and an options object in an array inside your config. This style is usually called `Babel Style`.
 
-```js
+```js {5-10}
 // docusaurus.config.js
 module.exports = {
+  // ...
   plugins: [
     [
       '@docusaurus/plugin-xxx',
diff --git a/website/docs/using-themes.md b/website/docs/using-themes.md
index 0a9e38603087..6eb675df065d 100644
--- a/website/docs/using-themes.md
+++ b/website/docs/using-themes.md
@@ -10,9 +10,10 @@ Like plugins, themes are designed to add functionality to your Docusaurus site.
 
 To use themes, specify the themes in your `docusaurus.config.js`. You may use multiple themes:
 
-```js
+```js {4}
 // docusaurus.config.js
 module.exports = {
+  // ...
   themes: ['@docusaurus/theme-classic', '@docusaurus/theme-live-codeblock'],
 };
 ```
@@ -60,7 +61,7 @@ For example, a Docusaurus blog consists of a blog plugin and a blog theme.
 }
 ```
 
-and if you want to use Bootstrap styling, you can swap out the theme with `theme-blog-bootstrap`:
+and if you want to use Bootstrap styling, you can swap out the theme with `theme-blog-bootstrap` (fictitious non-existing theme):
 
 ```js
 // docusaurus.config.js
diff --git a/website/src/css/custom.css b/website/src/css/custom.css
index 6db7827f4baf..3e7e861c8282 100644
--- a/website/src/css/custom.css
+++ b/website/src/css/custom.css
@@ -31,3 +31,10 @@ html[data-theme='dark'] {
     --ifm-font-size-base: 17px;
   }
 }
+
+.docusaurus-highlight-code-line {
+  background-color: rgb(72, 77, 91);
+  display: block;
+  margin: 0 calc(-1 * var(--ifm-pre-padding));
+  padding: 0 var(--ifm-pre-padding);
+}

From e6444c0d4d157a3d526d1c9dfad083d64735e7f4 Mon Sep 17 00:00:00 2001
From: Endi <endiliey@gmail.com>
Date: Tue, 29 Oct 2019 14:43:27 +0700
Subject: [PATCH 17/46] fix(v2): webpack modules resolve should prioritize
 @docusaurus/core own deps (#1907)

* fix(v2): webpack modules resolve should prioritize own deps

* nits
---
 CHANGELOG-2.x.md                        | 2 ++
 packages/docusaurus/src/webpack/base.ts | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index 188033449c79..c387917698da 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -9,6 +9,8 @@
 - Refactor dark toggle into a hook.
 - Changed the way we read the `USE_SSH` env variable during deployment to be the same as in v1.
 - Fix accessing `docs/` or `/docs/xxxx` that does not match any existing doc page should return 404 (Not found) page, not blank page.
+- Prioritize `@docusaurus/core` dependencies/ node_modules over user's node_modules. This fix a bug whereby if user has core-js@3 on its own node_modules but docusaurus depends on core-js@2, we previously encounter `Module not found: core-js/modules/xxxx` (because core-js@3 doesn't have that).
+Another example is if user installed webpack@3 but docusaurus depends on webpack@4.
 - Added code block line highlighting feature (thanks @lex111)! If you have previously swizzled the `CodeBlock` theme component, it is recommended to update your source code to have this feature.
 
 ## 2.0.0-alpha.31
diff --git a/packages/docusaurus/src/webpack/base.ts b/packages/docusaurus/src/webpack/base.ts
index bbbca0c38381..ce6ea57a04a1 100644
--- a/packages/docusaurus/src/webpack/base.ts
+++ b/packages/docusaurus/src/webpack/base.ts
@@ -50,10 +50,13 @@ export function createBaseConfig(
         '@generated': generatedFilesDir,
         '@docusaurus': path.resolve(__dirname, '../client/exports'),
       },
-      modules: [
-        'node_modules',
+      // This allows you to set a fallback for where Webpack should look for modules.
+      // We want `@docusaurus/core` own dependencies/`node_modules` to "win" if there is conflict
+      // Example: if there is core-js@3 in user's own node_modules, but core depends on
+      // core-js@2, we should use core-js@2.
+      modules: module.paths.concat([
         path.resolve(fs.realpathSync(process.cwd()), 'node_modules'),
-      ],
+      ]),
     },
     optimization: {
       removeAvailableModules: false,

From 2e58e839ee168dffe2962d06ca1c025787effafe Mon Sep 17 00:00:00 2001
From: Endi <endiliey@gmail.com>
Date: Tue, 29 Oct 2019 14:50:54 +0700
Subject: [PATCH 18/46] feat(v2): simplify blog metadata to minimize number of
 request (#1908)

* feat(v2): simplify blog metadata to minimize number of request

* remove async
---
 CHANGELOG-2.x.md                              |  1 +
 .../src/__tests__/index.test.ts               | 33 ++++++++++++++-----
 .../src/index.ts                              | 29 +++++++++++-----
 .../src/types.ts                              |  7 ++++
 .../src/theme/BlogPostPage/index.js           |  7 ++--
 5 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index c387917698da..bda664f80888 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -9,6 +9,7 @@
 - Refactor dark toggle into a hook.
 - Changed the way we read the `USE_SSH` env variable during deployment to be the same as in v1.
 - Fix accessing `docs/` or `/docs/xxxx` that does not match any existing doc page should return 404 (Not found) page, not blank page.
+- Simplify blog metadata. Previously, accessing `/blog/post-xxx` will request for next and prev blog post metadata too aside from target post metadata. We should only request target post metadata.  
 - Prioritize `@docusaurus/core` dependencies/ node_modules over user's node_modules. This fix a bug whereby if user has core-js@3 on its own node_modules but docusaurus depends on core-js@2, we previously encounter `Module not found: core-js/modules/xxxx` (because core-js@3 doesn't have that).
 Another example is if user installed webpack@3 but docusaurus depends on webpack@4.
 - Added code block line highlighting feature (thanks @lex111)! If you have previously swizzled the `CodeBlock` theme component, it is recommended to update your source code to have this feature.
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
index 7a4b606db4f9..ccb51d252996 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
@@ -31,6 +31,14 @@ describe('loadBlog', () => {
       },
     );
     const {blogPosts} = await plugin.loadContent();
+    const noDateSource = path.join('@site', pluginPath, 'no date.md');
+    const noDateSourceBirthTime = (await fs.stat(
+      noDateSource.replace('@site', siteDir),
+    )).birthtime;
+    const noDatePermalink = `/blog/${noDateSourceBirthTime
+      .toISOString()
+      .substr(0, '2019-01-01'.length)
+      .replace(/-/g, '/')}/no date`;
 
     expect(
       blogPosts.find(v => v.metadata.title === 'date-matter').metadata,
@@ -41,6 +49,14 @@ describe('loadBlog', () => {
       description: `date inside front matter`,
       date: new Date('2019-01-01'),
       tags: [],
+      nextItem: {
+        permalink: '/blog/2018/12/14/Happy-First-Birthday-Slash',
+        title: 'Happy 1st Birthday Slash!',
+      },
+      prevItem: {
+        permalink: noDatePermalink,
+        title: 'no date',
+      },
     });
     expect(
       blogPosts.find(v => v.metadata.title === 'Happy 1st Birthday Slash!')
@@ -56,24 +72,25 @@ describe('loadBlog', () => {
       description: `pattern name`,
       date: new Date('2018-12-14'),
       tags: [],
+      prevItem: {
+        permalink: '/blog/2019/01/01/date-matter',
+        title: 'date-matter',
+      },
     });
 
-    const noDateSource = path.join('@site', pluginPath, 'no date.md');
-    const noDateSourceBirthTime = (await fs.stat(
-      noDateSource.replace('@site', siteDir),
-    )).birthtime;
     expect(
       blogPosts.find(v => v.metadata.title === 'no date').metadata,
     ).toEqual({
-      permalink: `/blog/${noDateSourceBirthTime
-        .toISOString()
-        .substr(0, '2019-01-01'.length)
-        .replace(/-/g, '/')}/no date`,
+      permalink: noDatePermalink,
       source: noDateSource,
       title: 'no date',
       description: `no date`,
       date: noDateSourceBirthTime,
       tags: [],
+      nextItem: {
+        permalink: '/blog/2019/01/01/date-matter',
+        title: 'date-matter',
+      },
     });
   });
 });
diff --git a/packages/docusaurus-plugin-content-blog/src/index.ts b/packages/docusaurus-plugin-content-blog/src/index.ts
index c8f7dce0b740..1904f11814f3 100644
--- a/packages/docusaurus-plugin-content-blog/src/index.ts
+++ b/packages/docusaurus-plugin-content-blog/src/index.ts
@@ -23,7 +23,6 @@ import {
 import {
   LoadContext,
   PluginContentLoadedActions,
-  RouteModule,
   ConfigureWebpackUtils,
 } from '@docusaurus/types';
 import {Configuration} from 'webpack';
@@ -138,6 +137,25 @@ export default function pluginContentBlog(
         (a, b) => b.metadata.date.getTime() - a.metadata.date.getTime(),
       );
 
+      // Colocate next and prev metadata
+      blogPosts.forEach((blogPost, index) => {
+        const prevItem = index > 0 ? blogPosts[index - 1] : null;
+        if (prevItem) {
+          blogPost.metadata.prevItem = {
+            title: prevItem.metadata.title,
+            permalink: prevItem.metadata.permalink,
+          };
+        }
+        const nextItem =
+          index < blogPosts.length - 1 ? blogPosts[index + 1] : null;
+        if (nextItem) {
+          blogPost.metadata.nextItem = {
+            title: nextItem.metadata.title,
+            permalink: nextItem.metadata.permalink,
+          };
+        }
+      });
+
       // Blog pagination routes.
       // Example: `/blog`, `/blog/page/1`, `/blog/page/2`
       const totalCount = blogPosts.length;
@@ -267,10 +285,7 @@ export default function pluginContentBlog(
         }),
       );
 
-      blogItems.forEach((blogItem, index) => {
-        const prevItem = index > 0 ? blogItems[index - 1] : null;
-        const nextItem =
-          index < blogItems.length - 1 ? blogItems[index + 1] : null;
+      blogItems.map(blogItem => {
         const {metadata, metadataPath} = blogItem;
         const {source, permalink} = metadata;
 
@@ -281,9 +296,7 @@ export default function pluginContentBlog(
           modules: {
             content: source,
             metadata: aliasedSource(metadataPath),
-            prevItem: prevItem && aliasedSource(prevItem.metadataPath),
-            nextItem: nextItem && aliasedSource(nextItem.metadataPath),
-          } as RouteModule,
+          },
         });
       });
 
diff --git a/packages/docusaurus-plugin-content-blog/src/types.ts b/packages/docusaurus-plugin-content-blog/src/types.ts
index 0c8076e9c7c2..c050e9e9366a 100644
--- a/packages/docusaurus-plugin-content-blog/src/types.ts
+++ b/packages/docusaurus-plugin-content-blog/src/types.ts
@@ -51,6 +51,13 @@ export interface MetaData {
   date: Date;
   tags: (Tag | string)[];
   title: string;
+  prevItem?: Paginator;
+  nextItem?: Paginator;
+}
+
+export interface Paginator {
+  title: string;
+  permalink: string;
 }
 
 export interface Tag {
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.js b/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.js
index bb3ffb80509e..38e5b0330030 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.js
@@ -12,7 +12,7 @@ import BlogPostItem from '@theme/BlogPostItem';
 import BlogPostPaginator from '@theme/BlogPostPaginator';
 
 function BlogPostPage(props) {
-  const {content: BlogPostContents, metadata, nextItem, prevItem} = props;
+  const {content: BlogPostContents, metadata} = props;
   const {frontMatter} = BlogPostContents;
   return (
     <Layout title={metadata.title} description={metadata.description}>
@@ -24,7 +24,10 @@ function BlogPostPage(props) {
                 <BlogPostContents />
               </BlogPostItem>
               <div className="margin-vert--xl">
-                <BlogPostPaginator nextItem={nextItem} prevItem={prevItem} />
+                <BlogPostPaginator
+                  nextItem={metadata.nextItem}
+                  prevItem={metadata.prevItem}
+                />
               </div>
             </div>
           </div>

From 31d17c9d6bfb0a95e4e377d86f9dd3461df68b99 Mon Sep 17 00:00:00 2001
From: Alexey Pyltsyn <lex61rus@gmail.com>
Date: Tue, 29 Oct 2019 12:57:10 +0300
Subject: [PATCH 19/46] feat(v2): add ability to set custom HTML in footer
 items (#1905)

---
 CHANGELOG-2.x.md                               |  1 +
 .../src/theme/Footer/index.js                  | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index bda664f80888..d9f03c0a2b07 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -9,6 +9,7 @@
 - Refactor dark toggle into a hook.
 - Changed the way we read the `USE_SSH` env variable during deployment to be the same as in v1.
 - Fix accessing `docs/` or `/docs/xxxx` that does not match any existing doc page should return 404 (Not found) page, not blank page.
+- Allow user to add custom HTML to footer items.
 - Simplify blog metadata. Previously, accessing `/blog/post-xxx` will request for next and prev blog post metadata too aside from target post metadata. We should only request target post metadata.  
 - Prioritize `@docusaurus/core` dependencies/ node_modules over user's node_modules. This fix a bug whereby if user has core-js@3 on its own node_modules but docusaurus depends on core-js@2, we previously encounter `Module not found: core-js/modules/xxxx` (because core-js@3 doesn't have that).
 Another example is if user installed webpack@3 but docusaurus depends on webpack@4.
diff --git a/packages/docusaurus-theme-classic/src/theme/Footer/index.js b/packages/docusaurus-theme-classic/src/theme/Footer/index.js
index 38ea6a0e6310..36aeb2a48edd 100644
--- a/packages/docusaurus-theme-classic/src/theme/Footer/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Footer/index.js
@@ -62,11 +62,19 @@ function Footer() {
                 Array.isArray(linkItem.items) &&
                 linkItem.items.length > 0 ? (
                   <ul className="footer__items">
-                    {linkItem.items.map(item => (
-                      <li key={item.href || item.to} className="footer__item">
-                        <FooterLink item={item} />
-                      </li>
-                    ))}
+                    {linkItem.items.map(item =>
+                      item.html ? (
+                        <div
+                          dangerouslySetInnerHTML={{
+                            __html: item.html,
+                          }}
+                        />
+                      ) : (
+                        <li key={item.href || item.to} className="footer__item">
+                          <FooterLink item={item} />
+                        </li>
+                      ),
+                    )}
                   </ul>
                 ) : null}
               </div>

From ad22c9fab4cf57e89240e0efc8cf0bb3a165520d Mon Sep 17 00:00:00 2001
From: sige <sige@sige.hu>
Date: Tue, 29 Oct 2019 15:41:38 +0100
Subject: [PATCH 20/46] docs: update configcat user link (#1911)

---
 website-1.x/data/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website-1.x/data/users.js b/website-1.x/data/users.js
index 5ebd772c6a96..60f28206c628 100644
--- a/website-1.x/data/users.js
+++ b/website-1.x/data/users.js
@@ -143,7 +143,7 @@ module.exports = [
   {
     caption: 'ConfigCat',
     image: '/img/users/configcat.svg',
-    infoLink: 'https://docs.configcat.com',
+    infoLink: 'https://configcat.com/docs',
     fbOpenSource: false,
     pinned: false,
   },

From a8826b98b30e2306dc05398bc42f45896e165cf8 Mon Sep 17 00:00:00 2001
From: Endi <endiliey@gmail.com>
Date: Tue, 29 Oct 2019 22:59:27 +0700
Subject: [PATCH 21/46] fix(v2): docs plugin stability improvement (100% test
 coverage) (#1912)

* update jest config

* add more tests on docs plugin

* fix(v2): docs plugin should not add routes if there are no docs

* fix

* rm -rf coverage

* nits

* update
---
 CHANGELOG-2.x.md                              |   1 +
 jest.config.js                                |  21 +--
 .../__fixtures__/bad-site/docs/invalid-id.md  |   5 +
 .../empty-site/docusaurus.config.js           |  16 +++
 .../sidebars-category-wrong-items.json        |  11 ++
 .../sidebars-category.js                      |   0
 .../sidebars-unknown-type.json}               |   0
 .../sidebars/sidebars-wrong-field.json        |  20 +++
 .../{website => sidebars}/sidebars.json       |   0
 .../{website => simple-site}/docs/foo/bar.md  |   0
 .../{website => simple-site}/docs/foo/baz.md  |   0
 .../{website => simple-site}/docs/hello.md    |   0
 .../{website => simple-site}/docs/lorem.md    |   1 -
 .../docs/permalink.md                         |   0
 .../simple-site/docusaurus.config.js          |  16 +++
 .../__fixtures__/simple-site/sidebars.json    |  23 +++
 .../simple-site/wrong-sidebars.json           |   7 +
 .../__snapshots__/index.test.ts.snap          | 110 ++++++++++++++
 .../src/__tests__/index.test.ts               | 136 +++++++++++++++---
 .../src/__tests__/lastUpdate.test.ts          |  36 ++++-
 .../src/__tests__/metadata.test.ts            |  57 +++++++-
 .../src/__tests__/order.test.ts               |  23 +++
 .../src/__tests__/sidebars.test.ts            |  37 ++---
 .../src/index.ts                              |   5 +-
 .../src/lastUpdate.ts                         |   2 +-
 .../src/sidebars.ts                           |  10 +-
 26 files changed, 465 insertions(+), 72 deletions(-)
 create mode 100644 packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/bad-site/docs/invalid-id.md
 create mode 100644 packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/empty-site/docusaurus.config.js
 create mode 100644 packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars-category-wrong-items.json
 rename packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/{website => sidebars}/sidebars-category.js (100%)
 rename packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/{website/bad-sidebars.json => sidebars/sidebars-unknown-type.json} (100%)
 create mode 100644 packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars-wrong-field.json
 rename packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/{website => sidebars}/sidebars.json (100%)
 rename packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/{website => simple-site}/docs/foo/bar.md (100%)
 rename packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/{website => simple-site}/docs/foo/baz.md (100%)
 rename packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/{website => simple-site}/docs/hello.md (100%)
 rename packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/{website => simple-site}/docs/lorem.md (89%)
 rename packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/{website => simple-site}/docs/permalink.md (100%)
 create mode 100644 packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docusaurus.config.js
 create mode 100644 packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/sidebars.json
 create mode 100644 packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/wrong-sidebars.json
 create mode 100644 packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/index.test.ts.snap

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index d9f03c0a2b07..f668b6bc18d2 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -14,6 +14,7 @@
 - Prioritize `@docusaurus/core` dependencies/ node_modules over user's node_modules. This fix a bug whereby if user has core-js@3 on its own node_modules but docusaurus depends on core-js@2, we previously encounter `Module not found: core-js/modules/xxxx` (because core-js@3 doesn't have that).
 Another example is if user installed webpack@3 but docusaurus depends on webpack@4.
 - Added code block line highlighting feature (thanks @lex111)! If you have previously swizzled the `CodeBlock` theme component, it is recommended to update your source code to have this feature.
+- Fix a bug where docs plugin add `/docs` route even if docs folder is empty. We also improved docs plugin test coverage to 100% for stability before working on docs versioning.
 
 ## 2.0.0-alpha.31
 
diff --git a/jest.config.js b/jest.config.js
index 07bf8d64ec38..3afda9ceec2c 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -7,20 +7,23 @@
 
 const path = require('path');
 
+const ignorePatterns = [
+  '/node_modules/',
+  '__fixtures__',
+  '/packages/docusaurus/lib',
+  '/packages/docusaurus-utils/lib',
+  '/packages/docusaurus-plugin-content-blog/lib',
+  '/packages/docusaurus-plugin-content-docs/lib',
+  '/packages/docusaurus-plugin-content-pages/lib',
+];
+
 module.exports = {
   rootDir: path.resolve(__dirname),
   verbose: true,
   testURL: 'http://localhost/',
   testEnvironment: 'node',
-  testPathIgnorePatterns: [
-    '/node_modules/',
-    '__fixtures__',
-    '/packages/docusaurus/lib',
-    '/packages/docusaurus-utils/lib',
-    '/packages/docusaurus-plugin-content-blog/lib',
-    '/packages/docusaurus-plugin-content-docs-legacy/lib',
-    '/packages/docusaurus-plugin-content-pages/lib',
-  ],
+  testPathIgnorePatterns: ignorePatterns,
+  coveragePathIgnorePatterns: ignorePatterns,
   transform: {
     '^.+\\.[jt]sx?$': 'babel-jest',
   },
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/bad-site/docs/invalid-id.md b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/bad-site/docs/invalid-id.md
new file mode 100644
index 000000000000..1ffe4fa38eac
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/bad-site/docs/invalid-id.md
@@ -0,0 +1,5 @@
+---
+id: hello/super
+---
+
+Lorem
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/empty-site/docusaurus.config.js b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/empty-site/docusaurus.config.js
new file mode 100644
index 000000000000..4b278c9a7b13
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/empty-site/docusaurus.config.js
@@ -0,0 +1,16 @@
+/**
+ * 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.
+ */
+
+module.exports = {
+  title: 'My Site',
+  tagline: 'The tagline of my site',
+  url: 'https://your-docusaurus-test-site.com',
+  baseUrl: '/',
+  favicon: 'img/favicon.ico',
+  organizationName: 'facebook', // Usually your GitHub org/user name.
+  projectName: 'docusaurus', // Usually your repo name.
+};
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars-category-wrong-items.json b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars-category-wrong-items.json
new file mode 100644
index 000000000000..25bdf99e2032
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars-category-wrong-items.json
@@ -0,0 +1,11 @@
+{
+  "docs": {
+    "Test": [
+      {
+        "type": "category",
+        "label": "Category Label",
+        "items": "doc1"
+      }
+    ]
+  }
+}
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/sidebars-category.js b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars-category.js
similarity index 100%
rename from packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/sidebars-category.js
rename to packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars-category.js
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/bad-sidebars.json b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars-unknown-type.json
similarity index 100%
rename from packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/bad-sidebars.json
rename to packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars-unknown-type.json
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars-wrong-field.json b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars-wrong-field.json
new file mode 100644
index 000000000000..43dff88d7c96
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars-wrong-field.json
@@ -0,0 +1,20 @@
+{
+  "docs": {
+    "Test": [
+      "foo/bar",
+      "foo/baz",
+      {
+        "type": "category",
+        "label": "category",
+        "href": "https://github.com"
+      },
+      {
+        "type": "ref",
+        "id": "hello"
+      }
+    ],
+    "Guides": [
+      "hello"
+    ]
+  }
+}
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/sidebars.json b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars.json
similarity index 100%
rename from packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/sidebars.json
rename to packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/sidebars/sidebars.json
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/docs/foo/bar.md b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/foo/bar.md
similarity index 100%
rename from packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/docs/foo/bar.md
rename to packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/foo/bar.md
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/docs/foo/baz.md b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/foo/baz.md
similarity index 100%
rename from packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/docs/foo/baz.md
rename to packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/foo/baz.md
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/docs/hello.md b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/hello.md
similarity index 100%
rename from packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/docs/hello.md
rename to packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/hello.md
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/docs/lorem.md b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/lorem.md
similarity index 89%
rename from packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/docs/lorem.md
rename to packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/lorem.md
index 15589144c4a9..b088a6ec006b 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/docs/lorem.md
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/lorem.md
@@ -1,5 +1,4 @@
 ---
-id: lorem
 custom_edit_url: https://github.com/customUrl/docs/lorem.md
 ---
 
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/docs/permalink.md b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/permalink.md
similarity index 100%
rename from packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/website/docs/permalink.md
rename to packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/permalink.md
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docusaurus.config.js b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docusaurus.config.js
new file mode 100644
index 000000000000..4b278c9a7b13
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docusaurus.config.js
@@ -0,0 +1,16 @@
+/**
+ * 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.
+ */
+
+module.exports = {
+  title: 'My Site',
+  tagline: 'The tagline of my site',
+  url: 'https://your-docusaurus-test-site.com',
+  baseUrl: '/',
+  favicon: 'img/favicon.ico',
+  organizationName: 'facebook', // Usually your GitHub org/user name.
+  projectName: 'docusaurus', // Usually your repo name.
+};
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/sidebars.json b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/sidebars.json
new file mode 100644
index 000000000000..7892de099a43
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/sidebars.json
@@ -0,0 +1,23 @@
+{
+  "docs": {
+    "Test": [
+      {
+        "type": "category",
+        "label": "foo",
+        "items": ["foo/bar", "foo/baz"] 
+      },
+      {
+        "type": "link",
+        "label": "Github",
+        "href": "https://github.com"
+      },
+      {
+        "type": "ref",
+        "id": "hello"
+      }
+    ],
+    "Guides": [
+      "hello"
+    ]
+  }
+}
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/wrong-sidebars.json b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/wrong-sidebars.json
new file mode 100644
index 000000000000..6f56ce2c0b5a
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/wrong-sidebars.json
@@ -0,0 +1,7 @@
+{
+  "docs": {
+    "Test": [
+      "goku"
+    ]
+  }
+}
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/index.test.ts.snap b/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/index.test.ts.snap
new file mode 100644
index 000000000000..c59be9c120ee
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/index.test.ts.snap
@@ -0,0 +1,110 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`simple website content 1`] = `
+Object {
+  "docs": Array [
+    Object {
+      "items": Array [
+        Object {
+          "items": Array [
+            Object {
+              "href": "/docs/foo/bar",
+              "label": "Bar",
+              "type": "link",
+            },
+            Object {
+              "href": "/docs/foo/baz",
+              "label": "baz",
+              "type": "link",
+            },
+          ],
+          "label": "foo",
+          "type": "category",
+        },
+        Object {
+          "href": "https://github.com",
+          "label": "Github",
+          "type": "link",
+        },
+        Object {
+          "href": "/docs/hello",
+          "label": "Hello, World !",
+          "type": "link",
+        },
+      ],
+      "label": "Test",
+      "type": "category",
+    },
+    Object {
+      "items": Array [
+        Object {
+          "href": "/docs/hello",
+          "label": "Hello, World !",
+          "type": "link",
+        },
+      ],
+      "label": "Guides",
+      "type": "category",
+    },
+  ],
+}
+`;
+
+exports[`simple website content 2`] = `
+Array [
+  Object {
+    "component": "@theme/DocPage",
+    "modules": Object {
+      "docsMetadata": "@docusaurus-plugin-content-docs/docs-b5f.json",
+    },
+    "path": "/docs",
+    "routes": Array [
+      Object {
+        "component": "@theme/DocItem",
+        "exact": true,
+        "modules": Object {
+          "content": "@site/docs/permalink.md",
+          "metadata": "@docusaurus-plugin-content-docs/docs-endiliey-permalink-086.json",
+        },
+        "path": "/docs/endiliey/permalink",
+      },
+      Object {
+        "component": "@theme/DocItem",
+        "exact": true,
+        "modules": Object {
+          "content": "@site/docs/foo/bar.md",
+          "metadata": "@docusaurus-plugin-content-docs/docs-foo-bar-cef.json",
+        },
+        "path": "/docs/foo/bar",
+      },
+      Object {
+        "component": "@theme/DocItem",
+        "exact": true,
+        "modules": Object {
+          "content": "@site/docs/foo/baz.md",
+          "metadata": "@docusaurus-plugin-content-docs/docs-foo-baz-dd9.json",
+        },
+        "path": "/docs/foo/baz",
+      },
+      Object {
+        "component": "@theme/DocItem",
+        "exact": true,
+        "modules": Object {
+          "content": "@site/docs/hello.md",
+          "metadata": "@docusaurus-plugin-content-docs/docs-hello-da2.json",
+        },
+        "path": "/docs/hello",
+      },
+      Object {
+        "component": "@theme/DocItem",
+        "exact": true,
+        "modules": Object {
+          "content": "@site/docs/lorem.md",
+          "metadata": "@docusaurus-plugin-content-docs/docs-lorem-17b.json",
+        },
+        "path": "/docs/lorem",
+      },
+    ],
+  },
+]
+`;
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
index a338bed2aadb..a044c52325b7 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
@@ -6,32 +6,109 @@
  */
 
 import path from 'path';
-
+import {validate} from 'webpack';
+import fs from 'fs-extra';
 import pluginContentDocs from '../index';
-import {LoadContext} from '@docusaurus/types';
-
-describe('loadDocs', () => {
-  test('simple website', async () => {
-    const siteDir = path.join(__dirname, '__fixtures__', 'website');
-    const generatedFilesDir: string = path.resolve(siteDir, '.docusaurus');
-    const siteConfig = {
-      title: 'Hello',
-      baseUrl: '/',
-      url: 'https://docusaurus.io',
-    };
-    const context = {
-      siteDir,
-      siteConfig,
-      generatedFilesDir,
-    } as LoadContext;
-    const sidebarPath = path.join(siteDir, 'sidebars.json');
-    const pluginPath = 'docs';
-    const plugin = pluginContentDocs(context, {
-      path: pluginPath,
-      sidebarPath,
+import {loadContext} from '@docusaurus/core/src/server/index';
+import {applyConfigureWebpack} from '@docusaurus/core/src/webpack/utils';
+import {RouteConfig} from '@docusaurus/types';
+
+const createFakeActions = (routeConfigs: RouteConfig[], contentDir) => {
+  return {
+    addRoute: (config: RouteConfig) => {
+      config.routes.sort((a, b) =>
+        a.path > b.path ? 1 : b.path > a.path ? -1 : 0,
+      );
+      routeConfigs.push(config);
+    },
+    createData: async (name, _content) => {
+      return path.join(contentDir, name);
+    },
+  };
+};
+
+test('site with wrong sidebar file', async () => {
+  const siteDir = path.join(__dirname, '__fixtures__', 'simple-site');
+  const context = loadContext(siteDir);
+  const sidebarPath = path.join(siteDir, 'wrong-sidebars.json');
+  const plugin = pluginContentDocs(context, {
+    sidebarPath,
+  });
+  return plugin
+    .loadContent()
+    .catch(e =>
+      expect(e).toMatchInlineSnapshot(
+        `[Error: Improper sidebars file, document with id 'goku' not found.]`,
+      ),
+    );
+});
+
+describe('empty/no docs website', () => {
+  const siteDir = path.join(__dirname, '__fixtures__', 'empty-site');
+  const context = loadContext(siteDir);
+
+  test('no files in docs folder', async () => {
+    await fs.ensureDir(path.join(siteDir, 'docs'));
+    const plugin = pluginContentDocs(context, {});
+    const content = await plugin.loadContent();
+    const {docsMetadata, docsSidebars} = content;
+    expect(docsMetadata).toMatchInlineSnapshot(`Object {}`);
+    expect(docsSidebars).toMatchInlineSnapshot(`Object {}`);
+
+    const routeConfigs = [];
+    const pluginContentDir = path.join(context.generatedFilesDir, plugin.name);
+    const actions = createFakeActions(routeConfigs, pluginContentDir);
+
+    await plugin.contentLoaded({
+      content,
+      actions,
     });
-    const {docsMetadata} = await plugin.loadContent();
 
+    expect(routeConfigs).toEqual([]);
+  });
+
+  test('docs folder does not exist', async () => {
+    const plugin = pluginContentDocs(context, {path: '/path/does/not/exist/'});
+    const content = await plugin.loadContent();
+    expect(content).toBeNull();
+  });
+});
+
+describe('simple website', () => {
+  const siteDir = path.join(__dirname, '__fixtures__', 'simple-site');
+  const context = loadContext(siteDir);
+  const sidebarPath = path.join(siteDir, 'sidebars.json');
+  const pluginPath = 'docs';
+  const plugin = pluginContentDocs(context, {
+    path: pluginPath,
+    sidebarPath,
+  });
+  const pluginContentDir = path.join(context.generatedFilesDir, plugin.name);
+
+  test('getPathToWatch', () => {
+    const pathToWatch = plugin.getPathsToWatch();
+    expect(pathToWatch).not.toEqual([]);
+  });
+
+  test('configureWebpack', async () => {
+    const config = applyConfigureWebpack(
+      plugin.configureWebpack,
+      {
+        entry: './src/index.js',
+        output: {
+          filename: 'main.js',
+          path: path.resolve(__dirname, 'dist'),
+        },
+      },
+      false,
+    );
+    const errors = validate(config);
+    expect(errors.length).toBe(0);
+  });
+
+  test('content', async () => {
+    const content = await plugin.loadContent();
+    const {docsMetadata, docsSidebars} = content;
     expect(docsMetadata.hello).toEqual({
       id: 'hello',
       permalink: '/docs/hello',
@@ -57,5 +134,18 @@ describe('loadDocs', () => {
       title: 'Bar',
       description: 'This is custom description',
     });
+
+    expect(docsSidebars).toMatchSnapshot();
+
+    const routeConfigs = [];
+    const actions = createFakeActions(routeConfigs, pluginContentDir);
+
+    await plugin.contentLoaded({
+      content,
+      actions,
+    });
+
+    expect(routeConfigs).not.toEqual([]);
+    expect(routeConfigs).toMatchSnapshot();
   });
 });
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/lastUpdate.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/lastUpdate.test.ts
index bf088ed828d0..52210e918478 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/lastUpdate.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/lastUpdate.test.ts
@@ -7,15 +7,17 @@
 
 import fs from 'fs';
 import path from 'path';
+import shell from 'shelljs';
+import spawn from 'cross-spawn';
 
 import lastUpdate from '../lastUpdate';
 
 describe('lastUpdate', () => {
+  const existingFilePath = path.join(
+    __dirname,
+    '__fixtures__/simple-site/docs/hello.md',
+  );
   test('existing test file in repository with Git timestamp', () => {
-    const existingFilePath = path.join(
-      __dirname,
-      '__fixtures__/website/docs/hello.md',
-    );
     const lastUpdateData = lastUpdate(existingFilePath);
     expect(lastUpdateData).not.toBeNull();
 
@@ -44,4 +46,30 @@ describe('lastUpdate', () => {
     expect(lastUpdate(tempFilePath)).toBeNull();
     fs.unlinkSync(tempFilePath);
   });
+
+  test('Git does not exist', () => {
+    const mock = jest.spyOn(shell, 'which').mockImplementationOnce(() => null);
+    const consoleMock = jest.spyOn(console, 'warn').mockImplementation();
+    const lastUpdateData = lastUpdate(existingFilePath);
+    expect(lastUpdateData).toBeNull();
+    expect(consoleMock).toHaveBeenLastCalledWith(
+      'Sorry, the docs plugin last update options require Git.',
+    );
+
+    consoleMock.mockRestore();
+    mock.mockRestore();
+  });
+
+  test('Error', () => {
+    const mock = jest.spyOn(spawn, 'sync').mockImplementationOnce(() => {
+      throw new Error('PERMISSION Error');
+    });
+    const consoleMock = jest.spyOn(console, 'error').mockImplementation();
+    const lastUpdateData = lastUpdate('/fake/path/');
+    expect(lastUpdateData).toBeNull();
+    expect(consoleMock).toHaveBeenLastCalledWith(new Error('PERMISSION Error'));
+
+    consoleMock.mockRestore();
+    mock.mockRestore();
+  });
 });
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/metadata.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/metadata.test.ts
index 1a6ca22a172b..1caaab4a17cf 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/metadata.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/metadata.test.ts
@@ -9,14 +9,15 @@ import path from 'path';
 import processMetadata from '../metadata';
 
 describe('processMetadata', () => {
-  const siteDir = path.join(__dirname, '__fixtures__', 'website');
+  const fixtureDir = path.join(__dirname, '__fixtures__');
+  const simpleSiteDir = path.join(fixtureDir, 'simple-site');
   const siteConfig = {
     title: 'Hello',
     baseUrl: '/',
     url: 'https://docusaurus.io',
   };
   const pluginPath = 'docs';
-  const docsDir = path.resolve(siteDir, pluginPath);
+  const docsDir = path.resolve(simpleSiteDir, pluginPath);
 
   test('normal docs', async () => {
     const sourceA = path.join('foo', 'bar.md');
@@ -29,7 +30,7 @@ describe('processMetadata', () => {
         order: {},
         siteConfig,
         docsBasePath: pluginPath,
-        siteDir,
+        siteDir: simpleSiteDir,
       }),
       processMetadata({
         source: sourceB,
@@ -37,7 +38,7 @@ describe('processMetadata', () => {
         order: {},
         siteConfig,
         docsBasePath: pluginPath,
-        siteDir,
+        siteDir: simpleSiteDir,
       }),
     ]);
 
@@ -65,7 +66,7 @@ describe('processMetadata', () => {
       order: {},
       siteConfig,
       docsBasePath: pluginPath,
-      siteDir,
+      siteDir: simpleSiteDir,
     });
 
     expect(data).toEqual({
@@ -87,7 +88,7 @@ describe('processMetadata', () => {
       order: {},
       siteConfig,
       docsBasePath: pluginPath,
-      siteDir,
+      siteDir: simpleSiteDir,
       editUrl,
     });
 
@@ -110,7 +111,7 @@ describe('processMetadata', () => {
       order: {},
       siteConfig,
       docsBasePath: pluginPath,
-      siteDir,
+      siteDir: simpleSiteDir,
     });
 
     expect(data).toEqual({
@@ -122,4 +123,46 @@ describe('processMetadata', () => {
       description: 'Lorem ipsum.',
     });
   });
+
+  test('docs with last update time and author', async () => {
+    const source = 'lorem.md';
+    const data = await processMetadata({
+      source,
+      docsDir,
+      order: {},
+      siteConfig,
+      docsBasePath: pluginPath,
+      siteDir: simpleSiteDir,
+      showLastUpdateAuthor: true,
+      showLastUpdateTime: true,
+    });
+
+    expect(data).toEqual({
+      id: 'lorem',
+      permalink: '/docs/lorem',
+      source: path.join('@site', pluginPath, source),
+      title: 'lorem',
+      editUrl: 'https://github.com/customUrl/docs/lorem.md',
+      description: 'Lorem ipsum.',
+      lastUpdatedAt: '1539502055',
+      lastUpdatedBy: 'Author',
+    });
+  });
+
+  test('docs with invalid id', async () => {
+    const badSiteDir = path.join(fixtureDir, 'bad-site');
+
+    return processMetadata({
+      source: 'invalid-id.md',
+      docsDir: path.join(badSiteDir, 'docs'),
+      order: {},
+      siteConfig,
+      docsBasePath: 'docs',
+      siteDir: simpleSiteDir,
+    }).catch(e =>
+      expect(e).toMatchInlineSnapshot(
+        `[Error: Document id cannot include "/".]`,
+      ),
+    );
+  });
 });
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/order.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/order.test.ts
index 1f237318b747..7cdc265dbdd0 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/order.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/order.test.ts
@@ -218,6 +218,29 @@ describe('createOrder', () => {
     });
   });
 
+  test('multiple sidebars with unknown sidebar item type', () => {
+    expect(() =>
+      createOrder({
+        docs: [
+          {
+            type: 'category',
+            label: 'Category1',
+            items: [{type: 'endi', id: 'doc1'}, {type: 'doc', id: 'doc2'}],
+          },
+        ],
+        otherDocs: [
+          {
+            type: 'category',
+            label: 'Category1',
+            items: [{type: 'doc', id: 'doc5'}],
+          },
+        ],
+      }),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Unknown item type: endi. Item: {\\"type\\":\\"endi\\",\\"id\\":\\"doc1\\"}"`,
+    );
+  });
+
   test('edge cases', () => {
     expect(createOrder({})).toEqual({});
     expect(createOrder(undefined)).toEqual({});
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/sidebars.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/sidebars.test.ts
index 9239041d57c1..0a153e45f8d7 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/sidebars.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/sidebars.test.ts
@@ -11,40 +11,43 @@ import loadSidebars from '../sidebars';
 /* eslint-disable global-require, import/no-dynamic-require */
 
 describe('loadSidebars', () => {
+  const fixtureDir = path.join(__dirname, '__fixtures__', 'sidebars');
   test('sidebars with known sidebar item type', async () => {
-    const sidebarPath = path.join(
-      __dirname,
-      '__fixtures__',
-      'website',
-      'sidebars.json',
-    );
+    const sidebarPath = path.join(fixtureDir, 'sidebars.json');
     const result = loadSidebars(sidebarPath);
     expect(result).toMatchSnapshot();
   });
 
   test('sidebars with deep level of category', async () => {
-    const sidebarPath = path.join(
-      __dirname,
-      '__fixtures__',
-      'website',
-      'sidebars-category.js',
-    );
+    const sidebarPath = path.join(fixtureDir, 'sidebars-category.js');
     const result = loadSidebars(sidebarPath);
     expect(result).toMatchSnapshot();
   });
 
-  test('sidebars with unknown sidebar item type', async () => {
+  test('sidebars with category but category.items is not an array', async () => {
     const sidebarPath = path.join(
-      __dirname,
-      '__fixtures__',
-      'website',
-      'bad-sidebars.json',
+      fixtureDir,
+      'sidebars-category-wrong-items.json',
+    );
+    expect(() => loadSidebars(sidebarPath)).toThrowErrorMatchingInlineSnapshot(
+      `"Error loading \\"Category Label\\" category. Category items must be array."`,
     );
+  });
+
+  test('sidebars with unknown sidebar item type', async () => {
+    const sidebarPath = path.join(fixtureDir, 'sidebars-unknown-type.json');
     expect(() => loadSidebars(sidebarPath)).toThrowErrorMatchingInlineSnapshot(
       `"Unknown sidebar item type: superman"`,
     );
   });
 
+  test('sidebars with known sidebar item type but wrong field', async () => {
+    const sidebarPath = path.join(fixtureDir, 'sidebars-wrong-field.json');
+    expect(() => loadSidebars(sidebarPath)).toThrowErrorMatchingInlineSnapshot(
+      `"Unknown sidebar item keys: href. Item: {\\"type\\":\\"category\\",\\"label\\":\\"category\\",\\"href\\":\\"https://github.com\\"}"`,
+    );
+  });
+
   test('no sidebars', () => {
     const result = loadSidebars(null);
     expect(result).toEqual({});
diff --git a/packages/docusaurus-plugin-content-docs/src/index.ts b/packages/docusaurus-plugin-content-docs/src/index.ts
index c40852153818..a2e1061c29c9 100644
--- a/packages/docusaurus-plugin-content-docs/src/index.ts
+++ b/packages/docusaurus-plugin-content-docs/src/index.ts
@@ -177,9 +177,8 @@ export default function pluginContentDocs(
             case 'doc':
               return convertDocLink(item as SidebarItemDoc);
             case 'link':
-              break;
             default:
-              throw new Error(`Unknown sidebar item type: ${item.type}`);
+              break;
           }
           return item as SidebarItemLink;
         });
@@ -208,7 +207,7 @@ export default function pluginContentDocs(
     },
 
     async contentLoaded({content, actions}) {
-      if (!content) {
+      if (!content || Object.keys(content.docsMetadata).length === 0) {
         return;
       }
 
diff --git a/packages/docusaurus-plugin-content-docs/src/lastUpdate.ts b/packages/docusaurus-plugin-content-docs/src/lastUpdate.ts
index c1ac941e3411..da24c3add86d 100644
--- a/packages/docusaurus-plugin-content-docs/src/lastUpdate.ts
+++ b/packages/docusaurus-plugin-content-docs/src/lastUpdate.ts
@@ -33,7 +33,7 @@ export default function getFileLastUpdate(
     if (!shell.which('git')) {
       if (!showedGitRequirementError) {
         showedGitRequirementError = true;
-        console.log('Sorry, the docs plugin last update options require Git.');
+        console.warn('Sorry, the docs plugin last update options require Git.');
       }
 
       return null;
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars.ts b/packages/docusaurus-plugin-content-docs/src/sidebars.ts
index a8cb3c7516c4..dd0d108a41b2 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars.ts
@@ -44,7 +44,7 @@ function normalizeCategory(
 
   if (!Array.isArray(category.items)) {
     throw new Error(
-      `Error loading ${category.label} category. Category items must be array.`,
+      `Error loading "${category.label}" category. Category items must be array.`,
     );
   }
 
@@ -62,15 +62,11 @@ function normalizeCategory(
         assertItem(item, ['href', 'label']);
         break;
       case 'ref':
+      case 'doc':
         assertItem(item, ['id']);
         break;
       default:
-        if (item.type !== 'doc') {
-          throw new Error(`Unknown sidebar item type: ${item.type}`);
-        }
-
-        assertItem(item, ['id']);
-        break;
+        throw new Error(`Unknown sidebar item type: ${item.type}`);
     }
 
     return item as SidebarItem;

From f853171791e5a87e76ecc9a7538736066d04f84f Mon Sep 17 00:00:00 2001
From: Dylan Myers <dylmye@users.noreply.github.com>
Date: Tue, 29 Oct 2019 16:49:01 +0000
Subject: [PATCH 22/46] docs(v2): add windows batch instructions for publishing
 to gh pages (#1914)

* docs: add windows batch instructions for publishing to gh pages

* docs: add windows batch instructions on the v2 website
---
 docs/getting-started-publishing.md | 6 ++++++
 website/docs/deployment.md         | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/getting-started-publishing.md b/docs/getting-started-publishing.md
index 90ee88864fb6..9ad308c983c4 100644
--- a/docs/getting-started-publishing.md
+++ b/docs/getting-started-publishing.md
@@ -97,6 +97,7 @@ __Note:__ Not setting the `url` and `baseUrl` of your project might result in in
 
 To run the script directly from the command-line, you can use the following, filling in the parameter values as appropriate.
 
+**Bash**
 ```bash
 GIT_USER=<GIT_USER> \
   CURRENT_BRANCH=master \
@@ -104,6 +105,11 @@ GIT_USER=<GIT_USER> \
   yarn run publish-gh-pages # or `npm run publish-gh-pages`
 ```
 
+**Windows**
+```batch
+cmd /C "set GIT_USER=<GIT_USER> && set CURRENT_BRANCH=master && set USE_SSH=true && yarn run publish-gh-pages"
+```
+
 There are also two optional parameters that are set as environment variables:
 
 | Name             | Description                                                                                                                                                                                                                                                       |
diff --git a/website/docs/deployment.md b/website/docs/deployment.md
index 4c15a35bb226..f2234f89deb3 100644
--- a/website/docs/deployment.md
+++ b/website/docs/deployment.md
@@ -86,8 +86,14 @@ There are two more optional parameters that are set as environment variables:
 
 Finally, to deploy your site to GitHub Pages, run:
 
+**Bash**
 ```bash
-GIT_USER=<GITHUB_USERNAME> yarn run deploy
+GIT_USER=<GITHUB_USERNAME> yarn deploy
+```
+
+**Windows**
+```batch
+cmd /C "set GIT_USER=<GITHUB_USERNAME> && yarn deploy"
 ```
 
 <!--

From 64871b76e4814741446516286041e9a272aa09e8 Mon Sep 17 00:00:00 2001
From: Endi <endiliey@gmail.com>
Date: Wed, 30 Oct 2019 07:51:53 +0700
Subject: [PATCH 23/46] fix(v2): custom searchbar should appear even if
 themeconfig.algolia is undefined (#1909)

* fix(v2): custom searchbar should appear even if themeconfig.algolia is undefined

* nits

* Docs docs

* inaccuracy

* changelog

* nits
---
 CHANGELOG-2.x.md                              |  6 +++
 .../src/theme/Navbar/index.js                 | 14 ++---
 .../src/theme/SearchBar/index.js              |  5 +-
 website/docs/search.md                        |  2 +
 website/docs/theme-classic.md                 | 51 +++++++++++++++++++
 website/sidebars.js                           |  2 +-
 6 files changed, 67 insertions(+), 13 deletions(-)
 create mode 100644 website/docs/theme-classic.md

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index f668b6bc18d2..1bc30fd8bd53 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+- Fixed a bug in which if `themeConfig.algolia` is not defined, the custom searchbar won't appear.
+If you've swizzled Algolia `SearchBar` component before, please update your source code otherwise CSS might break. See [#1909](https://github.com/facebook/docusaurus/pull/1909/files) for reference.
+```js
+- <Fragment>
++ <div className="navbar__search" key="search-box">
+```
 - Reduce memory usage consumption.
 - Slightly adjust search icon position to be more aligned on small width device.
 - Convert sitemap plugin to TypeScript.
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
index fd4f323679cb..77f9211c17f9 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
@@ -52,7 +52,7 @@ function Navbar() {
   const [theme, setTheme] = useTheme();
   const {siteConfig = {}} = context;
   const {baseUrl, themeConfig = {}} = siteConfig;
-  const {algolia, navbar = {}} = themeConfig;
+  const {navbar = {}} = themeConfig;
   const {title, logo = {}, links = []} = navbar;
 
   const showSidebar = useCallback(() => {
@@ -137,14 +137,10 @@ function Navbar() {
                 unchecked: <Sun />,
               }}
             />
-            {algolia && (
-              <div className="navbar__search" key="search-box">
-                <SearchBar
-                  handleSearchBarToggle={setIsSearchBarExpanded}
-                  isSearchBarExpanded={isSearchBarExpanded}
-                />
-              </div>
-            )}
+            <SearchBar
+              handleSearchBarToggle={setIsSearchBarExpanded}
+              isSearchBarExpanded={isSearchBarExpanded}
+            />
           </div>
         </div>
         <div
diff --git a/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/index.js b/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/index.js
index aad9686ac519..0931c3a9b8d3 100644
--- a/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/index.js
+++ b/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/index.js
@@ -8,7 +8,6 @@
 import React, {
   useState,
   useEffect,
-  Fragment,
   useContext,
   useRef,
   useCallback,
@@ -60,7 +59,7 @@ const Search = props => {
   );
 
   return isEnabled ? (
-    <Fragment>
+    <div className="navbar__search" key="search-box">
       <span
         role="button"
         className={classnames('search-icon', {
@@ -84,7 +83,7 @@ const Search = props => {
         onBlur={toggleSearchIconClick}
         ref={searchBarRef}
       />
-    </Fragment>
+    </div>
   ) : null;
 };
 
diff --git a/website/docs/search.md b/website/docs/search.md
index a4f48860675e..5f96356de391 100644
--- a/website/docs/search.md
+++ b/website/docs/search.md
@@ -47,3 +47,5 @@ yarn swizzle @docusaurus/theme-classic SearchBar
 ```
 
 This will create a `src/themes/SearchBar` file in your project folder. Restart your dev server and edit the component, you will see that Docusaurus uses your own `SearchBar` component now.
+
+**Notes**: You can alternatively [swizzle from Algolia SearchBar](#customizing-the-algolia-search-bar) and create your own search component from there.
diff --git a/website/docs/theme-classic.md b/website/docs/theme-classic.md
new file mode 100644
index 000000000000..e80e97a7fe41
--- /dev/null
+++ b/website/docs/theme-classic.md
@@ -0,0 +1,51 @@
+---
+id: theme-classic
+title: Classic Theme Configuration
+---
+
+_This section is a work in progress._
+
+## Navbar
+
+### Navbar Title & Logo
+
+You can add a logo and title to the navbar via `themeConfig.navbar`. Logo can be placed in [static folder](static-assets.md).
+
+```js
+// docusaurus.config.js
+module.exports = {
+  themeConfig: {
+    navbar: {
+      title: 'Site Title',
+      logo: {
+        alt: 'Site Logo',
+        src: 'img/logo.svg',
+      },
+    }
+}
+```
+
+### Navbar Links
+
+You can add links to the navbar via `themeConfig.navbar.links`:
+
+```js
+// docusaurus/config.js
+module.exports = {
+  themeConfig: {
+    navbar: {
+      links: [
+        {
+          to: 'docs/docusaurus.config.js',
+          label: 'docusaurus.config.js',
+          position: 'left',
+        },
+        // ... other links
+      ],
+    }
+}
+```
+
+Outbound links automatically get `target="_blank" rel="noopener noreferrer"`.
+
+## Footer
\ No newline at end of file
diff --git a/website/sidebars.js b/website/sidebars.js
index cc54508511ef..53cc6c815981 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -34,7 +34,7 @@ module.exports = {
       {
         type: 'category',
         label: 'Themes',
-        items: ['using-themes', 'advanced-themes'],
+        items: ['using-themes', 'advanced-themes', 'theme-classic'],
       },
       'presets',
     ],

From 6fcee6dde4db34aff1b734b6c6aef2c960009b48 Mon Sep 17 00:00:00 2001
From: Endi <endiliey@gmail.com>
Date: Wed, 30 Oct 2019 07:52:36 +0700
Subject: [PATCH 24/46] fix(v2): missing/hidden algolia search suggestion
 result (#1915)

---
 CHANGELOG-2.x.md                                                 | 1 +
 .../src/theme/SearchBar/styles.css                               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index 1bc30fd8bd53..f22b0c2ed9c1 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -13,6 +13,7 @@ If you've swizzled Algolia `SearchBar` component before, please update your sour
 - Convert sitemap plugin to TypeScript.
 - Significantly reduce main bundle size and initial HTML payload on production build. Generated JS files from webpack is also shorter in name.
 - Refactor dark toggle into a hook.
+- Fix algolia styling bug, sometimes search suggestion result is hidden.
 - Changed the way we read the `USE_SSH` env variable during deployment to be the same as in v1.
 - Fix accessing `docs/` or `/docs/xxxx` that does not match any existing doc page should return 404 (Not found) page, not blank page.
 - Allow user to add custom HTML to footer items.
diff --git a/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/styles.css b/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/styles.css
index 7bf33eef231c..88c1eead4b6e 100644
--- a/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/styles.css
+++ b/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/styles.css
@@ -356,6 +356,7 @@
 }
 
 .algolia-autocomplete .algolia-docsearch-suggestion {
+  display: block;
   position: relative;
   padding: 0;
   overflow: hidden;

From 16f10dd32a2d293fd204180736e52917aaec08b9 Mon Sep 17 00:00:00 2001
From: Endi <endiliey@gmail.com>
Date: Wed, 30 Oct 2019 10:19:30 +0700
Subject: [PATCH 25/46] docs(v2): Redirect component for easy redirect (#1913)

* docs(v2): Redirect component for easy redirect

* typo

* docs

* Update website/docs/docusaurus-core.md

Co-Authored-By: Alexey Pyltsyn <lex61rus@gmail.com>

* Update docusaurus-core.md
---
 CHANGELOG-2.x.md                | 10 ++++++++++
 website/docs/docusaurus-core.md | 18 +++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index f22b0c2ed9c1..a7d66ff9d7ea 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -9,6 +9,16 @@ If you've swizzled Algolia `SearchBar` component before, please update your sour
 + <div className="navbar__search" key="search-box">
 ```
 - Reduce memory usage consumption.
+- Add `<Redirect>` component for easy client side redirect.
+Example Uaage:
+```js
+import React from 'react';
+import {Redirect} from '@docusaurus/router';
+
+function Home() {
+  return <Redirect to="/docs/test" />;
+}
+```
 - Slightly adjust search icon position to be more aligned on small width device.
 - Convert sitemap plugin to TypeScript.
 - Significantly reduce main bundle size and initial HTML payload on production build. Generated JS files from webpack is also shorter in name.
diff --git a/website/docs/docusaurus-core.md b/website/docs/docusaurus-core.md
index dcb919eef87e..b0118b3ec146 100644
--- a/website/docs/docusaurus-core.md
+++ b/website/docs/docusaurus-core.md
@@ -1,6 +1,7 @@
 ---
 id: docusaurus-core
-title: Docusaurus Core API
+title: Docusaurus Client API
+sidebar_title: Client API
 ---
 
 Docusaurus provides some API on client that can be helpful when building your site.
@@ -143,3 +144,18 @@ function Help() {
   );
 }
 ```
+
+## `<Redirect />`
+
+Rendering a `<Redirect>` will navigate to a new location. The new location will override the current location in the history stack, like server-side redirects (HTTP 3xx) do. You can refer to [React Router's Redirect documentation](https://reacttraining.com/react-router/web/api/Redirect) for more info on available props.
+
+Example usage:
+
+```jsx {2,5}
+import React from 'react';
+import {Redirect} from '@docusaurus/router';
+
+function Home() {
+  return <Redirect to="/docs/test" />;
+}
+```

From 5a2f5390202c02ed15ed8e0ab6e8cdcde1ff8ed9 Mon Sep 17 00:00:00 2001
From: Santiago Garcia da Rosa <santiago@Santiagos-MacBook-Pro.local>
Date: Tue, 29 Oct 2019 22:37:58 -0600
Subject: [PATCH 26/46] refactor: changes after comments (use custom hooks,
 code changes, fix bugs)

---
 .../src/theme/DocItem/index.js                | 80 +++--------------
 .../theme/hooks/useTableOfContentHighlight.js | 89 +++++++++++++++++++
 2 files changed, 100 insertions(+), 69 deletions(-)
 create mode 100644 packages/docusaurus-theme-classic/src/theme/hooks/useTableOfContentHighlight.js

diff --git a/packages/docusaurus-theme-classic/src/theme/DocItem/index.js b/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
index 196e8a076b14..0741aac5cd3b 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
@@ -5,90 +5,32 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import React, {useEffect} from 'react';
+import React from 'react';
 
 import Head from '@docusaurus/Head';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import useBaseUrl from '@docusaurus/useBaseUrl';
 import DocPaginator from '@theme/DocPaginator';
+import useTableOfContentHighlight from '@theme/hooks/useTableOfContentHighlight';
 
 import styles from './styles.module.css';
 
-let headersCache = [];
-let tableOfContentLinksCache = [];
-let lastActiveTableOfContentLink;
-
-function getActiveHeader() {
-  const TOP_OFFSET = 80;
-  let index = 0;
-  let activeHeader;
-  while (index < headersCache.length && !activeHeader) {
-    const header = headersCache[index];
-    const {top} = header.getBoundingClientRect();
-    if (top > 0 && top <= TOP_OFFSET) {
-      activeHeader = header;
-    }
-    index += 1;
-  }
-  return activeHeader;
-}
-
-function highlightTableOfContentLink(tableOfContentLink) {
-  const cssClass = 'contents__link--active';
-  if (lastActiveTableOfContentLink) {
-    lastActiveTableOfContentLink.classList.remove(cssClass);
-  }
-  tableOfContentLink.classList.add(cssClass);
-  lastActiveTableOfContentLink = tableOfContentLink;
-}
-
-function setActiveTableOfContentLink() {
-  const activeHeader = getActiveHeader();
-  if (activeHeader) {
-    let index = 0;
-    let itemHighlighted = false;
-    while (index < tableOfContentLinksCache.length && !itemHighlighted) {
-      const tableOfContentLink = tableOfContentLinksCache[index];
-      if (activeHeader.innerText.indexOf(tableOfContentLink.innerText) > -1) {
-        highlightTableOfContentLink(tableOfContentLink);
-        itemHighlighted = true;
-      }
-      index += 1;
-    }
-  }
-}
-
-function addEventListeners() {
-  document.addEventListener('scroll', setActiveTableOfContentLink);
-  document.addEventListener('resize', setActiveTableOfContentLink);
-  document.addEventListener('hashchange', setActiveTableOfContentLink);
-}
-
-function removeEventListeners() {
-  document.removeEventListener('scroll', setActiveTableOfContentLink);
-  document.removeEventListener('resize', setActiveTableOfContentLink);
-  document.removeEventListener('hashchange', setActiveTableOfContentLink);
-}
-
-function componentLoaded() {
-  headersCache = document.querySelectorAll('h2, h3');
-  tableOfContentLinksCache = document.querySelectorAll('.contents__link');
-  setActiveTableOfContentLink();
-  addEventListeners();
-}
-
 function Headings({headings, isChild}) {
-  useEffect(() => {
-    componentLoaded();
-    return removeEventListeners;
-  });
+  const LINK_CLASS_NAME = 'contents__link';
+  const TOP_OFFSET = 100;
+
+  useTableOfContentHighlight(
+    LINK_CLASS_NAME,
+    'contents__link--active',
+    TOP_OFFSET,
+  );
 
   if (!headings.length) return null;
   return (
     <ul className={isChild ? '' : 'contents contents__left-border'}>
       {headings.map(heading => (
         <li key={heading.id}>
-          <a href={`#${heading.id}`} className="contents__link">
+          <a href={`#${heading.id}`} className={LINK_CLASS_NAME}>
             {heading.value}
           </a>
           <Headings isChild headings={heading.children} />
diff --git a/packages/docusaurus-theme-classic/src/theme/hooks/useTableOfContentHighlight.js b/packages/docusaurus-theme-classic/src/theme/hooks/useTableOfContentHighlight.js
new file mode 100644
index 000000000000..a9ecf908bf2a
--- /dev/null
+++ b/packages/docusaurus-theme-classic/src/theme/hooks/useTableOfContentHighlight.js
@@ -0,0 +1,89 @@
+/**
+ * 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.
+ */
+
+import {useEffect, useState} from 'react';
+
+function useTableOfContentHighlight(
+  tableOfContentLinkClassName,
+  tableOfContentLinkActiveClassName,
+  topOffset,
+) {
+  const [
+    lastActiveTableOfContentLink,
+    setLastActiveTableOfContentLink,
+  ] = useState(undefined);
+
+  useEffect(() => {
+    let headersAnchor = [];
+    let tableOfContentLinks = [];
+
+    function getActiveHeaderAnchor() {
+      const TOP_OFFSET = topOffset;
+      let index = 0;
+      let activeHeaderAnchor;
+      headersAnchor = document.querySelectorAll('a.anchor');
+      while (index < headersAnchor.length && !activeHeaderAnchor) {
+        const headerAnchor = headersAnchor[index];
+        const {top} = headerAnchor.getBoundingClientRect();
+        if (top >= 0 && top <= TOP_OFFSET) {
+          activeHeaderAnchor = headerAnchor;
+        }
+        index += 1;
+      }
+      return activeHeaderAnchor;
+    }
+
+    function highlightTableOfContentLink(tableOfContentLink) {
+      if (lastActiveTableOfContentLink) {
+        lastActiveTableOfContentLink.classList.remove(
+          tableOfContentLinkActiveClassName,
+        );
+      }
+      tableOfContentLink.classList.add(tableOfContentLinkActiveClassName);
+      setLastActiveTableOfContentLink(tableOfContentLink);
+    }
+
+    function getAnchorValue(tableOfContentLink) {
+      const splittedUrl = tableOfContentLink.href
+        ? decodeURIComponent(tableOfContentLink.href).split('#')
+        : [];
+      return splittedUrl.length > 1 ? splittedUrl[1] : '';
+    }
+
+    function setActiveTableOfContentLink() {
+      const activeHeaderAnchor = getActiveHeaderAnchor();
+      if (activeHeaderAnchor) {
+        let index = 0;
+        let itemHighlighted = false;
+        tableOfContentLinks = document.querySelectorAll(
+          `.${tableOfContentLinkClassName}`,
+        );
+        while (index < tableOfContentLinks.length && !itemHighlighted) {
+          const tableOfContentLink = tableOfContentLinks[index];
+          const anchorValue = getAnchorValue(tableOfContentLink);
+          if (activeHeaderAnchor.id === anchorValue) {
+            highlightTableOfContentLink(tableOfContentLink);
+            itemHighlighted = true;
+          }
+          index += 1;
+        }
+      }
+    }
+
+    document.addEventListener('scroll', setActiveTableOfContentLink);
+    document.addEventListener('resize', setActiveTableOfContentLink);
+
+    setActiveTableOfContentLink();
+
+    return () => {
+      document.removeEventListener('scroll', setActiveTableOfContentLink);
+      document.removeEventListener('resize', setActiveTableOfContentLink);
+    };
+  });
+}
+
+export default useTableOfContentHighlight;

From ca4efb6428a59a557a076e80f32c9774dc8fcbd5 Mon Sep 17 00:00:00 2001
From: Endi <endiliey@gmail.com>
Date: Wed, 30 Oct 2019 13:02:05 +0700
Subject: [PATCH 27/46] fix(v2): regression from prioritizing core node_modules
 logic (#1917)

* fix(v2): regression from prioritizing core node_modules logic

* nits
---
 packages/docusaurus/src/webpack/base.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/docusaurus/src/webpack/base.ts b/packages/docusaurus/src/webpack/base.ts
index ce6ea57a04a1..2b20a055453f 100644
--- a/packages/docusaurus/src/webpack/base.ts
+++ b/packages/docusaurus/src/webpack/base.ts
@@ -54,9 +54,11 @@ export function createBaseConfig(
       // We want `@docusaurus/core` own dependencies/`node_modules` to "win" if there is conflict
       // Example: if there is core-js@3 in user's own node_modules, but core depends on
       // core-js@2, we should use core-js@2.
-      modules: module.paths.concat([
+      modules: [
+        path.resolve(__dirname, '..', '..', 'node_modules'),
+        'node_modules',
         path.resolve(fs.realpathSync(process.cwd()), 'node_modules'),
-      ]),
+      ],
     },
     optimization: {
       removeAvailableModules: false,

From c7ff07cf31583c7dcf85ae71de2b08ce9067b92d Mon Sep 17 00:00:00 2001
From: endiliey <endiliey@gmail.com>
Date: Wed, 30 Oct 2019 13:48:14 +0700
Subject: [PATCH 28/46] chore: changelog

---
 CHANGELOG-2.x.md | 48 +++++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index a7d66ff9d7ea..a874228a857a 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -2,15 +2,11 @@
 
 ## Unreleased
 
-- Fixed a bug in which if `themeConfig.algolia` is not defined, the custom searchbar won't appear.
-If you've swizzled Algolia `SearchBar` component before, please update your source code otherwise CSS might break. See [#1909](https://github.com/facebook/docusaurus/pull/1909/files) for reference.
-```js
-- <Fragment>
-+ <div className="navbar__search" key="search-box">
-```
-- Reduce memory usage consumption.
+## 2.0.0-alpha.32
+
+### Features
 - Add `<Redirect>` component for easy client side redirect.
-Example Uaage:
+Example Usage:
 ```js
 import React from 'react';
 import {Redirect} from '@docusaurus/router';
@@ -19,19 +15,33 @@ function Home() {
   return <Redirect to="/docs/test" />;
 }
 ```
-- Slightly adjust search icon position to be more aligned on small width device.
-- Convert sitemap plugin to TypeScript.
-- Significantly reduce main bundle size and initial HTML payload on production build. Generated JS files from webpack is also shorter in name.
-- Refactor dark toggle into a hook.
-- Fix algolia styling bug, sometimes search suggestion result is hidden.
+- Allow user to add custom HTML to footer items. [#1905](https://github.com/facebook/docusaurus/pull/1905)
+- Added code block line highlighting feature (thanks @lex111)! If you have previously swizzled the `CodeBlock` theme component, it is recommended to update your source code to have this feature.
+([#1860](https://github.com/facebook/Docusaurus/issues/1860))
+
+### Bug Fixes
+- Fixed a bug in which if `themeConfig.algolia` is not defined, the custom searchbar won't appear.
+If you've swizzled Algolia `SearchBar` component before, please update your source code otherwise CSS might break. See [#1909](https://github.com/facebook/docusaurus/pull/1909/files) for reference.
+```js
+- <Fragment>
++ <div className="navbar__search" key="search-box">
+```
+- Slightly adjust search icon position to be more aligned on small width device. ([#1893](https://github.com/facebook/Docusaurus/issues/1893))
+- Fix algolia styling bug, previously search suggestion result is sometimes hidden. ([#1915](https://github.com/facebook/Docusaurus/issues/1915))
 - Changed the way we read the `USE_SSH` env variable during deployment to be the same as in v1.
-- Fix accessing `docs/` or `/docs/xxxx` that does not match any existing doc page should return 404 (Not found) page, not blank page.
-- Allow user to add custom HTML to footer items.
-- Simplify blog metadata. Previously, accessing `/blog/post-xxx` will request for next and prev blog post metadata too aside from target post metadata. We should only request target post metadata.  
+- Fix accessing `docs/` or `/docs/xxxx` that does not match any existing doc page should return 404 (Not found) page, not blank page. ([#1903](https://github.com/facebook/Docusaurus/issues/1903))
 - Prioritize `@docusaurus/core` dependencies/ node_modules over user's node_modules. This fix a bug whereby if user has core-js@3 on its own node_modules but docusaurus depends on core-js@2, we previously encounter `Module not found: core-js/modules/xxxx` (because core-js@3 doesn't have that).
-Another example is if user installed webpack@3 but docusaurus depends on webpack@4.
-- Added code block line highlighting feature (thanks @lex111)! If you have previously swizzled the `CodeBlock` theme component, it is recommended to update your source code to have this feature.
-- Fix a bug where docs plugin add `/docs` route even if docs folder is empty. We also improved docs plugin test coverage to 100% for stability before working on docs versioning.
+- Fix a bug where docs plugin add `/docs` route even if docs folder is empty. We also improved docs plugin test coverage to 100% for stability before working on docs versioning. ([#1912](https://github.com/facebook/Docusaurus/issues/1912))
+
+### Performance Improvement
+- Reduce memory usage consumption. ([#1900](https://github.com/facebook/Docusaurus/issues/1900))
+- Significantly reduce main bundle size and initial HTML payload on production build. Generated files from webpack is also shorter in name. ([#1898](https://github.com/facebook/Docusaurus/issues/1898))
+- Simplify blog metadata. Previously, accessing `/blog/post-xxx` will request for next and prev blog post metadata too aside from target post metadata. We should only request target post metadata. 
+([#1908](https://github.com/facebook/Docusaurus/issues/1908))
+
+### Others
+- Convert sitemap plugin to TypeScript. ([#1894](https://github.com/facebook/Docusaurus/issues/1894))
+- Refactor dark mode toggle into a hook. ([#1899](https://github.com/facebook/Docusaurus/issues/1899))
 
 ## 2.0.0-alpha.31
 

From 255584cf65a6797b51b5a1573728937308a6b2d9 Mon Sep 17 00:00:00 2001
From: Mario Macai <10549870+mmacai@users.noreply.github.com>
Date: Wed, 30 Oct 2019 23:13:26 +0100
Subject: [PATCH 29/46] docs(v1): showcase user Reactive Interaction Gateway
 (#1918)

---
 website-1.x/data/users.js                     |   7 +
 .../users/reactive-interaction-gateway.svg    | 168 ++++++++++++++++++
 2 files changed, 175 insertions(+)
 create mode 100644 website-1.x/static/img/users/reactive-interaction-gateway.svg

diff --git a/website-1.x/data/users.js b/website-1.x/data/users.js
index 60f28206c628..dc2bb67cfc05 100644
--- a/website-1.x/data/users.js
+++ b/website-1.x/data/users.js
@@ -554,6 +554,13 @@ module.exports = [
     fbOpenSource: false,
     pinned: false,
   },
+  {
+    caption: 'Reactive Interaction Gateway',
+    image: '/img/users/reactive-interaction-gateway.svg',
+    infoLink: 'https://accenture.github.io/reactive-interaction-gateway/',
+    fbOpenSource: false,
+    pinned: false,
+  },
   {
     caption: 'Reason',
     image: '/img/users/reason.svg',
diff --git a/website-1.x/static/img/users/reactive-interaction-gateway.svg b/website-1.x/static/img/users/reactive-interaction-gateway.svg
new file mode 100644
index 000000000000..ac9e6ee8e7b7
--- /dev/null
+++ b/website-1.x/static/img/users/reactive-interaction-gateway.svg
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 437.886 385.35752"
+   height="385.35751"
+   width="437.88602"
+   xml:space="preserve"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="icon.svg"><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="856"
+     id="namedview97"
+     showgrid="false"
+     fit-margin-top="10"
+     fit-margin-left="10"
+     fit-margin-right="10"
+     fit-margin-bottom="10"
+     inkscape:zoom="0.44083401"
+     inkscape:cx="549.51176"
+     inkscape:cy="-61.989894"
+     inkscape:window-x="0"
+     inkscape:window-y="771"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" /><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       id="clipPath80"
+       clipPathUnits="userSpaceOnUse"><path
+         id="path82"
+         d="m 4437.41,2382.64 344.88,0 c 7.66,0 14.13,2.63 19.4,7.9 5.27,5.27 7.91,11.73 7.91,19.41 l 0,151.6 c 0,7.66 -2.64,14.25 -7.91,19.76 -5.27,5.5 -11.74,8.27 -19.4,8.27 l -344.88,0 c -7.68,0 -14.26,-2.77 -19.77,-8.27 -5.51,-5.51 -8.26,-12.1 -8.26,-19.76 l 0,-151.6 c 0,-7.68 2.75,-14.14 8.26,-19.41 5.51,-5.27 12.09,-7.9 19.77,-7.9 z m 431.1,178.91 0,-151.6 c 0,-23.97 -8.38,-44.32 -25.14,-61.08 -16.78,-16.77 -37.13,-25.15 -61.08,-25.15 l -79.03,0 162.38,-192.56 -76.88,0 -161.67,192.56 -189.68,0 c -4.32,0 -13.66,0.95 -28.03,2.88 l 0,-195.44 -58.2,0 0,516.61 431.11,0 c 23.95,0 44.3,-8.38 61.08,-25.15 16.76,-16.76 25.14,-37.13 25.14,-61.07 z"
+         inkscape:connector-curvature="0" /></clipPath><linearGradient
+       id="linearGradient84"
+       spreadMethod="pad"
+       gradientTransform="matrix(1e-7,2215.78,2215.78,-1e-7,4609.85,115.18)"
+       gradientUnits="userSpaceOnUse"
+       y2="0"
+       x2="1"
+       y1="0"
+       x1="0"><stop
+         id="stop86"
+         offset="0"
+         style="stop-opacity:1;stop-color:#286b82" /><stop
+         id="stop88"
+         offset="0.994624"
+         style="stop-opacity:1;stop-color:#4ab0d3" /><stop
+         id="stop90"
+         offset="1"
+         style="stop-opacity:1;stop-color:#4ab0d3" /></linearGradient><clipPath
+       id="clipPath112"
+       clipPathUnits="userSpaceOnUse"><path
+         id="path114"
+         d="m 4551.18,1128.93 0,517.34 58.2,0 0,-517.34 -58.2,0 z"
+         inkscape:connector-curvature="0" /></clipPath><linearGradient
+       id="linearGradient116"
+       spreadMethod="pad"
+       gradientTransform="matrix(1e-7,2215.78,2215.78,-1e-7,4580.28,115.18)"
+       gradientUnits="userSpaceOnUse"
+       y2="0"
+       x2="1"
+       y1="0"
+       x1="0"><stop
+         id="stop118"
+         offset="0"
+         style="stop-opacity:1;stop-color:#286b82" /><stop
+         id="stop120"
+         offset="0.994624"
+         style="stop-opacity:1;stop-color:#4ab0d3" /><stop
+         id="stop122"
+         offset="1"
+         style="stop-opacity:1;stop-color:#4ab0d3" /></linearGradient><clipPath
+       id="clipPath150"
+       clipPathUnits="userSpaceOnUse"><path
+         id="path152"
+         d="m 4868.51,557.832 0,-20.84 -58.2,0 0,20.84 c 0,7.648 -2.76,14.25 -8.26,19.75 -5.51,5.508 -12.11,8.27 -19.76,8.27 l -344.89,0 c -7.67,0 -14.26,-2.762 -19.76,-8.27 -5.51,-5.5 -8.26,-12.102 -8.26,-19.75 l 0,-344.891 c 0,-7.671 2.75,-14.261 8.26,-19.761 5.5,-5.52 12.09,-8.258 19.76,-8.258 l 344.89,0 c 7.65,0 14.25,2.738 19.76,8.258 5.5,5.5 8.26,12.09 8.26,19.761 l 0,127.899 -127.89,0 0,58.91 186.09,0 0,-186.809 c 0,-23.961 -8.38,-44.312 -25.15,-61.082 -16.77,-16.769 -37.12,-25.148 -61.07,-25.148 l -344.89,0 c -23.96,0 -44.31,8.379 -61.07,25.148 -16.78,16.77 -25.15,37.121 -25.15,61.082 l 0,344.891 c 0,23.938 8.37,44.297 25.15,61.066 16.76,16.762 37.11,25.153 61.07,25.153 l 344.89,0 c 23.95,0 44.3,-8.391 61.07,-25.153 16.77,-16.769 25.15,-37.128 25.15,-61.066 z"
+         inkscape:connector-curvature="0" /></clipPath><linearGradient
+       id="linearGradient154"
+       spreadMethod="pad"
+       gradientTransform="matrix(1e-7,2215.78,2215.78,-1e-7,4609.85,115.18)"
+       gradientUnits="userSpaceOnUse"
+       y2="0"
+       x2="1"
+       y1="0"
+       x1="0"><stop
+         id="stop156"
+         offset="0"
+         style="stop-opacity:1;stop-color:#286b82" /><stop
+         id="stop158"
+         offset="0.994624"
+         style="stop-opacity:1;stop-color:#4ab0d3" /><stop
+         id="stop160"
+         offset="1"
+         style="stop-opacity:1;stop-color:#4ab0d3" /></linearGradient><clipPath
+       id="clipPath180"
+       clipPathUnits="userSpaceOnUse"><path
+         id="path182"
+         d="m 3215.68,310.859 c -23.63,14.633 -51.39,23.223 -81.23,23.223 -13.48,0 -26.48,-1.902 -38.95,-5.141 l -190.27,329.571 c 28.19,26.117 45.95,63.359 45.95,104.828 0,14.738 -2.24,28.961 -6.38,42.34 l 801.55,462.78 c 4.8,-4.37 9.82,-8.49 15.17,-12.17 L 3215.68,310.859 Z M 1149.42,1256.26 c 5.37,3.69 10.39,7.81 15.19,12.18 l 1202.4,-694.21 c -1.75,-7.07 -2.96,-14.359 -2.96,-21.98 0,-2.828 0.58,-5.5 0.84,-8.262 L 1900.95,276.129 c -31.9,49.613 -87.46,82.551 -150.82,82.551 -26.17,0 -50.95,-5.739 -73.36,-15.809 l -527.35,913.389 z m 570.09,1223.25 c 9.79,-2.57 20.02,-4.08 30.62,-4.08 10.6,0 20.82,1.51 30.62,4.08 L 2711.06,868.172 c -28.2,-26.133 -45.95,-63.363 -45.95,-104.832 0,-14.738 2.23,-28.961 6.37,-42.34 l -163.29,-94.281 c -14.91,10.59 -33.04,16.953 -52.72,16.953 -19.69,0 -37.81,-6.363 -52.73,-16.953 L 1201.06,1320.51 c 6.73,16.59 10.51,34.67 10.51,53.67 0,48.96 -24.63,92.14 -62.14,117.92 l 570.08,987.41 z M 3012.67,274.582 2546.05,543.98 c 0.25,2.77 0.83,5.442 0.83,8.27 0,7.621 -1.2,14.91 -2.96,21.98 l 159.39,92.02 c 26.12,-28.191 63.36,-45.949 104.83,-45.949 14.74,0 28.96,2.238 42.34,6.379 l 188.19,-325.961 c -9.68,-7.649 -18.4,-16.418 -26,-26.137 z M 1925.4,217.129 2392.09,486.57 c 16.45,-15.871 38.72,-25.73 63.38,-25.73 24.65,0 46.93,9.859 63.38,25.73 l 465.83,-268.949 c -2.74,-10.762 -4.36,-21.941 -4.72,-33.461 l -1050.74,-0.008 c -0.3,11.278 -1.53,22.309 -3.82,32.977 z M 3761.52,1492.08 c -37.49,-25.79 -62.11,-68.95 -62.11,-117.9 0,-18.98 3.78,-37.07 10.5,-53.65 L 2912.97,860.422 c -26.12,28.199 -63.36,45.949 -104.83,45.949 -14.74,0 -28.96,-2.242 -42.34,-6.379 L 1835.64,2511.09 c 14.42,14.54 25.04,32.78 30.58,53.12 l 1118.21,0 c 14.98,-83.92 88.16,-147.68 176.38,-147.68 21.36,0 41.76,3.93 60.76,10.78 l 539.95,-935.23 z m 80.93,25.14 c -7.26,0 -14.33,-0.72 -21.3,-1.76 l -544.7,943.44 c 38.92,32.9 63.7,82.02 63.7,136.97 0,99.04 -80.29,179.34 -179.34,179.34 -88.22,0 -161.4,-63.76 -176.38,-147.68 l -1118.21,0 c -13.92,51.13 -60.55,88.78 -116.09,88.78 -66.52,0 -120.44,-53.92 -120.44,-120.44 0,-33.07 13.35,-63.01 34.93,-84.78 l -574.83,-995.62 c -6.96,1.04 -14.02,1.75 -21.26,1.75 -78.995,0 -143.034,-64.04 -143.034,-143.04 0,-79 64.039,-143.04 143.034,-143.04 7.24,0 14.31,0.72 21.26,1.76 L 1624.32,307.07 C 1591.3,274.539 1570.79,229.352 1570.79,179.34 1570.79,80.2891 1651.08,0 1750.13,0 c 78.53,0 145.1,50.5586 169.38,120.832 l 1071.74,0 c 23.08,-56.4336 78.46,-96.2304 143.2,-96.2304 85.47,0 154.74,69.2773 154.74,154.7384 0,32.031 -9.73,61.781 -26.4,86.469 l 558.35,967.091 c 6.97,-1.04 14.05,-1.76 21.31,-1.76 79,0 143.04,64.04 143.04,143.04 0,79 -64.04,143.04 -143.04,143.04 z"
+         inkscape:connector-curvature="0" /></clipPath><linearGradient
+       id="linearGradient184"
+       spreadMethod="pad"
+       gradientTransform="matrix(3059.99,0,0,-3059.99,925.495,1387.6)"
+       gradientUnits="userSpaceOnUse"
+       y2="0"
+       x2="1"
+       y1="0"
+       x1="0"><stop
+         id="stop186"
+         offset="0"
+         style="stop-opacity:1;stop-color:#286b82" /><stop
+         id="stop188"
+         offset="0.994624"
+         style="stop-opacity:1;stop-color:#4ab0d3" /><stop
+         id="stop190"
+         offset="1"
+         style="stop-opacity:1;stop-color:#4ab0d3" /></linearGradient></defs><g
+     transform="matrix(1.25,0,0,-1.25,10,906.2025)"
+     id="g10"><g
+       transform="scale(0.1,0.1)"
+       id="g12"><path
+         id="path66"
+         style="fill:#3972c1;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 1426.99,4246.76 c -229.88,0 -416.25,186.36 -416.25,416.25 0,57.54 11.32,112.51 32.8,162.2 19.6,45.33 27.02,61.21 111.14,163.32 77.68,95.01 164.08,284.86 163.74,507.58 0.34,222.71 -86.06,412.56 -163.74,507.57 -84.12,102.1 -91.54,117.99 -111.14,163.32 -21.48,49.69 -32.8,104.66 -32.8,162.2 0,1.22 0.01,2.44 0.02,3.66 1.29,-153.33 87.58,-300.14 234.94,-371.48 51.79,-25.08 106.21,-38.45 160.28,-41.16 l -0.01,-0.01 0.02,0.01 c 3.78,-0.19 7.56,-0.29 11.33,-0.29 56.37,0 111.45,20.42 175.18,34.9 22.47,5.11 46.24,9.26 71.06,12.28 -78.99,-117.78 -141.31,-283.93 -138.87,-471 -2.78,-213.59 78.84,-399.91 173.32,-518.11 43.53,-54.45 88.85,-97.11 112.43,-152.77 l 0.01,-0.02 0,0 c 21.11,-49.85 32.79,-104.66 32.79,-162.2 0,-229.89 -186.36,-416.25 -416.25,-416.25"
+         inkscape:connector-curvature="0" /><path
+         id="path68"
+         style="fill:#3972c1;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 2926.45,5193.59 c -60.84,0 -122.66,13.41 -181.1,41.7 -51.79,25.08 -96.03,59.48 -131.69,100.2 l -0.01,0 -0.01,0.02 c -39.82,45.47 -58.47,104.86 -88.51,167.77 -65.21,136.54 -197.33,291.2 -390.78,381.77 -125.94,63.01 -257.18,87.84 -374.28,87.84 -33.48,0 -65.8,-2.03 -96.51,-5.78 11.19,16.7 22.72,32.42 34.45,47.09 43.53,54.46 88.85,97.12 112.43,152.78 l 0.01,0.02 0,0 c 21.11,49.84 32.79,104.66 32.79,162.2 0,229.89 -186.36,416.25 -416.25,416.25 -228.66,0 -414.27,-184.39 -416.23,-412.59 -0.52,61.97 12.85,125 41.68,184.56 71.89,148.47 220.36,234.95 374.95,234.95 60.84,0 122.66,-13.41 181.09,-41.69 51.79,-25.08 96.34,-59.22 131.7,-100.21 32.26,-37.4 43.32,-50.99 98.57,-171.2 51.66,-111.32 184.88,-271.82 385.48,-368.57 134.21,-65.23 272.09,-88.99 384.39,-88.99 55.31,0.01 104.42,5.77 143.81,15.18 101.38,24.62 133.71,29.67 167.04,29.67 8.94,0 17.96,-0.37 28.39,-0.81 54.08,-2.32 108.49,-16.09 160.28,-41.17 206.91,-100.18 293.43,-349.13 193.25,-556.04 -71.88,-148.48 -220.35,-234.95 -374.94,-234.95"
+         inkscape:connector-curvature="0" /><path
+         id="path70"
+         style="fill:#293c88;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 1417.32,5919.93 c -3.77,0 -7.55,0.1 -11.33,0.29 l -0.02,-0.01 0.01,0.01 c -54.07,2.71 -108.49,16.08 -160.28,41.16 -147.36,71.34 -233.65,218.15 -234.94,371.48 1.96,228.2 187.57,412.59 416.23,412.59 229.89,0 416.25,-186.36 416.25,-416.25 0,-57.54 -11.68,-112.36 -32.79,-162.2 l 0,0 -0.01,-0.02 c -23.58,-55.66 -68.9,-98.32 -112.43,-152.78 -11.73,-14.67 -23.26,-30.39 -34.45,-47.09 -24.82,-3.02 -48.59,-7.17 -71.06,-12.28 -63.73,-14.48 -118.81,-34.9 -175.18,-34.9"
+         inkscape:connector-curvature="0" /><path
+         id="path72"
+         style="fill:#3972c1;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 424.176,5071.93 C 189.91,5071.93 0,5261.84 0,5496.1 c 0,234.27 189.91,424.18 424.176,424.18 234.265,0 424.172,-189.91 424.172,-424.18 0,-234.26 -189.907,-424.17 -424.172,-424.17"
+         inkscape:connector-curvature="0" /><path
+         id="path74"
+         style="fill:#3972c1;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 2643.7,6321.27 c -234.27,0 -424.18,189.91 -424.18,424.18 0,234.26 189.91,424.17 424.18,424.17 234.26,0 424.17,-189.91 424.17,-424.17 0,-234.27 -189.91,-424.18 -424.17,-424.18"
+         inkscape:connector-curvature="0" /><g
+         id="g76"><g
+           clip-path="url(#clipPath80)"
+           id="g78" /></g><g
+         id="g108"><g
+           clip-path="url(#clipPath112)"
+           id="g110" /></g><g
+         id="g146"><g
+           clip-path="url(#clipPath150)"
+           id="g148" /></g><g
+         id="g176"><g
+           clip-path="url(#clipPath180)"
+           id="g178" /></g></g></g></svg>
\ No newline at end of file

From ab1520548d1df8922859da0a0a705951ee5505b4 Mon Sep 17 00:00:00 2001
From: endiliey <endiliey@gmail.com>
Date: Fri, 1 Nov 2019 01:25:10 +0700
Subject: [PATCH 30/46] chore: bump dependencies

---
 .../__snapshots__/anchors.test.js.snap        |   5 -
 .../lib/core/__tests__/anchors.test.js        | 125 ------
 .../docusaurus-1.x/lib/core/renderMarkdown.js |   7 +-
 packages/docusaurus-1.x/lib/core/toc.js       |   2 +-
 packages/docusaurus-1.x/package.json          |  22 +-
 packages/docusaurus/package.json              |   2 +-
 yarn.lock                                     | 399 +++++++-----------
 7 files changed, 181 insertions(+), 381 deletions(-)
 delete mode 100644 packages/docusaurus-1.x/lib/core/__tests__/__snapshots__/anchors.test.js.snap
 delete mode 100644 packages/docusaurus-1.x/lib/core/__tests__/anchors.test.js

diff --git a/packages/docusaurus-1.x/lib/core/__tests__/__snapshots__/anchors.test.js.snap b/packages/docusaurus-1.x/lib/core/__tests__/__snapshots__/anchors.test.js.snap
deleted file mode 100644
index fb2ff82f4654..000000000000
--- a/packages/docusaurus-1.x/lib/core/__tests__/__snapshots__/anchors.test.js.snap
+++ /dev/null
@@ -1,5 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Anchors rendering 1`] = `"<h1><a class=\\"anchor\\" aria-hidden=\\"true\\" id=\\"hello-world\\"></a><a href=\\"#hello-world\\" aria-hidden=\\"true\\" class=\\"hash-link\\"><svg class=\\"hash-link-icon\\" aria-hidden=\\"true\\" height=\\"16\\" version=\\"1.1\\" viewBox=\\"0 0 16 16\\" width=\\"16\\"><path fill-rule=\\"evenodd\\" d=\\"M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z\\"></path></svg></a>"`;
-
-exports[`Anchors rendering 2`] = `"<h2><a class=\\"anchor\\" aria-hidden=\\"true\\" id=\\"hello-small-world\\"></a><a href=\\"#hello-small-world\\" aria-hidden=\\"true\\" class=\\"hash-link\\"><svg class=\\"hash-link-icon\\" aria-hidden=\\"true\\" height=\\"16\\" version=\\"1.1\\" viewBox=\\"0 0 16 16\\" width=\\"16\\"><path fill-rule=\\"evenodd\\" d=\\"M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z\\"></path></svg></a>"`;
diff --git a/packages/docusaurus-1.x/lib/core/__tests__/anchors.test.js b/packages/docusaurus-1.x/lib/core/__tests__/anchors.test.js
deleted file mode 100644
index 489f6ca1cd65..000000000000
--- a/packages/docusaurus-1.x/lib/core/__tests__/anchors.test.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * 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 rules = require('remarkable/lib/rules');
-const anchors = require('../anchors');
-
-const md = {
-  renderer: {
-    rules: {
-      heading_open: rules.heading_open,
-    },
-  },
-};
-
-anchors(md);
-
-const render = md.renderer.rules.heading_open;
-
-test('Anchors rendering', () => {
-  expect(
-    render([{hLevel: 1}, {content: 'Hello world'}], 0, {}, {}),
-  ).toMatchSnapshot();
-  expect(
-    render([{hLevel: 2}, {content: 'Hello small world'}], 0, {}, {}),
-  ).toMatchSnapshot();
-  expect(
-    render([{hLevel: 2}, {content: 'Some _ Heading'}], 0, {}, {}),
-  ).toContain('id="some-_-heading"');
-  expect(render([{hLevel: 2}, {content: 'foo-_ bar'}], 0, {}, {})).toContain(
-    'id="foo-_-bar"',
-  );
-});
-
-test('Each anchor is unique across rendered document', () => {
-  const tokens = [
-    {hLevel: 1},
-    {content: 'Almost unique heading'},
-    {hLevel: 1},
-    {content: 'Almost unique heading'},
-    {hLevel: 1},
-    {content: 'Almost unique heading 1'},
-    {hLevel: 1},
-    {content: 'Almost unique heading 1'},
-    {hLevel: 1},
-    {content: 'Almost unique heading 2'},
-    {hLevel: 1},
-    {content: 'Almost unique heading'},
-  ];
-  const options = {};
-  const env = {};
-
-  expect(render(tokens, 0, options, env)).toContain(
-    'id="almost-unique-heading"',
-  );
-  expect(render(tokens, 2, options, env)).toContain(
-    'id="almost-unique-heading-1"',
-  );
-  expect(render(tokens, 4, options, env)).toContain(
-    'id="almost-unique-heading-1-1"',
-  );
-  expect(render(tokens, 6, options, env)).toContain(
-    'id="almost-unique-heading-1-2"',
-  );
-  expect(render(tokens, 8, options, env)).toContain(
-    'id="almost-unique-heading-2"',
-  );
-  expect(render(tokens, 10, options, env)).toContain(
-    'id="almost-unique-heading-3"',
-  );
-});
-
-test('Each anchor is unique across rendered document. Case 2', () => {
-  const tokens = [
-    {hLevel: 1},
-    {content: 'foo'},
-    {hLevel: 1},
-    {content: 'foo 1'},
-    {hLevel: 1},
-    {content: 'foo'},
-    {hLevel: 1},
-    {content: 'foo 1'},
-  ];
-  const options = {};
-  const env = {};
-
-  expect(render(tokens, 0, options, env)).toContain('id="foo"');
-  expect(render(tokens, 2, options, env)).toContain('id="foo-1"');
-  expect(render(tokens, 4, options, env)).toContain('id="foo-2"');
-  expect(render(tokens, 6, options, env)).toContain('id="foo-1-1"');
-});
-
-test('Anchor index resets on each render', () => {
-  const tokens = [
-    {hLevel: 1},
-    {content: 'Almost unique heading'},
-    {hLevel: 1},
-    {content: 'Almost unique heading'},
-  ];
-  const options = {};
-  const env = {};
-  const env2 = {};
-
-  expect(render(tokens, 0, options, env)).toContain(
-    'id="almost-unique-heading"',
-  );
-  expect(render(tokens, 2, options, env)).toContain(
-    'id="almost-unique-heading-1"',
-  );
-
-  expect(render(tokens, 0, options, env2)).toContain(
-    'id="almost-unique-heading"',
-  );
-  expect(render(tokens, 2, options, env2)).toContain(
-    'id="almost-unique-heading-1"',
-  );
-});
-
-test('Anchor uses default renderer when empty', () => {
-  expect(render([{hLevel: 1}, {content: null}], 0, {}, {})).toEqual('<h1>');
-  expect(render([{hLevel: 2}, {content: ''}], 0, {}, {})).toEqual('<h2>');
-});
diff --git a/packages/docusaurus-1.x/lib/core/renderMarkdown.js b/packages/docusaurus-1.x/lib/core/renderMarkdown.js
index 4b6cac348cff..6adbb66d79ed 100644
--- a/packages/docusaurus-1.x/lib/core/renderMarkdown.js
+++ b/packages/docusaurus-1.x/lib/core/renderMarkdown.js
@@ -7,7 +7,8 @@
 
 const _ = require('lodash');
 const hljs = require('highlight.js');
-const Markdown = require('remarkable');
+const {Remarkable: Markdown} = require('remarkable');
+const {linkify} = require('remarkable/linkify');
 const prismjs = require('prismjs');
 const loadLanguages = require('prismjs/components/index');
 const chalk = require('chalk');
@@ -83,7 +84,6 @@ class MarkdownRenderer {
         return '';
       },
       html: true,
-      linkify: true,
     };
 
     // Allow overriding default options
@@ -100,6 +100,9 @@ class MarkdownRenderer {
     // Register anchors plugin
     md.use(anchors);
 
+    // Linkify
+    md.use(linkify);
+
     // Allow client sites to register their own plugins
     if (siteConfig.markdownPlugins) {
       siteConfig.markdownPlugins.forEach(plugin => {
diff --git a/packages/docusaurus-1.x/lib/core/toc.js b/packages/docusaurus-1.x/lib/core/toc.js
index 36626be16a26..0c84b9470584 100644
--- a/packages/docusaurus-1.x/lib/core/toc.js
+++ b/packages/docusaurus-1.x/lib/core/toc.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-const Remarkable = require('remarkable');
+const {Remarkable} = require('remarkable');
 const mdToc = require('markdown-toc');
 const striptags = require('striptags');
 const toSlug = require('./toSlug');
diff --git a/packages/docusaurus-1.x/package.json b/packages/docusaurus-1.x/package.json
index 679628af0492..6565ce9bbe59 100644
--- a/packages/docusaurus-1.x/package.json
+++ b/packages/docusaurus-1.x/package.json
@@ -35,10 +35,10 @@
     "@babel/register": "^7.6.2",
     "@babel/traverse": "^7.6.3",
     "@babel/types": "^7.6.3",
-    "autoprefixer": "^9.6.1",
+    "autoprefixer": "^9.7.0",
     "babylon": "^6.18.0",
     "chalk": "^2.4.2",
-    "chokidar": "^3.0.2",
+    "chokidar": "^3.2.3",
     "classnames": "^2.2.6",
     "color": "^2.0.1",
     "commander": "^2.20.0",
@@ -50,23 +50,23 @@
     "feed": "^1.1.0",
     "fs-extra": "^8.1.0",
     "gaze": "^1.1.3",
-    "glob": "^7.1.3",
-    "highlight.js": "^9.15.8",
-    "imagemin": "^6.0.0",
+    "glob": "^7.1.5",
+    "highlight.js": "^9.16.1",
+    "imagemin": "^7.0.0",
     "imagemin-gifsicle": "^6.0.1",
     "imagemin-jpegtran": "^6.0.0",
-    "imagemin-optipng": "^6.0.0",
+    "imagemin-optipng": "^7.1.0",
     "imagemin-svgo": "^7.0.0",
     "lodash": "^4.17.15",
     "markdown-toc": "^1.2.0",
     "mkdirp": "^0.5.1",
-    "portfinder": "^1.0.21",
-    "postcss": "^7.0.17",
+    "portfinder": "^1.0.25",
+    "postcss": "^7.0.21",
     "prismjs": "^1.17.1",
     "react": "^16.8.4",
-    "react-dev-utils": "^9.0.1",
+    "react-dev-utils": "^9.1.0",
     "react-dom": "^16.8.4",
-    "remarkable": "^1.7.4",
+    "remarkable": "^2.0.0",
     "request": "^2.88.0",
     "shelljs": "^0.8.3",
     "sitemap": "^3.2.2",
@@ -74,6 +74,6 @@
     "tcp-port-used": "^1.0.1",
     "tiny-lr": "^1.1.1",
     "tree-node-cli": "^1.2.5",
-    "truncate-html": "^1.0.2"
+    "truncate-html": "^1.0.3"
   }
 }
diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json
index 0ca4a998b4e8..478ee2aaf4a4 100644
--- a/packages/docusaurus/package.json
+++ b/packages/docusaurus/package.json
@@ -74,7 +74,7 @@
     "@endiliey/static-site-generator-webpack-plugin": "^4.0.0",
     "std-env": "^2.2.1",
     "style-loader": "^1.0.0",
-    "terser-webpack-plugin": "^2.1.3",
+    "terser-webpack-plugin": "^2.2.1",
     "wait-file": "^1.0.5",
     "webpack": "^4.41.2",
     "webpack-bundle-analyzer": "^3.6.0",
diff --git a/yarn.lock b/yarn.lock
index 5537455d1139..91767fdbaee3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3094,11 +3094,6 @@ acorn@^6.2.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e"
   integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==
 
-address@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/address/-/address-1.1.0.tgz#ef8e047847fcd2c5b6f50c16965f924fd99fe709"
-  integrity sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ==
-
 address@1.1.2, address@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
@@ -3314,14 +3309,6 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.2.tgz#ddb3a8495d44875423af7b919aace11e91732a41"
-  integrity sha512-rUe9SxpRQlVg4EM8It7JMNWWYHAirTPpbTuvaSKybb5IejNgWB3PGBBX9rrPKDx2pM/p3Wh+7+ASaWRyyAbxmQ==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
 anymatch@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
@@ -3413,11 +3400,6 @@ array-filter@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
   integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
 
-array-filter@~0.0.0:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
-  integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
-
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -3446,16 +3428,6 @@ array-includes@^3.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.7.0"
 
-array-map@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
-  integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=
-
-array-reduce@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
-  integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
-
 array-union@^1.0.1, array-union@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -3605,18 +3577,18 @@ autocomplete.js@0.36.0:
   dependencies:
     immediate "^3.2.3"
 
+autolinker@^3.11.0:
+  version "3.11.1"
+  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-3.11.1.tgz#aa4f910371df091b0d714d8d6e700d53f357ce95"
+  integrity sha512-6sAmetStorjXvwmV8MBxI5DGICHKD1B5EjdkIrq34X6YBDN6jj54EUHnoHgNqmNCclcf8c409zuVMNy449u80g==
+  dependencies:
+    tslib "^1.9.3"
+
 autolinker@~0.15.0:
   version "0.15.3"
   resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.15.3.tgz#342417d8f2f3461b14cf09088d5edf8791dc9832"
   integrity sha1-NCQX2PLzRhsUzwkIjV7fh5HcmDI=
 
-autolinker@~0.28.0:
-  version "0.28.1"
-  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47"
-  integrity sha1-BlK0kYgYefB3XazgzcoyM5QqTkc=
-  dependencies:
-    gulp-header "^1.7.1"
-
 autoprefixer@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
@@ -3630,6 +3602,19 @@ autoprefixer@^9.6.1:
     postcss "^7.0.17"
     postcss-value-parser "^4.0.0"
 
+autoprefixer@^9.7.0:
+  version "9.7.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.0.tgz#905ec19e50f04545fe9ff131182cc9ab25246901"
+  integrity sha512-j2IRvaCfrUxIiZun9ba4mhJ2omhw4OY88/yVzLO+lHhGBumAAK72PgM6gkbSN8iregPOn1ZlxGkmZh2CQ7X4AQ==
+  dependencies:
+    browserslist "^4.7.2"
+    caniuse-lite "^1.0.30001004"
+    chalk "^2.4.2"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.19"
+    postcss-value-parser "^4.0.2"
+
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
@@ -3960,7 +3945,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.1, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -4043,16 +4028,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.6.6, browserslist@^4.6.3, browserslist@^4.6.4:
-  version "4.6.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz#6e4bf467cde520bc9dbdf3747dafa03531cec453"
-  integrity sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==
-  dependencies:
-    caniuse-lite "^1.0.30000984"
-    electron-to-chromium "^1.3.191"
-    node-releases "^1.1.25"
-
-browserslist@4.7.0, browserslist@^4.6.0, browserslist@^4.6.6:
+browserslist@4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17"
   integrity sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==
@@ -4061,14 +4037,14 @@ browserslist@4.7.0, browserslist@^4.6.0, browserslist@^4.6.6:
     electron-to-chromium "^1.3.247"
     node-releases "^1.1.29"
 
-browserslist@^4.0.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
-  integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
+browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.6.4, browserslist@^4.6.6, browserslist@^4.7.2:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.2.tgz#1bb984531a476b5d389cedecb195b2cd69fb1348"
+  integrity sha512-uZavT/gZXJd2UTi9Ov7/Z340WOSQ3+m1iBVRUknf+okKxonL9P83S3ctiBDtuRmRu8PiCHjqyueqQ9HYlJhxiw==
   dependencies:
-    caniuse-lite "^1.0.30000971"
-    electron-to-chromium "^1.3.137"
-    node-releases "^1.1.21"
+    caniuse-lite "^1.0.30001004"
+    electron-to-chromium "^1.3.295"
+    node-releases "^1.1.38"
 
 bser@^2.0.0:
   version "2.0.0"
@@ -4416,11 +4392,16 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000971, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000984, caniuse-lite@^1.0.30000989:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989:
   version "1.0.30001002"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001002.tgz#ba999a737b1abd5bf0fd47efe43a09b9cadbe9b0"
   integrity sha512-pRuxPE8wdrWmVPKcDmJJiGBxr6lFJq4ivdSeo9FTmGj5Rb8NX3Mby2pARG57MXF15hYAhZ0nHV5XxT2ig4bz3g==
 
+caniuse-lite@^1.0.30001004:
+  version "1.0.30001006"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001006.tgz#5b6e8288792cfa275f007b2819a00ccad7112655"
+  integrity sha512-MXnUVX27aGs/QINz+QG1sWSLDr3P1A3Hq5EUWoIt0T7K24DuvMxZEnh3Y5aHlJW6Bz2aApJdSewdYLd8zQnUuw==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -4575,21 +4556,6 @@ chokidar@^2.0.4, chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz#0d1cd6d04eb2df0327446188cd13736a3367d681"
-  integrity sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==
-  dependencies:
-    anymatch "^3.0.1"
-    braces "^3.0.2"
-    glob-parent "^5.0.0"
-    is-binary-path "^2.1.0"
-    is-glob "^4.0.1"
-    normalize-path "^3.0.0"
-    readdirp "^3.1.1"
-  optionalDependencies:
-    fsevents "^2.0.6"
-
 chokidar@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.2.2.tgz#a433973350021e09f2b853a2287781022c0dc935"
@@ -4605,6 +4571,21 @@ chokidar@^3.2.2:
   optionalDependencies:
     fsevents "~2.1.1"
 
+chokidar@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.2.3.tgz#b9270a565d14f02f6bfdd537a6a2bbf5549b8c8c"
+  integrity sha512-GtrxGuRf6bzHQmXWRepvsGnXpkQkVU+D2/9a7dAe4a7v1NhrfZOZ2oKf76M3nOs46fFYL8D+Q8JYA4GYeJ8Cjw==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.2.0"
+  optionalDependencies:
+    fsevents "~2.1.1"
+
 chownr@^1.0.1, chownr@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"
@@ -4921,13 +4902,6 @@ concat-stream@^2.0.0:
     readable-stream "^3.0.2"
     typedarray "^0.0.6"
 
-concat-with-sourcemaps@*:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
-  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
-  dependencies:
-    source-map "^0.6.1"
-
 config-chain@^1.1.11:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
@@ -6099,21 +6073,16 @@ ejs@^2.6.2:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.2.tgz#3a32c63d1cd16d11266cd4703b14fec4e74ab4f6"
   integrity sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==
 
-electron-to-chromium@^1.3.137:
-  version "1.3.148"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.148.tgz#5796c0d9eb0358d397163413b90bf376c5d8bf08"
-  integrity sha512-nuCOlXNlGMQmdzihIPGm2K3Yf3H1hke/1rK381i02pH8wNliJU9hVNnOi/xjmxt+mjABd/BzufP5nPHWKshLWA==
-
-electron-to-chromium@^1.3.191:
-  version "1.3.195"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.195.tgz#d856ac85e6488365b6ae9abca0ce8d0032216e01"
-  integrity sha512-1pkd/paxpHb/kRTvuq8iJl0KP2YliWpiVGMM3nvwFCShLkuZBdUTJvYRjVsp7+9dQ6mpRFxLJHF3CyVxDseidA==
-
 electron-to-chromium@^1.3.247:
   version "1.3.260"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.260.tgz#ffd686b4810bab0e1a428e7af5f08c21fe7c1fa2"
   integrity sha512-wGt+OivF1C1MPwaSv3LJ96ebNbLAWlx3HndivDDWqwIVSQxmhL17Y/YmwUdEMtS/bPyommELt47Dct0/VZNQBQ==
 
+electron-to-chromium@^1.3.295:
+  version "1.3.296"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.296.tgz#a1d4322d742317945285d3ba88966561b67f3ac8"
+  integrity sha512-s5hv+TSJSVRsxH190De66YHb50pBGTweT9XGWYu/LMR20KX6TsjFzObo36CjVAzM+PUeeKSBRtm/mISlCzeojQ==
+
 elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
@@ -7007,11 +6976,16 @@ file-type@5.2.0, file-type@^5.2.0:
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"
   integrity sha1-LdvqfHP/42No365J3DOMBYwritY=
 
-file-type@^10.4.0, file-type@^10.7.0:
+file-type@^10.4.0:
   version "10.11.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.11.0.tgz#2961d09e4675b9fb9a3ee6b69e9cd23f43fd1890"
   integrity sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==
 
+file-type@^12.0.0:
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.3.1.tgz#8a13bb49332295e5b02c2d6bba6a6a179bd5898c"
+  integrity sha512-FXxY5h6vSYMjrRal4YqbtfuoKD/oE0AMjJ7E5Hm+BdaQECcFVD03B41RAWYJ7wyuLr/wRnCtFo7y37l+nh+TAA==
+
 file-type@^3.8.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
@@ -7327,11 +7301,6 @@ fsevents@^1.2.7:
     nan "^2.12.1"
     node-pre-gyp "^0.12.0"
 
-fsevents@^2.0.6:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz#382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"
-  integrity sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==
-
 fsevents@~2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.1.tgz#74c64e21df71721845d0c44fe54b7f56b82995a9"
@@ -7592,6 +7561,18 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.5:
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0"
+  integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-modules@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
@@ -7621,7 +7602,7 @@ globals@^11.0.1, globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globby@8.0.2, globby@^8.0.1:
+globby@8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
   integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
@@ -7634,7 +7615,7 @@ globby@8.0.2, globby@^8.0.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
-globby@^10.0.1:
+globby@^10.0.0, globby@^10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.1.tgz#4782c34cb75dd683351335c5829cc3420e606b22"
   integrity sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==
@@ -7795,15 +7776,6 @@ gud@^1.0.0:
   resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0"
   integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==
 
-gulp-header@^1.7.1:
-  version "1.8.12"
-  resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84"
-  integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ==
-  dependencies:
-    concat-with-sourcemaps "*"
-    lodash.template "^4.4.0"
-    through2 "^2.0.0"
-
 gzip-size@5.1.1, gzip-size@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
@@ -8002,10 +7974,10 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-highlight.js@^9.15.8:
-  version "9.15.10"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.10.tgz#7b18ed75c90348c045eef9ed08ca1319a2219ad2"
-  integrity sha512-RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw==
+highlight.js@^9.16.1:
+  version "9.16.1"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.1.tgz#827f49ca96eae006d8a2a0d5e3acd56041c26fc5"
+  integrity sha512-pyyiU56NR1XSm8M/l1QDKGGCA2n2GrcTxFahBo4v/2dH3gy4IiALczwhC9YJicyjoRh6JQWM+h3PvY1ZZ+D0+g==
 
 history@^4.9.0:
   version "4.9.0"
@@ -8311,14 +8283,14 @@ imagemin-jpegtran@^6.0.0:
     is-jpg "^2.0.0"
     jpegtran-bin "^4.0.0"
 
-imagemin-optipng@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-6.0.0.tgz#a6bfc7b542fc08fc687e83dfb131249179a51a68"
-  integrity sha512-FoD2sMXvmoNm/zKPOWdhKpWdFdF9qiJmKC17MxZJPH42VMAp17/QENI/lIuP7LCUnLVAloO3AUoTSNzfhpyd8A==
+imagemin-optipng@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-7.1.0.tgz#2225c82c35e5c29b7fa98d4f9ecee1161a68e888"
+  integrity sha512-JNORTZ6j6untH7e5gF4aWdhDCxe3ODsSLKs/f7Grewy3ebZpl1ZsU+VUTPY4rzeHgaFA8GSWOoA8V2M3OixWZQ==
   dependencies:
     exec-buffer "^3.0.0"
-    is-png "^1.0.0"
-    optipng-bin "^5.0.0"
+    is-png "^2.0.0"
+    optipng-bin "^6.0.0"
 
 imagemin-svgo@^7.0.0:
   version "7.0.0"
@@ -8328,16 +8300,16 @@ imagemin-svgo@^7.0.0:
     is-svg "^3.0.0"
     svgo "^1.0.5"
 
-imagemin@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/imagemin/-/imagemin-6.1.0.tgz#62508b465728fea36c03cdc07d915fe2d8cf9e13"
-  integrity sha512-8ryJBL1CN5uSHpiBMX0rJw79C9F9aJqMnjGnrd/1CafegpNuA81RBAAru/jQQEOWlOJJlpRnlcVFF6wq+Ist0A==
+imagemin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/imagemin/-/imagemin-7.0.0.tgz#48651ab86c1975157306e3a18f8994814db085ff"
+  integrity sha512-TXvCSSIYl4KQUASur9S0+E4olVECzvxvZABU9rNqsza7vzIrUQMRTjyczGf8OmtcgvZ9jOYyinXW3epOpd/04A==
   dependencies:
-    file-type "^10.7.0"
-    globby "^8.0.1"
-    make-dir "^1.0.0"
-    p-pipe "^1.1.0"
-    pify "^4.0.1"
+    file-type "^12.0.0"
+    globby "^10.0.0"
+    junk "^3.1.0"
+    make-dir "^3.0.0"
+    p-pipe "^3.0.0"
     replace-ext "^1.0.0"
 
 immediate@^3.2.3:
@@ -8642,7 +8614,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-binary-path@^2.1.0, is-binary-path@~2.1.0:
+is-binary-path@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
   integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
@@ -8911,10 +8883,10 @@ is-plain-object@^3.0.0:
   dependencies:
     isobject "^4.0.0"
 
-is-png@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-png/-/is-png-1.1.0.tgz#d574b12bf275c0350455570b0e5b57ab062077ce"
-  integrity sha1-1XSxK/J1wDUEVVcLDltXqwYgd84=
+is-png@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-png/-/is-png-2.0.0.tgz#ee8cbc9e9b050425cedeeb4a6fb74a649b0a4a8d"
+  integrity sha512-4KPGizaVGj2LK7xwJIz8o5B2ubu1D/vcQsgOGFEDlpcvgZHto4gBnyd0ig7Ws+67ixmwKoNmu0hYnpo6AaKb5g==
 
 is-promise@^2.1.0:
   version "2.1.0"
@@ -9676,11 +9648,6 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
-
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -9703,6 +9670,11 @@ jsx-ast-utils@^2.0.1, jsx-ast-utils@^2.1.0:
   dependencies:
     array-includes "^3.0.3"
 
+junk@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
+  integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
+
 keyv@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
@@ -10130,7 +10102,7 @@ lodash.template@^4.0.2:
     lodash._reinterpolate "~3.0.0"
     lodash.templatesettings "^4.0.0"
 
-lodash.template@^4.4.0, lodash.template@^4.5.0:
+lodash.template@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
   integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
@@ -11085,20 +11057,6 @@ node-pre-gyp@^0.12.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.21:
-  version "1.1.23"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.23.tgz#de7409f72de044a2fa59c097f436ba89c39997f0"
-  integrity sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==
-  dependencies:
-    semver "^5.3.0"
-
-node-releases@^1.1.25:
-  version "1.1.25"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.25.tgz#0c2d7dbc7fed30fbe02a9ee3007b8c90bf0133d3"
-  integrity sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==
-  dependencies:
-    semver "^5.3.0"
-
 node-releases@^1.1.29:
   version "1.1.30"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.30.tgz#35eebf129c63baeb6d8ddeda3c35b05abfd37f7f"
@@ -11106,6 +11064,13 @@ node-releases@^1.1.29:
   dependencies:
     semver "^5.3.0"
 
+node-releases@^1.1.38:
+  version "1.1.39"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.39.tgz#c1011f30343aff5b633153b10ff691d278d08e8d"
+  integrity sha512-8MRC/ErwNCHOlAFycy9OPca46fQYUjbJRDcZTHVWIGXIjYLM73k70vv3WkYutVnM4cCo4hE0MqBVVZjP6vjISA==
+  dependencies:
+    semver "^6.3.0"
+
 node-vibrant@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/node-vibrant/-/node-vibrant-3.1.3.tgz#0172ce83e35a3f6cd2223a00545a2012eab369da"
@@ -11509,10 +11474,10 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-optipng-bin@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-5.1.0.tgz#a7c7ab600a3ab5a177dae2f94c2d800aa386b5a9"
-  integrity sha512-9baoqZTNNmXQjq/PQTWEXbVV3AMO2sI/GaaqZJZ8SExfAzjijeAP7FEeT+TtyumSw7gr0PZtSUYB/Ke7iHQVKA==
+optipng-bin@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-6.0.0.tgz#376120fa79d5e71eee2f524176efdd3a5eabd316"
+  integrity sha512-95bB4y8IaTsa/8x6QH4bLUuyvyOoGBCLDA7wOgDL8UFqJpSUh1Hob8JRJhit+wC1ZLN3tQ7mFt7KuBj0x8F2Wg==
   dependencies:
     bin-build "^3.0.0"
     bin-wrapper "^4.0.0"
@@ -11689,11 +11654,16 @@ p-map@^3.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
-p-pipe@^1.1.0, p-pipe@^1.2.0:
+p-pipe@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
   integrity sha1-SxoROZoRUgpneQ7loMHViB1r7+k=
 
+p-pipe@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-3.0.0.tgz#ab1fb87c0b8dd79b3bb03a8a23680fc9d054e132"
+  integrity sha512-gwwdRFmaxsT3IU+Tl3vYKVRdjfhg8Bbdjw7B+E0y6F7Yz6l+eaQLn0BRmGMXIhcPDONPtOkMoNwx1etZh4zPJA==
+
 p-queue@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-4.0.0.tgz#ed0eee8798927ed6f2c2f5f5b77fdb2061a5d346"
@@ -12101,7 +12071,7 @@ pngjs@^3.0.0, pngjs@^3.3.3:
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
   integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
-portfinder@^1.0.21, portfinder@^1.0.24:
+portfinder@^1.0.24:
   version "1.0.24"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.24.tgz#11efbc6865f12f37624b6531ead1d809ed965cfa"
   integrity sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==
@@ -12727,6 +12697,11 @@ postcss-value-parser@^4.0.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz#99a983d365f7b2ad8d0f9b8c3094926eab4b936d"
   integrity sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==
 
+postcss-value-parser@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
+  integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
+
 postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f"
@@ -12754,6 +12729,15 @@ postcss@^7.0.17:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+postcss@^7.0.19, postcss@^7.0.21:
+  version "7.0.21"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17"
+  integrity sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.16"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"
@@ -13167,37 +13151,6 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dev-utils@^9.0.1:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.0.3.tgz#7607455587abb84599451460eb37cef0b684131a"
-  integrity sha512-OyInhcwsvycQ3Zr2pQN+HV4gtRXrky5mJXIy4HnqrWa+mI624xfYfqGuC9dYbxp4Qq3YZzP8GSGQjv0AgNU15w==
-  dependencies:
-    "@babel/code-frame" "7.5.5"
-    address "1.1.0"
-    browserslist "4.6.6"
-    chalk "2.4.2"
-    cross-spawn "6.0.5"
-    detect-port-alt "1.1.6"
-    escape-string-regexp "1.0.5"
-    filesize "3.6.1"
-    find-up "3.0.0"
-    fork-ts-checker-webpack-plugin "1.5.0"
-    global-modules "2.0.0"
-    globby "8.0.2"
-    gzip-size "5.1.1"
-    immer "1.10.0"
-    inquirer "6.5.0"
-    is-root "2.1.0"
-    loader-utils "1.2.3"
-    open "^6.3.0"
-    pkg-up "2.0.0"
-    react-error-overlay "^6.0.1"
-    recursive-readdir "2.2.2"
-    shell-quote "1.6.1"
-    sockjs-client "1.3.0"
-    strip-ansi "5.2.0"
-    text-table "0.2.0"
-
 react-dev-utils@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.1.0.tgz#3ad2bb8848a32319d760d0a84c56c14bdaae5e81"
@@ -13239,11 +13192,6 @@ react-dom@^16.8.4:
     prop-types "^15.6.2"
     scheduler "^0.15.0"
 
-react-error-overlay@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.1.tgz#b8d3cf9bb991c02883225c48044cb3ee20413e0f"
-  integrity sha512-V9yoTr6MeZXPPd4nV/05eCBvGH9cGzc52FN8fs0O0TVQ3HYYf1n7EgZVtHbldRq5xU9zEzoXIITjYNIfxDDdUw==
-
 react-error-overlay@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.3.tgz#c378c4b0a21e88b2e159a3e62b2f531fd63bf60d"
@@ -13544,13 +13492,6 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.1.tgz#b158123ac343c8b0f31d65680269cc0fc1025db1"
-  integrity sha512-XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ==
-  dependencies:
-    picomatch "^2.0.4"
-
 readdirp@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
@@ -13815,13 +13756,13 @@ remarkable@^1.7.1:
     argparse "~0.1.15"
     autolinker "~0.15.0"
 
-remarkable@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00"
-  integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg==
+remarkable@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-2.0.0.tgz#795f965bede8300362ce51a716edc322d9e7a4ca"
+  integrity sha512-3gvKFAgL4xmmVRKAMNm6UzDo/rO2gPVkZrWagp6AXEA4JvCcMcRx9aapYbb7AJAmLLvi/u06+EhzqoS7ha9qOg==
   dependencies:
     argparse "^1.0.10"
-    autolinker "~0.28.0"
+    autolinker "^3.11.0"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
@@ -14202,7 +14143,7 @@ schema-utils@^2.0.0:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.0.1, schema-utils@^2.4.1:
+schema-utils@^2.0.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.4.1.tgz#e89ade5d056dc8bcaca377574bb4a9c4e1b8be56"
   integrity sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==
@@ -14210,6 +14151,14 @@ schema-utils@^2.0.1, schema-utils@^2.4.1:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
 
+schema-utils@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz#8f254f618d402cc80257486213c8970edfd7c22f"
+  integrity sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==
+  dependencies:
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+
 section-matter@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167"
@@ -14421,16 +14370,6 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
-  integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=
-  dependencies:
-    array-filter "~0.0.0"
-    array-map "~0.0.0"
-    array-reduce "~0.0.0"
-    jsonify "~0.0.0"
-
 shell-quote@1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
@@ -14567,18 +14506,6 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-sockjs-client@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
-  integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==
-  dependencies:
-    debug "^3.2.5"
-    eventsource "^1.0.7"
-    faye-websocket "~0.11.1"
-    inherits "^2.0.3"
-    json3 "^3.3.2"
-    url-parse "^1.4.3"
-
 sockjs-client@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
@@ -15296,18 +15223,18 @@ terser-webpack-plugin@^1.4.1:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.1.3.tgz#85430da71ba88a60072bf659589eafaf6a00dc22"
-  integrity sha512-z5Utx0TxmirZvRNL1GC795tlDM+bO83ZfcbtkL1y1VLoWtZ7S2a9+HFCLnabSRE/Yjsu4zCEX6U6CIRo4dVmcQ==
+terser-webpack-plugin@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.2.1.tgz#5569e6c7d8be79e5e43d6da23acc3b6ba77d22bd"
+  integrity sha512-jwdauV5Al7zopR6OAYvIIRcxXCSvLjZjr7uZE8l2tIWb/ryrGN48sJftqGf5k9z09tWhajx53ldp0XPI080YnA==
   dependencies:
     cacache "^13.0.1"
     find-cache-dir "^3.0.0"
     jest-worker "^24.9.0"
-    schema-utils "^2.4.1"
+    schema-utils "^2.5.0"
     serialize-javascript "^2.1.0"
     source-map "^0.6.1"
-    terser "^4.3.8"
+    terser "^4.3.9"
     webpack-sources "^1.4.3"
 
 terser@^4.1.2:
@@ -15319,10 +15246,10 @@ terser@^4.1.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^4.3.8:
-  version "4.3.8"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.8.tgz#707f05f3f4c1c70c840e626addfdb1c158a17136"
-  integrity sha512-otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ==
+terser@^4.3.9:
+  version "4.3.9"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.9.tgz#e4be37f80553d02645668727777687dad26bbca8"
+  integrity sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -15605,7 +15532,7 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e"
   integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==
 
-truncate-html@^1.0.2:
+truncate-html@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/truncate-html/-/truncate-html-1.0.3.tgz#0166dfc7890626130c2e4174c6b73d4d63993e5f"
   integrity sha512-1o1prdRv+iehXcGwn29YgXU17DotHkr+OK3ijVEG7FGMwHNG9RyobXwimw6djDvbIc24rhmz3tjNNvNESjkNkQ==
@@ -15618,7 +15545,7 @@ tryer@^1.0.0:
   resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
   integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
 
-tslib@^1.9.0:
+tslib@^1.9.0, tslib@^1.9.3:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==

From 472c8fc176028a5b8f11d969e20f00c88e358711 Mon Sep 17 00:00:00 2001
From: Joel Ibaceta <mail@joelibaceta.com>
Date: Thu, 31 Oct 2019 19:54:41 -0500
Subject: [PATCH 31/46] docs(v2): fix typo in advanced plugins (#1926)

---
 website/docs/advanced-plugins.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/advanced-plugins.md b/website/docs/advanced-plugins.md
index 80ff73a11788..a402f5021749 100644
--- a/website/docs/advanced-plugins.md
+++ b/website/docs/advanced-plugins.md
@@ -108,7 +108,7 @@ Provides the [Docs](markdown-features.mdx) functionality and is the default docs
 module.exports = {
   plugins: [
     [
-      '@docuaurus/plugin-content-docs',
+      '@docusaurus/plugin-content-docs',
       {
         /**
          * Path to data on filesystem

From b8335fe925f3e9e7918436acccbba78b0c1f67b2 Mon Sep 17 00:00:00 2001
From: Alexey Pyltsyn <lex61rus@gmail.com>
Date: Sat, 2 Nov 2019 03:12:04 +0300
Subject: [PATCH 32/46] docs(v2): fix typos (#1930)

---
 website/docs/installation.md | 2 +-
 website/docs/presets.md      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/docs/installation.md b/website/docs/installation.md
index 053c99ac5216..c44674ff657e 100644
--- a/website/docs/installation.md
+++ b/website/docs/installation.md
@@ -71,7 +71,7 @@ my-website
 
 ## Running the development server
 
-To preview your changes as you edit the files, you can run a local development server that will serve your website and it will reflect the latest chages
+To preview your changes as you edit the files, you can run a local development server that will serve your website and it will reflect the latest changes.
 
 ```bash
 cd my-website
diff --git a/website/docs/presets.md b/website/docs/presets.md
index ab1ee6539af3..ab7a8dca3b70 100644
--- a/website/docs/presets.md
+++ b/website/docs/presets.md
@@ -85,7 +85,7 @@ The classic preset that is usually shipped by default to new docusaurus website.
 |                                  | @docusaurus/plugin-google-gtag      |
 |                                  | @docusaurus/plugin-sitemap          |
 
-To specify plugin options individually, you can provide the neccesary fields to certain plugins, i.e. `customCss` for `@docusaurus/theme-classic`, pass them in the preset field, like this:
+To specify plugin options individually, you can provide the necessary fields to certain plugins, i.e. `customCss` for `@docusaurus/theme-classic`, pass them in the preset field, like this:
 
 ```js
 // docusaurus.config.js

From 0baaad33651642989d58b9be2c9ca105a83fd553 Mon Sep 17 00:00:00 2001
From: Glen Winters <lamouche@gmail.com>
Date: Fri, 1 Nov 2019 19:12:52 -0500
Subject: [PATCH 33/46] docs(v1): fix links in CHANGELOG (#1931)

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc1686dff805..9616eaa82fa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 **Docs**
 
-- docs: document docker is optional ([#1848])(https://github.com/facebook/docusaurus/pull/1848)
+- docs: document docker is optional ([#1848](https://github.com/facebook/docusaurus/pull/1848))
 
 ## [1.13.0] - 2019-09-15
 
@@ -1178,7 +1178,8 @@ N/A
   - Blog
   - Documentation
 
-[unreleased]: https://github.com/facebook/docusaurus/compare/v1.13.0...HEAD
+[unreleased]: https://github.com/facebook/docusaurus/compare/v1.14.0...HEAD
+[1.14.0]: https://github.com/facebook/docusaurus/compare/v1.13.0...v1.14.0
 [1.13.0]: https://github.com/facebook/docusaurus/compare/v1.12.0...v1.13.0
 [1.12.0]: https://github.com/facebook/docusaurus/compare/v1.11.1...v1.12.0
 [1.11.1]: https://github.com/facebook/docusaurus/compare/v1.11.0...v1.11.1

From c41c19e10c7a53127118ca59e7717f61343004af Mon Sep 17 00:00:00 2001
From: Endi <endiliey@gmail.com>
Date: Sat, 2 Nov 2019 17:40:51 +0700
Subject: [PATCH 34/46] fix(v2): @theme/heading should not create anchor if id
 is not defined (#1925)

---
 CHANGELOG-2.x.md                              |  1 +
 .../src/theme/Heading/index.js                | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index a874228a857a..fd154b2b5680 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -20,6 +20,7 @@ function Home() {
 ([#1860](https://github.com/facebook/Docusaurus/issues/1860))
 
 ### Bug Fixes
+- Fix MDX `@theme/Heading` component. If there is no id, it should not create anchor link.
 - Fixed a bug in which if `themeConfig.algolia` is not defined, the custom searchbar won't appear.
 If you've swizzled Algolia `SearchBar` component before, please update your source code otherwise CSS might break. See [#1909](https://github.com/facebook/docusaurus/pull/1909/files) for reference.
 ```js
diff --git a/packages/docusaurus-theme-classic/src/theme/Heading/index.js b/packages/docusaurus-theme-classic/src/theme/Heading/index.js
index 789e637a2790..eb596f8fd587 100644
--- a/packages/docusaurus-theme-classic/src/theme/Heading/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Heading/index.js
@@ -11,14 +11,19 @@ import React from 'react';
 
 import './styles.css';
 
-const Heading = Tag => ({id, ...props}) => (
-  <Tag {...props}>
-    <a aria-hidden="true" className="anchor" id={id} />
-    <a aria-hidden="true" className="hash-link" href={`#${id}`}>
-      #
-    </a>
-    {props.children}
-  </Tag>
-);
+const Heading = Tag => ({id, ...props}) => {
+  if (!id) {
+    return <Tag {...props} />;
+  }
+  return (
+    <Tag {...props}>
+      <a aria-hidden="true" className="anchor" id={id} />
+      <a aria-hidden="true" className="hash-link" href={`#${id}`}>
+        #
+      </a>
+      {props.children}
+    </Tag>
+  );
+};
 
 export default Heading;

From 3f8cb78ba943c6f1b6906a0f2b35f9c5f917e7d3 Mon Sep 17 00:00:00 2001
From: Kate Bartolo <11848944+kadair@users.noreply.github.com>
Date: Sun, 3 Nov 2019 04:59:39 -0500
Subject: [PATCH 35/46] docs(v2): theme, plugin, and preset config (#1929)

* docs(v2): theme, plugin, and preset config

* change tabs to spaces

* change theme example
---
 website/docs/configuration.md | 77 +++++++++++++++++++++++++++++------
 1 file changed, 65 insertions(+), 12 deletions(-)

diff --git a/website/docs/configuration.md b/website/docs/configuration.md
index d58bfc3226ca..d995412538e6 100644
--- a/website/docs/configuration.md
+++ b/website/docs/configuration.md
@@ -17,7 +17,7 @@ The high-level overview of Docusaurus configuration can be categorized into:
 
 - [Site Metadata](#site-metadata)
 - [Deployment Configurations](#deployment-configurations)
-- [Themes, Plugins, and Presets configurations](#themes-plugins-and-presets-configurations)
+- [Theme, Plugin, and Preset Configurations](#theme-plugin-and-preset-configurations)
 - [Custom Configurations](#custom-configurations)
 
 For exact reference to each of the configurable fields, you may refer to [**docusaurus.config.js API reference**](docusaurus.config.js.md).
@@ -34,22 +34,75 @@ Deployment configurations such as `projectName` and `organizationName` are used
 
 It is recommended to check the [deployment docs](deployment.md) for more information.
 
-### Themes, Plugins, and Presets configurations
+### Theme, plugin, and preset configurations
 
-_This section is a work in progress. [Welcoming PRs](https://github.com/facebook/docusaurus/issues/1640)._
+List the installed [themes](using-themes.md), [plugins](using-plugins.md), and [presets](presets.md) for your site in the `themes`, `plugins`, and `presets` fields, respectively. These are typically npm packages:
 
-<!--
+```js
+// docusaurus.config.js
+module.exports = {
+  // ...
+  plugins: ['@docusaurus/plugin-content-blog', '@docusaurus/plugin-content-pages'],
+  themes: ['@docusaurus/theme-classic'],
+};
+```
+
+They can also be loaded from local directories:
+
+```js
+// docusaurus.config.js
+const path = require('path');
+
+module.exports = {
+  // ...
+  themes: [path.resolve(__dirname, '/path/to/docusaurus-local-theme')],
+};
+```
+
+To specify options for a plugin or theme, replace the name of the plugin or theme in the config file with an array containing the name and an options object:
+
+```js
+// docusaurus.config.js
+module.exports = {
+  // ...
+  plugins: [
+    [
+      '@docusaurus/plugin-content-blog',
+      {
+        path: 'blog',
+        routeBasePath: 'blog',
+        include: ['*.md', '*.mdx'],
+        // ...
+      },
+    ],
+    '@docusaurus/plugin-content-pages',
+  ],
+};
+```
 
-TODO:
-- briefly introduce how to pass configurations to themes, plugins, and presets
-- throw in links to them respectively
-- make sure the logic flows nicely
+To specify options for a plugin or theme that is bundled in a preset, pass the options through the `presets` field. In this example, `docs` refers to `@docusaurus/plugin-content-docs` and `theme` refers to `@docusaurus/theme-classic`.
 
-[themes](using-themes.md)
-[plugins](using-plugins.md)
-[presets](presets.md)
+```js
+//docusaurus.config.js
+module.exports = {
+  // ...
+  presets: [
+    [
+      '@docusaurus/preset-classic',
+      {
+        docs: {
+          sidebarPath: require.resolve('./sidebars.js'),
+        },
+        theme: {
+          customCss: require.resolve('./src/css/custom.css'),
+        },
+      },
+    ],
+  ],
+};
+```
 
--->
+For further help configuring themes, plugins, and presets, see [Using Themes](using-themes.md), [Using Plugins](using-plugins.md), and [Using Presets](presets.md).
 
 ### Custom configurations
 

From 82ece517f6a07c7053ffc23f040fc63f31192bca Mon Sep 17 00:00:00 2001
From: Marc Jansen <jansen@terrestris.de>
Date: Sun, 3 Nov 2019 15:29:16 +0100
Subject: [PATCH 36/46] misc: use /usr/bin/env bash to increase portability
 (#1923)

---
 scripts/prerelease.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/prerelease.sh b/scripts/prerelease.sh
index 94eb5c3fa907..29bb15492b9f 100644
--- a/scripts/prerelease.sh
+++ b/scripts/prerelease.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ##
 # Copyright (c) 2017-present, Facebook, Inc.

From 33718b6f8f7fa1397b63aa4b3229ed7c4851f6d1 Mon Sep 17 00:00:00 2001
From: Jiawen Geng <technicalcute@gmail.com>
Date: Sun, 3 Nov 2019 22:57:51 +0800
Subject: [PATCH 37/46] misc(v1): use Node.js lts version (#1920)

This is much stable and more performant
---
 packages/docusaurus-1.x/examples/basics/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/docusaurus-1.x/examples/basics/Dockerfile b/packages/docusaurus-1.x/examples/basics/Dockerfile
index d369844d5bdf..c7f1856c1419 100644
--- a/packages/docusaurus-1.x/examples/basics/Dockerfile
+++ b/packages/docusaurus-1.x/examples/basics/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8.11.4
+FROM node:lts
 
 WORKDIR /app/website
 

From 2d13fe2e0fb6a87485b384e8901b74f32870fcc5 Mon Sep 17 00:00:00 2001
From: Endi <endiliey@gmail.com>
Date: Sun, 3 Nov 2019 22:20:47 +0700
Subject: [PATCH 38/46] chore: downgrade imagemin (#1933)

---
 packages/docusaurus-1.x/package.json |  4 +-
 yarn.lock                            | 69 +++++++++++-----------------
 2 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/packages/docusaurus-1.x/package.json b/packages/docusaurus-1.x/package.json
index 6565ce9bbe59..469d882c4d96 100644
--- a/packages/docusaurus-1.x/package.json
+++ b/packages/docusaurus-1.x/package.json
@@ -52,10 +52,10 @@
     "gaze": "^1.1.3",
     "glob": "^7.1.5",
     "highlight.js": "^9.16.1",
-    "imagemin": "^7.0.0",
+    "imagemin": "^6.0.0",
     "imagemin-gifsicle": "^6.0.1",
     "imagemin-jpegtran": "^6.0.0",
-    "imagemin-optipng": "^7.1.0",
+    "imagemin-optipng": "^6.0.0",
     "imagemin-svgo": "^7.0.0",
     "lodash": "^4.17.15",
     "markdown-toc": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index 91767fdbaee3..e2a2ab5a874f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6976,16 +6976,11 @@ file-type@5.2.0, file-type@^5.2.0:
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"
   integrity sha1-LdvqfHP/42No365J3DOMBYwritY=
 
-file-type@^10.4.0:
+file-type@^10.4.0, file-type@^10.7.0:
   version "10.11.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.11.0.tgz#2961d09e4675b9fb9a3ee6b69e9cd23f43fd1890"
   integrity sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==
 
-file-type@^12.0.0:
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.3.1.tgz#8a13bb49332295e5b02c2d6bba6a6a179bd5898c"
-  integrity sha512-FXxY5h6vSYMjrRal4YqbtfuoKD/oE0AMjJ7E5Hm+BdaQECcFVD03B41RAWYJ7wyuLr/wRnCtFo7y37l+nh+TAA==
-
 file-type@^3.8.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
@@ -7602,7 +7597,7 @@ globals@^11.0.1, globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globby@8.0.2:
+globby@8.0.2, globby@^8.0.1:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
   integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
@@ -7615,7 +7610,7 @@ globby@8.0.2:
     pify "^3.0.0"
     slash "^1.0.0"
 
-globby@^10.0.0, globby@^10.0.1:
+globby@^10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.1.tgz#4782c34cb75dd683351335c5829cc3420e606b22"
   integrity sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==
@@ -8283,14 +8278,14 @@ imagemin-jpegtran@^6.0.0:
     is-jpg "^2.0.0"
     jpegtran-bin "^4.0.0"
 
-imagemin-optipng@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-7.1.0.tgz#2225c82c35e5c29b7fa98d4f9ecee1161a68e888"
-  integrity sha512-JNORTZ6j6untH7e5gF4aWdhDCxe3ODsSLKs/f7Grewy3ebZpl1ZsU+VUTPY4rzeHgaFA8GSWOoA8V2M3OixWZQ==
+imagemin-optipng@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-6.0.0.tgz#a6bfc7b542fc08fc687e83dfb131249179a51a68"
+  integrity sha512-FoD2sMXvmoNm/zKPOWdhKpWdFdF9qiJmKC17MxZJPH42VMAp17/QENI/lIuP7LCUnLVAloO3AUoTSNzfhpyd8A==
   dependencies:
     exec-buffer "^3.0.0"
-    is-png "^2.0.0"
-    optipng-bin "^6.0.0"
+    is-png "^1.0.0"
+    optipng-bin "^5.0.0"
 
 imagemin-svgo@^7.0.0:
   version "7.0.0"
@@ -8300,16 +8295,16 @@ imagemin-svgo@^7.0.0:
     is-svg "^3.0.0"
     svgo "^1.0.5"
 
-imagemin@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/imagemin/-/imagemin-7.0.0.tgz#48651ab86c1975157306e3a18f8994814db085ff"
-  integrity sha512-TXvCSSIYl4KQUASur9S0+E4olVECzvxvZABU9rNqsza7vzIrUQMRTjyczGf8OmtcgvZ9jOYyinXW3epOpd/04A==
+imagemin@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/imagemin/-/imagemin-6.1.0.tgz#62508b465728fea36c03cdc07d915fe2d8cf9e13"
+  integrity sha512-8ryJBL1CN5uSHpiBMX0rJw79C9F9aJqMnjGnrd/1CafegpNuA81RBAAru/jQQEOWlOJJlpRnlcVFF6wq+Ist0A==
   dependencies:
-    file-type "^12.0.0"
-    globby "^10.0.0"
-    junk "^3.1.0"
-    make-dir "^3.0.0"
-    p-pipe "^3.0.0"
+    file-type "^10.7.0"
+    globby "^8.0.1"
+    make-dir "^1.0.0"
+    p-pipe "^1.1.0"
+    pify "^4.0.1"
     replace-ext "^1.0.0"
 
 immediate@^3.2.3:
@@ -8883,10 +8878,10 @@ is-plain-object@^3.0.0:
   dependencies:
     isobject "^4.0.0"
 
-is-png@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-png/-/is-png-2.0.0.tgz#ee8cbc9e9b050425cedeeb4a6fb74a649b0a4a8d"
-  integrity sha512-4KPGizaVGj2LK7xwJIz8o5B2ubu1D/vcQsgOGFEDlpcvgZHto4gBnyd0ig7Ws+67ixmwKoNmu0hYnpo6AaKb5g==
+is-png@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-png/-/is-png-1.1.0.tgz#d574b12bf275c0350455570b0e5b57ab062077ce"
+  integrity sha1-1XSxK/J1wDUEVVcLDltXqwYgd84=
 
 is-promise@^2.1.0:
   version "2.1.0"
@@ -9670,11 +9665,6 @@ jsx-ast-utils@^2.0.1, jsx-ast-utils@^2.1.0:
   dependencies:
     array-includes "^3.0.3"
 
-junk@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
-  integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
-
 keyv@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
@@ -11474,10 +11464,10 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-optipng-bin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-6.0.0.tgz#376120fa79d5e71eee2f524176efdd3a5eabd316"
-  integrity sha512-95bB4y8IaTsa/8x6QH4bLUuyvyOoGBCLDA7wOgDL8UFqJpSUh1Hob8JRJhit+wC1ZLN3tQ7mFt7KuBj0x8F2Wg==
+optipng-bin@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-5.1.0.tgz#a7c7ab600a3ab5a177dae2f94c2d800aa386b5a9"
+  integrity sha512-9baoqZTNNmXQjq/PQTWEXbVV3AMO2sI/GaaqZJZ8SExfAzjijeAP7FEeT+TtyumSw7gr0PZtSUYB/Ke7iHQVKA==
   dependencies:
     bin-build "^3.0.0"
     bin-wrapper "^4.0.0"
@@ -11654,16 +11644,11 @@ p-map@^3.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
-p-pipe@^1.2.0:
+p-pipe@^1.1.0, p-pipe@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
   integrity sha1-SxoROZoRUgpneQ7loMHViB1r7+k=
 
-p-pipe@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-3.0.0.tgz#ab1fb87c0b8dd79b3bb03a8a23680fc9d054e132"
-  integrity sha512-gwwdRFmaxsT3IU+Tl3vYKVRdjfhg8Bbdjw7B+E0y6F7Yz6l+eaQLn0BRmGMXIhcPDONPtOkMoNwx1etZh4zPJA==
-
 p-queue@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-4.0.0.tgz#ed0eee8798927ed6f2c2f5f5b77fdb2061a5d346"

From 34a84a324005ae7700082af1388bfdf568ce0402 Mon Sep 17 00:00:00 2001
From: Alexey Pyltsyn <lex61rus@gmail.com>
Date: Mon, 4 Nov 2019 02:55:17 +0300
Subject: [PATCH 39/46] fix(v2): add missing key prop in footer items with HTML
 (#1935)

---
 packages/docusaurus-theme-classic/src/theme/Footer/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/docusaurus-theme-classic/src/theme/Footer/index.js b/packages/docusaurus-theme-classic/src/theme/Footer/index.js
index 36aeb2a48edd..d6d455a64638 100644
--- a/packages/docusaurus-theme-classic/src/theme/Footer/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Footer/index.js
@@ -62,9 +62,10 @@ function Footer() {
                 Array.isArray(linkItem.items) &&
                 linkItem.items.length > 0 ? (
                   <ul className="footer__items">
-                    {linkItem.items.map(item =>
+                    {linkItem.items.map((item, key) =>
                       item.html ? (
                         <div
+                          key={key}
                           dangerouslySetInnerHTML={{
                             __html: item.html,
                           }}

From 146a3019fb3d57bf1501e15a5177f32e08fb5276 Mon Sep 17 00:00:00 2001
From: Alexey Pyltsyn <lex61rus@gmail.com>
Date: Mon, 4 Nov 2019 03:35:54 +0300
Subject: [PATCH 40/46] fix(v2): fix browser window background (#1936)

---
 website/src/components/BrowserWindow/styles.module.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/src/components/BrowserWindow/styles.module.css b/website/src/components/BrowserWindow/styles.module.css
index c4b6e374ad2a..aa492ea54e25 100644
--- a/website/src/components/BrowserWindow/styles.module.css
+++ b/website/src/components/BrowserWindow/styles.module.css
@@ -1,12 +1,12 @@
 .browserWindow {
-  border: 3px solid var(--ifm-color-emphasis-alpha-10);
+  border: 3px solid var(--ifm-color-emphasis-200);
   border-top-left-radius: var(--ifm-global-radius);
   border-top-right-radius: var(--ifm-global-radius);
 }
 
 .browserWindowHeader {
   align-items: center;
-  background: var(--ifm-color-emphasis-alpha-10);
+  background: var(--ifm-color-emphasis-200);
   display: flex;
   padding: 0.5rem 1rem;
 }

From 9c34bb768872e238f4f5f2437ab1a438007df64b Mon Sep 17 00:00:00 2001
From: Bohdan Shulha <bohdan@shulha.pp.ua>
Date: Mon, 4 Nov 2019 02:54:36 +0200
Subject: [PATCH 41/46] fix(v2): allows to create tabs with only one item
 (#1934)

* fix(v2): allow to create tabs with only one item

It was not possible to have tabs containing only one tab item, so the code below crashed

```
<Tabs
    defaultValue="SomeFile.js"
    values={[
        { label: "SomeFile.js", value: "SomeFile.js" }
    ]}
>
<TabItem value="SomeFile.js">
    Tab content
</TabItem>
</Tabs>
```

* Update index.js
---
 packages/docusaurus-theme-classic/src/theme/Tabs/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/docusaurus-theme-classic/src/theme/Tabs/index.js b/packages/docusaurus-theme-classic/src/theme/Tabs/index.js
index d1f9933759b2..a2b9d883fd97 100644
--- a/packages/docusaurus-theme-classic/src/theme/Tabs/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Tabs/index.js
@@ -31,7 +31,7 @@ function Tabs(props) {
         ))}
       </ul>
       <div className="margin-vert--md">
-        {children.filter(child => child.props.value === selectedValue)[0]}
+        {[...children].filter(child => child.props.value === selectedValue)[0]}
       </div>
     </div>
   );

From 0d445fce77f62d7f4bd2b75e6a8f9359579e6224 Mon Sep 17 00:00:00 2001
From: Alexey Pyltsyn <lex61rus@gmail.com>
Date: Mon, 4 Nov 2019 03:55:11 +0300
Subject: [PATCH 42/46] fix(v2): remove redundant npm script in classic
 template (#1937)

---
 packages/docusaurus-init/templates/classic/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/docusaurus-init/templates/classic/package.json b/packages/docusaurus-init/templates/classic/package.json
index e4d27d9d8a71..b659f7df8a9e 100644
--- a/packages/docusaurus-init/templates/classic/package.json
+++ b/packages/docusaurus-init/templates/classic/package.json
@@ -3,7 +3,6 @@
   "version": "2.0.0-alpha.31",
   "private": true,
   "scripts": {
-    "docusaurus": "docusaurus",
     "start": "docusaurus start",
     "build": "docusaurus build",
     "swizzle": "docusaurus swizzle",

From cd9e2f23464a468ad50973c795f3052f4f7852bd Mon Sep 17 00:00:00 2001
From: endiliey <endiliey@gmail.com>
Date: Mon, 4 Nov 2019 12:45:05 +0700
Subject: [PATCH 43/46] v2.0.0-alpha.32

---
 lerna.json                                     |  2 +-
 packages/docusaurus-1.x/package.json           |  2 +-
 packages/docusaurus-init/package.json          |  2 +-
 .../templates/classic/package.json             |  6 +++---
 packages/docusaurus-mdx-loader/package.json    |  2 +-
 .../package.json                               |  8 ++++----
 .../package.json                               |  8 ++++----
 .../package.json                               |  6 +++---
 .../package.json                               |  2 +-
 .../docusaurus-plugin-google-gtag/package.json |  2 +-
 .../docusaurus-plugin-ideal-image/package.json |  2 +-
 .../docusaurus-plugin-sitemap/package.json     |  4 ++--
 .../docusaurus-preset-classic/package.json     | 18 +++++++++---------
 packages/docusaurus-theme-classic/package.json |  2 +-
 .../package.json                               |  2 +-
 .../package.json                               |  2 +-
 packages/docusaurus-types/package.json         |  2 +-
 packages/docusaurus-utils/package.json         |  2 +-
 packages/docusaurus/package.json               |  8 ++++----
 website-1.x/package.json                       |  4 ++--
 website/package.json                           |  8 ++++----
 21 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/lerna.json b/lerna.json
index 20fda1265a22..01efff751eb3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "3.14.1",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/docusaurus-1.x/package.json b/packages/docusaurus-1.x/package.json
index 469d882c4d96..2e59306f8365 100644
--- a/packages/docusaurus-1.x/package.json
+++ b/packages/docusaurus-1.x/package.json
@@ -1,7 +1,7 @@
 {
   "name": "docusaurus",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "license": "MIT",
   "keywords": [
     "documentation",
diff --git a/packages/docusaurus-init/package.json b/packages/docusaurus-init/package.json
index a6ee1a57d1be..6ba49ada72ab 100644
--- a/packages/docusaurus-init/package.json
+++ b/packages/docusaurus-init/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/init",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Create Docusaurus app easily",
   "repository": {
     "type": "git",
diff --git a/packages/docusaurus-init/templates/classic/package.json b/packages/docusaurus-init/templates/classic/package.json
index b659f7df8a9e..385432843243 100644
--- a/packages/docusaurus-init/templates/classic/package.json
+++ b/packages/docusaurus-init/templates/classic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-classic-template",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "private": true,
   "scripts": {
     "start": "docusaurus start",
@@ -9,8 +9,8 @@
     "deploy": "docusaurus deploy"
   },
   "dependencies": {
-    "@docusaurus/core": "^2.0.0-alpha.31",
-    "@docusaurus/preset-classic": "^2.0.0-alpha.31",
+    "@docusaurus/core": "^2.0.0-alpha.32",
+    "@docusaurus/preset-classic": "^2.0.0-alpha.32",
     "classnames": "^2.2.6",
     "react": "^16.8.4",
     "react-dom": "^16.8.4"
diff --git a/packages/docusaurus-mdx-loader/package.json b/packages/docusaurus-mdx-loader/package.json
index 63abfbd3ce67..936e5d845d21 100644
--- a/packages/docusaurus-mdx-loader/package.json
+++ b/packages/docusaurus-mdx-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/mdx-loader",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Docusaurus Loader for MDX",
   "main": "src/index.js",
   "publishConfig": {
diff --git a/packages/docusaurus-plugin-content-blog/package.json b/packages/docusaurus-plugin-content-blog/package.json
index 770cae3ed75a..13f7297c3383 100644
--- a/packages/docusaurus-plugin-content-blog/package.json
+++ b/packages/docusaurus-plugin-content-blog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-blog",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Blog plugin for Docusaurus",
   "main": "lib/index.js",
   "scripts": {
@@ -11,11 +11,11 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@docusaurus/types": "^2.0.0-alpha.31"
+    "@docusaurus/types": "^2.0.0-alpha.32"
   },
   "dependencies": {
-    "@docusaurus/mdx-loader": "^2.0.0-alpha.31",
-    "@docusaurus/utils": "^2.0.0-alpha.31",
+    "@docusaurus/mdx-loader": "^2.0.0-alpha.32",
+    "@docusaurus/utils": "^2.0.0-alpha.32",
     "fs-extra": "^8.1.0",
     "globby": "^10.0.1",
     "loader-utils": "^1.2.3",
diff --git a/packages/docusaurus-plugin-content-docs/package.json b/packages/docusaurus-plugin-content-docs/package.json
index 6594906ea785..269358868a60 100644
--- a/packages/docusaurus-plugin-content-docs/package.json
+++ b/packages/docusaurus-plugin-content-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-docs",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Docs content plugin for Docusaurus",
   "main": "lib/index.js",
   "scripts": {
@@ -11,11 +11,11 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@docusaurus/types": "^2.0.0-alpha.31"
+    "@docusaurus/types": "^2.0.0-alpha.32"
   },
   "dependencies": {
-    "@docusaurus/mdx-loader": "^2.0.0-alpha.31",
-    "@docusaurus/utils": "^2.0.0-alpha.31",
+    "@docusaurus/mdx-loader": "^2.0.0-alpha.32",
+    "@docusaurus/utils": "^2.0.0-alpha.32",
     "cross-spawn": "^7.0.1",
     "fs-extra": "^8.1.0",
     "globby": "^10.0.1",
diff --git a/packages/docusaurus-plugin-content-pages/package.json b/packages/docusaurus-plugin-content-pages/package.json
index 0041bd63fa96..8a591e961a27 100644
--- a/packages/docusaurus-plugin-content-pages/package.json
+++ b/packages/docusaurus-plugin-content-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-pages",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Pages content plugin for Docusaurus",
   "main": "lib/index.js",
   "scripts": {
@@ -11,8 +11,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/types": "^2.0.0-alpha.31",
-    "@docusaurus/utils": "^2.0.0-alpha.31",
+    "@docusaurus/types": "^2.0.0-alpha.32",
+    "@docusaurus/utils": "^2.0.0-alpha.32",
     "globby": "^10.0.1"
   },
   "peerDependencies": {
diff --git a/packages/docusaurus-plugin-google-analytics/package.json b/packages/docusaurus-plugin-google-analytics/package.json
index 3196e44f539e..bb73a3a1c18e 100644
--- a/packages/docusaurus-plugin-google-analytics/package.json
+++ b/packages/docusaurus-plugin-google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-google-analytics",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Global analytics (analytics.js) plugin for Docusaurus",
   "main": "src/index.js",
   "publishConfig": {
diff --git a/packages/docusaurus-plugin-google-gtag/package.json b/packages/docusaurus-plugin-google-gtag/package.json
index 1473c596d22d..5060c8f955ff 100644
--- a/packages/docusaurus-plugin-google-gtag/package.json
+++ b/packages/docusaurus-plugin-google-gtag/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-google-gtag",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Global Site Tag (gtag.js) plugin for Docusaurus",
   "main": "src/index.js",
   "publishConfig": {
diff --git a/packages/docusaurus-plugin-ideal-image/package.json b/packages/docusaurus-plugin-ideal-image/package.json
index fb1d056abe1c..e39c706abea7 100644
--- a/packages/docusaurus-plugin-ideal-image/package.json
+++ b/packages/docusaurus-plugin-ideal-image/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-ideal-image",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Docusaurus Plugin to generate an almost ideal image (responsive, lazy-loading, and low quality placeholder)",
   "main": "src/index.js",
   "publishConfig": {
diff --git a/packages/docusaurus-plugin-sitemap/package.json b/packages/docusaurus-plugin-sitemap/package.json
index ee12645ea186..d3c366c3663a 100644
--- a/packages/docusaurus-plugin-sitemap/package.json
+++ b/packages/docusaurus-plugin-sitemap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-sitemap",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Simple sitemap generation plugin for Docusaurus",
   "main": "lib/index.js",
   "scripts": {
@@ -11,7 +11,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/types": "^2.0.0-alpha.30",
+    "@docusaurus/types": "^2.0.0-alpha.32",
     "sitemap": "^3.2.2"
   },
   "peerDependencies": {
diff --git a/packages/docusaurus-preset-classic/package.json b/packages/docusaurus-preset-classic/package.json
index 30a58c55a8c5..40aba4386c03 100644
--- a/packages/docusaurus-preset-classic/package.json
+++ b/packages/docusaurus-preset-classic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/preset-classic",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Preset for classic Docusaurus",
   "main": "src/index.js",
   "publishConfig": {
@@ -8,14 +8,14 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/plugin-content-blog": "^2.0.0-alpha.31",
-    "@docusaurus/plugin-content-docs": "^2.0.0-alpha.31",
-    "@docusaurus/plugin-content-pages": "^2.0.0-alpha.31",
-    "@docusaurus/plugin-google-analytics": "^2.0.0-alpha.31",
-    "@docusaurus/plugin-google-gtag": "^2.0.0-alpha.31",
-    "@docusaurus/plugin-sitemap": "^2.0.0-alpha.31",
-    "@docusaurus/theme-classic": "^2.0.0-alpha.31",
-    "@docusaurus/theme-search-algolia": "^2.0.0-alpha.31"
+    "@docusaurus/plugin-content-blog": "^2.0.0-alpha.32",
+    "@docusaurus/plugin-content-docs": "^2.0.0-alpha.32",
+    "@docusaurus/plugin-content-pages": "^2.0.0-alpha.32",
+    "@docusaurus/plugin-google-analytics": "^2.0.0-alpha.32",
+    "@docusaurus/plugin-google-gtag": "^2.0.0-alpha.32",
+    "@docusaurus/plugin-sitemap": "^2.0.0-alpha.32",
+    "@docusaurus/theme-classic": "^2.0.0-alpha.32",
+    "@docusaurus/theme-search-algolia": "^2.0.0-alpha.32"
   },
   "peerDependencies": {
     "@docusaurus/core": "^2.0.0"
diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json
index 1d41e20657db..559a6e5436c4 100644
--- a/packages/docusaurus-theme-classic/package.json
+++ b/packages/docusaurus-theme-classic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Classic theme for Docusaurus",
   "main": "src/index.js",
   "publishConfig": {
diff --git a/packages/docusaurus-theme-live-codeblock/package.json b/packages/docusaurus-theme-live-codeblock/package.json
index e3f565310e98..cbb4a4c9a0f9 100644
--- a/packages/docusaurus-theme-live-codeblock/package.json
+++ b/packages/docusaurus-theme-live-codeblock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-live-codeblock",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Docusaurus Live CodeBlock",
   "main": "src/index.js",
   "publishConfig": {
diff --git a/packages/docusaurus-theme-search-algolia/package.json b/packages/docusaurus-theme-search-algolia/package.json
index 73f5676c5b7c..701f722e5ad0 100644
--- a/packages/docusaurus-theme-search-algolia/package.json
+++ b/packages/docusaurus-theme-search-algolia/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-search-algolia",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Algolia search component for Docusaurus",
   "main": "src/index.js",
   "publishConfig": {
diff --git a/packages/docusaurus-types/package.json b/packages/docusaurus-types/package.json
index c7e0defb0e87..5b21a2393b73 100644
--- a/packages/docusaurus-types/package.json
+++ b/packages/docusaurus-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/types",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Common used typings for Docusaurus packages",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
diff --git a/packages/docusaurus-utils/package.json b/packages/docusaurus-utils/package.json
index 113ea5025d3c..139c5584a055 100644
--- a/packages/docusaurus-utils/package.json
+++ b/packages/docusaurus-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/utils",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "description": "Node utility functions for Docusaurus packages",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json
index 478ee2aaf4a4..10cc5f8203fd 100644
--- a/packages/docusaurus/package.json
+++ b/packages/docusaurus/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -29,14 +29,15 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "devDependencies": {
-    "@docusaurus/types": "^2.0.0-alpha.31"
+    "@docusaurus/types": "^2.0.0-alpha.32"
   },
   "dependencies": {
     "@babel/core": "^7.6.4",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "^7.6.3",
     "@babel/preset-react": "^7.6.3",
-    "@docusaurus/utils": "^2.0.0-alpha.31",
+    "@docusaurus/utils": "^2.0.0-alpha.32",
+    "@endiliey/static-site-generator-webpack-plugin": "^4.0.0",
     "babel-loader": "^8.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.0",
     "cache-loader": "^4.1.0",
@@ -71,7 +72,6 @@
     "react-router-dom": "^5.1.2",
     "semver": "^6.3.0",
     "shelljs": "^0.8.3",
-    "@endiliey/static-site-generator-webpack-plugin": "^4.0.0",
     "std-env": "^2.2.1",
     "style-loader": "^1.0.0",
     "terser-webpack-plugin": "^2.2.1",
diff --git a/website-1.x/package.json b/website-1.x/package.json
index 69337f5de766..fc37990286df 100644
--- a/website-1.x/package.json
+++ b/website-1.x/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-1-website",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "private": true,
   "scripts": {
     "start": "docusaurus-start",
@@ -15,6 +15,6 @@
   },
   "dependencies": {
     "async": "^2.5.0",
-    "docusaurus": "^2.0.0-alpha.31"
+    "docusaurus": "^2.0.0-alpha.32"
   }
 }
diff --git a/website/package.json b/website/package.json
index 2ef44a128d16..e0b3d1cb7cab 100644
--- a/website/package.json
+++ b/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-website",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.32",
   "private": true,
   "scripts": {
     "start": "docusaurus start",
@@ -9,9 +9,9 @@
     "deploy": "docusaurus deploy"
   },
   "dependencies": {
-    "@docusaurus/core": "^2.0.0-alpha.31",
-    "@docusaurus/plugin-ideal-image": "^2.0.0-alpha.31",
-    "@docusaurus/preset-classic": "^2.0.0-alpha.31",
+    "@docusaurus/core": "^2.0.0-alpha.32",
+    "@docusaurus/plugin-ideal-image": "^2.0.0-alpha.32",
+    "@docusaurus/preset-classic": "^2.0.0-alpha.32",
     "classnames": "^2.2.6",
     "react": "^16.8.4",
     "react-dom": "^16.8.4"

From 5909b4991537d6f63053e87ef4232845ebc58aae Mon Sep 17 00:00:00 2001
From: endiliey <endiliey@gmail.com>
Date: Mon, 4 Nov 2019 12:56:10 +0700
Subject: [PATCH 44/46] chore(v2): changelog

---
 CHANGELOG-2.x.md                        | 1 +
 website/docs/migrating-from-v1-to-v2.md | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index fd154b2b5680..5f2661f3b983 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -20,6 +20,7 @@ function Home() {
 ([#1860](https://github.com/facebook/Docusaurus/issues/1860))
 
 ### Bug Fixes
+- Fix `@theme/Tabs` component to be able to create tabs with only one item.
 - Fix MDX `@theme/Heading` component. If there is no id, it should not create anchor link.
 - Fixed a bug in which if `themeConfig.algolia` is not defined, the custom searchbar won't appear.
 If you've swizzled Algolia `SearchBar` component before, please update your source code otherwise CSS might break. See [#1909](https://github.com/facebook/docusaurus/pull/1909/files) for reference.
diff --git a/website/docs/migrating-from-v1-to-v2.md b/website/docs/migrating-from-v1-to-v2.md
index 760d7f5d7d14..21d0581f8a81 100644
--- a/website/docs/migrating-from-v1-to-v2.md
+++ b/website/docs/migrating-from-v1-to-v2.md
@@ -37,8 +37,8 @@ Meanwhile, the default doc site functionalities provided by Docusaurus 1 are now
 {
   dependencies: {
 -    "docusaurus": "^1.x.x",
-+    "@docusaurus/core": "^2.0.0-alpha.31",
-+    "@docusaurus/preset-classic": "^2.0.0-alpha.31",
++    "@docusaurus/core": "^2.0.0-alpha.32",
++    "@docusaurus/preset-classic": "^2.0.0-alpha.32",
   }
 }
 ```
@@ -72,8 +72,8 @@ A typical Docusaurus 2 `package.json` may look like this:
     "deploy": "docusaurus deploy"
   },
   "dependencies": {
-    "@docusaurus/core": "^2.0.0-alpha.31",
-    "@docusaurus/preset-classic": "^2.0.0-alpha.31",
+    "@docusaurus/core": "^2.0.0-alpha.32",
+    "@docusaurus/preset-classic": "^2.0.0-alpha.32",
     "classnames": "^2.2.6",
     "react": "^16.10.2",
     "react-dom": "^16.10.2"

From 77e8890d0da71c18a0b94d96ba176b0e039ba159 Mon Sep 17 00:00:00 2001
From: Yangshun Tay <tay.yang.shun@gmail.com>
Date: Tue, 5 Nov 2019 09:21:00 +0800
Subject: [PATCH 45/46] misc(v2): update TOC highlight

---
 .../src/theme/DocItem/index.js                | 15 ++--
 .../src/theme/Navbar/index.js                 |  2 +-
 .../src/theme/hooks/useTOCHighlight.js        | 77 ++++++++++++++++
 .../theme/hooks/useTableOfContentHighlight.js | 89 -------------------
 .../src/theme/hooks/{theme.js => useTheme.js} |  0
 5 files changed, 84 insertions(+), 99 deletions(-)
 create mode 100644 packages/docusaurus-theme-classic/src/theme/hooks/useTOCHighlight.js
 delete mode 100644 packages/docusaurus-theme-classic/src/theme/hooks/useTableOfContentHighlight.js
 rename packages/docusaurus-theme-classic/src/theme/hooks/{theme.js => useTheme.js} (100%)

diff --git a/packages/docusaurus-theme-classic/src/theme/DocItem/index.js b/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
index 0741aac5cd3b..5678f93299bf 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
@@ -11,19 +11,16 @@ import Head from '@docusaurus/Head';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import useBaseUrl from '@docusaurus/useBaseUrl';
 import DocPaginator from '@theme/DocPaginator';
-import useTableOfContentHighlight from '@theme/hooks/useTableOfContentHighlight';
+import useTOCHighlight from '@theme/hooks/useTOCHighlight';
 
 import styles from './styles.module.css';
 
-function Headings({headings, isChild}) {
-  const LINK_CLASS_NAME = 'contents__link';
-  const TOP_OFFSET = 100;
+const LINK_CLASS_NAME = 'contents__link';
+const ACTIVE_LINK_CLASS_NAME = 'contents__link--active';
+const TOP_OFFSET = 100;
 
-  useTableOfContentHighlight(
-    LINK_CLASS_NAME,
-    'contents__link--active',
-    TOP_OFFSET,
-  );
+function Headings({headings, isChild}) {
+  useTOCHighlight(LINK_CLASS_NAME, ACTIVE_LINK_CLASS_NAME, TOP_OFFSET);
 
   if (!headings.length) return null;
   return (
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
index 77f9211c17f9..5919bd401e9a 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
@@ -17,7 +17,7 @@ import SearchBar from '@theme/SearchBar';
 
 import classnames from 'classnames';
 
-import useTheme from '@theme/hooks/theme';
+import useTheme from '@theme/hooks/useTheme';
 
 import styles from './styles.module.css';
 
diff --git a/packages/docusaurus-theme-classic/src/theme/hooks/useTOCHighlight.js b/packages/docusaurus-theme-classic/src/theme/hooks/useTOCHighlight.js
new file mode 100644
index 000000000000..bd033925b8c4
--- /dev/null
+++ b/packages/docusaurus-theme-classic/src/theme/hooks/useTOCHighlight.js
@@ -0,0 +1,77 @@
+/**
+ * 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.
+ */
+
+import {useEffect, useState} from 'react';
+
+function useTOCHighlight(linkClassName, linkActiveClassName, topOffset) {
+  const [lastActiveLink, setLastActiveLink] = useState(undefined);
+
+  useEffect(() => {
+    let headersAnchors = [];
+    let links = [];
+
+    function setActiveLink() {
+      function getActiveHeaderAnchor() {
+        let index = 0;
+        let activeHeaderAnchor = null;
+
+        headersAnchors = document.getElementsByClassName('anchor');
+        while (index < headersAnchors.length && !activeHeaderAnchor) {
+          const headerAnchor = headersAnchors[index];
+          const {top} = headerAnchor.getBoundingClientRect();
+
+          if (top >= 0 && top <= topOffset) {
+            activeHeaderAnchor = headerAnchor;
+          }
+
+          index += 1;
+        }
+
+        return activeHeaderAnchor;
+      }
+
+      const activeHeaderAnchor = getActiveHeaderAnchor();
+
+      if (activeHeaderAnchor) {
+        let index = 0;
+        let itemHighlighted = false;
+
+        links = document.getElementsByClassName(linkClassName);
+        while (index < links.length && !itemHighlighted) {
+          const link = links[index];
+          const {href} = link;
+          const anchorValue = decodeURIComponent(
+            href.substring(href.indexOf('#') + 1),
+          );
+
+          if (activeHeaderAnchor.id === anchorValue) {
+            if (lastActiveLink) {
+              lastActiveLink.classList.remove(linkActiveClassName);
+            }
+            link.classList.add(linkActiveClassName);
+            setLastActiveLink(link);
+            itemHighlighted = true;
+          }
+
+          index += 1;
+        }
+      }
+    }
+
+    document.addEventListener('scroll', setActiveLink);
+    document.addEventListener('resize', setActiveLink);
+
+    setActiveLink();
+
+    return () => {
+      document.removeEventListener('scroll', setActiveLink);
+      document.removeEventListener('resize', setActiveLink);
+    };
+  });
+}
+
+export default useTOCHighlight;
diff --git a/packages/docusaurus-theme-classic/src/theme/hooks/useTableOfContentHighlight.js b/packages/docusaurus-theme-classic/src/theme/hooks/useTableOfContentHighlight.js
deleted file mode 100644
index a9ecf908bf2a..000000000000
--- a/packages/docusaurus-theme-classic/src/theme/hooks/useTableOfContentHighlight.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 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.
- */
-
-import {useEffect, useState} from 'react';
-
-function useTableOfContentHighlight(
-  tableOfContentLinkClassName,
-  tableOfContentLinkActiveClassName,
-  topOffset,
-) {
-  const [
-    lastActiveTableOfContentLink,
-    setLastActiveTableOfContentLink,
-  ] = useState(undefined);
-
-  useEffect(() => {
-    let headersAnchor = [];
-    let tableOfContentLinks = [];
-
-    function getActiveHeaderAnchor() {
-      const TOP_OFFSET = topOffset;
-      let index = 0;
-      let activeHeaderAnchor;
-      headersAnchor = document.querySelectorAll('a.anchor');
-      while (index < headersAnchor.length && !activeHeaderAnchor) {
-        const headerAnchor = headersAnchor[index];
-        const {top} = headerAnchor.getBoundingClientRect();
-        if (top >= 0 && top <= TOP_OFFSET) {
-          activeHeaderAnchor = headerAnchor;
-        }
-        index += 1;
-      }
-      return activeHeaderAnchor;
-    }
-
-    function highlightTableOfContentLink(tableOfContentLink) {
-      if (lastActiveTableOfContentLink) {
-        lastActiveTableOfContentLink.classList.remove(
-          tableOfContentLinkActiveClassName,
-        );
-      }
-      tableOfContentLink.classList.add(tableOfContentLinkActiveClassName);
-      setLastActiveTableOfContentLink(tableOfContentLink);
-    }
-
-    function getAnchorValue(tableOfContentLink) {
-      const splittedUrl = tableOfContentLink.href
-        ? decodeURIComponent(tableOfContentLink.href).split('#')
-        : [];
-      return splittedUrl.length > 1 ? splittedUrl[1] : '';
-    }
-
-    function setActiveTableOfContentLink() {
-      const activeHeaderAnchor = getActiveHeaderAnchor();
-      if (activeHeaderAnchor) {
-        let index = 0;
-        let itemHighlighted = false;
-        tableOfContentLinks = document.querySelectorAll(
-          `.${tableOfContentLinkClassName}`,
-        );
-        while (index < tableOfContentLinks.length && !itemHighlighted) {
-          const tableOfContentLink = tableOfContentLinks[index];
-          const anchorValue = getAnchorValue(tableOfContentLink);
-          if (activeHeaderAnchor.id === anchorValue) {
-            highlightTableOfContentLink(tableOfContentLink);
-            itemHighlighted = true;
-          }
-          index += 1;
-        }
-      }
-    }
-
-    document.addEventListener('scroll', setActiveTableOfContentLink);
-    document.addEventListener('resize', setActiveTableOfContentLink);
-
-    setActiveTableOfContentLink();
-
-    return () => {
-      document.removeEventListener('scroll', setActiveTableOfContentLink);
-      document.removeEventListener('resize', setActiveTableOfContentLink);
-    };
-  });
-}
-
-export default useTableOfContentHighlight;
diff --git a/packages/docusaurus-theme-classic/src/theme/hooks/theme.js b/packages/docusaurus-theme-classic/src/theme/hooks/useTheme.js
similarity index 100%
rename from packages/docusaurus-theme-classic/src/theme/hooks/theme.js
rename to packages/docusaurus-theme-classic/src/theme/hooks/useTheme.js

From 542b7c9cb7bcfa5d71ac2dd1dd3955c9746e283b Mon Sep 17 00:00:00 2001
From: Yangshun Tay <tay.yang.shun@gmail.com>
Date: Tue, 5 Nov 2019 09:24:39 +0800
Subject: [PATCH 46/46] misc(v2): update CHANGELOG

---
 CHANGELOG-2.x.md | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index 5f2661f3b983..999e9334c482 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -2,11 +2,14 @@
 
 ## Unreleased
 
+- Add table of contents highlighting on scroll.
+
 ## 2.0.0-alpha.32
 
 ### Features
-- Add `<Redirect>` component for easy client side redirect.
-Example Usage:
+
+- Add `<Redirect>` component for easy client side redirect. Example Usage:
+
 ```js
 import React from 'react';
 import {Redirect} from '@docusaurus/router';
@@ -15,19 +18,21 @@ function Home() {
   return <Redirect to="/docs/test" />;
 }
 ```
+
 - Allow user to add custom HTML to footer items. [#1905](https://github.com/facebook/docusaurus/pull/1905)
-- Added code block line highlighting feature (thanks @lex111)! If you have previously swizzled the `CodeBlock` theme component, it is recommended to update your source code to have this feature.
-([#1860](https://github.com/facebook/Docusaurus/issues/1860))
+- Added code block line highlighting feature (thanks @lex111)! If you have previously swizzled the `CodeBlock` theme component, it is recommended to update your source code to have this feature. ([#1860](https://github.com/facebook/Docusaurus/issues/1860))
 
 ### Bug Fixes
+
 - Fix `@theme/Tabs` component to be able to create tabs with only one item.
 - Fix MDX `@theme/Heading` component. If there is no id, it should not create anchor link.
-- Fixed a bug in which if `themeConfig.algolia` is not defined, the custom searchbar won't appear.
-If you've swizzled Algolia `SearchBar` component before, please update your source code otherwise CSS might break. See [#1909](https://github.com/facebook/docusaurus/pull/1909/files) for reference.
+- Fixed a bug in which if `themeConfig.algolia` is not defined, the custom searchbar won't appear. If you've swizzled Algolia `SearchBar` component before, please update your source code otherwise CSS might break. See [#1909](https://github.com/facebook/docusaurus/pull/1909/files) for reference.
+
 ```js
 - <Fragment>
 + <div className="navbar__search" key="search-box">
 ```
+
 - Slightly adjust search icon position to be more aligned on small width device. ([#1893](https://github.com/facebook/Docusaurus/issues/1893))
 - Fix algolia styling bug, previously search suggestion result is sometimes hidden. ([#1915](https://github.com/facebook/Docusaurus/issues/1915))
 - Changed the way we read the `USE_SSH` env variable during deployment to be the same as in v1.
@@ -36,12 +41,13 @@ If you've swizzled Algolia `SearchBar` component before, please update your sour
 - Fix a bug where docs plugin add `/docs` route even if docs folder is empty. We also improved docs plugin test coverage to 100% for stability before working on docs versioning. ([#1912](https://github.com/facebook/Docusaurus/issues/1912))
 
 ### Performance Improvement
+
 - Reduce memory usage consumption. ([#1900](https://github.com/facebook/Docusaurus/issues/1900))
 - Significantly reduce main bundle size and initial HTML payload on production build. Generated files from webpack is also shorter in name. ([#1898](https://github.com/facebook/Docusaurus/issues/1898))
-- Simplify blog metadata. Previously, accessing `/blog/post-xxx` will request for next and prev blog post metadata too aside from target post metadata. We should only request target post metadata. 
-([#1908](https://github.com/facebook/Docusaurus/issues/1908))
+- Simplify blog metadata. Previously, accessing `/blog/post-xxx` will request for next and prev blog post metadata too aside from target post metadata. We should only request target post metadata. ([#1908](https://github.com/facebook/Docusaurus/issues/1908))
 
 ### Others
+
 - Convert sitemap plugin to TypeScript. ([#1894](https://github.com/facebook/Docusaurus/issues/1894))
 - Refactor dark mode toggle into a hook. ([#1899](https://github.com/facebook/Docusaurus/issues/1899))