fix: replace use of deepmerge with _.merge

facebook · May 1, 2019 · 2540c9b · 2540c9b
1 parent 5030952
commit 2540c9b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/docs/api-site-config.md b/docs/api-site-config.md
@@ -128,7 +128,7 @@ The default version for the site to be shown. If this is not set, the latest ver
 
 #### `docsUrl` [string]
 
-The base url for all docs file. Set this field to `''` to remove the `docs` prefix of the documentation URL. 
+The base url for all docs file. Set this field to `''` to remove the `docs` prefix of the documentation URL.
 If unset, it is defaulted to `docs`.
 
 #### `disableHeaderTitle` [boolean]
@@ -247,6 +247,10 @@ Hostname of your server. Useful if you are using GitHub Enterprise.
 
 Path to your web app manifest (e.g., `manifest.json`). This will add a `<link>` tag to `<head>` with `rel` as `"manifest"` and `href` as the provided path.
 
+#### `markdownOptions` [object]
+
+Override default [Remarkable options](https://github.com/jonschlinkert/remarkable#options) that will be used to render markdown.
+
 #### `markdownPlugins` [array]
 
 An array of plugins to be loaded by Remarkable, the markdown parser and renderer used by Docusaurus. The plugin will receive a reference to the Remarkable instance, allowing custom parsing and rendering rules to be defined.

diff --git a/packages/docusaurus-1.x/lib/core/renderMarkdown.js b/packages/docusaurus-1.x/lib/core/renderMarkdown.js
@@ -5,11 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+const _ = require('lodash');
 const hljs = require('highlight.js');
 const Markdown = require('remarkable');
 const prismjs = require('prismjs');
 const loadLanguages = require('prismjs/components/index');
-const deepmerge = require('deepmerge');
 const chalk = require('chalk');
 const anchors = require('./anchors.js');
 
@@ -88,7 +88,7 @@ class MarkdownRenderer {
 
     // Allow overriding default options
     if (siteConfig.markdownOptions) {
-      markdownOptions = deepmerge(
+      markdownOptions = _.merge(
         {},
         markdownOptions,
         siteConfig.markdownOptions,

diff --git a/packages/docusaurus-1.x/lib/write-translations.js b/packages/docusaurus-1.x/lib/write-translations.js
@@ -26,7 +26,7 @@ const fs = require('fs-extra');
 const glob = require('glob');
 const mkdirp = require('mkdirp');
 const nodePath = require('path');
-const deepmerge = require('deepmerge');
+const _ = require('lodash');
 
 const readMetadata = require('./server/readMetadata.js');
 
@@ -43,7 +43,8 @@ let customTranslations = {
   'pages-strings': {},
 };
 if (fs.existsSync(`${CWD}/data/custom-translation-strings.json`)) {
-  customTranslations = deepmerge(
+  customTranslations = _.merge(
+    {},
     JSON.parse(
       fs.readFileSync(`${CWD}/data/custom-translation-strings.json`, 'utf8'),
     ),
@@ -187,7 +188,8 @@ function execute() {
     translations['pages-strings'],
     customTranslations['pages-strings'],
   );
-  translations['localized-strings'] = deepmerge(
+  translations['localized-strings'] = _.merge(
+    {},
     translations['localized-strings'],
     customTranslations['localized-strings'],
   );

diff --git a/packages/docusaurus-1.x/package.json b/packages/docusaurus-1.x/package.json
@@ -44,7 +44,6 @@
     "cross-spawn": "^6.0.5",
     "crowdin-cli": "^0.3.0",
     "cssnano": "^3.10.0",
-    "deepmerge": "^2.1.1",
     "escape-string-regexp": "^1.0.5",
     "express": "^4.15.3",
     "feed": "^1.1.0",

diff --git a/yarn.lock b/yarn.lock
@@ -4882,6 +4882,11 @@ envify@^4.0.0:
     esprima "^4.0.0"
     through "~2.3.4"
 
+envinfo@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.2.0.tgz#7e6d7638740d2d43806431403be6dd4bddf15af9"
+  integrity sha512-hHDGx34o8V0IULC6MnMb+jIMEJ5LBuK/EIbFi8/aw81r6q+wXCvu9QCA9RPbpOaBxtlH/16cYB2HkBnRFTy4SQ==
+
 err-code@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"