@docusaurus/core 2.0.0-beta.21 → 2.0.0-beta.22

package/README.md

@@ -0,0 +1 @@
+# Docusaurus core

package/bin/docusaurus.mjs

@@ -8,7 +8,6 @@
 
 // @ts-check
 
-import fs from 'fs-extra';
 import logger from '@docusaurus/logger';
 import cli from 'commander';
 import {DOCUSAURUS_VERSION} from '@docusaurus/utils';
@@ -27,8 +26,6 @@ import beforeCli from './beforeCli.mjs';
 
 await beforeCli();
 
-const resolveDir = (dir = '.') => fs.realpath(dir);
-
 cli.version(DOCUSAURUS_VERSION).usage('<command> [options]');
 
 cli
@@ -54,9 +51,9 @@ cli
     '--no-minify',
     'build website without minimizing JS bundles (default: false)',
   )
-  .action(async (siteDir, options) => {
-    build(await resolveDir(siteDir), options);
-  });
+  // @ts-expect-error: Promise<string> is not assignable to Promise<void>... but
+  // good enough here.
+  .action(build);
 
 cli
   .command('swizzle [themeName] [componentName] [siteDir]')
@@ -80,9 +77,7 @@ cli
     'copy TypeScript theme files when possible (default: false)',
   )
   .option('--danger', 'enable swizzle for unsafe component of themes')
-  .action(async (themeName, componentName, siteDir, options) =>
-    swizzle(await resolveDir(siteDir), themeName, componentName, options),
-  );
+  .action(swizzle);
 
 cli
   .command('deploy [siteDir]')
@@ -103,9 +98,7 @@ cli
     '--skip-build',
     'skip building website before deploy it (default: false)',
   )
-  .action(async (siteDir, options) =>
-    deploy(await resolveDir(siteDir), options),
-  );
+  .action(deploy);
 
 cli
   .command('start [siteDir]')
@@ -130,9 +123,7 @@ cli
     '--no-minify',
     'build website without minimizing JS bundles (default: false)',
   )
-  .action(async (siteDir, options) =>
-    start(await resolveDir(siteDir), options),
-  );
+  .action(start);
 
 cli
   .command('serve [siteDir]')
@@ -152,14 +143,12 @@ cli
     '--no-open',
     'do not open page in the browser (default: false, or true in CI)',
   )
-  .action(async (siteDir, options) =>
-    serve(await resolveDir(siteDir), options),
-  );
+  .action(serve);
 
 cli
   .command('clear [siteDir]')
   .description('Remove build artifacts.')
-  .action(async (siteDir) => clear(await resolveDir(siteDir)));
+  .action(clear);
 
 cli
   .command('write-translations [siteDir]')
@@ -180,9 +169,7 @@ cli
     '--messagePrefix <messagePrefix>',
     'Allows to init new written messages with a given prefix. This might help you to highlight untranslated message by making them stand out in the UI (default: "")',
   )
-  .action(async (siteDir, options) =>
-    writeTranslations(await resolveDir(siteDir), options),
-  );
+  .action(writeTranslations);
 
 cli
   .command('write-heading-ids [siteDir] [files...]')
@@ -192,9 +179,7 @@ cli
     "keep the headings' casing, otherwise make all lowercase (default: false)",
   )
   .option('--overwrite', 'overwrite existing heading IDs (default: false)')
