mirror of
https://github.com/facebook/docusaurus.git
synced 2025-06-02 02:42:41 +02:00
ESLintify Part 3 (#846)
* ESLintify Part 3 * ESLintify Part 3 * ESLintify Part 3
This commit is contained in:
parent
5ac2cee658
commit
a7a214fb3a
54 changed files with 435 additions and 497 deletions
|
@ -10,7 +10,7 @@ const fs = require('fs-extra');
|
|||
const path = require('path');
|
||||
const chalk = require('chalk');
|
||||
|
||||
const siteConfig = require(CWD + '/siteConfig.js');
|
||||
const siteConfig = require(`${CWD}/siteConfig.js`);
|
||||
|
||||
const join = path.join;
|
||||
|
||||
|
|
|
@ -8,10 +8,10 @@
|
|||
const Feed = require('feed');
|
||||
|
||||
const CWD = process.cwd();
|
||||
const siteConfig = require(CWD + '/siteConfig.js');
|
||||
const siteConfig = require(`${CWD}/siteConfig.js`);
|
||||
const readMetadata = require('./readMetadata.js');
|
||||
|
||||
const blogRootURL = siteConfig.url + siteConfig.baseUrl + 'blog';
|
||||
const blogRootURL = `${siteConfig.url + siteConfig.baseUrl}blog`;
|
||||
const siteImageURL =
|
||||
siteConfig.url + siteConfig.baseUrl + siteConfig.headerIcon;
|
||||
const utils = require('../core/utils');
|
||||
|
@ -27,11 +27,10 @@ module.exports = function(type) {
|
|||
const MetadataBlog = require('../core/MetadataBlog.js');
|
||||
|
||||
const feed = new Feed({
|
||||
title: siteConfig.title + ' Blog',
|
||||
description:
|
||||
'The best place to stay up-to-date with the latest ' +
|
||||
siteConfig.title +
|
||||
' news and events.',
|
||||
title: `${siteConfig.title} Blog`,
|
||||
description: `The best place to stay up-to-date with the latest ${
|
||||
siteConfig.title
|
||||
} news and events.`,
|
||||
id: blogRootURL,
|
||||
link: blogRootURL,
|
||||
image: siteImageURL,
|
||||
|
@ -40,7 +39,7 @@ module.exports = function(type) {
|
|||
});
|
||||
|
||||
MetadataBlog.forEach(post => {
|
||||
const url = blogRootURL + '/' + post.path;
|
||||
const url = `${blogRootURL}/${post.path}`;
|
||||
const content = utils.blogPostHasTruncateMarker(post.content)
|
||||
? utils.extractBlogPostBeforeTruncate(post.content)
|
||||
: utils.extractBlogPostSummary(post.content.trim());
|
||||
|
|
|
@ -23,7 +23,7 @@ async function execute() {
|
|||
const chalk = require('chalk');
|
||||
const Site = require('../core/Site.js');
|
||||
const env = require('./env.js');
|
||||
const siteConfig = require(CWD + '/siteConfig.js');
|
||||
const siteConfig = require(`${CWD}/siteConfig.js`);
|
||||
const translate = require('./translate.js');
|
||||
const feed = require('./feed.js');
|
||||
const sitemap = require('./sitemap.js');
|
||||
|
@ -164,29 +164,29 @@ async function execute() {
|
|||
Object.keys(mdToHtml).forEach(key => {
|
||||
let link = mdToHtml[key];
|
||||
link = utils.getPath(link, siteConfig.cleanUrl);
|
||||
link = link.replace('/en/', '/' + language + '/');
|
||||
link = link.replace('/en/', `/${language}/`);
|
||||
link = link.replace(
|
||||
'/VERSION/',
|
||||
metadata.version && metadata.version !== defaultVersion
|
||||
? '/' + metadata.version + '/'
|
||||
? `/${metadata.version}/`
|
||||
: '/'
|
||||
);
|
||||
// replace relative links without "./"
|
||||
rawContent = rawContent.replace(
|
||||
new RegExp('\\]\\(' + key, 'g'),
|
||||
'](' + link
|
||||
new RegExp(`\\]\\(${key}`, 'g'),
|
||||
`](${link}`
|
||||
);
|
||||
// replace relative links with "./"
|
||||
rawContent = rawContent.replace(
|
||||
new RegExp('\\]\\(\\./' + key, 'g'),
|
||||
'](' + link
|
||||
new RegExp(`\\]\\(\\./${key}`, 'g'),
|
||||
`](${link}`
|
||||
);
|
||||
});
|
||||
|
||||
// replace any relative links to static assets to absolute links
|
||||
rawContent = rawContent.replace(
|
||||
/\]\(assets\//g,
|
||||
'](' + siteConfig.baseUrl + 'docs/assets/'
|
||||
`](${siteConfig.baseUrl}docs/assets/`
|
||||
);
|
||||
|
||||
const docComp = (
|
||||
|
@ -305,7 +305,7 @@ async function execute() {
|
|||
const targetFile = join(
|
||||
buildDir,
|
||||
'blog',
|
||||
page > 0 ? 'page' + (page + 1) : '',
|
||||
page > 0 ? `page${page + 1}` : '',
|
||||
'index.html'
|
||||
);
|
||||
writeFileAndCreateFolder(targetFile, str);
|
||||
|
@ -341,7 +341,7 @@ async function execute() {
|
|||
let targetFile = path.normalize(file);
|
||||
targetFile = join(
|
||||
buildDir,
|
||||
targetFile.split(sep + 'static' + sep)[1] || ''
|
||||
targetFile.split(`${sep}static${sep}`)[1] || ''
|
||||
);
|
||||
// parse css files to replace colors according to siteConfig
|
||||
if (file.match(/\.css$/)) {
|
||||
|
@ -361,16 +361,16 @@ async function execute() {
|
|||
|
||||
Object.keys(siteConfig.colors).forEach(key => {
|
||||
const color = siteConfig.colors[key];
|
||||
cssContent = cssContent.replace(new RegExp('\\$' + key, 'g'), color);
|
||||
cssContent = cssContent.replace(new RegExp(`\\$${key}`, 'g'), color);
|
||||
});
|
||||
|
||||
if (siteConfig.fonts) {
|
||||
Object.keys(siteConfig.fonts).forEach(key => {
|
||||
const fontString = siteConfig.fonts[key]
|
||||
.map(font => '"' + font + '"')
|
||||
.map(font => `"${font}"`)
|
||||
.join(', ');
|
||||
cssContent = cssContent.replace(
|
||||
new RegExp('\\$' + key, 'g'),
|
||||
new RegExp(`\\$${key}`, 'g'),
|
||||
fontString
|
||||
);
|
||||
});
|
||||
|
@ -394,20 +394,20 @@ async function execute() {
|
|||
if (normalizedFile.match(/\.css$/) && !isSeparateCss(normalizedFile)) {
|
||||
const mainCss = join(buildDir, 'css', 'main.css');
|
||||
let cssContent = fs.readFileSync(normalizedFile, 'utf8');
|
||||
cssContent = fs.readFileSync(mainCss, 'utf8') + '\n' + cssContent;
|
||||
cssContent = `${fs.readFileSync(mainCss, 'utf8')}\n${cssContent}`;
|
||||
|
||||
Object.keys(siteConfig.colors).forEach(key => {
|
||||
const color = siteConfig.colors[key];
|
||||
cssContent = cssContent.replace(new RegExp('\\$' + key, 'g'), color);
|
||||
cssContent = cssContent.replace(new RegExp(`\\$${key}`, 'g'), color);
|
||||
});
|
||||
|
||||
if (siteConfig.fonts) {
|
||||
Object.keys(siteConfig.fonts).forEach(key => {
|
||||
const fontString = siteConfig.fonts[key]
|
||||
.map(font => '"' + font + '"')
|
||||
.map(font => `"${font}"`)
|
||||
.join(', ');
|
||||
cssContent = cssContent.replace(
|
||||
new RegExp('\\$' + key, 'g'),
|
||||
new RegExp(`\\$${key}`, 'g'),
|
||||
fontString
|
||||
);
|
||||
});
|
||||
|
@ -418,7 +418,7 @@ async function execute() {
|
|||
normalizedFile.match(/\.png$|.jpg$|.svg$|.gif$/) &&
|
||||
!commander.skipImageCompression
|
||||
) {
|
||||
const parts = normalizedFile.split(sep + 'static' + sep);
|
||||
const parts = normalizedFile.split(`${sep}static${sep}`);
|
||||
const targetDirectory = join(
|
||||
buildDir,
|
||||
parts[1].substring(0, parts[1].lastIndexOf(sep))
|
||||
|
@ -435,7 +435,7 @@ async function execute() {
|
|||
],
|
||||
});
|
||||
} else if (!fs.lstatSync(normalizedFile).isDirectory()) {
|
||||
const parts = normalizedFile.split(sep + 'static' + sep);
|
||||
const parts = normalizedFile.split(`${sep}static${sep}`);
|
||||
const targetFile = join(buildDir, parts[1]);
|
||||
mkdirp.sync(path.dirname(targetFile));
|
||||
fs.copySync(normalizedFile, targetFile);
|
||||
|
@ -463,7 +463,7 @@ async function execute() {
|
|||
let tempFile = join(__dirname, '..', 'pages', parts[1]);
|
||||
tempFile = tempFile.replace(
|
||||
path.basename(normalizedFile),
|
||||
'temp' + path.basename(normalizedFile)
|
||||
`temp${path.basename(normalizedFile)}`
|
||||
);
|
||||
mkdirp.sync(path.dirname(tempFile));
|
||||
fs.copySync(normalizedFile, tempFile);
|
||||
|
@ -474,9 +474,9 @@ async function execute() {
|
|||
targetFile = targetFile.replace(/\.js$/, '.html');
|
||||
|
||||
const regexLang = new RegExp(
|
||||
escapeStringRegexp(sep + 'pages' + sep) +
|
||||
'(.*)' +
|
||||
escapeStringRegexp(sep)
|
||||
`${escapeStringRegexp(`${sep}pages${sep}`)}(.*)${escapeStringRegexp(
|
||||
sep
|
||||
)}`
|
||||
);
|
||||
const match = regexLang.exec(normalizedFile);
|
||||
const langParts = match[1].split(sep);
|
||||
|
@ -488,7 +488,7 @@ async function execute() {
|
|||
if (
|
||||
language === 'en' ||
|
||||
!fs.existsSync(
|
||||
normalizedFile.replace(sep + 'en' + sep, sep + language + sep)
|
||||
normalizedFile.replace(`${sep}en${sep}`, sep + language + sep)
|
||||
)
|
||||
) {
|
||||
translate.setLanguage(language);
|
||||
|
@ -504,7 +504,7 @@ async function execute() {
|
|||
);
|
||||
writeFileAndCreateFolder(
|
||||
// TODO: use path functions
|
||||
targetFile.replace(sep + 'en' + sep, sep + language + sep),
|
||||
targetFile.replace(`${sep}en${sep}`, sep + language + sep),
|
||||
str
|
||||
);
|
||||
}
|
||||
|
@ -524,7 +524,7 @@ async function execute() {
|
|||
</Site>
|
||||
);
|
||||
writeFileAndCreateFolder(
|
||||
targetFile.replace(sep + 'en' + sep, sep),
|
||||
targetFile.replace(`${sep}en${sep}`, sep),
|
||||
str
|
||||
);
|
||||
} else {
|
||||
|
@ -542,7 +542,7 @@ async function execute() {
|
|||
</Site>
|
||||
);
|
||||
writeFileAndCreateFolder(
|
||||
targetFile.replace(sep + 'en' + sep, sep),
|
||||
targetFile.replace(`${sep}en${sep}`, sep),
|
||||
str
|
||||
);
|
||||
}
|
||||
|
|
|
@ -11,8 +11,8 @@ const Metadata = require('../core/metadata.js');
|
|||
|
||||
const CWD = process.cwd();
|
||||
let languages;
|
||||
if (fs.existsSync(CWD + '/languages.js')) {
|
||||
languages = require(CWD + '/languages.js');
|
||||
if (fs.existsSync(`${CWD}/languages.js`)) {
|
||||
languages = require(`${CWD}/languages.js`);
|
||||
} else {
|
||||
languages = [
|
||||
{
|
||||
|
|
|
@ -15,7 +15,7 @@ const metadataUtils = require('./metadataUtils');
|
|||
|
||||
const env = require('./env.js');
|
||||
|
||||
const siteConfig = require(CWD + '/siteConfig.js');
|
||||
const siteConfig = require(`${CWD}/siteConfig.js`);
|
||||
const versionFallback = require('./versionFallback.js');
|
||||
const utils = require('./utils.js');
|
||||
|
||||
|
@ -44,8 +44,8 @@ function getDocsPath() {
|
|||
// returns map from id to object containing sidebar ordering info
|
||||
function readSidebar() {
|
||||
let allSidebars;
|
||||
if (fs.existsSync(CWD + '/sidebars.json')) {
|
||||
allSidebars = require(CWD + '/sidebars.json');
|
||||
if (fs.existsSync(`${CWD}/sidebars.json`)) {
|
||||
allSidebars = require(`${CWD}/sidebars.json`);
|
||||
} else {
|
||||
allSidebars = {};
|
||||
}
|
||||
|
@ -124,18 +124,18 @@ function processMetadata(file, refDir) {
|
|||
}
|
||||
|
||||
const langPart =
|
||||
env.translation.enabled || siteConfig.useEnglishUrl ? language + '/' : '';
|
||||
env.translation.enabled || siteConfig.useEnglishUrl ? `${language}/` : '';
|
||||
let versionPart = '';
|
||||
if (env.versioning.enabled) {
|
||||
metadata.version = 'next';
|
||||
versionPart = 'next/';
|
||||
}
|
||||
|
||||
metadata.permalink = 'docs/' + langPart + versionPart + metadata.id + '.html';
|
||||
metadata.permalink = `docs/${langPart}${versionPart}${metadata.id}.html`;
|
||||
|
||||
// change ids previous, next
|
||||
metadata.localized_id = metadata.id;
|
||||
metadata.id = (env.translation.enabled ? language + '-' : '') + metadata.id;
|
||||
metadata.id = (env.translation.enabled ? `${language}-` : '') + metadata.id;
|
||||
metadata.language = env.translation.enabled ? language : 'en';
|
||||
|
||||
const order = readSidebar();
|
||||
|
@ -148,12 +148,12 @@ function processMetadata(file, refDir) {
|
|||
if (order[id].next) {
|
||||
metadata.next_id = order[id].next;
|
||||
metadata.next =
|
||||
(env.translation.enabled ? language + '-' : '') + order[id].next;
|
||||
(env.translation.enabled ? `${language}-` : '') + order[id].next;
|
||||
}
|
||||
if (order[id].previous) {
|
||||
metadata.previous_id = order[id].previous;
|
||||
metadata.previous =
|
||||
(env.translation.enabled ? language + '-' : '') + order[id].previous;
|
||||
(env.translation.enabled ? `${language}-` : '') + order[id].previous;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -179,7 +179,7 @@ function generateMetadataDocs() {
|
|||
|
||||
// metadata for english files
|
||||
const docsDir = path.join(CWD, '../', getDocsPath());
|
||||
let files = glob.sync(CWD + '/../' + getDocsPath() + '/**');
|
||||
let files = glob.sync(`${CWD}/../${getDocsPath()}/**`);
|
||||
files.forEach(file => {
|
||||
const extension = path.extname(file);
|
||||
|
||||
|
@ -200,19 +200,19 @@ function generateMetadataDocs() {
|
|||
const baseMetadata = Object.assign({}, metadata);
|
||||
baseMetadata.id = baseMetadata.id
|
||||
.toString()
|
||||
.replace(/^en-/, currentLanguage + '-');
|
||||
.replace(/^en-/, `${currentLanguage}-`);
|
||||
if (baseMetadata.permalink)
|
||||
baseMetadata.permalink = baseMetadata.permalink
|
||||
.toString()
|
||||
.replace(/^docs\/en\//, 'docs/' + currentLanguage + '/');
|
||||
.replace(/^docs\/en\//, `docs/${currentLanguage}/`);
|
||||
if (baseMetadata.next)
|
||||
baseMetadata.next = baseMetadata.next
|
||||
.toString()
|
||||
.replace(/^en-/, currentLanguage + '-');
|
||||
.replace(/^en-/, `${currentLanguage}-`);
|
||||
if (baseMetadata.previous)
|
||||
baseMetadata.previous = baseMetadata.previous
|
||||
.toString()
|
||||
.replace(/^en-/, currentLanguage + '-');
|
||||
.replace(/^en-/, `${currentLanguage}-`);
|
||||
baseMetadata.language = currentLanguage;
|
||||
defaultMetadatas[baseMetadata.id] = baseMetadata;
|
||||
});
|
||||
|
@ -222,7 +222,7 @@ function generateMetadataDocs() {
|
|||
|
||||
// metadata for non-english docs
|
||||
const translatedDir = path.join(CWD, 'translated_docs');
|
||||
files = glob.sync(CWD + '/translated_docs/**');
|
||||
files = glob.sync(`${CWD}/translated_docs/**`);
|
||||
files.forEach(file => {
|
||||
if (!utils.getLanguage(file, translatedDir)) {
|
||||
return;
|
||||
|
@ -249,20 +249,20 @@ function generateMetadataDocs() {
|
|||
metadata.category = order[id].category;
|
||||
if (order[id].next) {
|
||||
metadata.next_id = order[id].next.replace(
|
||||
'version-' + metadata.version + '-',
|
||||
`version-${metadata.version}-`,
|
||||
''
|
||||
);
|
||||
metadata.next =
|
||||
(env.translation.enabled ? metadata.language + '-' : '') +
|
||||
(env.translation.enabled ? `${metadata.language}-` : '') +
|
||||
order[id].next;
|
||||
}
|
||||
if (order[id].previous) {
|
||||
metadata.previous_id = order[id].previous.replace(
|
||||
'version-' + metadata.version + '-',
|
||||
`version-${metadata.version}-`,
|
||||
''
|
||||
);
|
||||
metadata.previous =
|
||||
(env.translation.enabled ? metadata.language + '-' : '') +
|
||||
(env.translation.enabled ? `${metadata.language}-` : '') +
|
||||
order[id].previous;
|
||||
}
|
||||
}
|
||||
|
@ -271,7 +271,7 @@ function generateMetadataDocs() {
|
|||
|
||||
// Get the titles of the previous and next ids so that we can use them in
|
||||
// navigation buttons in DocsLayout.js
|
||||
Object.keys(metadatas).forEach(function(metadata) {
|
||||
Object.keys(metadatas).forEach(metadata => {
|
||||
if (metadatas[metadata].previous) {
|
||||
if (metadatas[metadatas[metadata].previous]) {
|
||||
metadatas[metadata].previous_title =
|
||||
|
@ -292,13 +292,11 @@ function generateMetadataDocs() {
|
|||
|
||||
fs.writeFileSync(
|
||||
path.join(__dirname, '/../core/metadata.js'),
|
||||
'/**\n' +
|
||||
`${'/**\n' +
|
||||
' * @' +
|
||||
'generated\n' + // separate this out for Nuclide treating @generated as readonly
|
||||
' */\n' +
|
||||
'module.exports = ' +
|
||||
JSON.stringify(metadatas, null, 2) +
|
||||
';\n'
|
||||
'module.exports = '}${JSON.stringify(metadatas, null, 2)};\n`
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -306,7 +304,7 @@ function generateMetadataDocs() {
|
|||
function generateMetadataBlog() {
|
||||
const metadatas = [];
|
||||
|
||||
const files = glob.sync(CWD + '/blog/**/*.*');
|
||||
const files = glob.sync(`${CWD}/blog/**/*.*`);
|
||||
files
|
||||
.sort()
|
||||
.reverse()
|
||||
|
@ -342,12 +340,9 @@ function generateMetadataBlog() {
|
|||
.toString()
|
||||
.split('-');
|
||||
metadata.date = new Date(
|
||||
filePathDateArr[0] +
|
||||
'-' +
|
||||
filePathDateArr[1] +
|
||||
'-' +
|
||||
filePathDateArr[2] +
|
||||
'T06:00:00.000Z'
|
||||
`${filePathDateArr[0]}-${filePathDateArr[1]}-${
|
||||
filePathDateArr[2]
|
||||
}T06:00:00.000Z`
|
||||
);
|
||||
// allow easier sorting of blog by providing seconds since epoch
|
||||
metadata.seconds = Math.round(metadata.date.getTime() / 1000);
|
||||
|
@ -361,13 +356,11 @@ function generateMetadataBlog() {
|
|||
|
||||
fs.writeFileSync(
|
||||
path.join(__dirname, '/../core/MetadataBlog.js'),
|
||||
'/**\n' +
|
||||
`${'/**\n' +
|
||||
' * @' +
|
||||
'generated\n' + // separate this out for Nuclide treating @generated as readonly
|
||||
' */\n' +
|
||||
'module.exports = ' +
|
||||
JSON.stringify(sortedMetadatas, null, 2) +
|
||||
';\n'
|
||||
'module.exports = '}${JSON.stringify(sortedMetadatas, null, 2)};\n`
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ const renderToStaticMarkup = require('react-dom/server').renderToStaticMarkup;
|
|||
* rendering within Docusaurus should use this function instead.
|
||||
*/
|
||||
function renderToStaticMarkupWithDoctype(...args) {
|
||||
return '<!DOCTYPE html>' + renderToStaticMarkup(...args);
|
||||
return `<!DOCTYPE html>${renderToStaticMarkup(...args)}`;
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
|
|
|
@ -49,7 +49,7 @@ function execute(port, options) {
|
|||
|
||||
function removeModulePathFromCache(moduleName) {
|
||||
/* eslint-disable no-underscore-dangle */
|
||||
Object.keys(module.constructor._pathCache).forEach(function(cacheKey) {
|
||||
Object.keys(module.constructor._pathCache).forEach(cacheKey => {
|
||||
if (cacheKey.indexOf(moduleName) > 0) {
|
||||
delete module.constructor._pathCache[cacheKey];
|
||||
}
|
||||
|
@ -149,7 +149,7 @@ function execute(port, options) {
|
|||
// Start LiveReload server.
|
||||
process.env.NODE_ENV = 'development';
|
||||
const server = tinylr();
|
||||
server.listen(constants.LIVE_RELOAD_PORT, function() {
|
||||
server.listen(constants.LIVE_RELOAD_PORT, () => {
|
||||
console.log(
|
||||
'LiveReload server started on port %d',
|
||||
constants.LIVE_RELOAD_PORT
|
||||
|
@ -159,13 +159,13 @@ function execute(port, options) {
|
|||
// gaze watches some specified dirs and triggers a callback when they change.
|
||||
gaze(
|
||||
[
|
||||
'../' + readMetadata.getDocsPath() + '/**/*', // docs
|
||||
`../${readMetadata.getDocsPath()}/**/*`, // docs
|
||||
'**/*', // website
|
||||
'!node_modules/**/*', // node_modules
|
||||
],
|
||||
function() {
|
||||
// Listen for all kinds of file changes - modified/added/deleted.
|
||||
this.on('all', function() {
|
||||
this.on('all', () => {
|
||||
// Notify LiveReload clients that there's a change.
|
||||
// Typically, LiveReload will only refresh the changed paths,
|
||||
// so we use / here to force a full-page reload.
|
||||
|
@ -252,29 +252,29 @@ function execute(port, options) {
|
|||
Object.keys(mdToHtml).forEach(key => {
|
||||
let link = mdToHtml[key];
|
||||
link = utils.getPath(link, siteConfig.cleanUrl);
|
||||
link = link.replace('/en/', '/' + language + '/');
|
||||
link = link.replace('/en/', `/${language}/`);
|
||||
link = link.replace(
|
||||
'/VERSION/',
|
||||
metadata.version && metadata.version !== defaultVersion
|
||||
? '/' + metadata.version + '/'
|
||||
? `/${metadata.version}/`
|
||||
: '/'
|
||||
);
|
||||
// replace relative links without "./"
|
||||
rawContent = rawContent.replace(
|
||||
new RegExp('\\]\\(' + key, 'g'),
|
||||
'](' + link
|
||||
new RegExp(`\\]\\(${key}`, 'g'),
|
||||
`](${link}`
|
||||
);
|
||||
// replace relative links with "./"
|
||||
rawContent = rawContent.replace(
|
||||
new RegExp('\\]\\(\\./' + key, 'g'),
|
||||
'](' + link
|
||||
new RegExp(`\\]\\(\\./${key}`, 'g'),
|
||||
`](${link}`
|
||||
);
|
||||
});
|
||||
|
||||
// replace any relative links to static assets to absolute links
|
||||
rawContent = rawContent.replace(
|
||||
/\]\(assets\//g,
|
||||
'](' + siteConfig.baseUrl + 'docs/assets/'
|
||||
`](${siteConfig.baseUrl}docs/assets/`
|
||||
);
|
||||
|
||||
removeModuleAndChildrenFromCache('../core/DocsLayout.js');
|
||||
|
@ -357,7 +357,7 @@ function execute(port, options) {
|
|||
);
|
||||
const str = renderToStaticMarkupWithDoctype(blogPageComp);
|
||||
|
||||
const pagePath = (page > 0 ? 'page' + (page + 1) : '') + '/index.html';
|
||||
const pagePath = `${page > 0 ? `page${page + 1}` : ''}/index.html`;
|
||||
blogPages[pagePath] = str;
|
||||
}
|
||||
|
||||
|
@ -369,9 +369,9 @@ function execute(port, options) {
|
|||
res.send(blogPages[parts[1]]);
|
||||
} else if (parts[1].match(/page([0-9]+)/)) {
|
||||
if (parts[1].endsWith('/')) {
|
||||
res.send(blogPages[parts[1] + 'index.html']);
|
||||
res.send(blogPages[`${parts[1]}index.html`]);
|
||||
} else {
|
||||
res.send(blogPages[parts[1] + '/index.html']);
|
||||
res.send(blogPages[`${parts[1]}/index.html`]);
|
||||
}
|
||||
} else {
|
||||
// send corresponding blog post. Ex: request to "blog/test/index.html" or
|
||||
|
@ -396,7 +396,7 @@ function execute(port, options) {
|
|||
let rawContent = result.rawContent;
|
||||
rawContent = rawContent.replace(
|
||||
/\]\(assets\//g,
|
||||
'](' + siteConfig.baseUrl + 'blog/assets/'
|
||||
`](${siteConfig.baseUrl}blog/assets/`
|
||||
);
|
||||
const metadata = Object.assign(
|
||||
{path: req.path.toString().split('blog/')[1], content: rawContent},
|
||||
|
@ -478,7 +478,7 @@ function execute(port, options) {
|
|||
}
|
||||
let englishFile = join(CWD, 'pages', file);
|
||||
if (language && language !== 'en') {
|
||||
englishFile = englishFile.replace(sep + language + sep, sep + 'en' + sep);
|
||||
englishFile = englishFile.replace(sep + language + sep, `${sep}en${sep}`);
|
||||
}
|
||||
|
||||
// check for: a file for the page, an english file for page with unspecified language, or an
|
||||
|
@ -488,17 +488,17 @@ function execute(port, options) {
|
|||
fs.existsSync(
|
||||
(userFile = userFile.replace(
|
||||
path.basename(userFile),
|
||||
'en' + sep + path.basename(userFile)
|
||||
`en${sep}${path.basename(userFile)}`
|
||||
))
|
||||
) ||
|
||||
fs.existsSync((userFile = englishFile))
|
||||
) {
|
||||
// copy into docusaurus so require paths work
|
||||
const userFileParts = userFile.split('pages' + sep);
|
||||
const userFileParts = userFile.split(`pages${sep}`);
|
||||
let tempFile = join(__dirname, '..', 'pages', userFileParts[1]);
|
||||
tempFile = tempFile.replace(
|
||||
path.basename(file),
|
||||
'temp' + path.basename(file)
|
||||
`temp${path.basename(file)}`
|
||||
);
|
||||
mkdirp.sync(path.dirname(tempFile));
|
||||
fs.copySync(userFile, tempFile);
|
||||
|
@ -544,8 +544,9 @@ function execute(port, options) {
|
|||
if (isSeparateCss(file)) {
|
||||
return;
|
||||
}
|
||||
cssContent =
|
||||
cssContent + '\n' + fs.readFileSync(file, {encoding: 'utf8'});
|
||||
cssContent = `${cssContent}\n${fs.readFileSync(file, {
|
||||
encoding: 'utf8',
|
||||
})}`;
|
||||
});
|
||||
|
||||
if (
|
||||
|
@ -562,16 +563,16 @@ function execute(port, options) {
|
|||
|
||||
Object.keys(siteConfig.colors).forEach(key => {
|
||||
const color = siteConfig.colors[key];
|
||||
cssContent = cssContent.replace(new RegExp('\\$' + key, 'g'), color);
|
||||
cssContent = cssContent.replace(new RegExp(`\\$${key}`, 'g'), color);
|
||||
});
|
||||
|
||||
if (siteConfig.fonts) {
|
||||
Object.keys(siteConfig.fonts).forEach(key => {
|
||||
const fontString = siteConfig.fonts[key]
|
||||
.map(font => '"' + font + '"')
|
||||
.map(font => `"${font}"`)
|
||||
.join(', ');
|
||||
cssContent = cssContent.replace(
|
||||
new RegExp('\\$' + key, 'g'),
|
||||
new RegExp(`\\$${key}`, 'g'),
|
||||
fontString
|
||||
);
|
||||
});
|
||||
|
@ -597,11 +598,11 @@ function execute(port, options) {
|
|||
// for example, request to "blog" returns "blog/index.html" or "blog.html"
|
||||
app.get(noExtRouting(), (req, res, next) => {
|
||||
const slash = req.path.toString().endsWith('/') ? '' : '/';
|
||||
const requestUrl = 'http://localhost:' + port + req.path;
|
||||
requestFile(requestUrl + slash + 'index.html', res, () => {
|
||||
const requestUrl = `http://localhost:${port}${req.path}`;
|
||||
requestFile(`${requestUrl + slash}index.html`, res, () => {
|
||||
requestFile(
|
||||
slash === '/'
|
||||
? requestUrl + '.html'
|
||||
? `${requestUrl}.html`
|
||||
: requestUrl.replace(/\/$/, '.html'),
|
||||
res,
|
||||
next
|
||||
|
@ -616,7 +617,7 @@ function execute(port, options) {
|
|||
next();
|
||||
return;
|
||||
}
|
||||
requestFile('http://localhost:' + port + req.path + '.html', res, next);
|
||||
requestFile(`http://localhost:${port}${req.path}.html`, res, next);
|
||||
});
|
||||
|
||||
if (options.watch) startLiveReload();
|
||||
|
|
|
@ -14,7 +14,7 @@ const CWD = process.cwd();
|
|||
const sitemap = require('sitemap');
|
||||
const utils = require('../core/utils');
|
||||
|
||||
const siteConfig = require(CWD + '/siteConfig.js');
|
||||
const siteConfig = require(`${CWD}/siteConfig.js`);
|
||||
|
||||
const readMetadata = require('./readMetadata.js');
|
||||
|
||||
|
@ -27,7 +27,7 @@ const MetadataBlog = require('../core/MetadataBlog.js');
|
|||
module.exports = function(callback) {
|
||||
console.log('sitemap.js triggered...');
|
||||
|
||||
const files = glob.sync(CWD + '/pages/en/**/*.js');
|
||||
const files = glob.sync(`${CWD}/pages/en/**/*.js`);
|
||||
|
||||
// English-only is the default.
|
||||
let enabledLanguages = [
|
||||
|
@ -39,8 +39,8 @@ module.exports = function(callback) {
|
|||
];
|
||||
|
||||
// If we have a languages.js file, get all the enabled languages in there
|
||||
if (fs.existsSync(CWD + '/languages.js')) {
|
||||
const languages = require(CWD + '/languages.js');
|
||||
if (fs.existsSync(`${CWD}/languages.js`)) {
|
||||
const languages = require(`${CWD}/languages.js`);
|
||||
enabledLanguages = languages.filter(lang => lang.enabled);
|
||||
}
|
||||
|
||||
|
@ -59,7 +59,7 @@ module.exports = function(callback) {
|
|||
|
||||
MetadataBlog.forEach(blog => {
|
||||
urls.push({
|
||||
url: '/blog/' + utils.getPath(blog.path, siteConfig.cleanUrl),
|
||||
url: `/blog/${utils.getPath(blog.path, siteConfig.cleanUrl)}`,
|
||||
changefreq: 'weekly',
|
||||
priority: 0.3,
|
||||
});
|
||||
|
|
|
@ -30,14 +30,14 @@ module.exports = function translatePlugin(babel) {
|
|||
path.replaceWith(
|
||||
t.jSXExpressionContainer(
|
||||
t.callExpression(t.identifier('translate'), [
|
||||
t.stringLiteral(text + '|' + description),
|
||||
t.stringLiteral(`${text}|${description}`),
|
||||
])
|
||||
)
|
||||
);
|
||||
} else {
|
||||
path.replaceWith(
|
||||
t.callExpression(t.identifier('translate'), [
|
||||
t.stringLiteral(text + '|' + description),
|
||||
t.stringLiteral(`${text}|${description}`),
|
||||
])
|
||||
);
|
||||
}
|
||||
|
|
|
@ -47,19 +47,13 @@ function translate(str) {
|
|||
// if a translated string doesn't exist, but english does then fallback
|
||||
if (doesTranslationExist(str, 'en')) {
|
||||
console.error(
|
||||
"Could not find a string translation in '" +
|
||||
language +
|
||||
"' for string '" +
|
||||
str +
|
||||
"'. Using English version instead."
|
||||
`Could not find a string translation in '${language}' for string '${str}'. Using English version instead.`
|
||||
);
|
||||
|
||||
return parseEscapeSequences(translation.en['pages-strings'][str]);
|
||||
}
|
||||
throw new Error(
|
||||
"Text that you've identified for translation ('" +
|
||||
str +
|
||||
"') hasn't been added to the global list in 'en.json'. To solve this problem run 'yarn write-translations'."
|
||||
`Text that you've identified for translation ('${str}') hasn't been added to the global list in 'en.json'. To solve this problem run 'yarn write-translations'.`
|
||||
);
|
||||
}
|
||||
return parseEscapeSequences(translation[language]['pages-strings'][str]);
|
||||
|
|
|
@ -13,8 +13,8 @@ const glob = require('glob');
|
|||
const path = require('path');
|
||||
|
||||
let languages;
|
||||
if (fs.existsSync(CWD + '/languages.js')) {
|
||||
languages = require(CWD + '/languages.js');
|
||||
if (fs.existsSync(`${CWD}/languages.js`)) {
|
||||
languages = require(`${CWD}/languages.js`);
|
||||
} else {
|
||||
languages = [
|
||||
{
|
||||
|
@ -29,7 +29,7 @@ const enabledLanguages = languages.filter(lang => lang.enabled);
|
|||
|
||||
const translation = {languages: enabledLanguages};
|
||||
|
||||
const files = glob.sync(CWD + '/i18n/**');
|
||||
const files = glob.sync(`${CWD}/i18n/**`);
|
||||
const langRegex = /\/i18n\/(.*)\.json$/;
|
||||
|
||||
files.forEach(file => {
|
||||
|
|
|
@ -25,7 +25,7 @@ function getSubDir(file, refDir) {
|
|||
// returns 'ko'
|
||||
function getLanguage(file, refDir) {
|
||||
const regexSubFolder = new RegExp(
|
||||
'/' + escapeStringRegexp(path.basename(refDir)) + '/(.*)/.*/'
|
||||
`/${escapeStringRegexp(path.basename(refDir))}/(.*)/.*/`
|
||||
);
|
||||
const match = regexSubFolder.exec(file);
|
||||
|
||||
|
|
|
@ -15,20 +15,20 @@ const metadataUtils = require('./metadataUtils');
|
|||
const env = require('./env.js');
|
||||
const utils = require('./utils.js');
|
||||
|
||||
const siteConfig = require(CWD + '/siteConfig.js');
|
||||
const siteConfig = require(`${CWD}/siteConfig.js`);
|
||||
|
||||
const ENABLE_TRANSLATION = fs.existsSync(CWD + '/languages.js');
|
||||
const ENABLE_TRANSLATION = fs.existsSync(`${CWD}/languages.js`);
|
||||
|
||||
let versions;
|
||||
if (fs.existsSync(CWD + '/versions.json')) {
|
||||
versions = require(CWD + '/versions.json');
|
||||
if (fs.existsSync(`${CWD}/versions.json`)) {
|
||||
versions = require(`${CWD}/versions.json`);
|
||||
} else {
|
||||
versions = [];
|
||||
}
|
||||
|
||||
let languages;
|
||||
if (fs.existsSync(CWD + '/languages.js')) {
|
||||
languages = require(CWD + '/languages.js');
|
||||
if (fs.existsSync(`${CWD}/languages.js`)) {
|
||||
languages = require(`${CWD}/languages.js`);
|
||||
} else {
|
||||
languages = [
|
||||
{
|
||||
|
@ -39,7 +39,7 @@ if (fs.existsSync(CWD + '/languages.js')) {
|
|||
];
|
||||
}
|
||||
|
||||
const versionFolder = CWD + '/versioned_docs/';
|
||||
const versionFolder = `${CWD}/versioned_docs/`;
|
||||
|
||||
// available stores doc ids of documents that are available for
|
||||
// each version
|
||||
|
@ -47,7 +47,7 @@ const available = {};
|
|||
// versionFiles is used to keep track of what file to use with a
|
||||
// given version/id of a document
|
||||
const versionFiles = {};
|
||||
const files = glob.sync(versionFolder + '**');
|
||||
const files = glob.sync(`${versionFolder}**`);
|
||||
files.forEach(file => {
|
||||
const ext = path.extname(file);
|
||||
if (ext !== '.md' && ext !== '.markdown') {
|
||||
|
@ -85,7 +85,7 @@ files.forEach(file => {
|
|||
// e.g. version-1.0.0-getting-started => 1.0.0
|
||||
const version = metadata.id.substring(
|
||||
metadata.id.indexOf('version-') + 8, // version- is 8 characters
|
||||
metadata.id.lastIndexOf('-' + metadata.original_id)
|
||||
metadata.id.lastIndexOf(`-${metadata.original_id}`)
|
||||
);
|
||||
available[metadata.original_id].add(version);
|
||||
|
||||
|
@ -178,26 +178,20 @@ function processVersionMetadata(file, version, useVersion, language) {
|
|||
const latestVersion = versions[0];
|
||||
|
||||
if (!ENABLE_TRANSLATION && !siteConfig.useEnglishUrl) {
|
||||
metadata.permalink =
|
||||
'docs/' +
|
||||
(version !== latestVersion ? version + '/' : '') +
|
||||
metadata.original_id +
|
||||
'.html';
|
||||
metadata.permalink = `docs/${
|
||||
version !== latestVersion ? `${version}/` : ''
|
||||
}${metadata.original_id}.html`;
|
||||
} else {
|
||||
metadata.permalink =
|
||||
'docs/' +
|
||||
language +
|
||||
'/' +
|
||||
(version !== latestVersion ? version + '/' : '') +
|
||||
metadata.original_id +
|
||||
'.html';
|
||||
metadata.permalink = `docs/${language}/${
|
||||
version !== latestVersion ? `${version}/` : ''
|
||||
}${metadata.original_id}.html`;
|
||||
}
|
||||
metadata.id = metadata.id.replace(
|
||||
'version-' + useVersion + '-',
|
||||
'version-' + version + '-'
|
||||
`version-${useVersion}-`,
|
||||
`version-${version}-`
|
||||
);
|
||||
metadata.localized_id = metadata.id;
|
||||
metadata.id = (env.translation.enabled ? language + '-' : '') + metadata.id;
|
||||
metadata.id = (env.translation.enabled ? `${language}-` : '') + metadata.id;
|
||||
metadata.language = language;
|
||||
metadata.version = version;
|
||||
|
||||
|
@ -252,7 +246,7 @@ function sidebarVersion(reqVersion) {
|
|||
if (
|
||||
requestedFound &&
|
||||
fs.existsSync(
|
||||
CWD + '/versioned_sidebars/version-' + versions[i] + '-sidebars.json'
|
||||
`${CWD}/versioned_sidebars/version-${versions[i]}-sidebars.json`
|
||||
)
|
||||
) {
|
||||
return versions[i];
|
||||
|
@ -272,12 +266,11 @@ function diffLatestSidebar() {
|
|||
const latest = versions[0];
|
||||
|
||||
const version = sidebarVersion(latest);
|
||||
const latestSidebar =
|
||||
CWD + '/versioned_sidebars/version-' + version + '-sidebars.json';
|
||||
const latestSidebar = `${CWD}/versioned_sidebars/version-${version}-sidebars.json`;
|
||||
if (!fs.existsSync(latestSidebar)) {
|
||||
return true;
|
||||
}
|
||||
const currentSidebar = CWD + '/sidebars.json';
|
||||
const currentSidebar = `${CWD}/sidebars.json`;
|
||||
// if no current sidebar file, return false so no sidebar file gets copied
|
||||
if (!fs.existsSync(currentSidebar)) {
|
||||
return false;
|
||||
|
@ -287,7 +280,7 @@ function diffLatestSidebar() {
|
|||
// stripped and current sidebar
|
||||
return (
|
||||
JSON.stringify(JSON.parse(fs.readFileSync(latestSidebar, 'utf8'))).replace(
|
||||
new RegExp('version-' + version + '-', 'g'),
|
||||
new RegExp(`version-${version}-`, 'g'),
|
||||
''
|
||||
) !== JSON.stringify(JSON.parse(fs.readFileSync(currentSidebar, 'utf8')))
|
||||
);
|
||||
|
@ -302,12 +295,12 @@ function sidebarData() {
|
|||
const sidebar = JSON.parse(
|
||||
fs
|
||||
.readFileSync(
|
||||
CWD + '/versioned_sidebars/version-' + version + '-sidebars.json',
|
||||
`${CWD}/versioned_sidebars/version-${version}-sidebars.json`,
|
||||
'utf8'
|
||||
)
|
||||
.replace(
|
||||
new RegExp('version-' + version + '-', 'g'),
|
||||
'version-' + versions[i] + '-'
|
||||
new RegExp(`version-${version}-`, 'g'),
|
||||
`version-${versions[i]}-`
|
||||
)
|
||||
);
|
||||
Object.assign(allSidebars, sidebar);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue