@docusaurus/core 3.8.1 → 3.9.0-canary-6403

package/lib/client/exports/ComponentCreator.js

@@ -44,7 +44,6 @@ export default function ComponentCreator(path, hash) {
     Object.entries(flatChunkNames).forEach(([keyPath, chunkName]) => {
         const chunkRegistry = registry[chunkName];
         if (chunkRegistry) {
-            // eslint-disable-next-line prefer-destructuring
             loader[keyPath] = chunkRegistry[0];
             modules.push(chunkRegistry[1]);
             optsWebpack.push(chunkRegistry[2]);

package/lib/commands/build/build.js

@@ -14,6 +14,7 @@ const utils_1 = require("@docusaurus/utils");
 const site_1 = require("../../server/site");
 const i18n_1 = require("../../server/i18n");
 const buildLocale_1 = require("./buildLocale");
+const buildUtils_1 = require("./buildUtils");
 async function build(siteDirParam = '.', cliOptions = {}) {
     process.env.BABEL_ENV = 'production';
     process.env.NODE_ENV = 'production';
@@ -49,16 +50,20 @@ function orderLocales({ locales, defaultLocale, }) {
     }
 }
 async function getLocalesToBuild({ siteDir, cliOptions, }) {
-    // We disable locale path localization if CLI has single "--locale" option
-    // yarn build --locale fr => baseUrl=/ instead of baseUrl=/fr/
-    const localizePath = cliOptions.locale?.length === 1 ? false : undefined;
+    // TODO we shouldn't need to load all context + i18n just to get that list
+    // only loading siteConfig should be enough
     const context = await (0, site_1.loadContext)({
         siteDir,
         outDir: cliOptions.outDir,
         config: cliOptions.config,
-        localizePath,
+        automaticBaseUrlLocalizationDisabled: (0, buildUtils_1.isAutomaticBaseUrlLocalizationDisabled)(cliOptions),
+    });
+    const i18n = await (0, i18n_1.loadI18n)({
+        siteDir,
+        config: context.siteConfig,
+        currentLocale: context.siteConfig.i18n.defaultLocale, // Awkward but ok
+        automaticBaseUrlLocalizationDisabled: false,
     });
-    const i18n = await (0, i18n_1.loadI18n)(context.siteConfig);
     const locales = cliOptions.locale ?? i18n.locales;
     return orderLocales({
         locales: locales,

package/lib/commands/build/buildLocale.js

@@ -20,6 +20,7 @@ const server_1 = tslib_1.__importDefault(require("../../webpack/server"));
 const configure_1 = require("../../webpack/configure");
 const ssgExecutor_1 = require("../../ssg/ssgExecutor");
 const clearPath_1 = tslib_1.__importDefault(require("../utils/clearPath"));
+const buildUtils_1 = require("./buildUtils");
 const SkipBundling = process.env.DOCUSAURUS_SKIP_BUNDLING === 'true';
 const ExitAfterLoading = process.env.DOCUSAURUS_EXIT_AFTER_LOADING === 'true';
 const ExitAfterBundling = process.env.DOCUSAURUS_EXIT_AFTER_BUNDLING === 'true';
@@ -34,7 +35,7 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
         outDir: cliOptions.outDir,
         config: cliOptions.config,
         locale,
-        localizePath: cliOptions.locale?.length === 1 ? false : undefined,
+        automaticBaseUrlLocalizationDisabled: (0, buildUtils_1.isAutomaticBaseUrlLocalizationDisabled)(cliOptions),
     }));
     if (ExitAfterLoading) {
         return process.exit(0);

package/lib/commands/build/buildUtils.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 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 { BuildCLIOptions } from './build';
+/**
+ * We disable locale path localization if CLI has a single "--locale" option
+ * yarn build --locale fr => baseUrl=/ instead of baseUrl=/fr/
+ * By default, this makes it easier to support multi-domain deployments
+ * See https://docusaurus.io/docs/i18n/tutorial#multi-domain-deployment
+ */
+export declare function isAutomaticBaseUrlLocalizationDisabled(cliOptions: BuildCLIOptions): boolean;

package/lib/commands/build/buildUtils.js

@@ -0,0 +1,18 @@
+"use strict";
+/**
+ * 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.isAutomaticBaseUrlLocalizationDisabled = isAutomaticBaseUrlLocalizationDisabled;
+/**
+ * We disable locale path localization if CLI has a single "--locale" option
+ * yarn build --locale fr => baseUrl=/ instead of baseUrl=/fr/
+ * By default, this makes it easier to support multi-domain deployments
+ * See https://docusaurus.io/docs/i18n/tutorial#multi-domain-deployment
+ */
+function isAutomaticBaseUrlLocalizationDisabled(cliOptions) {
+    return cliOptions.locale?.length === 1;
+}

package/lib/commands/start/utils.js

@@ -53,7 +53,6 @@ async function createLoadSiteParams({ siteDirParam, cliOptions, }) {
         siteDir,
         config: cliOptions.config,
         locale: cliOptions.locale,
-        localizePath: undefined, // Should this be configurable?
     };
 }
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types

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

@@ -51,8 +51,14 @@ 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 execPromise(command).catch(() => {
-                // Ignore grep errors when macOS user has no Chromium-based browser open
+            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
             });
             if (!result) {

package/lib/server/configValidation.d.ts

@@ -5,8 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { Joi } from '@docusaurus/utils-validation';
-import type { FasterConfig, FutureConfig, FutureV4Config, StorageConfig } from '@docusaurus/types/src/config';
-import type { DocusaurusConfig, I18nConfig, MarkdownConfig } from '@docusaurus/types';
+import type { FasterConfig, FutureConfig, FutureV4Config, StorageConfig, DocusaurusConfig, I18nConfig, MarkdownConfig, MarkdownHooks } from '@docusaurus/types';
 export declare const DEFAULT_I18N_CONFIG: I18nConfig;
 export declare const DEFAULT_STORAGE_CONFIG: StorageConfig;
 export declare const DEFAULT_FASTER_CONFIG: FasterConfig;
@@ -14,6 +13,7 @@ export declare const DEFAULT_FASTER_CONFIG_TRUE: FasterConfig;
 export declare const DEFAULT_FUTURE_V4_CONFIG: FutureV4Config;
 export declare const DEFAULT_FUTURE_V4_CONFIG_TRUE: FutureV4Config;
 export declare const DEFAULT_FUTURE_CONFIG: FutureConfig;
+export declare const DEFAULT_MARKDOWN_HOOKS: MarkdownHooks;
 export declare const DEFAULT_MARKDOWN_CONFIG: MarkdownConfig;
 export declare const DEFAULT_CONFIG: Pick<DocusaurusConfig, 'i18n' | 'future' | 'onBrokenLinks' | 'onBrokenAnchors' | 'onBrokenMarkdownLinks' | 'onDuplicateRoutes' | 'plugins' | 'themes' | 'presets' | 'headTags' | 'stylesheets' | 'scripts' | 'clientModules' | 'customFields' | 'themeConfig' | 'titleDelimiter' | 'noIndex' | 'tagline' | 'baseUrlIssueBanner' | 'staticDirectories' | 'markdown'>;
 export declare const ConfigSchema: Joi.ObjectSchema<DocusaurusConfig>;

package/lib/server/configValidation.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConfigSchema = exports.DEFAULT_CONFIG = exports.DEFAULT_MARKDOWN_CONFIG = exports.DEFAULT_FUTURE_CONFIG = exports.DEFAULT_FUTURE_V4_CONFIG_TRUE = exports.DEFAULT_FUTURE_V4_CONFIG = exports.DEFAULT_FASTER_CONFIG_TRUE = exports.DEFAULT_FASTER_CONFIG = exports.DEFAULT_STORAGE_CONFIG = exports.DEFAULT_I18N_CONFIG = void 0;
+exports.ConfigSchema = exports.DEFAULT_CONFIG = exports.DEFAULT_MARKDOWN_CONFIG = exports.DEFAULT_MARKDOWN_HOOKS = exports.DEFAULT_FUTURE_CONFIG = exports.DEFAULT_FUTURE_V4_CONFIG_TRUE = exports.DEFAULT_FUTURE_V4_CONFIG = exports.DEFAULT_FASTER_CONFIG_TRUE = exports.DEFAULT_FASTER_CONFIG = exports.DEFAULT_STORAGE_CONFIG = exports.DEFAULT_I18N_CONFIG = void 0;
 exports.validateConfig = validateConfig;
 const tslib_1 = require("tslib");
 const utils_1 = require("@docusaurus/utils");
@@ -14,6 +14,28 @@ const utils_validation_1 = require("@docusaurus/utils-validation");
 const utils_common_1 = require("@docusaurus/utils-common");
 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 {
+        return helpers.error('any.invalid');
+    }
+    return (0, utils_common_1.removeTrailingSlash)(value);
+})
+    .messages({
+    'any.invalid': '"{#value}" does not look like a valid URL. Make sure it has a protocol; for example, "https://example.com".',
+    'docusaurus.subPathError': 'The url is not supposed to contain a sub-path like "{#pathname}". Please use the baseUrl field for sub-paths.',
+});
+const BaseUrlSchema = utils_validation_1.Joi
+    // Weird Joi trick needed, otherwise value '' is not normalized...
+    .alternatives()
+    .try(utils_validation_1.Joi.string().required().allow(''))
+    .custom((value) => (0, utils_common_1.addLeadingSlash)((0, utils_common_1.addTrailingSlash)(value)));
 exports.DEFAULT_I18N_CONFIG = {
     defaultLocale: DEFAULT_I18N_LOCALE,
     path: utils_1.DEFAULT_I18N_DIR_NAME,
@@ -60,9 +82,14 @@ exports.DEFAULT_FUTURE_CONFIG = {
     experimental_storage: exports.DEFAULT_STORAGE_CONFIG,
     experimental_router: 'browser',
 };
+exports.DEFAULT_MARKDOWN_HOOKS = {
+    onBrokenMarkdownLinks: 'warn',
+    onBrokenMarkdownImages: 'throw',
+};
 exports.DEFAULT_MARKDOWN_CONFIG = {
     format: 'mdx', // TODO change this to "detect" in Docusaurus v4?
     mermaid: false,
+    emoji: true,
     preprocessor: undefined,
     parseFrontMatter: utils_1.DEFAULT_PARSE_FRONT_MATTER,
     mdx1Compat: {
@@ -74,13 +101,14 @@ exports.DEFAULT_MARKDOWN_CONFIG = {
         maintainCase: false,
     },
     remarkRehypeOptions: undefined,
+    hooks: exports.DEFAULT_MARKDOWN_HOOKS,
 };
 exports.DEFAULT_CONFIG = {
     i18n: exports.DEFAULT_I18N_CONFIG,
     future: exports.DEFAULT_FUTURE_CONFIG,
     onBrokenLinks: 'throw',
     onBrokenAnchors: 'warn', // TODO Docusaurus v4: change to throw
-    onBrokenMarkdownLinks: 'warn',
+    onBrokenMarkdownLinks: undefined,
     onDuplicateRoutes: 'warn',
     plugins: [],
     themes: [],
@@ -149,9 +177,11 @@ const PresetSchema = utils_validation_1.Joi.alternatives()
 const LocaleConfigSchema = utils_validation_1.Joi.object({
     label: utils_validation_1.Joi.string(),
     htmlLang: utils_validation_1.Joi.string(),
-    direction: utils_validation_1.Joi.string().equal('ltr', 'rtl').default('ltr'),
+    direction: utils_validation_1.Joi.string().equal('ltr', 'rtl'),
     calendar: utils_validation_1.Joi.string(),
     path: utils_validation_1.Joi.string(),
+    url: SiteUrlSchema,
+    baseUrl: BaseUrlSchema,
 });
 const I18N_CONFIG_SCHEMA = utils_validation_1.Joi.object({
     defaultLocale: utils_validation_1.Joi.string().required(),
@@ -207,36 +237,13 @@ const FUTURE_CONFIG_SCHEMA = utils_validation_1.Joi.object({
 })
     .optional()
     .default(exports.DEFAULT_FUTURE_CONFIG);
-const SiteUrlSchema = utils_validation_1.Joi.string()
-    .required()
-    .custom((value, helpers) => {
-    try {
-        const { pathname } = new URL(value);
-        if (pathname !== '/') {
-            return helpers.error('docusaurus.subPathError', { pathname });
-        }
-    }
-    catch {
-        return helpers.error('any.invalid');
-    }
-    return (0, utils_common_1.removeTrailingSlash)(value);
-})
-    .messages({
-    'any.invalid': '"{#value}" does not look like a valid URL. Make sure it has a protocol; for example, "https://example.com".',
-    'docusaurus.subPathError': 'The url is not supposed to contain a sub-path like "{#pathname}". Please use the baseUrl field for sub-paths.',
-});
 // TODO move to @docusaurus/utils-validation
 exports.ConfigSchema = utils_validation_1.Joi.object({
-    baseUrl: utils_validation_1.Joi
-        // Weird Joi trick needed, otherwise value '' is not normalized...
-        .alternatives()
-        .try(utils_validation_1.Joi.string().required().allow(''))
-        .required()
-        .custom((value) => (0, utils_common_1.addLeadingSlash)((0, utils_common_1.addTrailingSlash)(value))),
+    url: SiteUrlSchema.required(),
+    baseUrl: BaseUrlSchema.required(),
     baseUrlIssueBanner: utils_validation_1.Joi.boolean().default(exports.DEFAULT_CONFIG.baseUrlIssueBanner),
     favicon: utils_validation_1.Joi.string().optional(),
     title: utils_validation_1.Joi.string().required(),
-    url: SiteUrlSchema,
     trailingSlash: utils_validation_1.Joi.boolean(), // No default value! undefined = retrocompatible legacy behavior!
     i18n: I18N_CONFIG_SCHEMA,
     future: FUTURE_CONFIG_SCHEMA,
@@ -248,7 +255,7 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
         .default(exports.DEFAULT_CONFIG.onBrokenAnchors),
     onBrokenMarkdownLinks: utils_validation_1.Joi.string()
         .equal('ignore', 'log', 'warn', 'throw')
-        .default(exports.DEFAULT_CONFIG.onBrokenMarkdownLinks),
+        .default(() => exports.DEFAULT_CONFIG.onBrokenMarkdownLinks),
     onDuplicateRoutes: utils_validation_1.Joi.string()
         .equal('ignore', 'log', 'warn', 'throw')
         .default(exports.DEFAULT_CONFIG.onDuplicateRoutes),
@@ -315,6 +322,7 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
             .default(exports.DEFAULT_CONFIG.markdown.format),
         parseFrontMatter: utils_validation_1.Joi.function().default(() => exports.DEFAULT_CONFIG.markdown.parseFrontMatter),
         mermaid: utils_validation_1.Joi.boolean().default(exports.DEFAULT_CONFIG.markdown.mermaid),
+        emoji: utils_validation_1.Joi.boolean().default(exports.DEFAULT_CONFIG.markdown.emoji),
         preprocessor: utils_validation_1.Joi.function()
             .arity(1)
             .optional()
@@ -332,13 +340,29 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
         anchors: utils_validation_1.Joi.object({
             maintainCase: utils_validation_1.Joi.boolean().default(exports.DEFAULT_CONFIG.markdown.anchors.maintainCase),
         }).default(exports.DEFAULT_CONFIG.markdown.anchors),
+        hooks: utils_validation_1.Joi.object({
+            onBrokenMarkdownLinks: 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.onBrokenMarkdownLinks),
+            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),
+        }).default(exports.DEFAULT_CONFIG.markdown.hooks),
     }).default(exports.DEFAULT_CONFIG.markdown),
 }).messages({
     'docusaurus.configValidationWarning': 'Docusaurus config validation warning. Field {#label}: {#warningMessage}',
 });
 // Expressing this kind of logic in Joi is a pain
 // We also want to decouple logic from Joi: easier to remove it later!
-function ensureDocusaurusConfigConsistency(config) {
+function postProcessDocusaurusConfig(config) {
+    if (config.onBrokenMarkdownLinks) {
+        logger_1.default.warn `The code=${'siteConfig.onBrokenMarkdownLinks'} config option is deprecated and will be removed in Docusaurus v4.
+Please migrate and move this option to code=${'siteConfig.markdown.hooks.onBrokenMarkdownLinks'} instead.`;
+        // For v3 retro compatibility we use the old attribute over the new one
+        config.markdown.hooks.onBrokenMarkdownLinks = config.onBrokenMarkdownLinks;
+        // We erase the former one to ensure we don't use it anywhere
+        config.onBrokenMarkdownLinks = undefined;
+    }
     if (config.future.experimental_faster.ssgWorkerThreads &&
         !config.future.v4.removeLegacyPostBuildHeadAttribute) {
         throw new Error(`Docusaurus config ${logger_1.default.code('future.experimental_faster.ssgWorkerThreads')} requires the future flag ${logger_1.default.code('future.v4.removeLegacyPostBuildHeadAttribute')} to be turned on.
@@ -371,6 +395,6 @@ function validateConfig(config, siteConfigPath) {
             : formattedError;
         throw new Error(formattedError);
     }
-    ensureDocusaurusConfigConsistency(value);
+    postProcessDocusaurusConfig(value);
     return value;
 }

package/lib/server/i18n.d.ts

@@ -5,6 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { I18n, DocusaurusConfig, I18nLocaleConfig } from '@docusaurus/types';
-import type { LoadContextParams } from './site';
-export declare function getDefaultLocaleConfig(locale: string): I18nLocaleConfig;
-export declare function loadI18n(config: DocusaurusConfig, options?: Pick<LoadContextParams, 'locale'>): Promise<I18n>;
+export declare function getDefaultLocaleConfig(locale: string): Omit<I18nLocaleConfig, 'translate' | 'url' | 'baseUrl'>;
+export declare function loadI18n({ siteDir, config, currentLocale, automaticBaseUrlLocalizationDisabled, }: {
+    siteDir: string;
+    config: DocusaurusConfig;
+    currentLocale: string;
+    automaticBaseUrlLocalizationDisabled: boolean;
+}): Promise<I18n>;

package/lib/server/i18n.js

@@ -9,7 +9,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultLocaleConfig = getDefaultLocaleConfig;
 exports.loadI18n = loadI18n;
 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 combine_promises_1 = tslib_1.__importDefault(require("combine-promises"));
+const utils_1 = require("@docusaurus/utils");
 function inferLanguageDisplayName(locale) {
     const tryLocale = (l) => {
         try {
@@ -62,6 +66,7 @@ function getDefaultDirection(localeStr) {
     // see https://github.com/tc39/proposal-intl-locale-info
     // see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/getTextInfo
     // Node 18.0 implements a former version of the getTextInfo() proposal
+    // TODO Docusaurus v4: remove the fallback to locale.textInfo
     // @ts-expect-error: The TC39 proposal was updated
     const textInto = locale.getTextInfo?.() ?? locale.textInfo;
     return textInto.direction;
@@ -80,9 +85,8 @@ function getDefaultLocaleConfig(locale) {
         throw new Error(`Docusaurus couldn't get default locale config for ${locale}`, { cause: e });
     }
 }
-async function loadI18n(config, options) {
+async function loadI18n({ siteDir, config, currentLocale, automaticBaseUrlLocalizationDisabled, }) {
     const { i18n: i18nConfig } = config;
-    const currentLocale = options?.locale ?? i18nConfig.defaultLocale;
     if (!i18nConfig.locales.includes(currentLocale)) {
         logger_1.default.warn `The locale name=${currentLocale} was not found in your site configuration: Available locales are: ${i18nConfig.locales}
 Note: Docusaurus only support running one locale at a time.`;
@@ -90,13 +94,42 @@ Note: Docusaurus only support running one locale at a time.`;
     const locales = i18nConfig.locales.includes(currentLocale)
         ? i18nConfig.locales
         : i18nConfig.locales.concat(currentLocale);
-    function getLocaleConfig(locale) {
-        return {
+    async function getFullLocaleConfig(locale) {
+        const localeConfigInput = i18nConfig.localeConfigs[locale] ?? {};
+        const localeConfig = {
             ...getDefaultLocaleConfig(locale),
-            ...i18nConfig.localeConfigs[locale],
+            ...localeConfigInput,
+        };
+        // By default, translations will be enabled if i18n/<locale> dir exists
+        async function inferTranslate() {
+            const localizationDir = path_1.default.resolve(siteDir, i18nConfig.path, localeConfig.path);
+            return fs_extra_1.default.pathExists(localizationDir);
+        }
+        function getInferredBaseUrl() {
+            const addLocaleSegment = locale !== i18nConfig.defaultLocale &&
+                !automaticBaseUrlLocalizationDisabled;
+            return (0, utils_1.normalizeUrl)([
+                '/',
+                config.baseUrl,
+                addLocaleSegment ? locale : '',
+                '/',
+            ]);
+        }
+        const translate = localeConfigInput.translate ?? (await inferTranslate());
+        const url = typeof localeConfigInput.url !== 'undefined'
+            ? localeConfigInput.url
+            : config.url;
+        const baseUrl = typeof localeConfigInput.baseUrl !== 'undefined'
+            ? (0, utils_1.normalizeUrl)(['/', localeConfigInput.baseUrl, '/'])
+            : getInferredBaseUrl();
+        return {
+            ...localeConfig,
+            translate,
+            url,
+            baseUrl,
         };
     }
-    const localeConfigs = Object.fromEntries(locales.map((locale) => [locale, getLocaleConfig(locale)]));
+    const localeConfigs = await (0, combine_promises_1.default)(Object.fromEntries(locales.map((locale) => [locale, getFullLocaleConfig(locale)])));
     return {
         defaultLocale: i18nConfig.defaultLocale,
         locales,

package/lib/server/plugins/plugins.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPlugins = loadPlugins;
 exports.reloadPlugin = reloadPlugin;
 const logger_1 = require("@docusaurus/logger");
+const utils_1 = require("@docusaurus/utils");
 const init_1 = require("./init");
 const synthetic_1 = require("./synthetic");
 const translations_1 = require("../translations/translations");
@@ -37,11 +38,16 @@ async function translatePluginContent({ plugin, content, context, }) {
 async function executePluginContentLoading({ plugin, context, }) {
     return logger_1.PerfLogger.async(`Load ${(0, pluginsUtils_1.formatPluginName)(plugin)}`, async () => {
         let content = await logger_1.PerfLogger.async('loadContent()', () => plugin.loadContent?.());
-        content = await logger_1.PerfLogger.async('translatePluginContent()', () => translatePluginContent({
-            plugin,
-            content,
-            context,
-        }));
+        const shouldTranslate = (0, utils_1.getLocaleConfig)(context.i18n).translate;
+        if (shouldTranslate) {
+            content = await logger_1.PerfLogger.async('translatePluginContent()', () => translatePluginContent({
+                plugin,
+                content,
+                context,
+            }));
+        }
+        // If shouldTranslate === false, we still need the code translations
+        // Otherwise an unlocalized French site would show code strings in English
         const defaultCodeTranslations = (await logger_1.PerfLogger.async('getDefaultCodeTranslationMessages()', () => plugin.getDefaultCodeTranslationMessages?.())) ?? {};
         if (!plugin.contentLoaded) {
             return {

package/lib/server/site.d.ts

@@ -15,12 +15,19 @@ export type LoadContextParams = {
     /** Default is `i18n.defaultLocale` */
     locale?: string;
     /**
-     * `true` means the paths will have the locale prepended; `false` means they
-     * won't (useful for `yarn build -l zh-Hans` where the output should be
-     * emitted into `build/` instead of `build/zh-Hans/`); `undefined` is like the
-     * "smart" option where only non-default locale paths are localized
+     * By default, we try to automatically infer a localized baseUrl.
+     * We prepend `/<siteBaseUrl>/` with a `/<locale>/` path segment,
+     * except for the default locale.
+     *
+     * This option permits opting out of this baseUrl localization process.
+     * It is mostly useful to simplify config for multi-domain i18n deployments.
+     * See https://docusaurus.io/docs/i18n/tutorial#multi-domain-deployment
+     *
+     * In all cases, this process doesn't happen if an explicit localized baseUrl
+     * has been provided using `i18n.localeConfigs[].baseUrl`. We always use the
+     * provided value over the inferred one, letting you override it.
      */
-    localizePath?: boolean;
+    automaticBaseUrlLocalizationDisabled?: boolean;
 };
 export type LoadSiteParams = LoadContextParams & {
     isReload?: boolean;

package/lib/server/site.js

@@ -34,7 +34,7 @@ const siteMessages_1 = require("./siteMessages");
  * to plugin constructors.
  */
 async function loadContext(params) {
-    const { siteDir, outDir: baseOutDir = utils_1.DEFAULT_BUILD_DIR_NAME, locale, config: customConfigFilePath, } = params;
+    const { siteDir, outDir: baseOutDir = utils_1.DEFAULT_BUILD_DIR_NAME, locale, config: customConfigFilePath, automaticBaseUrlLocalizationDisabled, } = params;
     const generatedFilesDir = path_1.default.resolve(siteDir, utils_1.GENERATED_FILES_DIR_NAME);
     const { siteVersion, loadSiteConfig: { siteConfig: initialSiteConfig, siteConfigPath }, } = await (0, combine_promises_1.default)({
         siteVersion: (0, siteMetadata_1.loadSiteVersion)(siteDir),
@@ -46,21 +46,23 @@ async function loadContext(params) {
     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,
-        i18n,
-        options: params,
-        pathType: 'url',
-    });
-    const outDir = (0, utils_1.localizePath)({
-        path: path_1.default.resolve(siteDir, baseOutDir),
-        i18n,
-        options: params,
-        pathType: 'fs',
+    const i18n = await (0, i18n_1.loadI18n)({
+        siteDir,
+        config: initialSiteConfig,
+        currentLocale: locale ?? initialSiteConfig.i18n.defaultLocale,
+        automaticBaseUrlLocalizationDisabled: automaticBaseUrlLocalizationDisabled ?? false,
     });
-    const localizationDir = path_1.default.resolve(siteDir, i18n.path, i18n.localeConfigs[i18n.currentLocale].path);
-    const siteConfig = { ...initialSiteConfig, baseUrl };
+    const localeConfig = (0, utils_1.getLocaleConfig)(i18n);
+    // We use the baseUrl from the locale config.
+    // By default, it is inferred as /<siteConfig.baseUrl>/
+    // eventually including the /<locale>/ suffix
+    const baseUrl = localeConfig.baseUrl;
+    const outDir = path_1.default.join(path_1.default.resolve(siteDir, baseOutDir), baseUrl);
+    const localizationDir = path_1.default.resolve(siteDir, i18n.path, (0, utils_1.getLocaleConfig)(i18n).path);
+    const siteConfig = {
+        ...initialSiteConfig,
+        baseUrl,
+    };
     const codeTranslations = await (0, translations_1.loadSiteCodeTranslations)({ localizationDir });
     const siteStorage = (0, storage_1.createSiteStorage)(siteConfig);
     return {

package/lib/webpack/base.js

@@ -20,10 +20,6 @@ const BundlerCPUProfilerPlugin_1 = require("./plugins/BundlerCPUProfilerPlugin")
 const CSS_REGEX = /\.css$/i;
 const CSS_MODULE_REGEX = /\.module\.css$/i;
 exports.clientDir = path_1.default.join(__dirname, '..', 'client');
-const LibrariesToTranspile = [
-    'copy-text-to-clipboard', // Contains optional catch binding, incompatible with recent versions of Edge
-];
-const LibrariesToTranspileRegex = new RegExp(LibrariesToTranspile.map((libName) => `(node_modules/${libName})`).join('|'));
 function getReactAliases(siteDir) {
     // Escape hatch
     if (process.env.DOCUSAURUS_NO_REACT_ALIASES) {
@@ -43,8 +39,7 @@ function excludeJS(modulePath) {
     }
     // Don't transpile node_modules except any docusaurus npm package
     return (modulePath.includes('node_modules') &&
-        !/docusaurus(?:(?!node_modules).)*\.jsx?$/.test(modulePath) &&
-        !LibrariesToTranspileRegex.test(modulePath));
+        !/docusaurus(?:(?!node_modules).)*\.jsx?$/.test(modulePath));
 }
 async function createBaseConfig({ props, isServer, minify, faster, configureWebpackUtils, }) {
     const { outDir, siteDir, siteConfig, siteConfigPath, baseUrl, generatedFilesDir, routesPaths, siteMetadata, plugins, } = props;
@@ -111,35 +106,37 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
     }
     function getExperiments() {
         if (props.currentBundler.name === 'rspack') {
-            const PersistentCacheAttributes = process.env
-                .DOCUSAURUS_NO_PERSISTENT_CACHE
-                ? {}
-                : {
-                    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(),
-                    },
-                };
             // TODO find a way to type this
-            return {
-                // This is mostly useful in dev
-                // See https://rspack.dev/config/experiments#experimentsincremental
-                // Produces warnings in production builds
-                // See https://github.com/web-infra-dev/rspack/pull/8311#issuecomment-2476014664
-                // We use the same integration as Rspress, with ability to disable
-                // See https://github.com/web-infra-dev/rspress/pull/1631
-                // See https://github.com/facebook/docusaurus/issues/10646
-                // @ts-expect-error: Rspack-only, not available in Webpack typedefs
-                incremental: !isProd && !process.env.DISABLE_RSPACK_INCREMENTAL,
-                // TODO re-enable later, there's an Rspack performance issue
-                //  see https://github.com/facebook/docusaurus/pull/11178
-                parallelCodeSplitting: false,
-                ...PersistentCacheAttributes,
-            };
+            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(),
+                };
+            }
+            if (process.env.DISABLE_RSPACK_INCREMENTAL) {
+                // Enabled by default since Rspack 1.4
+                console.log('Rspack incremental disabled');
+                experiments.incremental = false;
+            }
+            // See https://rspack.rs/blog/announcing-1-5#barrel-file-optimization
+            if (process.env.DISABLE_RSPACK_LAZY_BARREL) {
+                console.log('Rspack lazyBarrel disabled');
+                experiments.lazyBarrel = false;
+            }
+            else {
+                // TODO remove after we upgrade to Rspack 1.6+
+                //  Enabled by default for Rspack >= 1.6
+                experiments.lazyBarrel = true;
+            }
+            // TODO re-enable later, there's an Rspack performance issue
+            //  see https://github.com/facebook/docusaurus/pull/11178
+            experiments.parallelCodeSplitting = false;
+            return experiments;
         }
         return undefined;
     }

package/lib/webpack/client.js

@@ -15,6 +15,7 @@ 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 utils_1 = require("@docusaurus/utils");
 const base_1 = require("./base");
 const ChunkAssetPlugin_1 = tslib_1.__importDefault(require("./plugins/ChunkAssetPlugin"));
 const ForceTerminatePlugin_1 = tslib_1.__importDefault(require("./plugins/ForceTerminatePlugin"));
@@ -84,6 +85,7 @@ async function createStartClientConfig({ props, minify, poll, faster, configureW
                 headTags,
                 preBodyTags,
                 postBodyTags,
+                lang: (0, utils_1.getLocaleConfig)(props.i18n).htmlLang,
             }),
         ],
     });

package/lib/webpack/templates/dev.html.template.ejs

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="<%= htmlWebpackPlugin.options.lang %>">
   <head>
     <meta charset="utf-8">
     <meta name="generator" content="Docusaurus">

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "3.8.1",
+  "version": "3.9.0-canary-6403",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,13 +33,13 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "3.8.1",
-    "@docusaurus/bundler": "3.8.1",
-    "@docusaurus/logger": "3.8.1",
-    "@docusaurus/mdx-loader": "3.8.1",
-    "@docusaurus/utils": "3.8.1",
-    "@docusaurus/utils-common": "3.8.1",
-    "@docusaurus/utils-validation": "3.8.1",
+    "@docusaurus/babel": "3.9.0-canary-6403",
+    "@docusaurus/bundler": "3.9.0-canary-6403",
+    "@docusaurus/logger": "3.9.0-canary-6403",
+    "@docusaurus/mdx-loader": "3.9.0-canary-6403",
+    "@docusaurus/utils": "3.9.0-canary-6403",
+    "@docusaurus/utils-common": "3.9.0-canary-6403",
+    "@docusaurus/utils-validation": "3.9.0-canary-6403",
     "boxen": "^6.2.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -73,12 +73,12 @@
     "update-notifier": "^6.0.2",
     "webpack": "^5.95.0",
     "webpack-bundle-analyzer": "^4.10.2",
-    "webpack-dev-server": "^4.15.2",
+    "webpack-dev-server": "^5.2.2",
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.8.1",
-    "@docusaurus/types": "3.8.1",
+    "@docusaurus/module-type-aliases": "3.9.0-canary-6403",
+    "@docusaurus/types": "3.9.0-canary-6403",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -96,7 +96,7 @@
     "react-dom": "^18.0.0 || ^19.0.0"
   },
   "engines": {
-    "node": ">=18.0"
+    "node": ">=20.0"
   },
-  "gitHead": "fa8ae13e668fcbc0481ce10c0a734e2a5b397293"
+  "gitHead": "22c95f8cb5c070ce47e115be376fa9b828dd54df"
 }