@docusaurus/core 2.0.0-beta.15a2b59f9 → 2.0.0-beta.17

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.
  */
+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 = tslib_1.__importDefault(require("path"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const lodash_1 = require("lodash");
+const lodash_1 = tslib_1.__importDefault(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 = 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(),
@@ -35,8 +35,9 @@ async function readTranslationFileContent(filePath) {
             ensureTranslationFileContent(content);
             return content;
         }
-        catch (e) {
-            throw new Error(`Invalid translation file at ${filePath}.\n${e.message}`);
+        catch (err) {
+            logger_1.default.error `Invalid translation file at path=${filePath}.`;
+            throw err;
         }
     }
     return undefined;
@@ -44,22 +45,18 @@ async function readTranslationFileContent(filePath) {
 exports.readTranslationFileContent = readTranslationFileContent;
 function mergeTranslationFileContent({ existingContent = {}, newContent, options, }) {
     // Apply messagePrefix to all messages
-    const newContentTransformed = lodash_1.mapValues(newContent, (value) => {
-        var _a;
-        return ({
-            ...value,
-            message: `${(_a = options.messagePrefix) !== null && _a !== void 0 ? _a : ''}${value.message}`,
-        });
-    });
+    const newContentTransformed = lodash_1.default.mapValues(newContent, (value) => ({
+        ...value,
+        message: `${options.messagePrefix ?? ''}${value.message}`,
+    }));
     const result = { ...existingContent };
     // We only add missing keys here, we don't delete existing ones
     Object.entries(newContentTransformed).forEach(([key, { message, description }]) => {
-        var _a, _b;
         result[key] = {
-            // If the messages already exist, we don't override them (unless requested)
+            // If messages already exist, we don't override them (unless requested)
             message: options.override
                 ? message
-                : (_b = (_a = existingContent[key]) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : message,
+                : existingContent[key]?.message ?? message,
             description, // description
         };
     });
@@ -68,11 +65,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 = lodash_1.default.difference(Object.keys(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,11 +77,9 @@ 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));
+        await fs_extra_1.default.writeFile(filePath, `${JSON.stringify(mergedContent, null, 2)}\n`);
     }
 }
 exports.writeTranslationFileContent = writeTranslationFileContent;
@@ -124,7 +118,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,
@@ -165,32 +159,23 @@ async function localizePluginTranslationFile({ siteDir, plugin, locale, translat
             },
         };
     }
-    else {
-        return translationFile;
-    }
+    return translationFile;
 }
 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 };
-    }, {});
+    const pluginsMessages = await Promise.all(plugins.map((plugin) => plugin.getDefaultCodeTranslationMessages?.() ?? {}));
+    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 = lodash_1.default.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) => {
-        var _a;
-        return {
-            ...messageTranslation,
-            message: (_a = defaultCodeMessages[messageId]) !== null && _a !== void 0 ? _a : messageTranslation.message,
-        };
-    });
+    return lodash_1.default.mapValues(extractedCodeTranslations, (messageTranslation, messageId) => ({
+        ...messageTranslation,
+        message: defaultCodeMessages[messageId] ?? messageTranslation.message,
+    }));
 }
 exports.applyDefaultCodeTranslations = applyDefaultCodeTranslations;

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

@@ -1,7 +1,13 @@
-import { TransformOptions } from '@babel/core';
-import { InitializedPlugin, TranslationFileContent, TranslationMessage } from '@docusaurus/types';
+/**
+ * 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 { type TransformOptions } from '@babel/core';
+import type { 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.
  */
+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 = 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"));
+const logger_1 = 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 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',
@@ -24,7 +23,7 @@ const TranslatableSourceCodeExtension = new Set([
     '.ts',
     '.tsx',
     // TODO support md/mdx too? (may be overkill)
-    // need to compile the MDX to JSX first and remove frontmatter
+    // need to compile the MDX to JSX first and remove front matter
     // '.md',
     // '.mdx',
 ]);
@@ -32,44 +31,48 @@ 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;
     // 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 just for that???
-    const codePaths = (_b = (_a = plugin.getPathsToWatch) === null || _a === void 0 ? void 0 : _a.call(plugin)) !== null && _b !== void 0 ? _b : [];
+    // 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 just for that???
+    const codePaths = plugin.getPathsToWatch?.() ?? [];
     // We also include theme code
