@docusaurus/core 2.0.0-beta.12faed89d → 2.0.0-beta.14

package/lib/server/routes.js

@@ -23,7 +23,7 @@ const createRouteCodeString = ({ routePath, routeHash, exact, subroutesCodeStrin
     }
     if (subroutesCodeStrings) {
         parts.push(`routes: [
-${indent(utils_1.removeSuffix(subroutesCodeStrings.join(',\n'), ',\n'))}
+${indent((0, utils_1.removeSuffix)(subroutesCodeStrings.join(',\n'), ',\n'))}
 ]`);
     }
     Object.entries(props).forEach(([propName, propValue]) => {
@@ -46,10 +46,10 @@ const RoutesImportsCode = [
     `import ComponentCreator from '@docusaurus/ComponentCreator';`,
 ].join('\n');
 function isModule(value) {
-    if (lodash_1.isString(value)) {
+    if ((0, lodash_1.isString)(value)) {
         return true;
     }
-    if (lodash_1.isPlainObject(value) && lodash_1.has(value, '__import') && lodash_1.has(value, 'path')) {
+    if ((0, lodash_1.isPlainObject)(value) && (0, lodash_1.has)(value, '__import') && (0, lodash_1.has)(value, 'path')) {
         return true;
     }
     return false;
@@ -58,19 +58,17 @@ function getModulePath(target) {
     if (typeof target === 'string') {
         return target;
     }
-    const queryStr = target.query ? `?${querystring_1.stringify(target.query)}` : '';
+    const queryStr = target.query ? `?${(0, querystring_1.stringify)(target.query)}` : '';
     return `${target.path}${queryStr}`;
 }
 async function loadRoutes(pluginsRouteConfigs, baseUrl) {
     const registry = {};
-    const routesPaths = [utils_1.normalizeUrl([baseUrl, '404.html'])];
+    const routesPaths = [(0, utils_1.normalizeUrl)([baseUrl, '404.html'])];
     const routesChunkNames = {};
     // This is the higher level overview of route code generation.
     function generateRouteCode(routeConfig) {
-        const { path: routePath, component, modules = {}, routes: subroutes, exact, 
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        priority, ...props } = routeConfig;
-        if (!lodash_1.isString(routePath) || !component) {
+        const { path: routePath, component, modules = {}, routes: subroutes, exact, priority, ...props } = routeConfig;
+        if (!(0, lodash_1.isString)(routePath) || !component) {
             throw new Error(`Invalid route config: path must be a string and component is required.\n${JSON.stringify(routeConfig)}`);
         }
         // Collect all page paths for injecting it later in the plugin lifecycle
@@ -82,7 +80,7 @@ async function loadRoutes(pluginsRouteConfigs, baseUrl) {
         // We hash the route to generate the key, because 2 routes can conflict with
         // each others if they have the same path, ex: parent=/docs, child=/docs
         // see https://github.com/facebook/docusaurus/issues/2917
-        const routeHash = utils_1.simpleHash(JSON.stringify(routeConfig), 3);
+        const routeHash = (0, utils_1.simpleHash)(JSON.stringify(routeConfig), 3);
         const chunkNamesKey = `${routePath}-${routeHash}`;
         routesChunkNames[chunkNamesKey] = {
             ...genRouteChunkNames(registry, { component }, 'component', component),
@@ -123,7 +121,7 @@ registry, value, prefix, name) {
     }
     if (isModule(value)) {
         const modulePath = getModulePath(value);
-        const chunkName = utils_1.genChunkName(modulePath, prefix, name);
+        const chunkName = (0, utils_1.genChunkName)(modulePath, prefix, name);
         // We need to JSON.stringify so that if its on windows, backslashes are escaped.
         const loader = `() => import(/* webpackChunkName: '${chunkName}' */ ${JSON.stringify(modulePath)})`;
         registry[chunkName] = {

package/lib/server/themes/alias.d.ts

@@ -5,4 +5,5 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { ThemeAliases } from '@docusaurus/types';
+export declare function sortAliases(aliases: ThemeAliases): ThemeAliases;
 export default function themeAlias(themePath: string, addOriginalAlias: boolean): ThemeAliases;

package/lib/server/themes/alias.js

@@ -6,35 +6,44 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortAliases = void 0;
 const tslib_1 = require("tslib");
-const globby_1 = tslib_1.__importDefault(require("globby"));
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const path_1 = tslib_1.__importDefault(require("path"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const utils_1 = require("@docusaurus/utils");
 const lodash_1 = require("lodash");
+// Order of Webpack aliases is important because one alias can shadow another
+// This ensure @theme/NavbarItem alias is after @theme/NavbarItem/LocaleDropdown
+// See https://github.com/facebook/docusaurus/pull/3922
+// See https://github.com/facebook/docusaurus/issues/5382
+function sortAliases(aliases) {
+    // Alphabetical order by default
+    const entries = (0, lodash_1.sortBy)(Object.entries(aliases), ([alias]) => alias);
+    // @theme/NavbarItem should be after @theme/NavbarItem/LocaleDropdown
+    entries.sort(([alias1], [alias2]) => alias1.includes(`${alias2}/`) ? -1 : 0);
+    return Object.fromEntries(entries);
+}
+exports.sortAliases = sortAliases;
 // TODO make async
 function themeAlias(themePath, addOriginalAlias) {
     if (!fs_extra_1.default.pathExistsSync(themePath)) {
         return {};
     }
-    const themeComponentFiles = globby_1.default.sync(['**/*.{js,jsx,ts,tsx}'], {
+    const themeComponentFiles = utils_1.Globby.sync(['**/*.{js,jsx,ts,tsx}'], {
         cwd: themePath,
     });
-    // See https://github.com/facebook/docusaurus/pull/3922
-    // ensure @theme/NavbarItem alias is created after @theme/NavbarItem/LocaleDropdown
-    const sortedThemeComponentFiles = lodash_1.sortBy(themeComponentFiles, (file) => file.endsWith('/index.js'));
     const aliases = {};
-    sortedThemeComponentFiles.forEach((relativeSource) => {
+    themeComponentFiles.forEach((relativeSource) => {
         const filePath = path_1.default.join(themePath, relativeSource);
-        const fileName = utils_1.fileToPath(relativeSource);
-        const aliasName = utils_1.posixPath(utils_1.normalizeUrl(['@theme', fileName]).replace(/\/$/, ''));
+        const fileName = (0, utils_1.fileToPath)(relativeSource);
+        const aliasName = (0, utils_1.posixPath)((0, utils_1.normalizeUrl)(['@theme', fileName]).replace(/\/$/, ''));
         aliases[aliasName] = filePath;
         if (addOriginalAlias) {
             // For swizzled components to access the original.
-            const originalAliasName = utils_1.posixPath(utils_1.normalizeUrl(['@theme-original', fileName]).replace(/\/$/, ''));
+            const originalAliasName = (0, utils_1.posixPath)((0, utils_1.normalizeUrl)(['@theme-original', fileName]).replace(/\/$/, ''));
             aliases[originalAliasName] = filePath;
         }
     });
-    return aliases;
+    return sortAliases(aliases);
 }
 exports.default = themeAlias;

package/lib/server/themes/index.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { ThemeAliases, LoadedPlugin } from '@docusaurus/types';
-export declare function loadThemeAliases(themePaths: string[], userThemePaths?: string[]): ThemeAliases;
+export declare function loadThemeAliases(themePaths: string[], userThemePaths: string[]): ThemeAliases;
 export declare function loadPluginsThemeAliases({ siteDir, plugins, }: {
     siteDir: string;
     plugins: LoadedPlugin[];

package/lib/server/themes/index.js

@@ -8,40 +8,39 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPluginsThemeAliases = exports.loadThemeAliases = void 0;
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
-const constants_1 = require("../../constants");
-const alias_1 = tslib_1.__importDefault(require("./alias"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const utils_1 = require("@docusaurus/utils");
+const alias_1 = (0, tslib_1.__importStar)(require("./alias"));
 const ThemeFallbackDir = path_1.default.resolve(__dirname, '../../client/theme-fallback');
-function buildThemeAliases(themeAliases, aliases = {}) {
-    Object.keys(themeAliases).forEach((aliasKey) => {
-        if (aliasKey in aliases) {
-            const componentName = aliasKey.substring(aliasKey.indexOf('/') + 1);
-            // eslint-disable-next-line no-param-reassign
-            aliases[`@theme-init/${componentName}`] = aliases[aliasKey];
-        }
-        // eslint-disable-next-line no-param-reassign
-        aliases[aliasKey] = themeAliases[aliasKey];
-    });
-    return aliases;
-}
-function loadThemeAliases(themePaths, userThemePaths = []) {
-    let aliases = {}; // TODO refactor, inelegant side-effect
+function loadThemeAliases(themePaths, userThemePaths) {
+    const aliases = {};
     themePaths.forEach((themePath) => {
-        const themeAliases = alias_1.default(themePath, true);
-        aliases = { ...aliases, ...buildThemeAliases(themeAliases, aliases) };
+        const themeAliases = (0, alias_1.default)(themePath, true);
+        Object.keys(themeAliases).forEach((aliasKey) => {
+            // If this alias shadows a previous one, use @theme-init to preserve the initial one.
+            // @theme-init is only applied once: to the initial theme that provided this component
+            if (aliasKey in aliases) {
+                const componentName = aliasKey.substring(aliasKey.indexOf('/') + 1);
+                const initAlias = `@theme-init/${componentName}`;
+                if (!(initAlias in aliases)) {
+                    aliases[initAlias] = aliases[aliasKey];
+                }
+            }
+            aliases[aliasKey] = themeAliases[aliasKey];
+        });
     });
     userThemePaths.forEach((themePath) => {
-        const userThemeAliases = alias_1.default(themePath, false);
-        aliases = { ...aliases, ...buildThemeAliases(userThemeAliases, aliases) };
+        const userThemeAliases = (0, alias_1.default)(themePath, false);
+        Object.assign(aliases, userThemeAliases);
     });
-    return aliases;
+    return (0, alias_1.sortAliases)(aliases);
 }
 exports.loadThemeAliases = loadThemeAliases;
 function loadPluginsThemeAliases({ siteDir, plugins, }) {
     const pluginThemes = plugins
         .map((plugin) => (plugin.getThemePath ? plugin.getThemePath() : undefined))
         .filter((x) => Boolean(x));
-    const userTheme = path_1.default.resolve(siteDir, constants_1.THEME_PATH);
+    const userTheme = path_1.default.resolve(siteDir, utils_1.THEME_PATH);
     return loadThemeAliases([ThemeFallbackDir, ...pluginThemes], [userTheme]);
 }
 exports.loadPluginsThemeAliases = loadPluginsThemeAliases;

package/lib/server/translations/translations.d.ts

@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 import { TranslationFileContent, TranslationFile, TranslationMessage, InitializedPlugin } from '@docusaurus/types';
 export declare type WriteTranslationsOptions = {
     override?: boolean;

package/lib/server/translations/translations.js

@@ -1,19 +1,19 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyDefaultCodeTranslations = exports.getPluginsDefaultCodeTranslationMessages = exports.localizePluginTranslationFile = exports.writePluginTranslations = exports.writeCodeTranslations = exports.readCodeTranslationFileContent = exports.getCodeTranslationsFilePath = exports.getTranslationsLocaleDirPath = exports.getTranslationsDirPath = exports.writeTranslationFileContent = exports.readTranslationFileContent = exports.ensureTranslationFileContent = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-const path_1 = tslib_1.__importDefault(require("path"));
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyDefaultCodeTranslations = exports.getPluginsDefaultCodeTranslationMessages = exports.localizePluginTranslationFile = exports.writePluginTranslations = exports.writeCodeTranslations = exports.readCodeTranslationFileContent = exports.getCodeTranslationsFilePath = exports.getTranslationsLocaleDirPath = exports.getTranslationsDirPath = exports.writeTranslationFileContent = exports.readTranslationFileContent = exports.ensureTranslationFileContent = void 0;
+const tslib_1 = require("tslib");
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const lodash_1 = require("lodash");
 const utils_1 = require("@docusaurus/utils");
 const utils_validation_1 = require("@docusaurus/utils-validation");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
 const TranslationFileContentSchema = utils_validation_1.Joi.object()
     .pattern(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
     message: utils_validation_1.Joi.string().allow('').required(),
@@ -44,7 +44,7 @@ async function readTranslationFileContent(filePath) {
 exports.readTranslationFileContent = readTranslationFileContent;
 function mergeTranslationFileContent({ existingContent = {}, newContent, options, }) {
     // Apply messagePrefix to all messages
-    const newContentTransformed = lodash_1.mapValues(newContent, (value) => {
+    const newContentTransformed = (0, lodash_1.mapValues)(newContent, (value) => {
         var _a;
         return ({
             ...value,
@@ -68,11 +68,10 @@ function mergeTranslationFileContent({ existingContent = {}, newContent, options
 async function writeTranslationFileContent({ filePath, content: newContent, options = {}, }) {
     const existingContent = await readTranslationFileContent(filePath);
     // Warn about potential legacy keys
-    const unknownKeys = lodash_1.difference(Object.keys(existingContent !== null && existingContent !== void 0 ? existingContent : {}), Object.keys(newContent));
+    const unknownKeys = (0, lodash_1.difference)(Object.keys(existingContent !== null && existingContent !== void 0 ? existingContent : {}), Object.keys(newContent));
     if (unknownKeys.length > 0) {
-        console.warn(chalk_1.default.yellow(`Some translation keys looks unknown to us in file ${filePath}
-Maybe you should remove them?
-- ${unknownKeys.join('\n- ')}`));
+        logger_1.default.warn `Some translation keys looks unknown to us in file path=${filePath}.
+Maybe you should remove them? ${unknownKeys}`;
     }
     const mergedContent = mergeTranslationFileContent({
         existingContent,
@@ -81,9 +80,7 @@ Maybe you should remove them?
     });
     // Avoid creating empty translation files
     if (Object.keys(mergedContent).length > 0) {
-        console.log(`${Object.keys(mergedContent)
-            .length.toString()
-            .padStart(3, ' ')} translations will be written at "${utils_1.toMessageRelativeFilePath(filePath)}".`);
+        logger_1.default.info `number=${Object.keys(mergedContent).length} translations will be written at path=${(0, utils_1.toMessageRelativeFilePath)(filePath)}.`;
         await fs_extra_1.default.ensureDir(path_1.default.dirname(filePath));
         await fs_extra_1.default.writeFile(filePath, JSON.stringify(mergedContent, null, 2));
     }
@@ -124,7 +121,7 @@ function addTranslationFileExtension(translationFilePath) {
     return `${translationFilePath}.json`;
 }
 function getPluginTranslationFilePath({ siteDir, plugin, locale, translationFilePath, }) {
-    const dirPath = utils_1.getPluginI18nPath({
+    const dirPath = (0, utils_1.getPluginI18nPath)({
         siteDir,
         locale,
         pluginName: plugin.name,
@@ -172,25 +169,21 @@ async function localizePluginTranslationFile({ siteDir, plugin, locale, translat
 exports.localizePluginTranslationFile = localizePluginTranslationFile;
 async function getPluginsDefaultCodeTranslationMessages(plugins) {
     const pluginsMessages = await Promise.all(plugins.map((plugin) => { var _a, _b; return (_b = (_a = plugin.getDefaultCodeTranslationMessages) === null || _a === void 0 ? void 0 : _a.call(plugin)) !== null && _b !== void 0 ? _b : {}; }));
-    return pluginsMessages.reduce((allMessages, pluginMessages) => {
-        return { ...allMessages, ...pluginMessages };
-    }, {});
+    return pluginsMessages.reduce((allMessages, pluginMessages) => ({ ...allMessages, ...pluginMessages }), {});
 }
 exports.getPluginsDefaultCodeTranslationMessages = getPluginsDefaultCodeTranslationMessages;
 function applyDefaultCodeTranslations({ extractedCodeTranslations, defaultCodeMessages, }) {
-    const unusedDefaultCodeMessages = lodash_1.difference(Object.keys(defaultCodeMessages), Object.keys(extractedCodeTranslations));
+    const unusedDefaultCodeMessages = (0, lodash_1.difference)(Object.keys(defaultCodeMessages), Object.keys(extractedCodeTranslations));
     if (unusedDefaultCodeMessages.length > 0) {
-        console.warn(chalk_1.default.yellow(`Unused default message codes found.
-Please report this Docusaurus issue.
-- ${unusedDefaultCodeMessages.join('\n- ')}
-`));
+        logger_1.default.warn `Unused default message codes found.
+Please report this Docusaurus issue. name=${unusedDefaultCodeMessages}`;
     }
-    return lodash_1.mapValues(extractedCodeTranslations, (messageTranslation, messageId) => {
+    return (0, lodash_1.mapValues)(extractedCodeTranslations, (messageTranslation, messageId) => {
         var _a;
-        return {
+        return ({
             ...messageTranslation,
             message: (_a = defaultCodeMessages[messageId]) !== null && _a !== void 0 ? _a : messageTranslation.message,
-        };
+        });
     });
 }
 exports.applyDefaultCodeTranslations = applyDefaultCodeTranslations;

package/lib/server/translations/translationsExtractor.d.ts

@@ -1,7 +1,13 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 import { TransformOptions } from '@babel/core';
 import { InitializedPlugin, TranslationFileContent, TranslationMessage } from '@docusaurus/types';
 export declare function globSourceCodeFilePaths(dirPaths: string[]): Promise<string[]>;
-export declare function extractSiteSourceCodeTranslations(siteDir: string, plugins: InitializedPlugin[], babelOptions: TransformOptions): Promise<TranslationFileContent>;
+export declare function extractSiteSourceCodeTranslations(siteDir: string, plugins: InitializedPlugin[], babelOptions: TransformOptions, extraSourceCodeFilePaths?: string[]): Promise<TranslationFileContent>;
 declare type SourceCodeFileTranslations = {
     sourceCodeFilePath: string;
     translations: Record<string, TranslationMessage>;

package/lib/server/translations/translationsExtractor.js

@@ -1,22 +1,21 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractSourceCodeFileTranslations = exports.extractAllSourceCodeFileTranslations = exports.extractSiteSourceCodeTranslations = exports.globSourceCodeFilePaths = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const traverse_1 = tslib_1.__importDefault(require("@babel/traverse"));
-const generator_1 = tslib_1.__importDefault(require("@babel/generator"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractSourceCodeFileTranslations = exports.extractAllSourceCodeFileTranslations = exports.extractSiteSourceCodeTranslations = exports.globSourceCodeFilePaths = void 0;
+const tslib_1 = require("tslib");
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const traverse_1 = (0, tslib_1.__importDefault)(require("@babel/traverse"));
+const generator_1 = (0, tslib_1.__importDefault)(require("@babel/generator"));
+const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
 const core_1 = require("@babel/core");
-const lodash_1 = require("lodash");
-const path_1 = tslib_1.__importDefault(require("path"));
-const constants_1 = require("../../constants");
-const utils_1 = require("../utils");
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const utils_1 = require("@docusaurus/utils");
+const utils_2 = require("../utils");
 // We only support extracting source code translations from these kind of files
 const TranslatableSourceCodeExtension = new Set([
     '.js',
@@ -32,7 +31,7 @@ function isTranslatableSourceCodePath(filePath) {
     return TranslatableSourceCodeExtension.has(path_1.default.extname(filePath));
 }
 function getSiteSourceCodeFilePaths(siteDir) {
-    return [path_1.default.join(siteDir, constants_1.SRC_DIR_NAME)];
+    return [path_1.default.join(siteDir, utils_1.SRC_DIR_NAME)];
 }
 function getPluginSourceCodeFilePaths(plugin) {
     var _a, _b, _c;
@@ -48,7 +47,7 @@ function getPluginSourceCodeFilePaths(plugin) {
     return codePaths;
 }
 async function globSourceCodeFilePaths(dirPaths) {
-    const filePaths = await utils_1.safeGlobby(dirPaths);
+    const filePaths = await (0, utils_2.safeGlobby)(dirPaths);
     return filePaths.filter(isTranslatableSourceCodePath);
 }
 exports.globSourceCodeFilePaths = globSourceCodeFilePaths;
@@ -57,19 +56,21 @@ async function getSourceCodeFilePaths(siteDir, plugins) {
     // The getPathsToWatch() generally returns the js/jsx/ts/tsx/md/mdx file paths
     // We can use this method as well to know which folders we should try to extract translations from
     // Hacky/implicit, but do we want to introduce a new lifecycle method for that???
-    const pluginsPaths = lodash_1.flatten(plugins.map(getPluginSourceCodeFilePaths));
+    const pluginsPaths = plugins.flatMap(getPluginSourceCodeFilePaths);
     const allPaths = [...sitePaths, ...pluginsPaths];
     return globSourceCodeFilePaths(allPaths);
 }
-async function extractSiteSourceCodeTranslations(siteDir, plugins, babelOptions) {
+async function extractSiteSourceCodeTranslations(siteDir, plugins, babelOptions, extraSourceCodeFilePaths = []) {
     // Should we warn here if the same translation "key" is found in multiple source code files?
     function toTranslationFileContent(sourceCodeFileTranslations) {
-        return sourceCodeFileTranslations.reduce((acc, item) => {
-            return { ...acc, ...item.translations };
-        }, {});
+        return sourceCodeFileTranslations.reduce((acc, item) => ({ ...acc, ...item.translations }), {});
     }
     const sourceCodeFilePaths = await getSourceCodeFilePaths(siteDir, plugins);
-    const sourceCodeFilesTranslations = await extractAllSourceCodeFileTranslations(sourceCodeFilePaths, babelOptions);
+    const allSourceCodeFilePaths = [
+        ...sourceCodeFilePaths,
+        ...extraSourceCodeFilePaths,
+    ];
+    const sourceCodeFilesTranslations = await extractAllSourceCodeFileTranslations(allSourceCodeFilePaths, babelOptions);
     logSourceCodeFileTranslationsWarnings(sourceCodeFilesTranslations);
     return toTranslationFileContent(sourceCodeFilesTranslations);
 }
@@ -77,28 +78,31 @@ exports.extractSiteSourceCodeTranslations = extractSiteSourceCodeTranslations;
 function logSourceCodeFileTranslationsWarnings(sourceCodeFilesTranslations) {
     sourceCodeFilesTranslations.forEach(({ sourceCodeFilePath, warnings }) => {
         if (warnings.length > 0) {
-            console.warn(`Translation extraction warnings for file path=${sourceCodeFilePath}:\n- ${chalk_1.default.yellow(warnings.join('\n\n- '))}`);
+            logger_1.default.warn `Translation extraction warnings for file path=${sourceCodeFilePath}: ${warnings}`;
         }
     });
 }
 async function extractAllSourceCodeFileTranslations(sourceCodeFilePaths, babelOptions) {
-    return lodash_1.flatten(await Promise.all(sourceCodeFilePaths.map((sourceFilePath) => extractSourceCodeFileTranslations(sourceFilePath, babelOptions))));
+    return Promise.all(sourceCodeFilePaths.flatMap((sourceFilePath) => extractSourceCodeFileTranslations(sourceFilePath, babelOptions)));
 }
 exports.extractAllSourceCodeFileTranslations = extractAllSourceCodeFileTranslations;
 async function extractSourceCodeFileTranslations(sourceCodeFilePath, babelOptions) {
     try {
         const code = await fs_extra_1.default.readFile(sourceCodeFilePath, 'utf8');
-        const ast = core_1.parse(code, {
+        const ast = (0, core_1.parse)(code, {
             ...babelOptions,
             ast: true,
             // filename is important, because babel does not process the same files according to their js/ts extensions
             // see  see https://twitter.com/NicoloRibaudo/status/1321130735605002243
             filename: sourceCodeFilePath,
         });
-        return await extractSourceCodeAstTranslations(ast, sourceCodeFilePath);
+        const translations = await extractSourceCodeAstTranslations(ast, sourceCodeFilePath);
+        return translations;
     }
     catch (e) {
-        e.message = `Error while attempting to extract Docusaurus translations from source code file at path=${sourceCodeFilePath}\n${e.message}`;
+        if (e instanceof Error) {
+            e.message = `Error while attempting to extract Docusaurus translations from source code file at path=${sourceCodeFilePath}\n${e.message}`;
+        }
         throw e;
     }
 }
@@ -112,20 +116,14 @@ https://github.com/formatjs/formatjs/blob/main/packages/babel-plugin-formatjs/in
 https://github.com/pugjs/babel-walk
  */
 function extractSourceCodeAstTranslations(ast, sourceCodeFilePath) {
-    function staticTranslateJSXWarningPart() {
-        return 'Translate content could not be extracted.\nIt has to be a static string and use optional but static props, like <Translate id="my-id" description="my-description">text</Translate>.';
-    }
-    function sourceFileWarningPart(node) {
+    function sourceWarningPart(node) {
         var _a;
-        return `File=${sourceCodeFilePath} at line=${(_a = node.loc) === null || _a === void 0 ? void 0 : _a.start.line}`;
-    }
-    function generateCode(node) {
-        return generator_1.default(node).code;
+        return `File: ${sourceCodeFilePath} at ${(_a = node.loc) === null || _a === void 0 ? void 0 : _a.start.line} line\nFull code: ${(0, generator_1.default)(node).code}`;
     }
     const translations = {};
     const warnings = [];
     // TODO we should check the presence of the correct @docusaurus imports here!
-    traverse_1.default(ast, {
+    (0, traverse_1.default)(ast, {
         JSXElement(path) {
             if (!path
                 .get('openingElement')
@@ -150,68 +148,77 @@ function extractSourceCodeAstTranslations(ast, sourceCodeFilePath) {
                         return attributeValueEvaluated.value;
                     }
                     else {
-                        warnings.push(`<Translate> prop=${propName} should be a statically evaluable object.\nExample: <Translate id="optional.id" description="optional description">Message</Translate>\nDynamically constructed values are not allowed, because they prevent translations to be extracted.\n${sourceFileWarningPart(path.node)}\n${generateCode(path.node)}`);
+                        warnings.push(`<Translate> prop=${propName} should be a statically evaluable object.\nExample: <Translate id="optional.id" description="optional description">Message</Translate>\nDynamically constructed values are not allowed, because they prevent translations to be extracted.\n${sourceWarningPart(path.node)}`);
                     }
                 }
                 return undefined;
             }
-            // We only handle the optimistic case where we have a single non-empty content
-            const singleChildren = path
-                .get('children')
+            const id = evaluateJSXProp('id');
+            const description = evaluateJSXProp('description');
+            let message;
+            const childrenPath = path.get('children');
+            // Handle empty content
+            if (!childrenPath.length) {
+                if (!id) {
+                    warnings.push(`
+            <Translate> without children must have id prop.\nExample: <Translate id="my-id" />\n${sourceWarningPart(path.node)}
+          `);
+                }
+                else {
+                    translations[id] = {
+                        message: message !== null && message !== void 0 ? message : id,
+                        ...(description && { description }),
+                    };
+                }
+                return;
+            }
+            // Handle single non-empty content
+            const singleChildren = childrenPath
                 // Remove empty/useless text nodes that might be around our translation!
                 // Makes the translation system more reliable to JSX formatting issues
-                .filter((childrenPath) => !(childrenPath.isJSXText() &&
-                childrenPath.node.value.replace('\n', '').trim() === ''))
+                .filter((children) => !(children.isJSXText() &&
+                children.node.value.replace('\n', '').trim() === ''))
                 .pop();
-            if (singleChildren && singleChildren.isJSXText()) {
-                const message = singleChildren.node.value.trim().replace(/\s+/g, ' ');
-                const id = evaluateJSXProp('id');
-                const description = evaluateJSXProp('description');
-                translations[id !== null && id !== void 0 ? id : message] = {
-                    message,
-                    ...(description && { description }),
-                };
-            }
-            else if (singleChildren &&
+            const isJSXText = singleChildren && singleChildren.isJSXText();
+            const isJSXExpressionContainer = singleChildren &&
                 singleChildren.isJSXExpressionContainer() &&
-                singleChildren.get('expression').evaluate().confident) {
-                const message = singleChildren.get('expression').evaluate().value;
-                const id = evaluateJSXProp('id');
-                const description = evaluateJSXProp('description');
+                singleChildren.get('expression').evaluate().confident;
+            if (isJSXText || isJSXExpressionContainer) {
+                message = isJSXText
+                    ? singleChildren.node.value.trim().replace(/\s+/g, ' ')
+                    : singleChildren.get('expression').evaluate().value;
                 translations[id !== null && id !== void 0 ? id : message] = {
                     message,
                     ...(description && { description }),
                 };
             }
             else {
-                warnings.push(`${staticTranslateJSXWarningPart()}\n${sourceFileWarningPart(path.node)}\n${generateCode(path.node)}`);
+                warnings.push(`Translate content could not be extracted. It has to be a static string and use optional but static props, like <Translate id="my-id" description="my-description">text</Translate>.\n${sourceWarningPart(path.node)}`);
             }
         },
         CallExpression(path) {
             if (!path.get('callee').isIdentifier({ name: 'translate' })) {
                 return;
             }
-            // console.log('CallExpression', path.node);
             const args = path.get('arguments');
             if (args.length === 1 || args.length === 2) {
                 const firstArgPath = args[0];
                 // evaluation allows translate("x" + "y"); to be considered as translate("xy");
                 const firstArgEvaluated = firstArgPath.evaluate();
-                // console.log('firstArgEvaluated', firstArgEvaluated);
                 if (firstArgEvaluated.confident &&
                     typeof firstArgEvaluated.value === 'object') {
                     const { message, id, description } = firstArgEvaluated.value;
                     translations[id !== null && id !== void 0 ? id : message] = {
-                        message,
+                        message: message !== null && message !== void 0 ? message : id,
                         ...(description && { description }),
                     };
                 }
                 else {
-                    warnings.push(`translate() first arg should be a statically evaluable object.\nExample: translate({message: "text",id: "optional.id",description: "optional description"}\nDynamically constructed values are not allowed, because they prevent translations to be extracted.\n${sourceFileWarningPart(path.node)}\n${generateCode(path.node)}`);
+                    warnings.push(`translate() first arg should be a statically evaluable object.\nExample: translate({message: "text",id: "optional.id",description: "optional description"}\nDynamically constructed values are not allowed, because they prevent translations to be extracted.\n${sourceWarningPart(path.node)}`);
                 }
             }
             else {
-                warnings.push(`translate() function only takes 1 or 2 args\n${sourceFileWarningPart(path.node)}\n${generateCode(path.node)}`);
+                warnings.push(`translate() function only takes 1 or 2 args\n${sourceWarningPart(path.node)}`);
             }
         },
     });

package/lib/server/utils.d.ts

@@ -1,4 +1,10 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 import { RouteConfig } from '@docusaurus/types';
-import globby from 'globby';
+import { Globby } from '@docusaurus/utils';
 export declare function getAllFinalRoutes(routeConfig: RouteConfig[]): RouteConfig[];
-export declare function safeGlobby(patterns: string[], options?: globby.GlobbyOptions): Promise<string[]>;
+export declare function safeGlobby(patterns: string[], options?: Globby.GlobbyOptions): Promise<string[]>;

package/lib/server/utils.js

@@ -1,23 +1,21 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeGlobby = exports.getAllFinalRoutes = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-const lodash_1 = require("lodash");
-const globby_1 = tslib_1.__importDefault(require("globby"));
-const path_1 = tslib_1.__importDefault(require("path"));
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.safeGlobby = exports.getAllFinalRoutes = void 0;
+const tslib_1 = require("tslib");
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const utils_1 = require("@docusaurus/utils");
 // Recursively get the final routes (routes with no subroutes)
 function getAllFinalRoutes(routeConfig) {
     function getFinalRoutes(route) {
-        return route.routes ? lodash_1.flatMap(route.routes, getFinalRoutes) : [route];
+        return route.routes ? route.routes.flatMap(getFinalRoutes) : [route];
     }
-    return lodash_1.flatMap(routeConfig, getFinalRoutes);
+    return routeConfig.flatMap(getFinalRoutes);
 }
 exports.getAllFinalRoutes = getAllFinalRoutes;
 // Globby that fix Windows path patterns
@@ -25,7 +23,7 @@ exports.getAllFinalRoutes = getAllFinalRoutes;
 async function safeGlobby(patterns, options) {
     // Required for Windows support, as paths using \ should not be used by globby
     // (also using the windows hard drive prefix like c: is not a good idea)
-    const globPaths = patterns.map((dirPath) => utils_1.posixPath(path_1.default.relative(process.cwd(), dirPath)));
-    return globby_1.default(globPaths, options);
+    const globPaths = patterns.map((dirPath) => (0, utils_1.posixPath)(path_1.default.relative(process.cwd(), dirPath)));
+    return (0, utils_1.Globby)(globPaths, options);
 }
 exports.safeGlobby = safeGlobby;