-  .action(async (siteDir, files, options) =>
-    writeHeadingIds(await resolveDir(siteDir), files, options),
-  );
+  .action(writeHeadingIds);
 
 cli.arguments('<command>').action((cmd) => {
   cli.outputHelp();
@@ -221,7 +206,7 @@ function isInternalCommand(command) {
 }
 
 if (!isInternalCommand(process.argv.slice(2)[0])) {
-  await externalCommand(cli, await resolveDir('.'));
+  await externalCommand(cli);
 }
 
 if (!process.argv.slice(2).length) {

package/lib/client/BaseUrlIssueBanner/index.js

@@ -32,6 +32,7 @@ function createInlineHtmlBanner(baseUrl) {
 }
 // Needs to work for older browsers!
 function createInlineScript(baseUrl) {
+    /* language=js */
     return `
 window['${InsertBannerWindowAttribute}'] = true;
 

package/lib/client/PendingNavigation.js

@@ -52,7 +52,13 @@ class PendingNavigation extends React.Component {
             this.routeUpdateCleanupCb();
             this.setState({ nextRouteHasLoaded: true });
         })
-            .catch((e) => console.warn(e));
+            .catch((e) => {
+            console.warn(e);
+            // If chunk loading failed, it could be because the path to a chunk
+            // no longer exists due to a new deployment. Force refresh the page
+            // instead of just not navigating.
+            window.location.reload();
+        });
         return false;
     }
     render() {

package/lib/client/exports/ErrorBoundary.js

@@ -7,6 +7,7 @@
 import React from 'react';
 import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
 import ThemeError from '@theme/Error';
+// eslint-disable-next-line react/function-component-definition
 const DefaultFallback = (params) => (<ThemeError {...params}/>);
 export default class ErrorBoundary extends React.Component {
     constructor(props) {

package/lib/client/serverEntry.js

@@ -108,6 +108,9 @@ async function doRender(locals) {
         version: DOCUSAURUS_VERSION,
     });
     try {
+        if (process.env.SKIP_HTML_MINIFICATION === 'true') {
+            return renderedHtml;
+        }
         // Minify html with https://github.com/DanielRuf/html-minifier-terser
         return await minify(renderedHtml, {
             removeComments: false,

package/lib/commands/build.d.ts

@@ -9,4 +9,4 @@ export declare type BuildCLIOptions = Pick<LoadContextOptions, 'config' | 'local
     bundleAnalyzer?: boolean;
     minify?: boolean;
 };
-export declare function build(siteDir: string, cliOptions: Partial<BuildCLIOptions>, forceTerminate?: boolean): Promise<string>;
+export declare function build(siteDirParam?: string, cliOptions?: Partial<BuildCLIOptions>, forceTerminate?: boolean): Promise<string>;

package/lib/commands/build.js

@@ -23,12 +23,13 @@ const server_2 = tslib_1.__importDefault(require("../webpack/server"));
 const utils_2 = require("../webpack/utils");
 const CleanWebpackPlugin_1 = tslib_1.__importDefault(require("../webpack/plugins/CleanWebpackPlugin"));
 const i18n_1 = require("../server/i18n");
-async function build(siteDir, cliOptions, 
+async function build(siteDirParam = '.', cliOptions = {}, 
 // When running build, we force terminate the process to prevent async
 // operations from never returning. However, if run as part of docusaurus
 // deploy, we have to let deploy finish.
 // See https://github.com/facebook/docusaurus/pull/2496
 forceTerminate = true) {
+    const siteDir = await fs_extra_1.default.realpath(siteDirParam);
     ['SIGINT', 'SIGTERM'].forEach((sig) => {
         process.on(sig, () => process.exit());
     });

package/lib/commands/clear.d.ts

@@ -4,4 +4,4 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-export declare function clear(siteDir: string): Promise<void>;
+export declare function clear(siteDirParam?: string): Promise<void>;

package/lib/commands/clear.js

@@ -25,7 +25,8 @@ async function removePath(entry) {
         logger_1.default.error(err);
     }
 }
-async function clear(siteDir) {
+async function clear(siteDirParam = '.') {
+    const siteDir = await fs_extra_1.default.realpath(siteDirParam);
     const generatedFolder = {
         path: path_1.default.join(siteDir, utils_1.GENERATED_FILES_DIR_NAME),
         description: 'generated folder',

package/lib/commands/deploy.d.ts

@@ -8,4 +8,4 @@ import { type LoadContextOptions } from '../server';
 export declare type DeployCLIOptions = Pick<LoadContextOptions, 'config' | 'locale' | 'outDir'> & {
     skipBuild?: boolean;
 };
-export declare function deploy(siteDir: string, cliOptions: Partial<DeployCLIOptions>): Promise<void>;
+export declare function deploy(siteDirParam?: string, cliOptions?: Partial<DeployCLIOptions>): Promise<void>;

package/lib/commands/deploy.js

@@ -34,7 +34,8 @@ function shellExecLog(cmd) {
         throw err;
     }
 }
-async function deploy(siteDir, cliOptions) {
+async function deploy(siteDirParam = '.', cliOptions = {}) {
+    const siteDir = await fs_extra_1.default.realpath(siteDirParam);
     const { outDir, siteConfig, siteConfigPath } = await (0, server_1.loadContext)({
         siteDir,
         config: cliOptions.config,
@@ -126,6 +127,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 = shellExecLog('git rev-parse HEAD').stdout.trim();
+    const currentGitRootDir = shellExecLog('git rev-parse --show-toplevel').stdout.trim();
     const runDeploy = async (outputDirectory) => {
         const fromPath = outputDirectory;
         const toPath = await fs_extra_1.default.mkdtemp(path_1.default.join(os_1.default.tmpdir(), `${projectName}-${deploymentBranch}`));
@@ -149,6 +151,15 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
             logger_1.default.error `Copying build assets from path=${fromPath} to path=${toPath} failed.`;
             throw err;
         }
+        const gitConfigFromPath = path_1.default.join(currentGitRootDir, `.git`, `config`);
+        const gitConfigToPath = path_1.default.join(toPath, `.git`, `config`);
+        try {
+            await fs_extra_1.default.copy(gitConfigFromPath, gitConfigToPath);
+        }
+        catch (err) {
+            logger_1.default.error `Copying git config from path=${gitConfigFromPath} to path=${gitConfigToPath} failed.`;
+            throw err;
+        }
         shellExecLog('git add --all');
         const commitMessage = process.env.CUSTOM_COMMIT_MESSAGE ??
             `Deploy website - based on ${currentCommit}`;

package/lib/commands/external.d.ts

@@ -5,4 +5,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { CommanderStatic } from 'commander';
-export declare function externalCommand(cli: CommanderStatic, siteDir: string): Promise<void>;
+export declare function externalCommand(cli: CommanderStatic): Promise<void>;

package/lib/commands/external.js

@@ -7,9 +7,12 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.externalCommand = void 0;
+const tslib_1 = require("tslib");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const server_1 = require("../server");
 const init_1 = require("../server/plugins/init");
-async function externalCommand(cli, siteDir) {
+async function externalCommand(cli) {
+    const siteDir = await fs_extra_1.default.realpath('.');
     const context = await (0, server_1.loadContext)({ siteDir });
     const plugins = await (0, init_1.initPlugins)(context);
     // Plugin Lifecycle - extendCli.

package/lib/commands/serve.d.ts

@@ -11,4 +11,4 @@ export declare type ServeCLIOptions = HostPortOptions & Pick<LoadContextOptions,
     build?: boolean;
     open?: boolean;
 };
-export declare function serve(siteDir: string, cliOptions: Partial<ServeCLIOptions>): Promise<void>;
+export declare function serve(siteDirParam?: string, cliOptions?: Partial<ServeCLIOptions>): Promise<void>;

package/lib/commands/serve.js

@@ -8,6 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serve = void 0;
 const tslib_1 = require("tslib");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const http_1 = tslib_1.__importDefault(require("http"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
@@ -17,7 +18,8 @@ const openBrowser_1 = tslib_1.__importDefault(require("react-dev-utils/openBrows
 const config_1 = require("../server/config");
 const build_1 = require("./build");
 const getHostPort_1 = require("../server/getHostPort");
-async function serve(siteDir, cliOptions) {
+async function serve(siteDirParam = '.', cliOptions = {}) {
+    const siteDir = await fs_extra_1.default.realpath(siteDirParam);
     const buildDir = cliOptions.dir ?? utils_1.DEFAULT_BUILD_DIR_NAME;
     let dir = path_1.default.resolve(siteDir, buildDir);
     if (cliOptions.build) {

package/lib/commands/start.d.ts

@@ -12,4 +12,4 @@ export declare type StartCLIOptions = HostPortOptions & Pick<LoadContextOptions,
     poll?: boolean | number;
     minify?: boolean;
 };
-export declare function start(siteDir: string, cliOptions: Partial<StartCLIOptions>): Promise<void>;
+export declare function start(siteDirParam?: string, cliOptions?: Partial<StartCLIOptions>): Promise<void>;

package/lib/commands/start.js

@@ -8,6 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = void 0;
 const tslib_1 = require("tslib");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
@@ -24,8 +25,8 @@ const server_1 = require("../server");
 const client_1 = tslib_1.__importDefault(require("../webpack/client"));
 const utils_2 = require("../webpack/utils");
 const getHostPort_1 = require("../server/getHostPort");
-const translations_1 = require("../server/translations/translations");
-async function start(siteDir, cliOptions) {
+async function start(siteDirParam = '.', cliOptions = {}) {
+    const siteDir = await fs_extra_1.default.realpath(siteDirParam);
     process.env.NODE_ENV = 'development';
     process.env.BABEL_ENV = 'development';
     logger_1.default.info('Starting the development server...');
@@ -61,7 +62,7 @@ async function start(siteDir, cliOptions) {
             logger_1.default.error(err.stack);
         });
     }, 500);
-    const { siteConfig, plugins } = props;
+    const { siteConfig, plugins, localizationDir } = props;
     const normalizeToSiteDir = (filepath) => {
         if (filepath && path_1.default.isAbsolute(filepath)) {
             return (0, utils_1.posixPath)(path_1.default.relative(siteDir, filepath));
@@ -72,14 +73,7 @@ async function start(siteDir, cliOptions) {
         .flatMap((plugin) => plugin.getPathsToWatch?.() ?? [])
         .filter(Boolean)
         .map(normalizeToSiteDir);
-    const pathsToWatch = [
-        ...pluginPaths,
-        props.siteConfigPath,
-        (0, translations_1.getTranslationsLocaleDirPath)({
-            siteDir,
-            locale: props.i18n.currentLocale,
-        }),
-    ];
+    const pathsToWatch = [...pluginPaths, props.siteConfigPath, localizationDir];
     const pollingOptions = {
         usePolling: !!cliOptions.poll,
         interval: Number.isInteger(cliOptions.poll)

package/lib/commands/swizzle/actions.js

@@ -69,11 +69,12 @@ async function wrap({ siteDir, themePath, componentName: themeComponentName, typ
     await fs_extra_1.default.ensureDir(path_1.default.resolve(siteDir, utils_1.THEME_PATH));
     const toPath = path_1.default.resolve(siteDir, utils_1.THEME_PATH, wrapperFileName);
     const content = typescript
-        ? `import React, {ComponentProps} from 'react';
+        ? `import React from 'react';
 import ${componentName} from '@theme-${importType}/${themeComponentName}';
 import type ${componentName}Type from '@theme/${themeComponentName}';
+import type {WrapperProps} from '@docusaurus/types';
 
-type Props = ComponentProps<typeof ${componentName}Type>;
+type Props = WrapperProps<typeof ${componentName}Type>;
 
 export default function ${wrapperComponentName}(props: Props): JSX.Element {
   return (

package/lib/commands/swizzle/index.d.ts

@@ -5,4 +5,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { SwizzleCLIOptions } from './common';
-export declare function swizzle(siteDir: string, themeNameParam: string | undefined, componentNameParam: string | undefined, optionsParam: Partial<SwizzleCLIOptions>): Promise<void>;
+export declare function swizzle(themeNameParam?: string | undefined, componentNameParam?: string | undefined, siteDirParam?: string, optionsParam?: Partial<SwizzleCLIOptions>): Promise<void>;

package/lib/commands/swizzle/index.js

@@ -8,6 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.swizzle = void 0;
 const tslib_1 = require("tslib");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const themes_1 = require("./themes");
 const components_1 = require("./components");
@@ -57,7 +58,8 @@ If you want to swizzle it, use the code=${'--danger'} flag, or confirm that you
     }
     return undefined;
 }
-async function swizzle(siteDir, themeNameParam, componentNameParam, optionsParam) {
+async function swizzle(themeNameParam = undefined, componentNameParam = undefined, siteDirParam = '.', optionsParam = {}) {
+    const siteDir = await fs_extra_1.default.realpath(siteDirParam);
     const options = (0, common_1.normalizeOptions)(optionsParam);
     const { list, danger, typescript } = options;
     const { plugins } = await (0, context_1.initSwizzleContext)(siteDir);

package/lib/commands/writeHeadingIds.d.ts

@@ -5,4 +5,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { type WriteHeadingIDOptions } from '@docusaurus/utils';
-export declare function writeHeadingIds(siteDir: string, files: string[] | undefined, options: WriteHeadingIDOptions): Promise<void>;
+export declare function writeHeadingIds(siteDirParam?: string, files?: string[], options?: WriteHeadingIDOptions): Promise<void>;

package/lib/commands/writeHeadingIds.js

@@ -34,7 +34,8 @@ async function getPathsToWatch(siteDir) {
     const plugins = await (0, init_1.initPlugins)(context);
     return plugins.flatMap((plugin) => plugin.getPathsToWatch?.() ?? []);
 }
-async function writeHeadingIds(siteDir, files, options) {
+async function writeHeadingIds(siteDirParam = '.', files = [], options = {}) {
+    const siteDir = await fs_extra_1.default.realpath(siteDirParam);
     const markdownFiles = await (0, utils_2.safeGlobby)(files ?? (await getPathsToWatch(siteDir)), {
         expandDirectories: ['**/*.{md,mdx}'],
     });

package/lib/commands/writeTranslations.d.ts

@@ -7,4 +7,4 @@
 import { type LoadContextOptions } from '../server';
 import { type WriteTranslationsOptions } from '../server/translations/translations';
 export declare type WriteTranslationsCLIOptions = Pick<LoadContextOptions, 'config' | 'locale'> & WriteTranslationsOptions;
-export declare function writeTranslations(siteDir: string, options: Partial<WriteTranslationsCLIOptions>): Promise<void>;
+export declare function writeTranslations(siteDirParam?: string, options?: Partial<WriteTranslationsCLIOptions>): Promise<void>;

package/lib/commands/writeTranslations.js

@@ -8,6 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeTranslations = void 0;
 const tslib_1 = require("tslib");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const server_1 = require("../server");
 const init_1 = require("../server/plugins/init");
@@ -30,7 +31,7 @@ async function getExtraSourceCodeFilePaths() {
         return []; // User may not use a Docusaurus official theme? Quite unlikely...
     }
 }
-async function writePluginTranslationFiles({ siteDir, plugin, locale, options, }) {
+async function writePluginTranslationFiles({ localizationDir, plugin, options, }) {
     if (plugin.getTranslationFiles) {
         const content = await plugin.loadContent?.();
         const translationFiles = await plugin.getTranslationFiles({
@@ -38,21 +39,22 @@ async function writePluginTranslationFiles({ siteDir, plugin, locale, options, }
         });
         await Promise.all(translationFiles.map(async (translationFile) => {
             await (0, translations_1.writePluginTranslations)({
-                siteDir,
+                localizationDir,
                 plugin,
                 translationFile,
-                locale,
                 options,
             });
         }));
     }
 }
-async function writeTranslations(siteDir, options) {
+async function writeTranslations(siteDirParam = '.', options = {}) {
+    const siteDir = await fs_extra_1.default.realpath(siteDirParam);
     const context = await (0, server_1.loadContext)({
         siteDir,
         config: options.config,
         locale: options.locale,
     });
+    const { localizationDir } = context;
     const plugins = await (0, init_1.initPlugins)(context);
     const locale = options.locale ?? context.i18n.defaultLocale;
     if (!context.i18n.locales.includes(locale)) {
@@ -69,9 +71,9 @@ Available locales are: ${context.i18n.locales.join(',')}.`);
         extractedCodeTranslations,
         defaultCodeMessages,
     });
-    await (0, translations_1.writeCodeTranslations)({ siteDir, locale }, codeTranslations, options);
+    await (0, translations_1.writeCodeTranslations)({ localizationDir }, codeTranslations, options);
     await Promise.all(plugins.map(async (plugin) => {
-        await writePluginTranslationFiles({ siteDir, plugin, locale, options });
+        await writePluginTranslationFiles({ localizationDir, plugin, options });
     }));
 }
 exports.writeTranslations = writeTranslations;