-    const themePath = (_c = plugin.getThemePath) === null || _c === void 0 ? void 0 : _c.call(plugin);
+    const themePath = plugin.getThemePath?.();
     if (themePath) {
         codePaths.push(themePath);
     }
     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;
 async function getSourceCodeFilePaths(siteDir, plugins) {
     const sitePaths = getSiteSourceCodeFilePaths(siteDir);
     // 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));
+    // 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 = plugins.flatMap(getPluginSourceCodeFilePaths);
     const allPaths = [...sitePaths, ...pluginsPaths];
     return globSourceCodeFilePaths(allPaths);
 }
-async function extractSiteSourceCodeTranslations(siteDir, plugins, babelOptions) {
-    // Should we warn here if the same translation "key" is found in multiple source code files?
+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,29 +80,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 is important, because babel does not process the same files
+            // according to their js/ts extensions.
+            // 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}`;
-        throw e;
+    catch (err) {
+        logger_1.default.error `Error while attempting to extract Docusaurus translations from source code file at path=${sourceCodeFilePath}.`;
+        throw err;
     }
 }
 exports.extractSourceCodeFileTranslations = extractSourceCodeFileTranslations;
@@ -112,108 +117,142 @@ 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) {
-        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;
+    function sourceWarningPart(node) {
+        return `File: ${sourceCodeFilePath} at line ${node.loc?.start.line}
+Full 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, {
-        JSXElement(path) {
-            if (!path
-                .get('openingElement')
-                .get('name')
-                .isJSXIdentifier({ name: 'Translate' })) {
+    let translateComponentName;
+    let translateFunctionName;
+    // First pass: find import declarations of Translate / translate.
+    // If not found, don't process the rest to avoid false positives
+    (0, traverse_1.default)(ast, {
+        ImportDeclaration(path) {
+            if (path.node.importKind === 'type' ||
+                path.get('source').node.value !== '@docusaurus/Translate') {
                 return;
             }
-            function evaluateJSXProp(propName) {
-                const attributePath = path
-                    .get('openingElement.attributes')
-                    .find((attr) => attr.isJSXAttribute() &&
-                    attr
-                        .get('name')
-                        .isJSXIdentifier({ name: propName }));
-                if (attributePath) {
-                    const attributeValue = attributePath.get('value');
-                    const attributeValueEvaluated = attributeValue.isJSXExpressionContainer()
-                        ? attributeValue.get('expression').evaluate()
-                        : attributeValue.evaluate();
-                    if (attributeValueEvaluated.confident &&
-                        typeof attributeValueEvaluated.value === 'string') {
-                        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)}`);
+            const importSpecifiers = path.get('specifiers');
+            const defaultImport = importSpecifiers.find((specifier) => specifier.node.type === 'ImportDefaultSpecifier');
+            const callbackImport = importSpecifiers.find((specifier) => specifier.node.type === 'ImportSpecifier' &&
+                (specifier.get('imported')
+                    .node.name === 'translate' ||
+                    specifier.get('imported')
+                        .node.value === 'translate'));
+            translateComponentName = defaultImport?.get('local').node.name;
+            translateFunctionName = callbackImport?.get('local').node.name;
+        },
+    });
+    (0, traverse_1.default)(ast, {
+        ...(translateComponentName && {
+            JSXElement(path) {
+                if (!path
+                    .get('openingElement')
+                    .get('name')
+                    .isJSXIdentifier({ name: translateComponentName })) {
+                    return;
+                }
+                function evaluateJSXProp(propName) {
+                    const attributePath = path
+                        .get('openingElement.attributes')
+                        .find((attr) => attr.isJSXAttribute() &&
+                        attr
+                            .get('name')
+                            .isJSXIdentifier({ name: propName }));
+                    if (attributePath) {
+                        const attributeValue = attributePath.get('value');
+                        const attributeValueEvaluated = attributeValue.isJSXExpressionContainer()
+                            ? attributeValue.get('expression').evaluate()
+                            : attributeValue.evaluate();
+                        if (attributeValueEvaluated.confident &&
+                            typeof attributeValueEvaluated.value === 'string') {
+                            return attributeValueEvaluated.value;
+                        }
+                        warnings.push(`<Translate> prop=${propName} should be a statically evaluable object.
+Example: <Translate id="optional id" description="optional description">Message</Translate>
+Dynamically constructed values are not allowed, because they prevent translations to be extracted.
+${sourceWarningPart(path.node)}`);
                     }
+                    return undefined;
                 }
-                return undefined;
-            }
-            // We only handle the optimistic case where we have a single non-empty content
-            const singleChildren = path
-                .get('children')
-                // 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() === ''))
-                .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 &&
-                singleChildren.isJSXExpressionContainer() &&
-                singleChildren.get('expression').evaluate().confident) {
-                const message = singleChildren.get('expression').evaluate().value;
-                const id = evaluateJSXProp('id');
-                const description = evaluateJSXProp('description');
-                translations[id !== null && id !== void 0 ? id : message] = {
-                    message,
-                    ...(description && { description }),
-                };
-            }
-            else {
-                warnings.push(`${staticTranslateJSXWarningPart()}\n${sourceFileWarningPart(path.node)}\n${generateCode(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] = {
+                let message;
+                const childrenPath = path.get('children');
+                // Handle empty content
+                if (!childrenPath.length) {
+                    if (!id) {
+                        warnings.push(`<Translate> without children must have id prop.
+Example: <Translate id="my-id" />
+${sourceWarningPart(path.node)}`);
+                    }
+                    else {
+                        translations[id] = {
+                            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((children) => !(children.isJSXText() &&
+                    children.node.value.replace('\n', '').trim() === ''))
+                    .pop();
+                const isJSXText = singleChildren && singleChildren.isJSXText();
+                const isJSXExpressionContainer = singleChildren &&
+                    singleChildren.isJSXExpressionContainer() &&
+                    singleChildren.get('expression').evaluate().confident;
+                if (isJSXText || isJSXExpressionContainer) {
+                    message = isJSXText
+                        ? singleChildren.node.value.trim().replace(/\s+/g, ' ')
+                        : singleChildren.get('expression').evaluate().value;
+                    translations[id ?? message] = {
                         message,
                         ...(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 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>.
+${sourceWarningPart(path.node)}`);
                 }
-            }
-            else {
-                warnings.push(`translate() function only takes 1 or 2 args\n${sourceFileWarningPart(path.node)}\n${generateCode(path.node)}`);
-            }
-        },
+            },
+        }),
+        ...(translateFunctionName && {
+            CallExpression(path) {
+                if (!path.get('callee').isIdentifier({ name: translateFunctionName })) {
+                    return;
+                }
+                const args = path.get('arguments');
+                if (args.length === 1 || args.length === 2) {
+                    const firstArgPath = args[0];
+                    // translate("x" + "y"); => translate("xy");
+                    const firstArgEvaluated = firstArgPath.evaluate();
+                    if (firstArgEvaluated.confident &&
+                        typeof firstArgEvaluated.value === 'object') {
+                        const { message, id, description } = firstArgEvaluated.value;
+                        translations[id ?? message] = {
+                            message: message ?? id,
+                            ...(description && { description }),
+                        };
+                    }
+                    else {
+                        warnings.push(`translate() first arg should be a statically evaluable object.
+Example: translate({message: "text",id: "optional.id",description: "optional description"}
+Dynamically constructed values are not allowed, because they prevent translations to be extracted.
+${sourceWarningPart(path.node)}`);
+                    }
+                }
+                else {
+                    warnings.push(`translate() function only takes 1 or 2 args
+${sourceWarningPart(path.node)}`);
+                }
+            },
+        }),
     });
     return { sourceCodeFilePath, translations, warnings };
 }

package/lib/server/utils.d.ts

@@ -1,4 +1,10 @@
-import { RouteConfig } from '@docusaurus/types';
-import globby from 'globby';
+/**
+ * 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 type { RouteConfig } from '@docusaurus/types';
+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"));
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.safeGlobby = exports.getAllFinalRoutes = void 0;
+const tslib_1 = require("tslib");
 const path_1 = 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;

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

@@ -4,7 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { DocusaurusPluginVersionInformation } from '@docusaurus/types';
-export declare function getPackageJsonVersion(packageJsonPath: string): string | undefined;
-export declare function getPackageJsonName(packageJsonPath: string): string | undefined;
-export declare function getPluginVersion(pluginPath: string, siteDir: string): DocusaurusPluginVersionInformation;
+import type { DocusaurusPluginVersionInformation } from '@docusaurus/types';
+export declare function getPackageJsonVersion(packageJsonPath: string): Promise<string | undefined>;
+export declare function getPluginVersion(pluginPath: string, siteDir: string): Promise<DocusaurusPluginVersionInformation>;