@docusaurus/core 3.9.2-canary-6436 → 3.9.2-canary-6437

package/lib/commands/build/build.js

@@ -11,10 +11,9 @@ const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const logger_1 = tslib_1.__importStar(require("@docusaurus/logger"));
 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");
+const config_1 = require("../../server/config");
 async function build(siteDirParam = '.', cliOptions = {}) {
     process.env.BABEL_ENV = 'production';
     process.env.NODE_ENV = 'production';
@@ -50,24 +49,18 @@ function orderLocales({ locales, defaultLocale, }) {
     }
 }
 async function getLocalesToBuild({ siteDir, cliOptions, }) {
-    // 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)({
+    const { siteConfig } = await (0, config_1.loadSiteConfig)({
         siteDir,
-        outDir: cliOptions.outDir,
-        config: cliOptions.config,
-        automaticBaseUrlLocalizationDisabled: (0, buildUtils_1.isAutomaticBaseUrlLocalizationDisabled)(cliOptions),
+        customConfigFilePath: cliOptions.config,
     });
-    const i18n = await (0, i18n_1.loadI18n)({
-        siteDir,
-        config: context.siteConfig,
-        currentLocale: context.siteConfig.i18n.defaultLocale, // Awkward but ok
-        automaticBaseUrlLocalizationDisabled: false,
-    });
-    const locales = cliOptions.locale ?? i18n.locales;
+    const locales = cliOptions.locale ??
+        (0, i18n_1.loadI18nLocaleList)({
+            i18nConfig: siteConfig.i18n,
+            currentLocale: siteConfig.i18n.defaultLocale, // Awkward but ok
+        });
     return orderLocales({
         locales: locales,
-        defaultLocale: i18n.defaultLocale,
+        defaultLocale: siteConfig.i18n.defaultLocale,
     });
 }
 async function tryToBuildLocale(params) {

package/lib/server/i18n.d.ts

@@ -4,8 +4,12 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import type { I18n, DocusaurusConfig, I18nLocaleConfig } from '@docusaurus/types';
+import type { I18n, DocusaurusConfig, I18nLocaleConfig, I18nConfig } from '@docusaurus/types';
 export declare function getDefaultLocaleConfig(locale: string): Omit<I18nLocaleConfig, 'translate' | 'url' | 'baseUrl'>;
+export declare function loadI18nLocaleList({ i18nConfig, currentLocale, }: {
+    i18nConfig: I18nConfig;
+    currentLocale: string;
+}): [string, ...string[]];
 export declare function loadI18n({ siteDir, config, currentLocale, automaticBaseUrlLocalizationDisabled, }: {
     siteDir: string;
     config: DocusaurusConfig;

package/lib/server/i18n.js

@@ -7,6 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultLocaleConfig = getDefaultLocaleConfig;
+exports.loadI18nLocaleList = loadI18nLocaleList;
 exports.loadI18n = loadI18n;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -82,22 +83,29 @@ function getDefaultLocaleConfig(locale) {
         };
     }
     catch (e) {
-        throw new Error(`Docusaurus couldn't get default locale config for ${locale}`, { cause: e });
+        throw new Error(`Docusaurus couldn't infer a default locale config for ${logger_1.default.name(locale)}.
+Make sure it is a valid BCP 47 locale name (e.g. en, fr, fr-FR, etc.) and/or provide a valid BCP 47 ${logger_1.default.code(`siteConfig.i18n.localeConfig['${locale}'].htmlLang`)} attribute.`, { cause: e });
     }
 }
-async function loadI18n({ siteDir, config, currentLocale, automaticBaseUrlLocalizationDisabled, }) {
-    const { i18n: i18nConfig } = config;
+function loadI18nLocaleList({ i18nConfig, currentLocale, }) {
     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.`;
+        logger_1.default.warn `The locale name=${currentLocale} was not found in your Docusaurus site configuration.
+We recommend adding the name=${currentLocale} to your site i18n config, but we will still try to run your site.
+Declared site config locales are: ${i18nConfig.locales}`;
+        return i18nConfig.locales.concat(currentLocale);
     }
-    const locales = i18nConfig.locales.includes(currentLocale)
-        ? i18nConfig.locales
-        : i18nConfig.locales.concat(currentLocale);
+    return i18nConfig.locales;
+}
+async function loadI18n({ siteDir, config, currentLocale, automaticBaseUrlLocalizationDisabled, }) {
+    const { i18n: i18nConfig } = config;
+    const locales = loadI18nLocaleList({
+        i18nConfig,
+        currentLocale,
+    });
     async function getFullLocaleConfig(locale) {
         const localeConfigInput = i18nConfig.localeConfigs[locale] ?? {};
         const localeConfig = {
-            ...getDefaultLocaleConfig(locale),
+            ...getDefaultLocaleConfig(localeConfigInput.htmlLang ?? locale),
             ...localeConfigInput,
         };
         // By default, translations will be enabled if i18n/<locale> dir exists

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "3.9.2-canary-6436",
+  "version": "3.9.2-canary-6437",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,13 +33,13 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "3.9.2-canary-6436",
-    "@docusaurus/bundler": "3.9.2-canary-6436",
-    "@docusaurus/logger": "3.9.2-canary-6436",
-    "@docusaurus/mdx-loader": "3.9.2-canary-6436",
-    "@docusaurus/utils": "3.9.2-canary-6436",
-    "@docusaurus/utils-common": "3.9.2-canary-6436",
-    "@docusaurus/utils-validation": "3.9.2-canary-6436",
+    "@docusaurus/babel": "3.9.2-canary-6437",
+    "@docusaurus/bundler": "3.9.2-canary-6437",
+    "@docusaurus/logger": "3.9.2-canary-6437",
+    "@docusaurus/mdx-loader": "3.9.2-canary-6437",
+    "@docusaurus/utils": "3.9.2-canary-6437",
+    "@docusaurus/utils-common": "3.9.2-canary-6437",
+    "@docusaurus/utils-validation": "3.9.2-canary-6437",
     "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.9.2-canary-6436",
-    "@docusaurus/types": "3.9.2-canary-6436",
+    "@docusaurus/module-type-aliases": "3.9.2-canary-6437",
+    "@docusaurus/types": "3.9.2-canary-6437",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -98,5 +98,5 @@
   "engines": {
     "node": ">=20.0"
   },
-  "gitHead": "4f472cb2a0662d946b23a4c521a81bebc7341d63"
+  "gitHead": "c36f3ac2e06fc332b02fc2feaae5011d1a51ac87"
 }