package/lib/server/brokenLinks.js

@@ -150,7 +150,7 @@ async function handleBrokenLinks({ allCollectedLinks, onBrokenLinks, routes, bas
     });
     const errorMessage = getBrokenLinksErrorMessage(allBrokenLinks);
     if (errorMessage) {
-        (0, utils_1.reportMessage)(errorMessage, onBrokenLinks);
+        logger_1.default.report(onBrokenLinks)(errorMessage);
     }
 }
 exports.handleBrokenLinks = handleBrokenLinks;

package/lib/server/configValidation.js

@@ -12,6 +12,7 @@ const utils_validation_1 = require("@docusaurus/utils-validation");
 const DEFAULT_I18N_LOCALE = 'en';
 exports.DEFAULT_I18N_CONFIG = {
     defaultLocale: DEFAULT_I18N_LOCALE,
+    path: utils_1.DEFAULT_I18N_DIR_NAME,
     locales: [DEFAULT_I18N_LOCALE],
     localeConfigs: {},
 };
@@ -88,9 +89,11 @@ const LocaleConfigSchema = utils_validation_1.Joi.object({
     htmlLang: utils_validation_1.Joi.string(),
     direction: utils_validation_1.Joi.string().equal('ltr', 'rtl').default('ltr'),
     calendar: utils_validation_1.Joi.string(),
+    path: utils_validation_1.Joi.string(),
 });
 const I18N_CONFIG_SCHEMA = utils_validation_1.Joi.object({
     defaultLocale: utils_validation_1.Joi.string().required(),
+    path: utils_validation_1.Joi.string().default(exports.DEFAULT_I18N_CONFIG.path),
     locales: utils_validation_1.Joi.array().items().min(1).items(utils_validation_1.Joi.string().required()).required(),
     localeConfigs: utils_validation_1.Joi.object()
         .pattern(/.*/, LocaleConfigSchema)
@@ -123,13 +126,13 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
     trailingSlash: utils_validation_1.Joi.boolean(),
     i18n: I18N_CONFIG_SCHEMA,
     onBrokenLinks: utils_validation_1.Joi.string()
-        .equal('ignore', 'log', 'warn', 'error', 'throw')
+        .equal('ignore', 'log', 'warn', 'throw')
         .default(exports.DEFAULT_CONFIG.onBrokenLinks),
     onBrokenMarkdownLinks: utils_validation_1.Joi.string()
-        .equal('ignore', 'log', 'warn', 'error', 'throw')
+        .equal('ignore', 'log', 'warn', 'throw')
         .default(exports.DEFAULT_CONFIG.onBrokenMarkdownLinks),
     onDuplicateRoutes: utils_validation_1.Joi.string()
-        .equal('ignore', 'log', 'warn', 'error', 'throw')
+        .equal('ignore', 'log', 'warn', 'throw')
         .default(exports.DEFAULT_CONFIG.onDuplicateRoutes),
     organizationName: utils_validation_1.Joi.string().allow(''),
     staticDirectories: utils_validation_1.Joi.array()

package/lib/server/i18n.js

@@ -21,6 +21,7 @@ function getDefaultLocaleConfig(locale) {
         htmlLang: locale,
         // If the locale name includes -u-ca-xxx the calendar will be defined
         calendar: new Intl.Locale(locale).calendar ?? 'gregory',
+        path: locale,
     };
 }
 exports.getDefaultLocaleConfig = getDefaultLocaleConfig;
@@ -44,6 +45,7 @@ Note: Docusaurus only support running one locale at a time.`;
     return {
         defaultLocale: i18nConfig.defaultLocale,
         locales,
+        path: i18nConfig.path,
         currentLocale,
         localeConfigs,
     };

package/lib/server/index.js

@@ -46,15 +46,14 @@ async function loadContext(options) {
         pathType: 'fs',
     });
     const siteConfig = { ...initialSiteConfig, baseUrl };
-    const codeTranslationFileContent = (await (0, translations_1.readCodeTranslationFileContent)({
-        siteDir,
-        locale: i18n.currentLocale,
-    })) ?? {};
+    const localizationDir = path_1.default.resolve(siteDir, i18n.path, i18n.localeConfigs[i18n.currentLocale].path);
+    const codeTranslationFileContent = (await (0, translations_1.readCodeTranslationFileContent)({ localizationDir })) ?? {};
     // We only need key->message for code translations
     const codeTranslations = lodash_1.default.mapValues(codeTranslationFileContent, (value) => value.message);
     return {
         siteDir,
         generatedFilesDir,
+        localizationDir,
         siteConfig,
         siteConfigPath,
         outDir,
@@ -73,7 +72,7 @@ exports.loadContext = loadContext;
 async function load(options) {
     const { siteDir } = options;
     const context = await loadContext(options);
-    const { generatedFilesDir, siteConfig, siteConfigPath, outDir, baseUrl, i18n, codeTranslations: siteCodeTranslations, } = context;
+    const { generatedFilesDir, siteConfig, siteConfigPath, outDir, baseUrl, i18n, localizationDir, codeTranslations: siteCodeTranslations, } = context;
     const { plugins, pluginsRouteConfigs, globalData } = await (0, plugins_1.loadPlugins)(context);
     const clientModules = (0, clientModules_1.loadClientModules)(plugins);
     const { headTags, preBodyTags, postBodyTags } = (0, htmlTags_1.loadHtmlTags)(plugins);
@@ -84,7 +83,9 @@ async function load(options) {
     };
     const siteMetadata = await (0, siteMetadata_1.loadSiteMetadata)({ plugins, siteDir });
     // === Side-effects part ===
-    const genWarning = (0, utils_1.generate)(generatedFilesDir, 'DONT-EDIT-THIS-FOLDER', `This folder stores temp files that Docusaurus' client bundler accesses.
+    const genWarning = (0, utils_1.generate)(generatedFilesDir, 
+    // cSpell:ignore DONT
+    'DONT-EDIT-THIS-FOLDER', `This folder stores temp files that Docusaurus' client bundler accesses.
 
 DO NOT hand-modify files in this folder because they will be overwritten in the
 next build. You can clear all build artifacts (including this folder) with the
@@ -137,6 +138,7 @@ ${Object.entries(registry)
         outDir,
         baseUrl,
         i18n,
+        localizationDir,
         generatedFilesDir,
         routes: pluginsRouteConfigs,
         routesPaths,

package/lib/server/plugins/index.js

@@ -35,8 +35,7 @@ async function loadPlugins(context) {
         const content = await plugin.loadContent?.();
         const rawTranslationFiles = (await plugin.getTranslationFiles?.({ content })) ?? [];
         const translationFiles = await Promise.all(rawTranslationFiles.map((translationFile) => (0, translations_1.localizePluginTranslationFile)({
-            locale: context.i18n.currentLocale,
-            siteDir: context.siteDir,
+            localizationDir: context.localizationDir,
             translationFile,
             plugin,
         })));

package/lib/server/plugins/synthetic.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMDXFallbackPlugin = exports.createBootstrapPlugin = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
-const remark_admonitions_1 = tslib_1.__importDefault(require("remark-admonitions"));
 /**
  * Make a synthetic plugin to:
  * - Inject site client modules
@@ -81,13 +80,13 @@ function createMDXFallbackPlugin({ siteDir, siteConfig, }) {
                 });
             }
             const mdxLoaderOptions = {
+                admonitions: true,
                 staticDirs: siteConfig.staticDirectories.map((dir) => path_1.default.resolve(siteDir, dir)),
                 siteDir,
                 // External MDX files are always meant to be imported as partials
                 isMDXPartial: () => true,
                 // External MDX files might have front matter, just disable the warning
                 isMDXPartialFrontMatterWarningDisabled: true,
-                remarkPlugins: [remark_admonitions_1.default],
             };
             return {
                 module: {

package/lib/server/routes.js

@@ -10,6 +10,7 @@ exports.loadRoutes = exports.handleDuplicateRoutes = exports.genChunkName = void
 const tslib_1 = require("tslib");
 const querystring_1 = tslib_1.__importDefault(require("querystring"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("./utils");
 /** Indents every line of `str` by one level. */
@@ -133,12 +134,8 @@ function handleDuplicateRoutes(pluginsRouteConfigs, onDuplicateRoutes) {
         return false;
     });
     if (duplicatePaths.length > 0) {
-        const finalMessage = `Duplicate routes found!
-${duplicatePaths
-            .map((duplicateRoute) => `- Attempting to create page at ${duplicateRoute}, but a page already exists at this route.`)
-            .join('\n')}
+        logger_1.default.report(onDuplicateRoutes) `Duplicate routes found!${duplicatePaths.map((duplicateRoute) => logger_1.default.interpolate `Attempting to create page at url=${duplicateRoute}, but a page already exists at this route.`)}
 This could lead to non-deterministic routing behavior.`;
-        (0, utils_1.reportMessage)(finalMessage, onDuplicateRoutes);
     }
 }
 exports.handleDuplicateRoutes = handleDuplicateRoutes;

