@docusaurus/core 3.10.1-canary-6655 → 3.10.1-canary-6800

package/bin/beforeCli.mjs

@@ -10,14 +10,14 @@
 import fs from 'fs-extra';
 import path from 'path';
 import {createRequire} from 'module';
-import execa from 'execa';
+import {execa} from 'execa';
 import {logger} from '@docusaurus/logger';
 import semver from 'semver';
 import updateNotifier from 'update-notifier';
 import boxen from 'boxen';
 import {DOCUSAURUS_VERSION} from '@docusaurus/utils';
 
-const packageJson = /** @type {import("../package.json")} */ (
+const packageJson = /** @type {typeof import("../package.json")} */ (
   createRequire(import.meta.url)('../package.json')
 );
 /** @type {Record<string, any>} */
@@ -111,15 +111,13 @@ export default async function beforeCli() {
         return undefined;
       }
 
-      const yarnVersionResult = await execa.command('yarn --version');
-      if (yarnVersionResult.exitCode === 0) {
-        const majorVersion = parseInt(
-          yarnVersionResult.stdout?.trim().split('.')[0] ?? '',
-          10,
-        );
-        if (!Number.isNaN(majorVersion)) {
-          return majorVersion;
-        }
+      const yarnVersionResult = await execa`yarn --version`;
+      const majorVersion = parseInt(
+        yarnVersionResult.stdout?.trim().split('.')[0] ?? '',
+        10,
+      );
+      if (!Number.isNaN(majorVersion)) {
+        return majorVersion;
       }
 
       return undefined;

package/lib/client/BaseUrlIssueBanner/index.js

@@ -53,7 +53,7 @@ function insertBanner() {
   var suggestedBaseUrl = actualHomePagePath.substr(-1) === '/'
         ? actualHomePagePath
         : actualHomePagePath + '/';
-  suggestionContainer.innerHTML = suggestedBaseUrl;
+  suggestionContainer.textContent = suggestedBaseUrl;
 }
 `;
 }

package/lib/client/exports/Link.js

@@ -4,7 +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 React, { useEffect, useImperativeHandle, useRef, } from 'react';
+import React, { useCallback, useEffect, useImperativeHandle, useRef, } from 'react';
 import { NavLink, Link as RRLink } from 'react-router-dom';
 import { applyTrailingSlash } from '@docusaurus/utils-common';
 import useDocusaurusContext from './useDocusaurusContext';
@@ -64,18 +64,23 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
     const LinkComponent = (isNavLink ? NavLink : RRLink);
     const IOSupported = ExecutionEnvironment.canUseIntersectionObserver;
     const ioRef = useRef(undefined);
-    const handleRef = (el) => {
+    const handleRef = useCallback((el) => {
         innerRef.current = el;
+        ioRef.current?.disconnect();
+        ioRef.current = undefined;
         if (IOSupported && el && isInternal) {
             // If IO supported and element reference found, set up Observer.
-            ioRef.current = new window.IntersectionObserver((entries) => {
+            const observer = new window.IntersectionObserver((entries) => {
                 entries.forEach((entry) => {
                     if (el === entry.target) {
                         // If element is in viewport, stop observing and run callback.
                         // https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API
                         if (entry.isIntersecting || entry.intersectionRatio > 0) {
-                            ioRef.current.unobserve(el);
-                            ioRef.current.disconnect();
+                            observer.unobserve(el);
+                            observer.disconnect();
+                            if (ioRef.current === observer) {
+                                ioRef.current = undefined;
+                            }
                             if (targetLink != null) {
                                 window.docusaurus.prefetch(targetLink);
                             }
@@ -84,9 +89,10 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
                 });
             });
             // Add element to the observer.
-            ioRef.current.observe(el);
+            ioRef.current = observer;
+            observer.observe(el);
         }
-    };
+    }, [IOSupported, isInternal, targetLink]);
     const onInteractionEnter = () => {
         if (!preloaded.current && targetLink != null) {
             window.docusaurus.preload(targetLink);
@@ -100,13 +106,7 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
                 window.docusaurus.prefetch(targetLink);
             }
         }
-        // When unmounting, stop intersection observer from watching.
-        return () => {
-            if (IOSupported && ioRef.current) {
-                ioRef.current.disconnect();
-            }
-        };
-    }, [ioRef, targetLink, IOSupported, isInternal]);
+    }, [targetLink, IOSupported, isInternal]);
     // It is simple local anchor link targeting current page?
     const isAnchorLink = targetLink?.startsWith('#') ?? false;
     // See also RR logic:

package/lib/client/preload.js

@@ -15,8 +15,6 @@ import { matchRoutes } from 'react-router-config';
  * @returns Promise object represents whether pathname has been preloaded
  */
 export default function preload(pathname) {
-    const matches = Array.from(new Set([pathname, decodeURI(pathname)]))
-        .map((p) => matchRoutes(routes, p))
-        .flat();
+    const matches = Array.from(new Set([pathname, decodeURI(pathname)])).flatMap((p) => matchRoutes(routes, p));
     return Promise.all(matches.map((match) => match.route.component.preload?.()));
 }

package/lib/commands/deploy.js

@@ -12,7 +12,7 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const os_1 = tslib_1.__importDefault(require("os"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
-const execa_1 = tslib_1.__importDefault(require("execa"));
+const execa_1 = require("execa");
 const utils_1 = require("@docusaurus/utils");
 const site_1 = require("../server/site");
 const build_1 = require("./build/build");
@@ -24,14 +24,12 @@ function obfuscateGitPass(str) {
 const debugMode = !!process.env.DOCUSAURUS_DEPLOY_DEBUG;
 // Log executed commands so that user can figure out mistakes on his own
 // for example: https://github.com/facebook/docusaurus/issues/3875
-function exec(cmd, options) {
+async function exec(file, args, options) {
     const log = options?.log ?? true;
-    const failfast = options?.failfast ?? false;
+    const failfast = options?.failfast ?? true;
+    const cmd = [file, ...args].join(' ');
     try {
-        // TODO migrate to execa(file,[...args]) instead
-        //  Use async/await everything
-        //  Avoid execa.command: the args need to be escaped manually
-        const result = execa_1.default.commandSync(cmd);
+        const result = await (0, execa_1.execa)(file, args, { reject: false });
         if (log || debugMode) {
             logger_1.default.info `code=${obfuscateGitPass(cmd)} subdue=${`code: ${result.exitCode}`}`;
         }
@@ -39,7 +37,8 @@ function exec(cmd, options) {
             console.log(result);
         }
         if (failfast && result.exitCode !== 0) {
-            throw new Error(`Command returned unexpected exitCode ${result.exitCode}`);
+            throw new Error(`Command returned unexpected exitCode ${result.exitCode}
+${result.stderr}`);
         }
         return result;
     }
@@ -48,13 +47,8 @@ function exec(cmd, options) {
 In CWD code=${process.cwd()}`, { cause: err });
     }
 }
