@docusaurus/core 2.0.0-beta.18 → 2.0.0-beta.19

package/lib/commands/swizzle/actions.js

@@ -32,7 +32,7 @@ async function eject({ siteDir, themePath, componentName, }) {
     const fromPath = path_1.default.join(themePath, componentName);
     const isDirectory = await isDir(fromPath);
     const globPattern = isDirectory
-        ? // do we really want to copy all components?
+        ? // Do we really want to copy all components?
             path_1.default.join(fromPath, '*')
         : `${fromPath}.*`;
     const globPatternPosix = (0, utils_1.posixPath)(globPattern);
@@ -51,10 +51,11 @@ async function eject({ siteDir, themePath, componentName, }) {
         const fileName = path_1.default.basename(sourceFile);
         const targetFile = path_1.default.join(toPath, fileName);
         try {
-            await fs_extra_1.default.copy(sourceFile, targetFile, { overwrite: true });
+            const fileContents = await fs_extra_1.default.readFile(sourceFile, 'utf-8');
+            await fs_extra_1.default.outputFile(targetFile, fileContents.trimStart().replace(/^\/\*.+?\*\/\s*/ms, ''));
         }
         catch (err) {
-            throw new Error(logger_1.default.interpolate `Could not copy file from ${sourceFile} to ${targetFile}`);
+            throw new Error(logger_1.default.interpolate `Could not copy file from path=${sourceFile} to path=${targetFile}`);
         }
         return targetFile;
     }));
