@docusaurus/core 0.0.0-6080 → 0.0.0-6082

package/lib/babel/preset.d.ts

@@ -4,5 +4,5 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import type { ConfigAPI, TransformOptions } from '@babel/core';
-export default function babelPresets(api: ConfigAPI): TransformOptions;
+import BabelPreset from '@docusaurus/babel/preset';
+export default BabelPreset;

package/lib/babel/preset.js

@@ -6,75 +6,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = babelPresets;
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
-function getTransformOptions(isServer) {
-    const absoluteRuntimePath = path_1.default.dirname(require.resolve(`@babel/runtime/package.json`));
-    return {
-        // All optional newlines and whitespace will be omitted when generating code
-        // in compact mode
-        compact: true,
-        presets: [
-            isServer
-                ? [
-                    require.resolve('@babel/preset-env'),
-                    {
-                        targets: {
-                            node: 'current',
-                        },
-                    },
-                ]
-                : [
-                    require.resolve('@babel/preset-env'),
-                    {
-                        useBuiltIns: 'entry',
-                        loose: true,
-                        corejs: '3',
-                        // Do not transform modules to CJS
-                        modules: false,
-                        // Exclude transforms that make all code slower
-                        exclude: ['transform-typeof-symbol'],
-                    },
-                ],
-            [
-                require.resolve('@babel/preset-react'),
-                {
-                    runtime: 'automatic',
-                },
-            ],
-            require.resolve('@babel/preset-typescript'),
-        ],
-        plugins: [
-            // Polyfills the runtime needed for async/await, generators, and friends
-            // https://babeljs.io/docs/en/babel-plugin-transform-runtime
-            [
-                require.resolve('@babel/plugin-transform-runtime'),
-                {
-                    corejs: false,
-                    helpers: true,
-                    // By default, it assumes @babel/runtime@7.0.0. Since we use >7.0.0,
-                    // better to explicitly specify the version so that it can reuse the
-                    // helper better. See https://github.com/babel/babel/issues/10261
-                    // eslint-disable-next-line @typescript-eslint/no-var-requires, global-require
-                    version: require('@babel/runtime/package.json')
-                        .version,
-                    regenerator: true,
-                    useESModules: true,
-                    // Undocumented option that lets us encapsulate our runtime, ensuring
-                    // the correct version is used
-                    // https://github.com/babel/babel/blob/090c364a90fe73d36a30707fc612ce037bdbbb24/packages/babel-plugin-transform-runtime/src/index.js#L35-L42
-                    absoluteRuntime: absoluteRuntimePath,
-                },
-            ],
-            // Adds syntax support for import()
-            isServer
-                ? require.resolve('babel-plugin-dynamic-import-node')
-                : require.resolve('@babel/plugin-syntax-dynamic-import'),
-        ],
-    };
-}
-function babelPresets(api) {
-    const callerName = api.caller((caller) => caller?.name);
-    return getTransformOptions(callerName === 'server');
-}
+// TODO Docusaurus v4, do breaking change and expose babel preset cleanly
+/*
+this just ensure retro-compatibility with our former init template .babelrc.js:
+
+module.exports = {
+  presets: [require.resolve('@docusaurus/core/lib/babel/preset')],
+};
+ */
+const preset_1 = tslib_1.__importDefault(require("@docusaurus/babel/preset"));
+exports.default = preset_1.default;

package/lib/commands/build.js

