@docusaurus/core 2.0.0-beta.15d451942 → 2.0.0-beta.16

package/lib/server/client-modules/index.js

@@ -7,8 +7,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 function loadClientModules(plugins) {
-    return [].concat(...plugins
-        .map((plugin) => { var _a, _b; return (_b = (_a = plugin.getClientModules) === null || _a === void 0 ? void 0 : _a.call(plugin)) !== null && _b !== void 0 ? _b : []; })
-        .filter(Boolean));
+    return plugins.flatMap((plugin) => { var _a, _b; return (_b = (_a = plugin.getClientModules) === null || _a === void 0 ? void 0 : _a.call(plugin)) !== null && _b !== void 0 ? _b : []; });
 }
 exports.default = loadClientModules;

package/lib/server/config.d.ts

@@ -4,5 +4,5 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { DocusaurusConfig } from '@docusaurus/types';
-export default function loadConfig(configPath: string): DocusaurusConfig;
+import type { DocusaurusConfig } from '@docusaurus/types';
+export default function loadConfig(configPath: string): Promise<DocusaurusConfig>;

package/lib/server/config.js

@@ -7,14 +7,17 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const import_fresh_1 = tslib_1.__importDefault(require("import-fresh"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const import_fresh_1 = (0, tslib_1.__importDefault)(require("import-fresh"));
 const configValidation_1 = require("./configValidation");
-function loadConfig(configPath) {
-    if (!fs_extra_1.default.existsSync(configPath)) {
-        throw new Error(`Config file "${configPath}" not found`);
+async function loadConfig(configPath) {
+    if (!(await fs_extra_1.default.pathExists(configPath))) {
+        throw new Error(`Config file at "${configPath}" not found.`);
     }
-    const loadedConfig = import_fresh_1.default(configPath);
-    return configValidation_1.validateConfig(loadedConfig);
+    const importedConfig = (0, import_fresh_1.default)(configPath);
+    const loadedConfig = importedConfig instanceof Function
+        ? await importedConfig()
+        : await importedConfig;
+    return (0, configValidation_1.validateConfig)(loadedConfig);
 }
 exports.default = loadConfig;

package/lib/server/configValidation.d.ts

@@ -4,7 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { DocusaurusConfig, I18nConfig } from '@docusaurus/types';
+import type { DocusaurusConfig, I18nConfig } from '@docusaurus/types';
+import { Joi } from '@docusaurus/utils-validation';
 export declare const DEFAULT_I18N_CONFIG: I18nConfig;
-export declare const DEFAULT_CONFIG: Pick<DocusaurusConfig, 'i18n' | 'onBrokenLinks' | 'onBrokenMarkdownLinks' | 'onDuplicateRoutes' | 'plugins' | 'themes' | 'presets' | 'customFields' | 'themeConfig' | 'titleDelimiter' | 'noIndex' | 'baseUrlIssueBanner'>;
+export declare const DEFAULT_CONFIG: Pick<DocusaurusConfig, 'i18n' | 'onBrokenLinks' | 'onBrokenMarkdownLinks' | 'onDuplicateRoutes' | 'plugins' | 'themes' | 'presets' | 'customFields' | 'themeConfig' | 'titleDelimiter' | 'noIndex' | 'tagline' | 'baseUrlIssueBanner' | 'staticDirectories'>;
+export declare const ConfigSchema: Joi.ObjectSchema<any>;
 export declare function validateConfig(config: Partial<DocusaurusConfig>): DocusaurusConfig;

package/lib/server/configValidation.js

@@ -6,8 +6,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateConfig = exports.DEFAULT_CONFIG = exports.DEFAULT_I18N_CONFIG = void 0;
-const constants_1 = require("../constants");
+exports.validateConfig = exports.ConfigSchema = exports.DEFAULT_CONFIG = exports.DEFAULT_I18N_CONFIG = void 0;
+const utils_1 = require("@docusaurus/utils");
 const utils_validation_1 = require("@docusaurus/utils-validation");
 const DEFAULT_I18N_LOCALE = 'en';
 exports.DEFAULT_I18N_CONFIG = {
@@ -27,19 +27,30 @@ exports.DEFAULT_CONFIG = {
     themeConfig: {},
     titleDelimiter: '|',
     noIndex: false,
+    tagline: '',
     baseUrlIssueBanner: true,
+    staticDirectories: [utils_1.STATIC_DIR_NAME],
 };
-const PluginSchema = utils_validation_1.Joi.alternatives()
-    .try(utils_validation_1.Joi.function(), utils_validation_1.Joi.array().ordered(utils_validation_1.Joi.function().required(), utils_validation_1.Joi.object().required()), utils_validation_1.Joi.string(), utils_validation_1.Joi.array()
-    .ordered(utils_validation_1.Joi.string().required(), utils_validation_1.Joi.object().required())
-    .length(2), utils_validation_1.Joi.bool().equal(false))
-    // TODO isn't there a simpler way to customize the default Joi error message???
-    // Not sure why Joi makes it complicated to add a custom error message...
-    // See https://stackoverflow.com/a/54657686/82609
-    .error((errors) => {
-    errors.forEach((error) => {
-        error.message = ` => Bad Docusaurus plugin value as path [${error.path}].
-Example valid plugin config:
+function createPluginSchema(theme = false) {
+    return (utils_validation_1.Joi.alternatives()
+        .try(utils_validation_1.Joi.function(), utils_validation_1.Joi.array().ordered(utils_validation_1.Joi.function().required(), utils_validation_1.Joi.object().required()), utils_validation_1.Joi.string(), utils_validation_1.Joi.array()
+        .ordered(utils_validation_1.Joi.string().required(), utils_validation_1.Joi.object().required())
+        .length(2), utils_validation_1.Joi.bool().equal(false))
+        // @ts-expect-error: bad lib def, doesn't recognize an array of reports
+        .error((errors) => {
+        errors.forEach((error) => {
+            const validConfigExample = theme
+                ? `Example valid theme config:
+{
+  themes: [
+    ["@docusaurus/theme-classic",options],
+    "./myTheme",
+    ["./myTheme",{someOption: 42}],
+    function myTheme() { },
+    [function myTheme() { },options]
+  ],
+};`
+                : `Example valid plugin config:
 {
   plugins: [
     ["@docusaurus/plugin-content-docs",options],
@@ -48,15 +59,20 @@ Example valid plugin config:
     function myPlugin() { },
     [function myPlugin() { },options]
   ],
-};
+};`;
+            error.message = ` => Bad Docusaurus ${theme ? 'theme' : 'plugin'} value as path [${error.path}].
+${validConfigExample}
 `;
-    });
-    return errors;
-});
-const ThemeSchema = utils_validation_1.Joi.alternatives().try(utils_validation_1.Joi.string(), utils_validation_1.Joi.array().items(utils_validation_1.Joi.string().required(), utils_validation_1.Joi.object().required()).length(2));
+        });
+        return errors;
+    }));
+}
+const PluginSchema = createPluginSchema(false);
+const ThemeSchema = createPluginSchema(true);
 const PresetSchema = utils_validation_1.Joi.alternatives().try(utils_validation_1.Joi.string(), utils_validation_1.Joi.array().items(utils_validation_1.Joi.string().required(), utils_validation_1.Joi.object().required()).length(2));
 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'),
 });
 const I18N_CONFIG_SCHEMA = utils_validation_1.Joi.object({
@@ -68,16 +84,29 @@ const I18N_CONFIG_SCHEMA = utils_validation_1.Joi.object({
 })
     .optional()
     .default(exports.DEFAULT_I18N_CONFIG);
+const SiteUrlSchema = utils_validation_1.URISchema.required().custom((value, helpers) => {
+    try {
+        const { pathname } = new URL(value);
+        if (pathname !== '/') {
+            helpers.warn('docusaurus.configValidationWarning', {
+                warningMessage: `the url is not supposed to contain a sub-path like '${pathname}', please use the baseUrl field for sub-paths`,
+            });
+        }
+    }
+    catch { }
+    return value;
+}, 'siteUrlCustomValidation');
 // TODO move to @docusaurus/utils-validation
-const ConfigSchema = utils_validation_1.Joi.object({
+exports.ConfigSchema = utils_validation_1.Joi.object({
     baseUrl: utils_validation_1.Joi.string()
         .required()
-        .regex(new RegExp('/$', 'm'))
-        .message('{{#label}} must be a string with a trailing `/`'),
+        .regex(/\/$/m)
+        .message('{{#label}} must be a string with a trailing slash.'),
     baseUrlIssueBanner: utils_validation_1.Joi.boolean().default(exports.DEFAULT_CONFIG.baseUrlIssueBanner),
-    favicon: utils_validation_1.Joi.string().required(),
+    favicon: utils_validation_1.Joi.string().optional(),
     title: utils_validation_1.Joi.string().required(),
-    url: utils_validation_1.URISchema.required(),
+    url: SiteUrlSchema,
+    trailingSlash: utils_validation_1.Joi.boolean(),
     i18n: I18N_CONFIG_SCHEMA,
     onBrokenLinks: utils_validation_1.Joi.string()
         .equal('ignore', 'log', 'warn', 'error', 'throw')
@@ -89,7 +118,11 @@ const ConfigSchema = utils_validation_1.Joi.object({
         .equal('ignore', 'log', 'warn', 'error', 'throw')
         .default(exports.DEFAULT_CONFIG.onDuplicateRoutes),
     organizationName: utils_validation_1.Joi.string().allow(''),
+    staticDirectories: utils_validation_1.Joi.array()
+        .items(utils_validation_1.Joi.string())
+        .default(exports.DEFAULT_CONFIG.staticDirectories),
     projectName: utils_validation_1.Joi.string().allow(''),
+    deploymentBranch: utils_validation_1.Joi.string().optional(),
     customFields: utils_validation_1.Joi.object().unknown().default(exports.DEFAULT_CONFIG.customFields),
     githubHost: utils_validation_1.Joi.string(),
     plugins: utils_validation_1.Joi.array().items(PluginSchema).default(exports.DEFAULT_CONFIG.plugins),
@@ -106,10 +139,10 @@ const ConfigSchema = utils_validation_1.Joi.object({
     ssrTemplate: utils_validation_1.Joi.string(),
     stylesheets: utils_validation_1.Joi.array().items(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
         href: utils_validation_1.Joi.string().required(),
-        type: utils_validation_1.Joi.string().required(),
+        type: utils_validation_1.Joi.string(),
     }).unknown()),
     clientModules: utils_validation_1.Joi.array().items(utils_validation_1.Joi.string()),
-    tagline: utils_validation_1.Joi.string().allow(''),
+    tagline: utils_validation_1.Joi.string().allow('').default(exports.DEFAULT_CONFIG.tagline),
     titleDelimiter: utils_validation_1.Joi.string().default('|'),
     noIndex: utils_validation_1.Joi.bool().default(false),
     webpack: utils_validation_1.Joi.object({
@@ -117,18 +150,16 @@ const ConfigSchema = utils_validation_1.Joi.object({
             .try(utils_validation_1.Joi.string().equal('babel'), utils_validation_1.Joi.function())
             .optional(),
     }).optional(),
+}).messages({
+    'docusaurus.configValidationWarning': 'Docusaurus config validation warning. Field {#label}: {#warningMessage}',
 });
 // TODO move to @docusaurus/utils-validation
 function validateConfig(config) {
-    const { error, value } = ConfigSchema.validate(config, {
+    const { error, warning, value } = exports.ConfigSchema.validate(config, {
         abortEarly: false,
     });
+    (0, utils_validation_1.printWarning)(warning);
     if (error) {
-        utils_validation_1.logValidationBugReportHint();
-        if (utils_validation_1.isValidationDisabledEscapeHatch) {
-            console.error(error);
-            return config;
-        }
         const unknownFields = error.details.reduce((formattedError, err) => {
             if (err.type === 'object.unknown') {
                 return `${formattedError}"${err.path}",`;
@@ -139,7 +170,7 @@ function validateConfig(config) {
             ? `${accumulatedErr}${err.message}\n`
             : accumulatedErr, '');
         formattedError = unknownFields
-            ? `${formattedError}These field(s) [${unknownFields}] are not recognized in ${constants_1.DEFAULT_CONFIG_FILE_NAME}.\nIf you still want these fields to be in your configuration, put them in the 'customFields' attribute.\nSee https://docusaurus.io/docs/docusaurus.config.js/#customfields`
+            ? `${formattedError}These field(s) (${unknownFields}) are not recognized in ${utils_1.DEFAULT_CONFIG_FILE_NAME}.\nIf you still want these fields to be in your configuration, put them in the "customFields" field.\nSee https://docusaurus.io/docs/docusaurus.config.js/#customfields`
             : formattedError;
         throw new Error(formattedError);
     }

package/lib/server/duplicateRoutes.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { ReportingSeverity, RouteConfig } from '@docusaurus/types';
+import type { ReportingSeverity, RouteConfig } from '@docusaurus/types';
 export declare function getAllDuplicateRoutes(pluginsRouteConfigs: RouteConfig[]): string[];
 export declare function getDuplicateRoutesMessage(allDuplicateRoutes: string[]): string;
 export declare function handleDuplicateRoutes(pluginsRouteConfigs: RouteConfig[], onDuplicateRoutes: ReportingSeverity): void;

package/lib/server/duplicateRoutes.js

@@ -1,19 +1,23 @@
 "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.handleDuplicateRoutes = exports.getDuplicateRoutesMessage = exports.getAllDuplicateRoutes = void 0;
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("./utils");
 function getAllDuplicateRoutes(pluginsRouteConfigs) {
-    const allRoutes = utils_2.getAllFinalRoutes(pluginsRouteConfigs).map((routeConfig) => routeConfig.path);
+    const allRoutes = (0, utils_2.getAllFinalRoutes)(pluginsRouteConfigs).map((routeConfig) => routeConfig.path);
     const seenRoutes = {};
     return allRoutes.filter((route) => {
         if (Object.prototype.hasOwnProperty.call(seenRoutes, route)) {
             return true;
         }
-        else {
-            seenRoutes[route] = true;
-            return false;
-        }
+        seenRoutes[route] = true;
+        return false;
     });
 }
 exports.getAllDuplicateRoutes = getAllDuplicateRoutes;
@@ -32,7 +36,7 @@ function handleDuplicateRoutes(pluginsRouteConfigs, onDuplicateRoutes) {
     const message = getDuplicateRoutesMessage(duplicatePaths);
     if (message) {
         const finalMessage = `Duplicate routes found!\n${message}\nThis could lead to non-deterministic routing behavior`;
-        utils_1.reportMessage(finalMessage, onDuplicateRoutes);
+        (0, utils_1.reportMessage)(finalMessage, onDuplicateRoutes);
     }
 }
 exports.handleDuplicateRoutes = handleDuplicateRoutes;

package/lib/server/html-tags/htmlTags.js

@@ -7,22 +7,21 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const lodash_1 = require("lodash");
-const html_tags_1 = tslib_1.__importDefault(require("html-tags"));
-const void_1 = tslib_1.__importDefault(require("html-tags/void"));
+const html_tags_1 = (0, tslib_1.__importDefault)(require("html-tags"));
+const void_1 = (0, tslib_1.__importDefault)(require("html-tags/void"));
+const escape_html_1 = (0, tslib_1.__importDefault)(require("escape-html"));
 function assertIsHtmlTagObject(val) {
-    if (!lodash_1.isPlainObject(val)) {
-        throw new Error(`"${val}" is not a valid HTML tag object`);
+    if (typeof val !== 'object' || !val) {
+        throw new Error(`"${val}" is not a valid HTML tag object.`);
     }
-    // @ts-expect-error: If tagName doesn't exist, it will throw.
     if (typeof val.tagName !== 'string') {
-        throw new Error(`${JSON.stringify(val)} is not a valid HTML tag object. "tagName" must be defined as a string`);
+        throw new Error(`${JSON.stringify(val)} is not a valid HTML tag object. "tagName" must be defined as a string.`);
     }
 }
 function htmlTagObjectToString(tagDefinition) {
     assertIsHtmlTagObject(tagDefinition);
     if (html_tags_1.default.indexOf(tagDefinition.tagName) === -1) {
-        throw new Error(`Error loading ${JSON.stringify(tagDefinition)}, "${tagDefinition.tagName}" is not a valid HTML tags`);
+        throw new Error(`Error loading ${JSON.stringify(tagDefinition)}, "${tagDefinition.tagName}" is not a valid HTML tags.`);
     }
     const isVoidTag = void_1.default.indexOf(tagDefinition.tagName) !== -1;
     const tagAttributes = tagDefinition.attributes || {};
@@ -32,7 +31,7 @@ function htmlTagObjectToString(tagDefinition) {
         if (tagAttributes[attributeName] === true) {
             return attributeName;
         }
-        return `${attributeName}="${tagAttributes[attributeName]}"`;
+        return `${attributeName}="${(0, escape_html_1.default)(tagAttributes[attributeName])}"`;
     });
     return `<${[tagDefinition.tagName].concat(attributes).join(' ')}>${(!isVoidTag && tagDefinition.innerHTML) || ''}${isVoidTag ? '' : `</${tagDefinition.tagName}>`}`;
 }

package/lib/server/html-tags/index.d.ts

@@ -4,6 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { Plugin, InjectedHtmlTags, HtmlTags } from '@docusaurus/types';
+import type { InjectedHtmlTags, HtmlTags, LoadedPlugin } from '@docusaurus/types';
 export declare function createHtmlTagsString(tags: HtmlTags): string;
-export declare function loadHtmlTags(plugins: Plugin<unknown>[]): InjectedHtmlTags;
+export declare function loadHtmlTags(plugins: LoadedPlugin[]): InjectedHtmlTags;

package/lib/server/html-tags/index.js

@@ -8,9 +8,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadHtmlTags = exports.createHtmlTagsString = void 0;
 const tslib_1 = require("tslib");
-const htmlTags_1 = tslib_1.__importDefault(require("./htmlTags"));
+const htmlTags_1 = (0, tslib_1.__importDefault)(require("./htmlTags"));
 function toString(val) {
-    return typeof val === 'string' ? val : htmlTags_1.default(val);
+    return typeof val === 'string' ? val : (0, htmlTags_1.default)(val);
 }
 function createHtmlTagsString(tags) {
     return Array.isArray(tags) ? tags.map(toString).join('\n') : toString(tags);
@@ -21,7 +21,7 @@ function loadHtmlTags(plugins) {
         if (!plugin.injectHtmlTags) {
             return acc;
         }
-        const { headTags, preBodyTags, postBodyTags } = plugin.injectHtmlTags() || {};
+        const { headTags, preBodyTags, postBodyTags } = plugin.injectHtmlTags({ content: plugin.content }) || {};
         return {
             headTags: headTags
                 ? `${acc.headTags}\n${createHtmlTagsString(headTags)}`

package/lib/server/i18n.d.ts

@@ -4,9 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { I18n, DocusaurusConfig, I18nLocaleConfig } from '@docusaurus/types';
+import type { I18n, DocusaurusConfig, I18nLocaleConfig } from '@docusaurus/types';
 export declare function getDefaultLocaleConfig(locale: string): I18nLocaleConfig;
-export declare function shouldWarnAboutNodeVersion(version: number, locales: string[]): boolean;
 export declare function loadI18n(config: DocusaurusConfig, options?: {
     locale?: string;
 }): Promise<I18n>;

package/lib/server/i18n.js

@@ -1,58 +1,47 @@
 "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.localizePath = exports.loadI18n = exports.shouldWarnAboutNodeVersion = exports.getDefaultLocaleConfig = void 0;
+exports.localizePath = exports.loadI18n = exports.getDefaultLocaleConfig = void 0;
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const utils_1 = require("@docusaurus/utils");
 const rtl_detect_1 = require("rtl-detect");
-const constants_1 = require("../constants");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
 function getDefaultLocaleLabel(locale) {
-    // Intl.DisplayNames is ES2021 - Node14+
-    // https://v8.dev/features/intl-displaynames
-    // @ts-expect-error: wait for TS support of ES2021 feature
-    if (typeof Intl.DisplayNames !== 'undefined') {
-        // @ts-expect-error: wait for TS support of ES2021 feature
-        return new Intl.DisplayNames([locale], { type: 'language' }).of(locale);
-    }
-    return locale;
+    const languageName = new Intl.DisplayNames(locale, { type: 'language' }).of(locale);
+    return (languageName.charAt(0).toLocaleUpperCase(locale) + languageName.substring(1));
 }
 function getDefaultLocaleConfig(locale) {
     return {
         label: getDefaultLocaleLabel(locale),
-        direction: rtl_detect_1.getLangDir(locale),
+        direction: (0, rtl_detect_1.getLangDir)(locale),
+        htmlLang: locale,
     };
 }
 exports.getDefaultLocaleConfig = getDefaultLocaleConfig;
-function shouldWarnAboutNodeVersion(version, locales) {
-    const isOnlyEnglish = locales.length === 1 && locales.includes('en');
-    const isOlderNodeVersion = version < 14;
-    return isOlderNodeVersion && !isOnlyEnglish;
-}
-exports.shouldWarnAboutNodeVersion = shouldWarnAboutNodeVersion;
 async function loadI18n(config, options = {}) {
     var _a;
     const { i18n: i18nConfig } = config;
     const currentLocale = (_a = options.locale) !== null && _a !== void 0 ? _a : i18nConfig.defaultLocale;
     if (!i18nConfig.locales.includes(currentLocale)) {
-        console.warn(chalk_1.default.yellow(`The locale=${currentLocale} was not found in your site configuration: config.i18n.locales=[${i18nConfig.locales.join(',')}]
-Note: Docusaurus only support running one locale at a time.`));
+        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.`;
     }
     const locales = i18nConfig.locales.includes(currentLocale)
         ? i18nConfig.locales
         : i18nConfig.locales.concat(currentLocale);
-    if (shouldWarnAboutNodeVersion(constants_1.NODE_MAJOR_VERSION, locales)) {
-        console.warn(chalk_1.default.yellow(`To use Docusaurus i18n, it is strongly advised to use NodeJS >= 14 (instead of ${constants_1.NODE_MAJOR_VERSION})`));
-    }
     function getLocaleConfig(locale) {
         return {
             ...getDefaultLocaleConfig(locale),
             ...i18nConfig.localeConfigs[locale],
         };
     }
-    const localeConfigs = locales.reduce((acc, locale) => {
-        return { ...acc, [locale]: getLocaleConfig(locale) };
-    }, {});
+    const localeConfigs = locales.reduce((acc, locale) => ({ ...acc, [locale]: getLocaleConfig(locale) }), {});
     return {
         defaultLocale: i18nConfig.defaultLocale,
         locales,
@@ -62,26 +51,22 @@ Note: Docusaurus only support running one locale at a time.`));
 }
 exports.loadI18n = loadI18n;
 function localizePath({ pathType, path: originalPath, i18n, options = {}, }) {
-    const shouldLocalizePath = typeof options.localizePath === 'undefined'
-        ? // By default, we don't localize the path of defaultLocale
-            i18n.currentLocale !== i18n.defaultLocale
-        : options.localizePath;
-    if (shouldLocalizePath) {
-        // FS paths need special care, for Windows support
-        if (pathType === 'fs') {
-            return path_1.default.join(originalPath, path_1.default.sep, i18n.currentLocale, path_1.default.sep);
-        }
-        // Url paths
-        else if (pathType === 'url') {
-            return utils_1.normalizeUrl([originalPath, '/', i18n.currentLocale, '/']);
-        }
-        // should never happen
-        else {
-            throw new Error(`unhandled pathType=${pathType}`);
-        }
-    }
-    else {
+    var _a;
+    const shouldLocalizePath = 
+    // By default, we don't localize the path of defaultLocale
+    (_a = options.localizePath) !== null && _a !== void 0 ? _a : i18n.currentLocale !== i18n.defaultLocale;
+    if (!shouldLocalizePath) {
         return originalPath;
     }
+    // FS paths need special care, for Windows support
+    if (pathType === 'fs') {
+        return path_1.default.join(originalPath, i18n.currentLocale);
+    }
+    // Url paths; add a trailing slash so it's a valid base URL
+    if (pathType === 'url') {
+        return (0, utils_1.normalizeUrl)([originalPath, i18n.currentLocale, '/']);
+    }
+    // should never happen
+    throw new Error(`Unhandled path type "${pathType}".`);
 }
 exports.localizePath = localizePath;

package/lib/server/index.d.ts

@@ -4,13 +4,20 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { LoadContext, PluginConfig, Props } from '@docusaurus/types';
+import type { DocusaurusConfig, LoadContext, PluginConfig, Props } from '@docusaurus/types';
 export declare type LoadContextOptions = {
     customOutDir?: string;
     customConfigFilePath?: string;
     locale?: string;
     localizePath?: boolean;
 };
+export declare function loadSiteConfig({ siteDir, customConfigFilePath, }: {
+    siteDir: string;
+    customConfigFilePath?: string;
+}): Promise<{
+    siteConfig: DocusaurusConfig;
+    siteConfigPath: string;
+}>;
 export declare function loadContext(siteDir: string, options?: LoadContextOptions): Promise<LoadContext>;
-export declare function loadPluginConfigs(context: LoadContext): PluginConfig[];
+export declare function loadPluginConfigs(context: LoadContext): Promise<PluginConfig[]>;
 export declare function load(siteDir: string, options?: LoadContextOptions): Promise<Props>;