-// Execa escape args and add necessary quotes automatically
-// When using Execa.command, the args containing spaces must be escaped manually
-function escapeArg(arg) {
-    return arg.replaceAll(' ', '\\ ');
-}
-function hasGit() {
-    return exec('git --version').exitCode === 0;
+async function hasGit() {
+    return (await exec('git', ['--version'], { failfast: false })).exitCode === 0;
 }
 async function deploy(siteDirParam = '.', cliOptions = {}) {
     const siteDir = await fs_extra_1.default.realpath(siteDirParam);
@@ -70,23 +64,16 @@ This behavior can have SEO impacts and create relative link issues.
 `);
     }
     logger_1.default.info('Deploy command invoked...');
-    if (!hasGit()) {
+    if (!(await hasGit())) {
         throw new Error('Git not installed or not added to PATH!');
     }
     // Source repo is the repo from where the command is invoked
-    const { stdout } = exec('git remote get-url origin', {
+    const sourceRepoUrl = (await exec('git', ['remote', 'get-url', 'origin'], {
         log: false,
-        failfast: true,
-    });
-    const sourceRepoUrl = stdout.trim();
+    })).stdout.trim();
     // The source branch; defaults to the currently checked out branch
     const sourceBranch = process.env.CURRENT_BRANCH ??
-        exec('git rev-parse --abbrev-ref HEAD', {
-            log: false,
-            failfast: true,
-        })
-            ?.stdout?.toString()
-            .trim();
+        (await exec('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { log: false })).stdout.trim();
     const gitUser = process.env.GIT_USER;
     let useSSH = process.env.USE_SSH !== undefined &&
         process.env.USE_SSH.toLowerCase() === 'true';
@@ -116,10 +103,7 @@ This behavior can have SEO impacts and create relative link issues.
     // We never deploy on pull request.
     const isPullRequest = process.env.CI_PULL_REQUEST ?? process.env.CIRCLE_PULL_REQUEST;
     if (isPullRequest) {
-        exec('echo "Skipping deploy on a pull request."', {
-            log: false,
-            failfast: true,
-        });
+        logger_1.default.info('Skipping deploy on a pull request.');
         process.exit(0);
     }
     // github.io indicates organization repos that deploy via default branch. All
@@ -158,7 +142,7 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
     }
     // Save the commit hash that triggers publish-gh-pages before checking
     // out to deployment branch.
-    const currentCommit = exec('git rev-parse HEAD')?.stdout?.toString().trim();
+    const currentCommit = (await exec('git', ['rev-parse', 'HEAD'])).stdout.trim();
     const runDeploy = async (outputDirectory) => {
         const targetDirectory = cliOptions.targetDir ?? '.';
         const fromPath = outputDirectory;
@@ -167,42 +151,46 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
         // Clones the repo into the temp folder and checks out the target branch.
         // If the branch doesn't exist, it creates a new one based on the
         // repository default branch.
-        if (exec(`git clone --depth 1 --branch ${deploymentBranch} ${deploymentRepoURL} ${escapeArg(toPath)}`).exitCode !== 0) {
-            exec(`git clone --depth 1 ${deploymentRepoURL} ${escapeArg(toPath)}`);
-            exec(`git checkout -b ${deploymentBranch}`);
+        const cloneResult = await exec('git', [
+            'clone',
+            '--depth',
+            '1',
+            '--branch',
+            deploymentBranch,
+            deploymentRepoURL,
+            toPath,
+        ], { failfast: false });
+        if (cloneResult.exitCode !== 0) {
+            await exec('git', ['clone', '--depth', '1', deploymentRepoURL, toPath]);
+            await exec('git', ['checkout', '-b', deploymentBranch]);
         }
         // Clear out any existing contents in the target directory
-        exec(`git rm -rf ${escapeArg(targetDirectory)}`, {
-            log: false,
-            failfast: true,
-        });
+        await exec('git', ['rm', '-rf', targetDirectory], { log: false });
         const targetPath = path_1.default.join(toPath, targetDirectory);
         try {
             await fs_extra_1.default.copy(fromPath, targetPath);
         }
         catch (err) {
-            logger_1.default.error `Copying build assets from path=${fromPath} to path=${targetPath} failed.`;
-            throw err;
+            throw new Error(`Failed to copy build assets from path=${fromPath} to path=${targetPath}.`, { cause: err });
         }
-        exec('git add --all', { failfast: true });
+        await exec('git', ['add', '--all']);
         const gitUserName = process.env.GIT_USER_NAME;
         if (gitUserName) {
-            exec(`git config user.name ${escapeArg(gitUserName)}`, { failfast: true });
+            await exec('git', ['config', 'user.name', gitUserName]);
         }
         const gitUserEmail = process.env.GIT_USER_EMAIL;
         if (gitUserEmail) {
-            exec(`git config user.email ${escapeArg(gitUserEmail)}`, {
-                failfast: true,
-            });
+            await exec('git', ['config', 'user.email', gitUserEmail]);
         }
         const commitMessage = process.env.CUSTOM_COMMIT_MESSAGE ??
             `Deploy website - based on ${currentCommit}`;
-        const commitResults = exec(`git commit -m ${escapeArg(commitMessage)} --allow-empty`);
-        if (exec(`git push --force origin ${deploymentBranch}`).exitCode !== 0) {
+        // The commit might return a non-zero value when site is up to date.
+        const commitResults = await exec('git', ['commit', '-m', commitMessage, '--allow-empty'], { failfast: false });
+        const pushResult = await exec('git', ['push', '--force', 'origin', deploymentBranch], { failfast: false });
+        if (pushResult.exitCode !== 0) {
             throw new Error('Running "git push" command failed. Does the GitHub user account you are using have push access to the repository?');
         }
         else if (commitResults.exitCode === 0) {
-            // The commit might return a non-zero value when site is up to date.
             let websiteURL;
             if (githubHost === 'github.com') {
                 websiteURL = projectName.includes('.github.io')
@@ -213,7 +201,7 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
                 // GitHub enterprise hosting.
                 websiteURL = `https://${githubHost}/pages/${organizationName}/${projectName}/`;
             }
-            exec(`echo "Website is live at ${websiteURL}."`, { failfast: true });
+            logger_1.default.success `Website is live at url=${websiteURL}.`;
             process.exit(0);
         }
     };

