3pp-mirror/docusaurus
1
0
Fork 0
mirror of https://github.com/facebook/docusaurus.git synced 2025-06-01 18:32:52 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: replace use of deepmerge with _.merge (#1430)

Browse source
This commit is contained in:
Yangshun Tay 2019-05-02 08:00:28 -07:00 • committed by Endi
parent 578c53a936
commit 64fdafbcea
5 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/docusaurus-1.x/lib/write-translations.js
View file

@ -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'],
);