package/lib/server/translations/translations.d.ts

@@ -10,18 +10,16 @@ export declare type WriteTranslationsOptions = {
     messagePrefix?: string;
 };
 declare type TranslationContext = {
-    siteDir: string;
-    locale: string;
+    localizationDir: string;
 };
-export declare function getTranslationsLocaleDirPath(context: TranslationContext): string;
 export declare function readCodeTranslationFileContent(context: TranslationContext): Promise<TranslationFileContent | undefined>;
 export declare function writeCodeTranslations(context: TranslationContext, content: TranslationFileContent, options: WriteTranslationsOptions): Promise<void>;
-export declare function writePluginTranslations({ siteDir, plugin, locale, translationFile, options, }: TranslationContext & {
+export declare function writePluginTranslations({ localizationDir, plugin, translationFile, options, }: TranslationContext & {
     plugin: InitializedPlugin;
     translationFile: TranslationFile;
     options?: WriteTranslationsOptions;
 }): Promise<void>;
-export declare function localizePluginTranslationFile({ siteDir, plugin, locale, translationFile, }: TranslationContext & {
+export declare function localizePluginTranslationFile({ localizationDir, plugin, translationFile, }: TranslationContext & {
     plugin: InitializedPlugin;
     translationFile: TranslationFile;
 }): Promise<TranslationFile>;

package/lib/server/translations/translations.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyDefaultCodeTranslations = exports.getPluginsDefaultCodeTranslationMessages = exports.localizePluginTranslationFile = exports.writePluginTranslations = exports.writeCodeTranslations = exports.readCodeTranslationFileContent = exports.getTranslationsLocaleDirPath = void 0;
+exports.applyDefaultCodeTranslations = exports.getPluginsDefaultCodeTranslationMessages = exports.localizePluginTranslationFile = exports.writePluginTranslations = exports.writeCodeTranslations = exports.readCodeTranslationFileContent = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
@@ -79,13 +79,8 @@ Maybe you should remove them? ${unknownKeys}`;
         await fs_extra_1.default.outputFile(filePath, `${JSON.stringify(mergedContent, null, 2)}\n`);
     }
 }
-// Should we make this configurable?
-function getTranslationsLocaleDirPath(context) {
-    return path_1.default.join(context.siteDir, utils_1.I18N_DIR_NAME, context.locale);
-}
-exports.getTranslationsLocaleDirPath = getTranslationsLocaleDirPath;
 function getCodeTranslationsFilePath(context) {
-    return path_1.default.join(getTranslationsLocaleDirPath(context), utils_1.CODE_TRANSLATIONS_FILE_NAME);
+    return path_1.default.join(context.localizationDir, utils_1.CODE_TRANSLATIONS_FILE_NAME);
 }
 async function readCodeTranslationFileContent(context) {
     return readTranslationFileContent(getCodeTranslationsFilePath(context));
@@ -108,21 +103,19 @@ function addTranslationFileExtension(translationFilePath) {
     }
     return `${translationFilePath}.json`;
 }
-function getPluginTranslationFilePath({ siteDir, plugin, locale, translationFilePath, }) {
+function getPluginTranslationFilePath({ localizationDir, plugin, translationFilePath, }) {
     const dirPath = (0, utils_1.getPluginI18nPath)({
-        siteDir,
-        locale,
+        localizationDir,
         pluginName: plugin.name,
         pluginId: plugin.options.id,
     });
     const filePath = addTranslationFileExtension(translationFilePath);
     return path_1.default.join(dirPath, filePath);
 }
-async function writePluginTranslations({ siteDir, plugin, locale, translationFile, options, }) {
+async function writePluginTranslations({ localizationDir, plugin, translationFile, options, }) {
     const filePath = getPluginTranslationFilePath({
         plugin,
-        siteDir,
-        locale,
+        localizationDir,
         translationFilePath: translationFile.path,
     });
     await writeTranslationFileContent({
@@ -132,11 +125,10 @@ async function writePluginTranslations({ siteDir, plugin, locale, translationFil
     });
 }
 exports.writePluginTranslations = writePluginTranslations;
-async function localizePluginTranslationFile({ siteDir, plugin, locale, translationFile, }) {
+async function localizePluginTranslationFile({ localizationDir, plugin, translationFile, }) {
     const filePath = getPluginTranslationFilePath({
         plugin,
-        siteDir,
-        locale,
+        localizationDir,
         translationFilePath: translationFile.path,
     });
     const localizedContent = await readTranslationFileContent(filePath);

package/lib/webpack/server.js

@@ -65,6 +65,11 @@ async function createServerConfig({ props, onLinksCollected, onHeadTagsCollected
                 // has any importance for this plugin, just using an empty string to
                 // avoid the error. See https://github.com/facebook/docusaurus/issues/4922
                 globals: { __filename: '' },
+                // Secret way to set SSR plugin concurrency option
+                // Waiting for feedback before documenting this officially?
+                concurrency: process.env.DOCUSAURUS_SSR_CONCURRENCY
+                    ? parseInt(process.env.DOCUSAURUS_SSR_CONCURRENCY, 10)
+                    : undefined,
             }),
             // Show compilation progress bar.
             new LogPlugin_1.default({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.22",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,24 +33,24 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@babel/core": "^7.18.2",
-    "@babel/generator": "^7.18.2",
+    "@babel/core": "^7.18.6",
+    "@babel/generator": "^7.18.7",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.18.2",
-    "@babel/preset-env": "^7.18.2",
-    "@babel/preset-react": "^7.17.12",
-    "@babel/preset-typescript": "^7.17.12",
-    "@babel/runtime": "^7.18.3",
-    "@babel/runtime-corejs3": "^7.18.3",
-    "@babel/traverse": "^7.18.2",
-    "@docusaurus/cssnano-preset": "2.0.0-beta.21",
-    "@docusaurus/logger": "2.0.0-beta.21",
-    "@docusaurus/mdx-loader": "2.0.0-beta.21",
+    "@babel/plugin-transform-runtime": "^7.18.6",
+    "@babel/preset-env": "^7.18.6",
+    "@babel/preset-react": "^7.18.6",
+    "@babel/preset-typescript": "^7.18.6",
+    "@babel/runtime": "^7.18.6",
+    "@babel/runtime-corejs3": "^7.18.6",
+    "@babel/traverse": "^7.18.6",
+    "@docusaurus/cssnano-preset": "2.0.0-beta.22",
+    "@docusaurus/logger": "2.0.0-beta.22",
+    "@docusaurus/mdx-loader": "2.0.0-beta.22",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "2.0.0-beta.21",
-    "@docusaurus/utils-common": "2.0.0-beta.21",
-    "@docusaurus/utils-validation": "2.0.0-beta.21",
-    "@slorber/static-site-generator-webpack-plugin": "^4.0.4",
+    "@docusaurus/utils": "2.0.0-beta.22",
+    "@docusaurus/utils-common": "2.0.0-beta.22",
+    "@docusaurus/utils-validation": "2.0.0-beta.22",
+    "@slorber/static-site-generator-webpack-plugin": "^4.0.7",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.7",
     "babel-loader": "^8.2.5",
@@ -63,10 +63,10 @@
     "combine-promises": "^1.1.0",
     "commander": "^5.1.0",
     "copy-webpack-plugin": "^11.0.0",
-    "core-js": "^3.22.7",
+    "core-js": "^3.23.3",
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^4.0.0",
-    "cssnano": "^5.1.9",
+    "cssnano": "^5.1.12",
     "del": "^6.1.1",
     "detect-port": "^1.3.0",
     "escape-html": "^1.0.3",
@@ -79,7 +79,7 @@
     "import-fresh": "^3.3.0",
     "leven": "^3.1.0",
     "lodash": "^4.17.21",
-    "mini-css-extract-plugin": "^2.6.0",
+    "mini-css-extract-plugin": "^2.6.1",
     "postcss": "^8.4.14",
     "postcss-loader": "^7.0.0",
     "prompts": "^2.4.2",
@@ -90,25 +90,24 @@
     "react-router": "^5.3.3",
     "react-router-config": "^5.1.1",
     "react-router-dom": "^5.3.3",
-    "remark-admonitions": "^1.2.1",
     "rtl-detect": "^1.0.4",
     "semver": "^7.3.7",
     "serve-handler": "^6.1.3",
     "shelljs": "^0.8.5",
-    "terser-webpack-plugin": "^5.3.1",
+    "terser-webpack-plugin": "^5.3.3",
     "tslib": "^2.4.0",
     "update-notifier": "^5.1.0",
     "url-loader": "^4.1.1",
     "wait-on": "^6.0.1",
-    "webpack": "^5.72.1",
+    "webpack": "^5.73.0",
     "webpack-bundle-analyzer": "^4.5.0",
-    "webpack-dev-server": "^4.9.0",
+    "webpack-dev-server": "^4.9.3",
     "webpack-merge": "^5.8.0",
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.21",
-    "@docusaurus/types": "2.0.0-beta.21",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.22",
+    "@docusaurus/types": "2.0.0-beta.22",
     "@types/detect-port": "^1.3.2",
     "@types/react-dom": "^18.0.5",
     "@types/react-router-config": "^5.0.6",
@@ -128,5 +127,5 @@
   "engines": {
     "node": ">=16.14"
   },
-  "gitHead": "69ac49fc6909517f13615ee40290c4bd00c39df4"
+  "gitHead": "daf9e462c4eebb7ac26a940932311f987e768f87"
 }

package/lib/client/.eslintrc.js

@@ -1,27 +0,0 @@
-/**
- * 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.
- */
-
-module.exports = {
-  rules: {
-    'no-restricted-imports': [
-      'error',
-      {
-        patterns: [
-          // Prevent importing lodash in client bundle for bundle size
-          'lodash',
-          'lodash.**',
-          'lodash/**',
-          // Prevent importing server code in client bundle
-          '**/../babel/**',
-          '**/../server/**',
-          '**/../commands/**',
-          '**/../webpack/**',
-        ],
-      },
-    ],
-  },
-};