@@ -11,6 +11,7 @@ const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const bundler_1 = require("@docusaurus/bundler");
 const logger_1 = tslib_1.__importStar(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 const site_1 = require("../server/site");
@@ -18,7 +19,6 @@ const brokenLinks_1 = require("../server/brokenLinks");
 const client_1 = require("../webpack/client");
 const server_1 = tslib_1.__importDefault(require("../webpack/server"));
 const configure_1 = require("../webpack/configure");
-const utils_2 = require("../webpack/utils");
 const i18n_1 = require("../server/i18n");
 const ssg_1 = require("../ssg");
 const templates_1 = require("../templates/templates");
@@ -101,7 +101,7 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
     const router = siteConfig.future.experimental_router;
     const configureWebpackUtils = await (0, configure_1.createConfigureWebpackUtils)({ siteConfig });
     // We can build the 2 configs in parallel
-    const [{ clientConfig, clientManifestPath }, { serverConfig, serverBundlePath }] = await logger_1.PerfLogger.async('Creating webpack configs', () => Promise.all([
+    const [{ clientConfig, clientManifestPath }, { serverConfig, serverBundlePath }] = await logger_1.PerfLogger.async('Creating bundler configs', () => Promise.all([
         getBuildClientConfig({
             props,
             cliOptions,
@@ -113,13 +113,13 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
         }),
     ]));
     // Run webpack to build JS bundle (client) and static html files (server).
-    await logger_1.PerfLogger.async('Bundling with Webpack', () => {
-        if (router === 'hash') {
-            return (0, utils_2.compile)([clientConfig]);
-        }
-        else {
-            return (0, utils_2.compile)([clientConfig, serverConfig]);
-        }
+    await logger_1.PerfLogger.async(`Bundling with ${configureWebpackUtils.currentBundler.name}`, () => {
+        return (0, bundler_1.compile)({
+            configs: 
+            // For hash router we don't do SSG and can skip the server bundle
+            router === 'hash' ? [clientConfig] : [clientConfig, serverConfig],
+            currentBundler: configureWebpackUtils.currentBundler,
+        });
     });
     const { collectedData } = await logger_1.PerfLogger.async('SSG', () => executeSSG({
         props,

package/lib/commands/start/webpack.js

@@ -11,11 +11,12 @@ const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
 const webpack_1 = tslib_1.__importDefault(require("webpack"));
+const bundler_1 = require("@docusaurus/bundler");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const webpack_dev_server_1 = tslib_1.__importDefault(require("webpack-dev-server"));
 const evalSourceMapMiddleware_1 = tslib_1.__importDefault(require("react-dev-utils/evalSourceMapMiddleware"));
 const watcher_1 = require("./watcher");
-const utils_1 = require("../../webpack/utils");
+const getHttpsConfig_1 = tslib_1.__importDefault(require("../../webpack/utils/getHttpsConfig"));
 const configure_1 = require("../../webpack/configure");
 const client_1 = require("../../webpack/client");
 // E2E_TEST=true docusaurus start
@@ -23,11 +24,11 @@ const client_1 = require("../../webpack/client");
 function registerWebpackE2ETestHook(compiler) {
     compiler.hooks.done.tap('done', (stats) => {
         const errorsWarnings = stats.toJson('errors-warnings');
-        const statsErrorMessage = (0, utils_1.formatStatsErrorMessage)(errorsWarnings);
+        const statsErrorMessage = (0, bundler_1.formatStatsErrorMessage)(errorsWarnings);
         if (statsErrorMessage) {
             console.error(statsErrorMessage);
         }
-        (0, utils_1.printStatsWarnings)(errorsWarnings);
+        (0, bundler_1.printStatsWarnings)(errorsWarnings);
         if (process.env.E2E_TEST) {
             if (stats.hasErrors()) {
                 logger_1.default.error('E2E_TEST: Project has compiler errors.');
@@ -41,7 +42,7 @@ function registerWebpackE2ETestHook(compiler) {
 async function createDevServerConfig({ cliOptions, props, host, port, }) {
     const { baseUrl, siteDir, siteConfig } = props;
     const pollingOptions = (0, watcher_1.createPollingOptions)(cliOptions);
-    const httpsConfig = await (0, utils_1.getHttpsConfig)();
+    const httpsConfig = await (0, getHttpsConfig_1.default)();
     // https://webpack.js.org/configuration/dev-server
     return {
         hot: cliOptions.hotOnly ? 'only' : true,

package/lib/commands/writeHeadingIds.js

@@ -13,7 +13,6 @@ const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 const site_1 = require("../server/site");
 const init_1 = require("../server/plugins/init");
-const utils_2 = require("../server/utils");
 async function transformMarkdownFile(filepath, options) {
     const content = await fs_extra_1.default.readFile(filepath, 'utf8');
     const updatedContent = (0, utils_1.writeMarkdownHeadingId)(content, options);
@@ -36,7 +35,7 @@ async function getPathsToWatch(siteDir) {
 }
 async function writeHeadingIds(siteDirParam = '.', files = [], options = {}) {
     const siteDir = await fs_extra_1.default.realpath(siteDirParam);
-    const markdownFiles = await (0, utils_2.safeGlobby)(files ?? (await getPathsToWatch(siteDir)), {
+    const markdownFiles = await (0, utils_1.safeGlobby)(files ?? (await getPathsToWatch(siteDir)), {
         expandDirectories: ['**/*.{md,mdx}'],
     });
     const result = await Promise.all(markdownFiles.map((p) => transformMarkdownFile(p, options)));

package/lib/commands/writeTranslations.js

@@ -10,11 +10,11 @@ exports.writeTranslations = writeTranslations;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const utils_1 = require("@docusaurus/utils");
 const site_1 = require("../server/site");
 const init_1 = require("../server/plugins/init");
 const translations_1 = require("../server/translations/translations");
 const translationsExtractor_1 = require("../server/translations/translationsExtractor");
-const utils_1 = require("../webpack/utils");
 function resolveThemeCommonLibDir() {
     try {
         return path_1.default.dirname(require.resolve('@docusaurus/theme-common'));
@@ -35,7 +35,7 @@ async function getExtraSourceCodeFilePaths() {
     if (!themeCommonLibDir) {
         return []; // User may not use a Docusaurus official theme? Quite unlikely...
     }
-    return (0, translationsExtractor_1.globSourceCodeFilePaths)([themeCommonLibDir]);
+    return (0, utils_1.globTranslatableSourceFiles)([themeCommonLibDir]);
 }
 async function writePluginTranslationFiles({ localizationDir, plugin, options, }) {
     if (plugin.getTranslationFiles) {
@@ -67,11 +67,11 @@ async function writeTranslations(siteDirParam = '.', options = {}) {
         throw new Error(`Can't write-translation for locale "${locale}" that is not in the locale configuration file.
 Available locales are: ${context.i18n.locales.join(',')}.`);
     }
-    const babelOptions = (0, utils_1.getBabelOptions)({
-        isServer: true,
-        babelOptions: await (0, utils_1.getCustomBabelConfigFilePath)(siteDir),
+    const extractedCodeTranslations = await (0, translationsExtractor_1.extractSiteSourceCodeTranslations)({
+        siteDir,
+        plugins,
+        extraSourceCodeFilePaths: await getExtraSourceCodeFilePaths(),
     });
-    const extractedCodeTranslations = await (0, translationsExtractor_1.extractSiteSourceCodeTranslations)(siteDir, plugins, babelOptions, await getExtraSourceCodeFilePaths());
     const defaultCodeMessages = await (0, translations_1.loadPluginsDefaultCodeTranslationMessages)(plugins);
     const codeTranslations = (0, translations_1.applyDefaultCodeTranslations)({
         extractedCodeTranslations,

package/lib/server/site.js

@@ -15,6 +15,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const utils_1 = require("@docusaurus/utils");
 const logger_1 = require("@docusaurus/logger");
 const combine_promises_1 = tslib_1.__importDefault(require("combine-promises"));
+const bundler_1 = require("@docusaurus/bundler");
 const config_1 = require("./config");
 const clientModules_1 = require("./clientModules");
 const plugins_1 = require("./plugins/plugins");
@@ -41,6 +42,9 @@ async function loadContext(params) {
             customConfigFilePath,
         }),
     });
+    const currentBundler = await (0, bundler_1.getCurrentBundler)({
+        siteConfig: initialSiteConfig,
+    });
     const i18n = await (0, i18n_1.loadI18n)(initialSiteConfig, { locale });
     const baseUrl = (0, utils_1.localizePath)({
         path: initialSiteConfig.baseUrl,
@@ -70,11 +74,12 @@ async function loadContext(params) {
         baseUrl,
         i18n,
         codeTranslations,
+        currentBundler,
     };
 }
 function createSiteProps(params) {
     const { plugins, routes, context } = params;
-    const { generatedFilesDir, siteDir, siteVersion, siteConfig, siteConfigPath, siteStorage, outDir, baseUrl, i18n, localizationDir, codeTranslations: siteCodeTranslations, } = context;
+    const { generatedFilesDir, siteDir, siteVersion, siteConfig, siteConfigPath, siteStorage, outDir, baseUrl, i18n, localizationDir, codeTranslations: siteCodeTranslations, currentBundler, } = context;
     const { headTags, preBodyTags, postBodyTags } = (0, htmlTags_1.loadHtmlTags)({
         plugins,
         router: siteConfig.future.experimental_router,
@@ -105,6 +110,7 @@ function createSiteProps(params) {
         preBodyTags,
         postBodyTags,
         codeTranslations,
+        currentBundler,
     };
 }
 // TODO global data should be part of site props?

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

@@ -4,15 +4,9 @@
  * 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 } from '@docusaurus/types';
-export declare function globSourceCodeFilePaths(dirPaths: string[]): Promise<string[]>;
-export declare function extractSiteSourceCodeTranslations(siteDir: string, plugins: InitializedPlugin[], babelOptions: TransformOptions, extraSourceCodeFilePaths?: string[]): Promise<TranslationFileContent>;
-type SourceCodeFileTranslations = {
-    sourceCodeFilePath: string;
-    translations: TranslationFileContent;
-    warnings: string[];
-};
-export declare function extractAllSourceCodeFileTranslations(sourceCodeFilePaths: string[], babelOptions: TransformOptions): Promise<SourceCodeFileTranslations[]>;
-export declare function extractSourceCodeFileTranslations(sourceCodeFilePath: string, babelOptions: TransformOptions): Promise<SourceCodeFileTranslations>;
-export {};
+export declare function extractSiteSourceCodeTranslations({ siteDir, plugins, extraSourceCodeFilePaths, }: {
+    siteDir: string;
+    plugins: InitializedPlugin[];
+    extraSourceCodeFilePaths?: string[];
+}): Promise<TranslationFileContent>;

package/lib/server/translations/translationsExtractor.js

@@ -6,33 +6,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.globSourceCodeFilePaths = globSourceCodeFilePaths;
 exports.extractSiteSourceCodeTranslations = extractSiteSourceCodeTranslations;
-exports.extractAllSourceCodeFileTranslations = extractAllSourceCodeFileTranslations;
-exports.extractSourceCodeFileTranslations = extractSourceCodeFileTranslations;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
-const traverse_1 = tslib_1.__importDefault(require("@babel/traverse"));
-const generator_1 = tslib_1.__importDefault(require("@babel/generator"));
-const core_1 = require("@babel/core");
 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',
-    '.jsx',
-    '.ts',
-    '.tsx',
-    // TODO support md/mdx too? (may be overkill)
-    // need to compile the MDX to JSX first and remove front matter
-    // '.md',
-    // '.mdx',
-]);
-function isTranslatableSourceCodePath(filePath) {
-    return TranslatableSourceCodeExtension.has(path_1.default.extname(filePath));
-}
+const babel_1 = require("@docusaurus/babel");
 function getSiteSourceCodeFilePaths(siteDir) {
     return [path_1.default.join(siteDir, utils_1.SRC_DIR_NAME)];
 }
@@ -49,10 +28,6 @@ function getPluginSourceCodeFilePaths(plugin) {
     }
     return codePaths.map((p) => path_1.default.resolve(plugin.path, p));
 }
-async function globSourceCodeFilePaths(dirPaths) {
-    const filePaths = await (0, utils_2.safeGlobby)(dirPaths);
-    return filePaths.filter(isTranslatableSourceCodePath);
-}
 async function getSourceCodeFilePaths(siteDir, plugins) {
     const sitePaths = getSiteSourceCodeFilePaths(siteDir);
     // The getPathsToWatch() generally returns the js/jsx/ts/tsx/md/mdx file paths
@@ -61,9 +36,13 @@ async function getSourceCodeFilePaths(siteDir, plugins) {
     // new lifecycle method for that???
     const pluginsPaths = plugins.flatMap(getPluginSourceCodeFilePaths);
     const allPaths = [...sitePaths, ...pluginsPaths];
-    return globSourceCodeFilePaths(allPaths);
+    return (0, utils_1.globTranslatableSourceFiles)(allPaths);
 }
-async function extractSiteSourceCodeTranslations(siteDir, plugins, babelOptions, extraSourceCodeFilePaths = []) {
+async function extractSiteSourceCodeTranslations({ siteDir, plugins, extraSourceCodeFilePaths = [], }) {
+    const babelOptions = (0, babel_1.getBabelOptions)({
+        isServer: true,
+        babelOptions: await (0, babel_1.getCustomBabelConfigFilePath)(siteDir),
+    });
     // Should we warn here if the same translation "key" is found in multiple
     // source code files?
     function toTranslationFileContent(sourceCodeFileTranslations) {
@@ -74,7 +53,7 @@ async function extractSiteSourceCodeTranslations(siteDir, plugins, babelOptions,
         ...sourceCodeFilePaths,
         ...extraSourceCodeFilePaths,
     ];
-    const sourceCodeFilesTranslations = await extractAllSourceCodeFileTranslations(allSourceCodeFilePaths, babelOptions);
+    const sourceCodeFilesTranslations = await (0, babel_1.extractAllSourceCodeFileTranslations)(allSourceCodeFilePaths, babelOptions);
     logSourceCodeFileTranslationsWarnings(sourceCodeFilesTranslations);
     return toTranslationFileContent(sourceCodeFilesTranslations);
 }
@@ -85,170 +64,3 @@ function logSourceCodeFileTranslationsWarnings(sourceCodeFilesTranslations) {
         }
     });
 }
-async function extractAllSourceCodeFileTranslations(sourceCodeFilePaths, babelOptions) {
-    return Promise.all(sourceCodeFilePaths.flatMap((sourceFilePath) => extractSourceCodeFileTranslations(sourceFilePath, babelOptions)));
-}
-async function extractSourceCodeFileTranslations(sourceCodeFilePath, babelOptions) {
-    try {
-        const code = await fs_extra_1.default.readFile(sourceCodeFilePath, 'utf8');
-        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 https://x.com/NicoloRibaudo/status/1321130735605002243
-            filename: sourceCodeFilePath,
-        });
-        const translations = extractSourceCodeAstTranslations(ast, sourceCodeFilePath);
-        return translations;
-    }
-    catch (err) {
-        logger_1.default.error `Error while attempting to extract Docusaurus translations from source code file at path=${sourceCodeFilePath}.`;
-        throw err;
-    }
-}
-/*
-Need help understanding this?
-
-Useful resources:
-https://github.com/jamiebuilds/babel-handbook/blob/master/translations/en/plugin-handbook.md
-https://github.com/formatjs/formatjs/blob/main/packages/babel-plugin-formatjs/index.ts
-https://github.com/pugjs/babel-walk
- */
-function extractSourceCodeAstTranslations(ast, sourceCodeFilePath) {
-    function sourceWarningPart(node) {
-        return `File: ${sourceCodeFilePath} at line ${node.loc?.start.line ?? '?'}
-Full code: ${(0, generator_1.default)(node).code}`;
-    }
-    const translations = {};
-    const warnings = [];
-    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;
-            }
-            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;
-                }
-                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.
-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?.isJSXText();
-                const isJSXExpressionContainer = singleChildren?.isJSXExpressionContainer() &&
-                    singleChildren.get('expression').evaluate().confident;
-                if (isJSXText || isJSXExpressionContainer) {
-                    message = isJSXText
-                        ? singleChildren.node.value.trim().replace(/\s+/g, ' ')
-                        : String(singleChildren.get('expression').evaluate().value);
-                    translations[id ?? message] = {
-                        message,
-                        ...(description && { description }),
-                    };
-                }
-                else {
-                    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)}`);
-                }
-            },
-        }),
-        ...(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[String(id ?? message)] = {
-                            message: String(message ?? id),
-                            ...(Boolean(description) && { description: String(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/webpack/base.js

@@ -12,11 +12,10 @@ exports.createBaseConfig = createBaseConfig;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const babel_1 = require("@docusaurus/babel");
+const bundler_1 = require("@docusaurus/bundler");
 const utils_1 = require("@docusaurus/utils");
-const utils_2 = require("./utils");
-const minification_1 = require("./minification");
 const aliases_1 = require("./aliases");
-const currentBundler_1 = require("./currentBundler");
 const CSS_REGEX = /\.css$/i;
 const CSS_MODULE_REGEX = /\.module\.css$/i;
 exports.clientDir = path_1.default.join(__dirname, '..', 'client');
@@ -51,9 +50,9 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
     const name = isServer ? 'server' : 'client';
     const mode = isProd ? 'production' : 'development';
     const themeAliases = await (0, aliases_1.loadThemeAliases)({ siteDir, plugins });
-    const createJsLoader = await (0, utils_2.createJsLoaderFactory)({ siteConfig });
-    const CSSExtractPlugin = await (0, currentBundler_1.getCSSExtractPlugin)({
-        currentBundler: configureWebpackUtils.currentBundler,
+    const createJsLoader = await (0, bundler_1.createJsLoaderFactory)({ siteConfig });
+    const CSSExtractPlugin = await (0, bundler_1.getCSSExtractPlugin)({
+        currentBundler: props.currentBundler,
     });
     return {
         mode,
@@ -138,7 +137,9 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
             // Only minimize client bundle in production because server bundle is only
             // used for static site generation
             minimize: minimizeEnabled,
-            minimizer: minimizeEnabled ? await (0, minification_1.getMinimizers)({ faster }) : undefined,
+            minimizer: minimizeEnabled
+                ? await (0, bundler_1.getMinimizers)({ faster, currentBundler: props.currentBundler })
+                : undefined,
             splitChunks: isServer
                 ? false
                 : {
@@ -181,7 +182,7 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
                     use: [
                         createJsLoader({
                             isServer,
-                            babelOptions: await (0, utils_2.getCustomBabelConfigFilePath)(siteDir),
+                            babelOptions: await (0, babel_1.getCustomBabelConfigFilePath)(siteDir),
                         }),
                     ],
                 },

package/lib/webpack/client.js

@@ -11,11 +11,10 @@ exports.createBuildClientConfig = createBuildClientConfig;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
-const webpackbar_1 = tslib_1.__importDefault(require("webpackbar"));
-const webpack_1 = tslib_1.__importDefault(require("webpack"));
 const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
 const react_loadable_ssr_addon_v5_slorber_1 = tslib_1.__importDefault(require("react-loadable-ssr-addon-v5-slorber"));
 const html_webpack_plugin_1 = tslib_1.__importDefault(require("html-webpack-plugin"));
+const bundler_1 = require("@docusaurus/bundler");
 const base_1 = require("./base");
 const ChunkAssetPlugin_1 = tslib_1.__importDefault(require("./plugins/ChunkAssetPlugin"));
 const CleanWebpackPlugin_1 = tslib_1.__importDefault(require("./plugins/CleanWebpackPlugin"));
@@ -29,6 +28,9 @@ async function createBaseClientConfig({ props, hydrate, minify, faster, configur
         faster,
         configureWebpackUtils,
     });
+    const ProgressBarPlugin = await (0, bundler_1.getProgressBarPlugin)({
+        currentBundler: configureWebpackUtils.currentBundler,
+    });
     return (0, webpack_merge_1.default)(baseConfig, {
         // Useless, disabled on purpose (errors on existing sites with no
         // browserslist config)
@@ -40,17 +42,15 @@ async function createBaseClientConfig({ props, hydrate, minify, faster, configur
             runtimeChunk: true,
         },
         plugins: [
-            new webpack_1.default.DefinePlugin({
+            new props.currentBundler.instance.DefinePlugin({
                 'process.env.HYDRATE_CLIENT_ENTRY': JSON.stringify(hydrate),
             }),
             new ChunkAssetPlugin_1.default(),
-            // Show compilation progress bar and build time.
-            new webpackbar_1.default({
+            new ProgressBarPlugin({
                 name: 'Client',
             }),
             await (0, StaticDirectoriesCopyPlugin_1.createStaticDirectoriesCopyPlugin)({
                 props,
-                currentBundler: configureWebpackUtils.currentBundler,
             }),
         ].filter(Boolean),
     });

package/lib/webpack/configure.d.ts

@@ -4,8 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { createJsLoaderFactory } from './utils';
-import { getCurrentBundler } from './currentBundler';
+import { getCurrentBundler, createJsLoaderFactory } from '@docusaurus/bundler';
 import type { Configuration } from 'webpack';
 import type { Plugin, ConfigureWebpackUtils, LoadedPlugin } from '@docusaurus/types';
 /**