@docusaurus/core 0.0.0-6111 → 0.0.0-6112

package/bin/docusaurus.mjs

@@ -33,6 +33,15 @@ process.env.NODE_ENV ??= 'development';
 
 await beforeCli();
 
+/**
+ * @param {string} locale
+ * @param {string[]} locales
+ * @returns {string[]}
+ */
+function concatLocaleOptions(locale, locales = []) {
+  return locales.concat(locale);
+}
+
 cli.version(DOCUSAURUS_VERSION).usage('<command> [options]');
 
 cli
@@ -55,8 +64,9 @@ cli
     'path to docusaurus config file (default: `[siteDir]/docusaurus.config.js`)',
   )
   .option(
-    '-l, --locale <locale>',
-    'build the site in a specified locale. Build all known locales otherwise',
+    '-l, --locale <locale...>',
+    'build the site in the specified locale(s). Build all known locales otherwise',
+    concatLocaleOptions,
   )
   .option(
     '--no-minify',
@@ -101,7 +111,8 @@ cli
   .description('Deploy website to GitHub pages.')
   .option(
     '-l, --locale <locale>',
-    'deploy the site in a specified locale. Deploy all known locales otherwise',
+    'deploy the site in the specified locale(s). Deploy all known locales otherwise',
+    concatLocaleOptions,
   )
   .option(
     '--out-dir <dir>',

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

@@ -5,7 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { type LoadContextParams } from '../../server/site';
-export type BuildCLIOptions = Pick<LoadContextParams, 'config' | 'locale' | 'outDir'> & {
+export type BuildCLIOptions = Pick<LoadContextParams, 'config' | 'outDir'> & {
+    locale?: [string, ...string[]];
     bundleAnalyzer?: boolean;
     minify?: boolean;
     dev?: boolean;

package/lib/commands/build/build.js

@@ -17,7 +17,7 @@ const buildLocale_1 = require("./buildLocale");
 async function build(siteDirParam = '.', cliOptions = {}) {
     process.env.BABEL_ENV = 'production';
     process.env.NODE_ENV = 'production';
-    process.env.DOCUSAURUS_CURRENT_LOCALE = cliOptions.locale;
+    process.env.DOCUSAURUS_CURRENT_LOCALE = cliOptions.locale?.[0];
     if (cliOptions.dev) {
         logger_1.default.info `Building in dev mode`;
         process.env.BABEL_ENV = 'development';
@@ -36,29 +36,35 @@ async function build(siteDirParam = '.', cliOptions = {}) {
     }));
     logger_1.default.info `Use code=${'npm run serve'} command to test your build locally.`;
 }
-async function getLocalesToBuild({ siteDir, cliOptions, }) {
-    if (cliOptions.locale) {
-        return [cliOptions.locale];
+// We need the default locale to always be the 1st in the list. If we build it
+// last, it would "erase" the localized sites built in sub-folders
+function orderLocales({ locales, defaultLocale, }) {
+    if (locales.includes(defaultLocale)) {
+        return [
+            defaultLocale,
+            ...locales.filter((locale) => locale !== defaultLocale),
+        ];
+    }
+    else {
+        return locales;
     }
+}
+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;
     const context = await (0, site_1.loadContext)({
         siteDir,
         outDir: cliOptions.outDir,
         config: cliOptions.config,
-        locale: cliOptions.locale,
-        localizePath: cliOptions.locale ? false : undefined,
+        localizePath,
     });
-    const i18n = await (0, i18n_1.loadI18n)(context.siteConfig, {
-        locale: cliOptions.locale,
+    const i18n = await (0, i18n_1.loadI18n)(context.siteConfig);
+    const locales = cliOptions.locale ?? i18n.locales;
+    return orderLocales({
+        locales: locales,
+        defaultLocale: i18n.defaultLocale,
     });
-    if (i18n.locales.length > 1) {
-        logger_1.default.info `Website will be built for all these locales: ${i18n.locales}`;
-    }
-    // We need the default locale to always be the 1st in the list. If we build it
-    // last, it would "erase" the localized sites built in sub-folders
-    return [
-        i18n.defaultLocale,
-        ...i18n.locales.filter((locale) => locale !== i18n.defaultLocale),
-    ];
 }
 async function tryToBuildLocale(params) {
     try {

package/lib/commands/build/buildLocale.js

@@ -30,7 +30,7 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
         outDir: cliOptions.outDir,
         config: cliOptions.config,
         locale,
-        localizePath: cliOptions.locale ? false : undefined,
+        localizePath: cliOptions.locale?.length === 1 ? false : undefined,
     }));
     const { props } = site;
     const { outDir, plugins, siteConfig } = props;

package/lib/commands/deploy.d.ts

@@ -5,7 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { type LoadContextParams } from '../server/site';
-export type DeployCLIOptions = Pick<LoadContextParams, 'config' | 'locale' | 'outDir'> & {
+export type DeployCLIOptions = Pick<LoadContextParams, 'config' | 'outDir'> & {
+    locale?: [string, ...string[]];
     skipBuild?: boolean;
     targetDir?: string;
 };

package/lib/server/i18n.d.ts

@@ -7,4 +7,4 @@
 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 loadI18n(config: DocusaurusConfig, options?: Pick<LoadContextParams, 'locale'>): Promise<I18n>;

package/lib/server/i18n.js

@@ -74,7 +74,7 @@ function getDefaultLocaleConfig(locale) {
 }
 async function loadI18n(config, options) {
     const { i18n: i18nConfig } = config;
-    const currentLocale = options.locale ?? i18nConfig.defaultLocale;
+    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.`;

package/package.json

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