package/lib/commands/serve.js

@@ -19,6 +19,7 @@ const openBrowser_1 = tslib_1.__importDefault(require("./utils/openBrowser/openB
 const config_1 = require("../server/config");
 const build_1 = require("./build/build");
 const getHostPort_1 = require("../server/getHostPort");
+const listenToServer_1 = require("./utils/listenToServer");
 function redirect(res, location) {
     res.writeHead(302, {
         Location: location,
@@ -84,7 +85,7 @@ async function serve(siteDirParam = '.', cliOptions = {}) {
     });
     const url = servingUrl + baseUrl;
     logger_1.default.success `Serving path=${buildDir} directory at: url=${url}`;
-    server.listen(port);
+    await (0, listenToServer_1.listenToServer)({ server, host, port });
     if (cliOptions.open && !process.env.CI) {
         await (0, openBrowser_1.default)(url);
     }

package/lib/commands/start/webpack.js

@@ -12,7 +12,6 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
 const bundler_1 = require("@docusaurus/bundler");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
-// eslint-disable-next-line import/default
 const webpack_dev_server_1 = tslib_1.__importDefault(require("webpack-dev-server"));
 const evalSourceMapMiddleware_1 = tslib_1.__importDefault(require("../utils/legacy/evalSourceMapMiddleware"));
 const watcher_1 = require("./watcher");
@@ -139,5 +138,19 @@ async function createWebpackDevServer({ props, cliOptions, openUrlContext, }) {
     });
     // Allow plugin authors to customize/override devServer config
     const devServerConfig = (0, webpack_merge_1.default)([defaultDevServerConfig, config.devServer].filter(Boolean));
-    return new webpack_dev_server_1.default(devServerConfig, compiler);
+    return createDevServer({
+        devServerConfig,
+        compiler,
+        currentBundler: props.currentBundler,
+    });
+}
+async function createDevServer({ devServerConfig, compiler, currentBundler, }) {
+    if (currentBundler.name === 'webpack') {
+        return new webpack_dev_server_1.default(devServerConfig, compiler);
+    }
+    else {
+        const RspackDevServer = await (0, bundler_1.importRspackDevServer)();
+        // @ts-expect-error: different types
+        return new RspackDevServer(devServerConfig, compiler);
+    }
 }

package/lib/commands/swizzle/actions.js

@@ -39,6 +39,11 @@ async function eject({ siteDir, themePath, componentName, typescript, }) {
         : `${fromPath}.*`;
     const globPatternPosix = (0, utils_1.posixPath)(globPattern);
     const filesToCopy = await (0, utils_1.Globby)(globPatternPosix, {
+        // Workaround for Tinyglobby bug?
+        // We glob absolute from the theme root path, not from cwd
+        // See https://github.com/SuperchupuDev/tinyglobby/issues/186
+        cwd: themePath,
+        absolute: true,
         ignore: lodash_1.default.compact([
             '**/*.{story,stories,test,tests}.{js,jsx,ts,tsx}',
             // When ejecting JS components, we want to avoid emitting TS files

package/lib/commands/utils/listenToServer.d.ts

@@ -0,0 +1,5 @@
+export declare function listenToServer({ server, port, host, }: {
+    server: import('node:http').Server;
+    port: number;
+    host: string;
+}): Promise<void>;

package/lib/commands/utils/listenToServer.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listenToServer = listenToServer;
+/**
+ * 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 logger_1 = require("@docusaurus/logger");
+async function listenToServer({ server, port, host, }) {
+    return new Promise((resolve, reject) => {
+        server.once('listening', () => resolve());
+        server.once('error', (err) => {
+            if (err.code === 'EADDRINUSE') {
+                reject(new Error(logger_1.logger.interpolate `Address in use, another server is already listening on the requested port number=${port} and host name=${host}`, { cause: err }));
+            }
+            else {
+                reject(err);
+            }
+        });
+        server.listen(port, host);
+    });
+}

package/lib/commands/utils/openBrowser/openBrowser.js

@@ -15,7 +15,7 @@ const tslib_1 = require("tslib");
 /* eslint-disable */
 const child_process_1 = require("child_process");
 const util_1 = require("util");
-const open_1 = tslib_1.__importDefault(require("open"));
+const open_1 = tslib_1.__importStar(require("open"));
 const logger_1 = require("@docusaurus/logger");
 const execPromise = (0, util_1.promisify)(child_process_1.exec);
 // Not sure if we need this, but let's keep a secret escape hatch
@@ -51,7 +51,12 @@ async function tryOpenWithAppleScript({ url, browser, }) {
             ];
             // Among all the supported browsers, retrieves to stdout the active ones
             const command = `ps cax -o command | grep -E "^(${supportedChromiumBrowsers.join('|')})$"`;
-            const result = await Promise.try(() => execPromise(command)).catch(() => {
+            const result = await Promise
+                // TODO Docusaurus v4: use Promise.try()
+                // See why here https://github.com/facebook/docusaurus/issues/11204#issuecomment-3073480330
+                .resolve()
+                .then(() => execPromise(command))
+                .catch(() => {
                 // Ignore all errors
                 // In particular grep errors when macOS user has no Chromium-based browser open
                 // See https://github.com/facebook/docusaurus/issues/11204
@@ -96,9 +101,9 @@ function toOpenApp(params) {
         return undefined;
     }
     // Handles "cross-platform" shortcuts like "chrome", "firefox", "edge"
-    if (open_1.default.apps[params.browser]) {
+    if (open_1.apps[params.browser]) {
         return {
-            name: open_1.default.apps[params.browser],
+            name: open_1.apps[params.browser],
             arguments: params.browserArgs,
         };
     }

package/lib/commands/writeHeadingIds.js

@@ -63,9 +63,9 @@ async function writeHeadingIds(siteDirParam = '.', files = [], options = {}) {
     validateOptions(options);
     const siteDir = await fs_extra_1.default.realpath(siteDirParam);
     const patterns = files.length ? files : await getPathsToWatch(siteDir);
-    const markdownFiles = await (0, utils_1.safeGlobby)(patterns, {
-        expandDirectories: ['**/*.{md,mdx}'],
-    });
+    const markdownFiles = (await (0, utils_1.safeGlobby)(patterns, {
+        expandDirectories: true,
+    })).filter((file) => file.endsWith('.md') || file.endsWith('.mdx'));
     if (markdownFiles.length === 0) {
         logger_1.default.warn `No markdown files found in siteDir path=${siteDir} for patterns: ${patterns}`;
         return;

package/lib/server/configValidation.js

@@ -16,15 +16,14 @@ const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const DEFAULT_I18N_LOCALE = 'en';
 const SiteUrlSchema = utils_validation_1.Joi.string()
     .custom((value, helpers) => {
-    try {
-        const { pathname } = new URL(value);
-        if (pathname !== '/') {
-            return helpers.error('docusaurus.subPathError', { pathname });
-        }
-    }
-    catch {
+    const url = URL.parse(value);
+    if (url === null) {
         return helpers.error('any.invalid');
     }
+    const { pathname } = url;
+    if (pathname !== '/') {
+        return helpers.error('docusaurus.subPathError', { pathname });
+    }
     return (0, utils_common_1.removeTrailingSlash)(value);
 })
     .messages({
@@ -91,6 +90,7 @@ exports.DEFAULT_FUTURE_CONFIG = {
 exports.DEFAULT_MARKDOWN_HOOKS = {
     onBrokenMarkdownLinks: 'warn',
     onBrokenMarkdownImages: 'throw',
+    onUnusedMarkdownDirectives: 'warn',
 };
 exports.DEFAULT_MARKDOWN_MDX1COMPAT = {
     comments: true,
@@ -349,7 +349,7 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
             is: utils_validation_1.Joi.valid(true),
             then: utils_validation_1.Joi.optional(),
             otherwise: utils_validation_1.Joi.object()
-                .pattern(/[\w-]+/, utils_validation_1.Joi.string())
+                .pattern(/[\w-]+/, utils_validation_1.Joi.alternatives().try(utils_validation_1.Joi.string(), utils_validation_1.Joi.boolean()))
                 .required(),
         }),
         customElement: utils_validation_1.Joi.bool().default(false),
@@ -412,6 +412,9 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
             onBrokenMarkdownImages: utils_validation_1.Joi.alternatives()
                 .try(utils_validation_1.Joi.string().equal('ignore', 'log', 'warn', 'throw'), utils_validation_1.Joi.function())
                 .default(exports.DEFAULT_CONFIG.markdown.hooks.onBrokenMarkdownImages),
+            onUnusedMarkdownDirectives: utils_validation_1.Joi.alternatives()
+                .try(utils_validation_1.Joi.string().equal('ignore', 'log', 'warn', 'throw'), utils_validation_1.Joi.function())
+                .default(exports.DEFAULT_CONFIG.markdown.hooks.onUnusedMarkdownDirectives),
         }).default(exports.DEFAULT_CONFIG.markdown.hooks),
     }).default({
         ...exports.DEFAULT_CONFIG.markdown,

package/lib/server/getHostPort.js

@@ -69,8 +69,7 @@ Would you like to run the app on another port instead?`),
         return shouldChangePort ? port : null;
     }
     catch (err) {
-        logger_1.default.error `Could not find an open port at ${host}.`;
-        throw err;
+        throw new Error(logger_1.default.interpolate `Could not find an open port at ${host}.`, { cause: err });
     }
 }
 async function getHostPort(options) {

package/lib/server/htmlTags.js

@@ -9,8 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadHtmlTags = loadHtmlTags;
 const tslib_1 = require("tslib");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
-const html_tags_1 = tslib_1.__importDefault(require("html-tags"));
-const void_1 = tslib_1.__importDefault(require("html-tags/void"));
+const html_tags_1 = tslib_1.__importStar(require("html-tags"));
 const escape_html_1 = tslib_1.__importDefault(require("escape-html"));
 // TODO this should be done at config validation time, not here
 function assertIsHtmlTagObject(val) {
@@ -34,7 +33,7 @@ function hashRouterAbsoluteToRelativeTagAttribute(name, value) {
 }
 function htmlTagObjectToString({ tag, router, }) {
     assertIsHtmlTagObject(tag);
-    const isVoidTag = void_1.default.includes(tag.tagName);
+    const isVoidTag = html_tags_1.voidHtmlTags.includes(tag.tagName);
     const tagAttributes = tag.attributes ?? {};
     const attributes = Object.keys(tagAttributes)
         .map((attr) => {

package/lib/ssg/ssgExecutor.js

@@ -60,6 +60,21 @@ function getNumberOfThreads(pathnames) {
         minPagesPerCpu: 100,
     });
 }
+// Workaround for Node styleText() limitation
+// See https://github.com/nodejs/node/issues/65766
+function getWorkerColorEnv() {
+    // Preserve an explicit user choice
+    if (process.env.FORCE_COLOR !== undefined) {
+        return {};
+    }
+    const depth = process.stdout.isTTY
+        ? (process.stdout.getColorDepth?.() ?? 0)
+        : 0;
+    if (depth > 2) {
+        return { FORCE_COLOR: depth >= 24 ? '3' : depth >= 8 ? '2' : '1' };
+    }
+    return {};
+}
 const createPooledSSGExecutor = async ({ params, pathnames, }) => {
     const numberOfThreads = getNumberOfThreads(pathnames);
     // When the inferred or provided number of threads is just 1
@@ -80,6 +95,12 @@ const createPooledSSGExecutor = async ({ params, pathnames, }) => {
             runtime: 'worker_threads',
             isolateWorkers: false,
             workerData: { params },
+            env: {
+                // Cast is safe
+                // See https://github.com/tinylibs/tinypool/issues/136
+                ...process.env,
+                ...getWorkerColorEnv(),
+            },
             // WORKER MEMORY MANAGEMENT
             // Allows containing SSG memory leaks with a thread recycling workaround
             // See https://github.com/facebook/docusaurus/pull/11166

package/lib/ssg/ssgTemplate.js

@@ -9,15 +9,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileSSGTemplate = compileSSGTemplate;
 exports.renderSSGTemplate = renderSSGTemplate;
 exports.renderHashRouterTemplate = renderHashRouterTemplate;
-const tslib_1 = require("tslib");
-const eta = tslib_1.__importStar(require("eta"));
+const eta_1 = require("eta");
 const react_loadable_ssr_addon_v5_slorber_1 = require("react-loadable-ssr-addon-v5-slorber");
 const logger_1 = require("@docusaurus/logger");
 async function compileSSGTemplate(template) {
-    const compiledTemplate = eta.compile(template.trim(), {
-        rmWhitespace: true,
-    });
-    return (data) => compiledTemplate(data, eta.defaultConfig);
+    const eta = new eta_1.Eta({ rmWhitespace: true });
+    const compiledTemplate = eta.compile(template.trim());
+    return (data) => eta.render(compiledTemplate, data);
 }
 /**
  * Given a list of modules that were SSR an d

package/lib/webpack/base.js

@@ -87,9 +87,14 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
         }
         if (props.currentBundler.name === 'rspack') {
             if (props.siteConfig.future.faster.rspackPersistentCache) {
-                // Use cache: true + experiments.cache.type: "persistent"
-                // See https://rspack.dev/config/experiments#persistent-cache
-                return true;
+                return {
+                    type: 'persistent',
+                    // Rspack doesn't have "cache.name" like Webpack
+                    // This is not ideal but work around is to merge name/version
+                    // See https://github.com/web-infra-dev/rspack/pull/8920#issuecomment-2658938695
+                    version: `${getCacheName()}-${getCacheVersion()}`,
+                    buildDependencies: getCacheBuildDependencies(),
+                };
             }
             else {
                 return disabledPersistentCacheValue;
@@ -104,29 +109,10 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
             },
         };
     }
-    function getExperiments() {
-        if (props.currentBundler.name === 'rspack') {
-            // TODO find a way to type this
-            const experiments = {};
-            if (!process.env.DOCUSAURUS_NO_PERSISTENT_CACHE) {
-                experiments.cache = {
-                    type: 'persistent',
-                    // Rspack doesn't have "cache.name" like Webpack
-                    // This is not ideal but work around is to merge name/version
-                    // See https://github.com/web-infra-dev/rspack/pull/8920#issuecomment-2658938695
-                    version: `${getCacheName()}-${getCacheVersion()}`,
-                    buildDependencies: getCacheBuildDependencies(),
-                };
-            }
-            return experiments;
-        }
-        return undefined;
-    }
     return {
         mode,
         name,
         cache: getCache(),
-        experiments: getExperiments(),
         output: {
             pathinfo: false,
             path: outDir,
@@ -251,6 +237,10 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
                             // See https://github.com/facebook/docusaurus/pull/10423
                             localIdentName: `[local]_[contenthash:base64:4]`,
                             exportOnlyLocals: isServer,
+                            // Export CSS module class names compatible with css-loader v6
+                            // export ".themedComponent--dark" instead of .themedComponentDark
+                            // See https://github.com/webpack/css-loader/releases/tag/v7.0.0
+                            exportLocalsConvention: 'as-is',
                         },
                         importLoaders: 1,
                         sourceMap: !isProd,

package/lib/webpack/server.js

@@ -35,7 +35,7 @@ async function createServerConfig({ props, configureWebpackUtils, }) {
         output: {
             path: outputDir,
             filename: outputFilename,
-            libraryTarget: 'commonjs2',
+            library: { type: 'commonjs2' },
         },
         plugins: [
             new ProgressBarPlugin({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "3.10.1-canary-6655",
+  "version": "3.10.1-canary-6800",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,31 +33,30 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "3.10.1-canary-6655",
-    "@docusaurus/bundler": "3.10.1-canary-6655",
-    "@docusaurus/logger": "3.10.1-canary-6655",
-    "@docusaurus/mdx-loader": "3.10.1-canary-6655",
-    "@docusaurus/utils": "3.10.1-canary-6655",
-    "@docusaurus/utils-common": "3.10.1-canary-6655",
-    "@docusaurus/utils-validation": "3.10.1-canary-6655",
+    "@docusaurus/babel": "3.10.1-canary-6800",
+    "@docusaurus/bundler": "3.10.1-canary-6800",
+    "@docusaurus/logger": "3.10.1-canary-6800",
+    "@docusaurus/mdx-loader": "3.10.1-canary-6800",
+    "@docusaurus/utils": "3.10.1-canary-6800",
+    "@docusaurus/utils-common": "3.10.1-canary-6800",
+    "@docusaurus/utils-validation": "3.10.1-canary-6800",
     "boxen": "^6.2.1",
-    "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.3",
     "combine-promises": "^1.1.0",
     "commander": "^5.1.0",
     "core-js": "^3.31.1",
-    "detect-port": "^1.5.1",
+    "detect-port": "^2.1.0",
     "escape-html": "^1.0.3",
-    "eta": "^2.2.0",
+    "eta": "^4.0.1",
     "eval": "^0.1.8",
-    "execa": "^5.1.1",
+    "execa": "^10.0.0",
     "fs-extra": "^11.2.0",
-    "html-tags": "^3.3.1",
+    "html-tags": "^5.1.0",
     "html-webpack-plugin": "^5.6.7",
     "leven": "^3.1.0",
     "lodash": "^4.17.21",
-    "open": "^8.4.0",
+    "open": "^11.0.0",
     "p-map": "^4.0.0",
     "prompts": "^2.4.2",
     "react-helmet-async": "npm:@slorber/react-helmet-async@1.3.0",
@@ -73,27 +72,29 @@
     "update-notifier": "^6.0.2",
     "webpack": "^5.106.2",
     "webpack-bundle-analyzer": "^5.3.0",
-    "webpack-dev-server": "^5.2.3",
+    "webpack-dev-server": "^6.0.0",
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.10.1-canary-6655",
-    "@docusaurus/types": "3.10.1-canary-6655",
+    "@docusaurus/module-type-aliases": "3.10.1-canary-6800",
+    "@docusaurus/types": "3.10.1-canary-6800",
     "@total-typescript/shoehorn": "^0.1.2",
-    "@types/detect-port": "^1.3.3",
-    "@types/react-dom": "^19.2.3",
+    "@types/escape-html": "^1.0.4",
+    "@types/history": "^4.7.11",
+    "@types/react-dom": "^19.3.0",
     "@types/react-router-config": "^5.0.7",
+    "@types/react-router-dom": "^5.3.3",
     "@types/serve-handler": "^6.1.4",
     "@types/update-notifier": "^6.0.4",
     "@types/webpack-bundle-analyzer": "^4.7.0",
     "@types/webpack-env": "^1.18.8",
-    "tree-node-cli": "^1.6.0"
+    "tree-node-cli": "^3.0.0"
   },
   "peerDependencies": {
-    "@docusaurus/faster": "*",
+    "@docusaurus/faster": "3.10.1-canary-6800",
     "@mdx-js/react": "^3.1.1",
-    "react": "^19.2.5",
-    "react-dom": "^19.2.5"
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0"
   },
   "peerDependenciesMeta": {
     "@docusaurus/faster": {
@@ -103,5 +104,5 @@
   "engines": {
     "node": ">=24.14"
   },
-  "gitHead": "6e93a3055178dd0af922ba627f787229dcdf948b"
+  "gitHead": "7facf9bbbdb6f9f0843f143bee8a1af701bde603"
 }