@@ -74,7 +75,7 @@ async function wrap({ siteDir, themePath, componentName: themeComponentName, typ
 import type ${componentName}Type from '@theme/${themeComponentName}';
 import ${componentName} from '@theme-${importType}/${themeComponentName}';
 
-type Props = ComponentProps<typeof ${componentName}Type>
+type Props = ComponentProps<typeof ${componentName}Type>;
 
 export default function ${wrapperComponentName}(props: Props): JSX.Element {
   return (

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

@@ -4,8 +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 type { NormalizedPluginConfig } from '../../server/plugins/configs';
 import type { InitializedPlugin, SwizzleAction, SwizzleActionStatus } from '@docusaurus/types';
-import type { NormalizedPluginConfig } from '../../server/plugins/init';
 export declare const SwizzleActions: SwizzleAction[];
 export declare const SwizzleActionsStatuses: SwizzleActionStatus[];
 export declare const PartiallySafeHint: string;
@@ -21,13 +21,13 @@ export declare type SwizzlePlugin = {
 export declare type SwizzleContext = {
     plugins: SwizzlePlugin[];
 };
-export declare type SwizzleOptions = {
+export declare type SwizzleCLIOptions = {
     typescript: boolean;
     danger: boolean;
     list: boolean;
     wrap: boolean;
     eject: boolean;
 };
-export declare function normalizeOptions(options: Partial<SwizzleOptions>): SwizzleOptions;
+export declare function normalizeOptions(options: Partial<SwizzleCLIOptions>): SwizzleCLIOptions;
 export declare function findStringIgnoringCase(str: string, values: string[]): string | undefined;
 export declare function findClosestValue(str: string, values: string[], maxLevenshtein?: number): string | undefined;

package/lib/commands/swizzle/components.js

@@ -18,6 +18,25 @@ const common_1 = require("./common");
 const tables_1 = require("./tables");
 const actions_1 = require("./actions");
 const formatComponentName = (componentName) => componentName.replace(/[/\\]index\.[jt]sx?/, '').replace(/\.[jt]sx?/, '');
+function sortComponentNames(componentNames) {
+    return componentNames.sort(); // Algo may change?
+}
+/**
+ * Expand a list of components to include and return parent folders.
+ * If a folder is not directly a component (no Folder/index.tsx file),
+ * we still want to be able to swizzle --eject that folder.
+ * See https://github.com/facebook/docusaurus/pull/7175#issuecomment-1103757218
+ *
+ * @param componentNames the original list of component names
+ */
+function getMissingIntermediateComponentFolderNames(componentNames) {
+    function getAllIntermediatePaths(componentName) {
+        const paths = componentName.split('/');
+        return lodash_1.default.range(1, paths.length + 1).map((i) => paths.slice(0, i).join('/'));
+    }
+    const expandedComponentNames = lodash_1.default.uniq(componentNames.flatMap((componentName) => getAllIntermediatePaths(componentName)));
+    return lodash_1.default.difference(expandedComponentNames, componentNames);
+}
 const skipReadDirNames = ['__test__', '__tests__', '__mocks__', '__fixtures__'];
 async function readComponentNames(themePath) {
     if (!(await fs_extra_1.default.pathExists(themePath))) {
@@ -48,8 +67,8 @@ async function readComponentNames(themePath) {
         }))).flat();
     }
     const componentFiles = await walk(themePath);
-    const componentFilesOrdered = lodash_1.default.orderBy(componentFiles, [(f) => f.componentName], ['asc']);
-    return componentFilesOrdered.map((f) => f.componentName);
+    const componentNames = componentFiles.map((f) => f.componentName);
+    return sortComponentNames(componentNames);
 }
 exports.readComponentNames = readComponentNames;
 function listComponentNames(themeComponents) {
@@ -72,11 +91,30 @@ async function getThemeComponents({ themeName, themePath, swizzleConfig, }) {
         },
         description: FallbackSwizzleComponentDescription,
     };
-    const allComponents = await readComponentNames(themePath);
+    const FallbackIntermediateFolderSwizzleComponentConfig = {
+        actions: {
+            // It doesn't make sense to wrap an intermediate folder
+            // because it has not any index component
+            wrap: 'forbidden',
+            eject: FallbackSwizzleActionStatus,
+        },
+        description: FallbackSwizzleComponentDescription,
+    };
+    const allInitialComponents = await readComponentNames(themePath);
+    const missingIntermediateComponentFolderNames = getMissingIntermediateComponentFolderNames(allInitialComponents);
+    const allComponents = sortComponentNames(allInitialComponents.concat(missingIntermediateComponentFolderNames));
     function getConfig(component) {
         if (!allComponents.includes(component)) {
             throw new Error(`Can't get component config: component doesn't exist: ${component}`);
         }
+        const config = swizzleConfig.components[component];
+        if (config) {
+            return config;
+        }
+        const isIntermediateFolder = missingIntermediateComponentFolderNames.includes(component);
+        if (isIntermediateFolder) {
+            return FallbackIntermediateFolderSwizzleComponentConfig;
+        }
         return (swizzleConfig.components[component] ?? FallbackSwizzleComponentConfig);
     }
     function getDescription(component) {

package/lib/commands/swizzle/config.js

@@ -36,20 +36,23 @@ function getModuleSwizzleConfig(swizzlePlugin) {
     }
     return undefined;
 }
-function normalizeSwizzleConfig(unsafeSwizzleConfig) {
-    const schema = utils_validation_1.Joi.object({
-        components: utils_validation_1.Joi.object()
-            .pattern(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
-            actions: utils_validation_1.Joi.object().pattern(utils_validation_1.Joi.string().valid(...common_1.SwizzleActions), utils_validation_1.Joi.string().valid(...common_1.SwizzleActionsStatuses)),
-            description: utils_validation_1.Joi.string(),
-        }))
-            .required(),
-    });
-    const result = schema.validate(unsafeSwizzleConfig);
+const SwizzleConfigSchema = utils_validation_1.Joi.object({
+    components: utils_validation_1.Joi.object()
+        .pattern(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
+        actions: utils_validation_1.Joi.object().pattern(utils_validation_1.Joi.string().valid(...common_1.SwizzleActions), utils_validation_1.Joi.string().valid(...common_1.SwizzleActionsStatuses)),
+        description: utils_validation_1.Joi.string(),
+    }))
+        .required(),
+});
+function validateSwizzleConfig(unsafeSwizzleConfig) {
+    const result = SwizzleConfigSchema.validate(unsafeSwizzleConfig);
     if (result.error) {
         throw new Error(`Swizzle config does not match expected schema: ${result.error.message}`);
     }
-    const swizzleConfig = result.value;
+    return result.value;
+}
+function normalizeSwizzleConfig(unsafeSwizzleConfig) {
+    const swizzleConfig = validateSwizzleConfig(unsafeSwizzleConfig);
     // Ensure all components always declare all actions
     Object.values(swizzleConfig.components).forEach((componentConfig) => {
         common_1.SwizzleActions.forEach((action) => {

package/lib/commands/swizzle/context.js

@@ -7,20 +7,16 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initSwizzleContext = void 0;
-const tslib_1 = require("tslib");
 const server_1 = require("../../server");
-const init_1 = tslib_1.__importStar(require("../../server/plugins/init"));
+const init_1 = require("../../server/plugins/init");
+const configs_1 = require("../../server/plugins/configs");
 async function initSwizzleContext(siteDir) {
-    const context = await (0, server_1.loadContext)(siteDir);
-    const pluginConfigs = await (0, server_1.loadPluginConfigs)(context);
-    const plugins = await (0, init_1.default)({
-        pluginConfigs,
-        context,
-    });
-    const pluginsNormalized = await (0, init_1.normalizePluginConfigs)(pluginConfigs, context.siteConfigPath);
+    const context = await (0, server_1.loadContext)({ siteDir });
+    const plugins = await (0, init_1.initPlugins)(context);
+    const pluginConfigs = await (0, configs_1.loadPluginConfigs)(context);
     return {
         plugins: plugins.map((plugin, pluginIndex) => ({
-            plugin: pluginsNormalized[pluginIndex],
+            plugin: pluginConfigs[pluginIndex],
             instance: plugin,
         })),
     };

package/lib/commands/swizzle/index.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 type { SwizzleOptions } from './common';
-export default function swizzle(siteDir: string, themeNameParam: string | undefined, componentNameParam: string | undefined, optionsParam: Partial<SwizzleOptions>): Promise<void>;
+import type { SwizzleCLIOptions } from './common';
+export declare function swizzle(siteDir: string, themeNameParam: string | undefined, componentNameParam: string | undefined, optionsParam: Partial<SwizzleCLIOptions>): Promise<void>;

package/lib/commands/swizzle/index.js

@@ -6,6 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.swizzle = void 0;
 const tslib_1 = require("tslib");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const themes_1 = require("./themes");
@@ -90,7 +91,7 @@ async function swizzle(siteDir, themeNameParam, componentNameParam, optionsParam
                     typescript,
                 });
                 logger_1.default.success `
-Created wrapper of name=${componentName} from name=${themeName} in path=${result.createdFiles}.
+Created wrapper of name=${componentName} from name=${themeName} in path=${result.createdFiles}
 `;
                 return result;
             }
@@ -101,7 +102,7 @@ Created wrapper of name=${componentName} from name=${themeName} in path=${result
                     componentName,
                 });
                 logger_1.default.success `
-Ejected name=${componentName} from name=${themeName} to path=${result.createdFiles}.
+Ejected name=${componentName} from name=${themeName} to path=${result.createdFiles}
 `;
                 return result;
             }
@@ -112,4 +113,4 @@ Ejected name=${componentName} from name=${themeName} to path=${result.createdFil
     await executeAction();
     return process.exit(0);
 }
-exports.default = swizzle;
+exports.swizzle = swizzle;

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 default function writeHeadingIds(siteDir: string, files?: string[], options?: WriteHeadingIDOptions): Promise<void>;
+export declare function writeHeadingIds(siteDir: string, files: string[], options: WriteHeadingIDOptions): Promise<void>;

package/lib/commands/writeHeadingIds.js

@@ -6,12 +6,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeHeadingIds = 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 utils_1 = require("@docusaurus/utils");
 const server_1 = require("../server");
-const init_1 = tslib_1.__importDefault(require("../server/plugins/init"));
+const init_1 = require("../server/plugins/init");
 const utils_2 = require("../server/utils");
 async function transformMarkdownFile(filepath, options) {
     const content = await fs_extra_1.default.readFile(filepath, 'utf8');
@@ -29,12 +30,8 @@ async function transformMarkdownFile(filepath, options) {
  * transformed
  */
 async function getPathsToWatch(siteDir) {
-    const context = await (0, server_1.loadContext)(siteDir);
-    const pluginConfigs = await (0, server_1.loadPluginConfigs)(context);
-    const plugins = await (0, init_1.default)({
-        pluginConfigs,
-        context,
-    });
+    const context = await (0, server_1.loadContext)({ siteDir });
+    const plugins = await (0, init_1.initPlugins)(context);
     return plugins.flatMap((plugin) => plugin?.getPathsToWatch?.() ?? []);
 }
 async function writeHeadingIds(siteDir, files, options) {
@@ -50,4 +47,4 @@ async function writeHeadingIds(siteDir, files, options) {
         logger_1.default.warn `number=${markdownFiles.length} Markdown files already have explicit heading IDs. If you intend to overwrite the existing heading IDs, use the code=${'--overwrite'} option.`;
     }
 }
-exports.default = writeHeadingIds;
+exports.writeHeadingIds = writeHeadingIds;

package/lib/commands/writeTranslations.d.ts

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

package/lib/commands/writeTranslations.js

@@ -6,10 +6,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeTranslations = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const server_1 = require("../server");
-const init_1 = tslib_1.__importDefault(require("../server/plugins/init"));
+const init_1 = require("../server/plugins/init");
 const translations_1 = require("../server/translations/translations");
 const translationsExtractor_1 = require("../server/translations/translationsExtractor");
 const utils_1 = require("../webpack/utils");
@@ -47,15 +48,12 @@ async function writePluginTranslationFiles({ siteDir, plugin, locale, options, }
     }
 }
 async function writeTranslations(siteDir, options) {
-    const context = await (0, server_1.loadContext)(siteDir, {
-        customConfigFilePath: options.config,
+    const context = await (0, server_1.loadContext)({
+        siteDir,
+        config: options.config,
         locale: options.locale,
     });
-    const pluginConfigs = await (0, server_1.loadPluginConfigs)(context);
-    const plugins = await (0, init_1.default)({
-        pluginConfigs,
-        context,
-    });
+    const plugins = await (0, init_1.initPlugins)(context);
     const locale = options.locale ?? context.i18n.defaultLocale;
     if (!context.i18n.locales.includes(locale)) {
         throw new Error(`Can't write-translation for locale "${locale}" that is not in the locale configuration file.
@@ -76,4 +74,4 @@ Available locales are: ${context.i18n.locales.join(',')}.`);
         await writePluginTranslationFiles({ siteDir, plugin, locale, options });
     }));
 }
-exports.default = writeTranslations;
+exports.writeTranslations = writeTranslations;

package/lib/index.d.ts

@@ -4,13 +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 build from './commands/build';
-import clear from './commands/clear';
-import deploy from './commands/deploy';
-import externalCommand from './commands/external';
-import serve from './commands/serve';
-import start from './commands/start';
-import swizzle from './commands/swizzle';
-import writeHeadingIds from './commands/writeHeadingIds';
-import writeTranslations from './commands/writeTranslations';
-export { build, clear, deploy, externalCommand, serve, start, swizzle, writeHeadingIds, writeTranslations, };
+export { build } from './commands/build';
+export { clear } from './commands/clear';
+export { deploy } from './commands/deploy';
+export { externalCommand } from './commands/external';
+export { serve } from './commands/serve';
+export { start } from './commands/start';
+export { swizzle } from './commands/swizzle';
+export { writeHeadingIds } from './commands/writeHeadingIds';
+export { writeTranslations } from './commands/writeTranslations';

package/lib/index.js

@@ -7,22 +7,21 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeTranslations = exports.writeHeadingIds = exports.swizzle = exports.start = exports.serve = exports.externalCommand = exports.deploy = exports.clear = exports.build = void 0;
-const tslib_1 = require("tslib");
-const build_1 = tslib_1.__importDefault(require("./commands/build"));
-exports.build = build_1.default;
-const clear_1 = tslib_1.__importDefault(require("./commands/clear"));
-exports.clear = clear_1.default;
-const deploy_1 = tslib_1.__importDefault(require("./commands/deploy"));
-exports.deploy = deploy_1.default;
-const external_1 = tslib_1.__importDefault(require("./commands/external"));
-exports.externalCommand = external_1.default;
-const serve_1 = tslib_1.__importDefault(require("./commands/serve"));
-exports.serve = serve_1.default;
-const start_1 = tslib_1.__importDefault(require("./commands/start"));
-exports.start = start_1.default;
-const swizzle_1 = tslib_1.__importDefault(require("./commands/swizzle"));
-exports.swizzle = swizzle_1.default;
-const writeHeadingIds_1 = tslib_1.__importDefault(require("./commands/writeHeadingIds"));
-exports.writeHeadingIds = writeHeadingIds_1.default;
-const writeTranslations_1 = tslib_1.__importDefault(require("./commands/writeTranslations"));
-exports.writeTranslations = writeTranslations_1.default;
+var build_1 = require("./commands/build");
+Object.defineProperty(exports, "build", { enumerable: true, get: function () { return build_1.build; } });
+var clear_1 = require("./commands/clear");
+Object.defineProperty(exports, "clear", { enumerable: true, get: function () { return clear_1.clear; } });
+var deploy_1 = require("./commands/deploy");
+Object.defineProperty(exports, "deploy", { enumerable: true, get: function () { return deploy_1.deploy; } });
+var external_1 = require("./commands/external");
+Object.defineProperty(exports, "externalCommand", { enumerable: true, get: function () { return external_1.externalCommand; } });
+var serve_1 = require("./commands/serve");
+Object.defineProperty(exports, "serve", { enumerable: true, get: function () { return serve_1.serve; } });
+var start_1 = require("./commands/start");
+Object.defineProperty(exports, "start", { enumerable: true, get: function () { return start_1.start; } });
+var swizzle_1 = require("./commands/swizzle");
+Object.defineProperty(exports, "swizzle", { enumerable: true, get: function () { return swizzle_1.swizzle; } });
+var writeHeadingIds_1 = require("./commands/writeHeadingIds");
+Object.defineProperty(exports, "writeHeadingIds", { enumerable: true, get: function () { return writeHeadingIds_1.writeHeadingIds; } });
+var writeTranslations_1 = require("./commands/writeTranslations");
+Object.defineProperty(exports, "writeTranslations", { enumerable: true, get: function () { return writeTranslations_1.writeTranslations; } });

package/lib/server/brokenLinks.js

@@ -34,7 +34,7 @@ function getPageBrokenLinks({ pagePath, pageLinks, routes, }) {
             // component, but we load route components with string paths.
             // We don't actually access component here, so it's fine.
             .map((l) => (0, react_router_config_1.matchRoutes)(routes, l))
-            .reduce((prev, cur) => prev.concat(cur));
+            .flat();
         return matchedRoutes.length === 0;
     }
     return pageLinks.map(resolveLink).filter((l) => isBrokenLink(l.resolvedLink));
@@ -52,7 +52,6 @@ function filterIntermediateRoutes(routesInput) {
 function getAllBrokenLinks({ allCollectedLinks, routes, }) {
     const filteredRoutes = filterIntermediateRoutes(routes);
     const allBrokenLinks = lodash_1.default.mapValues(allCollectedLinks, (pageLinks, pagePath) => getPageBrokenLinks({ pageLinks, pagePath, routes: filteredRoutes }));
-    // remove pages without any broken link
     return lodash_1.default.pickBy(allBrokenLinks, (brokenLinks) => brokenLinks.length > 0);
 }
 function getBrokenLinksErrorMessage(allBrokenLinks) {

package/lib/server/{client-modules/index.d.ts → clientModules.d.ts}

@@ -5,4 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { LoadedPlugin } from '@docusaurus/types';
-export default function loadClientModules(plugins: LoadedPlugin<unknown>[]): string[];
+/**
+ * Runs the `getClientModules` lifecycle. The returned file paths are all
+ * absolute.
+ */
+export declare function loadClientModules(plugins: LoadedPlugin[]): string[];

package/lib/server/{client-modules/index.js → clientModules.js}

@@ -6,10 +6,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadClientModules = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
+/**
+ * Runs the `getClientModules` lifecycle. The returned file paths are all
+ * absolute.
+ */
 function loadClientModules(plugins) {
     return plugins.flatMap((plugin) => plugin.getClientModules?.().map((p) => path_1.default.resolve(plugin.path, p)) ??
         []);
 }
-exports.default = loadClientModules;
+exports.loadClientModules = loadClientModules;

package/lib/server/config.d.ts

@@ -4,5 +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 type { DocusaurusConfig } from '@docusaurus/types';
-export default function loadConfig(configPath: string): Promise<DocusaurusConfig>;
+import type { LoadContext } from '@docusaurus/types';
+export declare function loadSiteConfig({ siteDir, customConfigFilePath, }: {
+    siteDir: string;
+    customConfigFilePath?: string;
+}): Promise<Pick<LoadContext, 'siteConfig' | 'siteConfigPath'>>;

package/lib/server/config.js

@@ -6,18 +6,23 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadSiteConfig = 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"));
 const import_fresh_1 = tslib_1.__importDefault(require("import-fresh"));
+const utils_1 = require("@docusaurus/utils");
 const configValidation_1 = require("./configValidation");
-async function loadConfig(configPath) {
-    if (!(await fs_extra_1.default.pathExists(configPath))) {
-        throw new Error(`Config file at "${configPath}" not found.`);
+async function loadSiteConfig({ siteDir, customConfigFilePath, }) {
+    const siteConfigPath = path_1.default.resolve(siteDir, customConfigFilePath ?? utils_1.DEFAULT_CONFIG_FILE_NAME);
+    if (!(await fs_extra_1.default.pathExists(siteConfigPath))) {
+        throw new Error(`Config file at "${siteConfigPath}" not found.`);
     }
-    const importedConfig = (0, import_fresh_1.default)(configPath);
+    const importedConfig = (0, import_fresh_1.default)(siteConfigPath);
     const loadedConfig = typeof importedConfig === 'function'
         ? await importedConfig()
         : await importedConfig;
-    return (0, configValidation_1.validateConfig)(loadedConfig);
+    const siteConfig = (0, configValidation_1.validateConfig)(loadedConfig);
+    return { siteConfig, siteConfigPath };
 }
-exports.default = loadConfig;
+exports.loadSiteConfig = loadSiteConfig;

package/lib/server/configValidation.js

@@ -40,7 +40,7 @@ function createPluginSchema(theme) {
         .ordered(utils_validation_1.Joi.function().required(), utils_validation_1.Joi.object().required())
         .length(2), 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))
+        .length(2), utils_validation_1.Joi.any().valid(false, null))
         // @ts-expect-error: bad lib def, doesn't recognize an array of reports
         .error((errors) => {
         errors.forEach((error) => {
@@ -77,7 +77,7 @@ 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))
+    .length(2), utils_validation_1.Joi.any().valid(false, null))
     .messages({
     'alternatives.types': `{#label} does not look like a valid preset config. A preset config entry should be one of:
 - A tuple of [presetName, options], like \`["classic", \\{ blog: false \\}]\`, or
@@ -87,6 +87,7 @@ 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'),
+    calendar: utils_validation_1.Joi.string(),
 });
 const I18N_CONFIG_SCHEMA = utils_validation_1.Joi.object({
     defaultLocale: utils_validation_1.Joi.string().required(),
@@ -168,8 +169,8 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
         .items(utils_validation_1.Joi.string())
         .default(exports.DEFAULT_CONFIG.clientModules),
     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),
+    titleDelimiter: utils_validation_1.Joi.string().default(exports.DEFAULT_CONFIG.titleDelimiter),
+    noIndex: utils_validation_1.Joi.bool().default(exports.DEFAULT_CONFIG.noIndex),
     webpack: utils_validation_1.Joi.object({
         jsLoader: utils_validation_1.Joi.alternatives()
             .try(utils_validation_1.Joi.string().equal('babel'), utils_validation_1.Joi.function())
@@ -195,7 +196,7 @@ function validateConfig(config) {
             ? `${accumulatedErr}${err.message}\n`
             : accumulatedErr, '');
         formattedError = unknownFields
-            ? `${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}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/api/docusaurus-config/#customfields`
             : formattedError;
         throw new Error(formattedError);
     }

package/lib/server/getHostPort.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 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.
+ */
+export declare type HostPortOptions = {
+    host?: string;
+    port?: string;
+};
+export declare function getHostPort(options: HostPortOptions): Promise<{
+    host: string;
+    port: number | null;
+}>;