@docusaurus/core 3.8.1-canary-6362 → 3.8.1-canary-6364

package/lib/commands/build/build.js

@@ -58,7 +58,11 @@ async function getLocalesToBuild({ siteDir, cliOptions, }) {
         config: cliOptions.config,
         localizePath,
     });
-    const i18n = await (0, i18n_1.loadI18n)(context.siteConfig);
+    const i18n = await (0, i18n_1.loadI18n)({
+        siteDir,
+        config: context.siteConfig,
+        currentLocale: context.siteConfig.i18n.defaultLocale // Awkward but ok
+    });
     const locales = cliOptions.locale ?? i18n.locales;
     return orderLocales({
         locales: locales,

package/lib/server/i18n.d.ts

@@ -5,6 +5,9 @@
  * 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'>;
+export declare function loadI18n({ siteDir, config, currentLocale, }: {
+    siteDir: string;
+    config: DocusaurusConfig;
+    currentLocale: string;
+}): Promise<I18n>;

package/lib/server/i18n.js

@@ -9,7 +9,10 @@ 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"));
 function inferLanguageDisplayName(locale) {
     const tryLocale = (l) => {
         try {
@@ -80,9 +83,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, }) {
     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 +92,24 @@ 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);
+        }
+        const translate = localeConfigInput.translate ?? (await inferTranslate());
+        return {
+            ...localeConfig,
+            translate,
         };
     }
-    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.js

@@ -46,7 +46,11 @@ async function loadContext(params) {
     const currentBundler = await (0, bundler_1.getCurrentBundler)({
         siteConfig: initialSiteConfig,
     });
-    const i18n = await (0, i18n_1.loadI18n)(initialSiteConfig, { locale });
+    const i18n = await (0, i18n_1.loadI18n)({
+        siteDir,
+        config: initialSiteConfig,
+        currentLocale: locale ?? initialSiteConfig.i18n.defaultLocale,
+    });
     const baseUrl = (0, utils_1.localizePath)({
         path: initialSiteConfig.baseUrl,
         i18n,
@@ -59,7 +63,7 @@ async function loadContext(params) {
         options: params,
         pathType: 'fs',
     });
-    const localizationDir = path_1.default.resolve(siteDir, i18n.path, i18n.localeConfigs[i18n.currentLocale].path);
+    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);

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,7 +85,7 @@ async function createStartClientConfig({ props, minify, poll, faster, configureW
                 headTags,
                 preBodyTags,
                 postBodyTags,
-                lang: props.i18n.localeConfigs[props.i18n.currentLocale].htmlLang,
+                lang: (0, utils_1.getLocaleConfig)(props.i18n).htmlLang,
             }),
         ],
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "3.8.1-canary-6362",
+  "version": "3.8.1-canary-6364",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,13 +33,13 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "3.8.1-canary-6362",
-    "@docusaurus/bundler": "3.8.1-canary-6362",
-    "@docusaurus/logger": "3.8.1-canary-6362",
-    "@docusaurus/mdx-loader": "3.8.1-canary-6362",
-    "@docusaurus/utils": "3.8.1-canary-6362",
-    "@docusaurus/utils-common": "3.8.1-canary-6362",
-    "@docusaurus/utils-validation": "3.8.1-canary-6362",
+    "@docusaurus/babel": "3.8.1-canary-6364",
+    "@docusaurus/bundler": "3.8.1-canary-6364",
+    "@docusaurus/logger": "3.8.1-canary-6364",
+    "@docusaurus/mdx-loader": "3.8.1-canary-6364",
+    "@docusaurus/utils": "3.8.1-canary-6364",
+    "@docusaurus/utils-common": "3.8.1-canary-6364",
+    "@docusaurus/utils-validation": "3.8.1-canary-6364",
     "boxen": "^6.2.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -77,8 +77,8 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.8.1-canary-6362",
-    "@docusaurus/types": "3.8.1-canary-6362",
+    "@docusaurus/module-type-aliases": "3.8.1-canary-6364",
+    "@docusaurus/types": "3.8.1-canary-6364",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -98,5 +98,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "fb5e2407590e2ec2155298195df6ca0db1026801"
+  "gitHead": "eb21e3eaf84009a29feff55780bb5d3a76658d01"
 }