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

package/lib/commands/serve.js

@@ -9,13 +9,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.serve = void 0;
 const tslib_1 = require("tslib");
 const http_1 = tslib_1.__importDefault(require("http"));
-const serve_handler_1 = tslib_1.__importDefault(require("serve-handler"));
-const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const utils_1 = require("@docusaurus/utils");
+const serve_handler_1 = tslib_1.__importDefault(require("serve-handler"));
+const openBrowser_1 = tslib_1.__importDefault(require("react-dev-utils/openBrowser"));
 const config_1 = require("../server/config");
 const build_1 = require("./build");
 const getHostPort_1 = require("../server/getHostPort");
-const utils_1 = require("@docusaurus/utils");
 async function serve(siteDir, cliOptions) {
     const buildDir = cliOptions.dir ?? utils_1.DEFAULT_BUILD_DIR_NAME;
     let dir = path_1.default.resolve(siteDir, buildDir);
@@ -45,7 +46,7 @@ async function serve(siteDir, cliOptions) {
         }
         // Remove baseUrl before calling serveHandler, because /baseUrl/ should
         // serve /build/index.html, not /build/baseUrl/index.html (does not exist)
-        req.url = req.url?.replace(baseUrl, '/');
+        req.url = req.url.replace(baseUrl, '/');
         (0, serve_handler_1.default)(req, res, {
             cleanUrls: true,
             public: dir,
@@ -53,7 +54,11 @@ async function serve(siteDir, cliOptions) {
             directoryListing: false,
         });
     });
-    logger_1.default.success `Serving path=${buildDir} directory at url=${servingUrl + baseUrl}.`;
+    const url = servingUrl + baseUrl;
+    logger_1.default.success `Serving path=${buildDir} directory at: url=${url}`;
     server.listen(port);
+    if (cliOptions.open && !process.env.CI) {
+        (0, openBrowser_1.default)(url);
+    }
 }
 exports.serve = serve;

package/lib/commands/start.d.ts

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

package/lib/commands/start.js

@@ -8,12 +8,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = void 0;
 const tslib_1 = require("tslib");
-const utils_1 = require("@docusaurus/utils");
+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"));
+const utils_1 = require("@docusaurus/utils");
 const chokidar_1 = tslib_1.__importDefault(require("chokidar"));
 const html_webpack_plugin_1 = tslib_1.__importDefault(require("html-webpack-plugin"));
-const path_1 = tslib_1.__importDefault(require("path"));
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const openBrowser_1 = tslib_1.__importDefault(require("react-dev-utils/openBrowser"));
 const WebpackDevServerUtils_1 = require("react-dev-utils/WebpackDevServerUtils");
 const evalSourceMapMiddleware_1 = tslib_1.__importDefault(require("react-dev-utils/evalSourceMapMiddleware"));
@@ -47,14 +47,14 @@ async function start(siteDir, cliOptions) {
     const { baseUrl, headTags, preBodyTags, postBodyTags } = props;
     const urls = (0, WebpackDevServerUtils_1.prepareUrls)(protocol, host, port);
     const openUrl = (0, utils_1.normalizeUrl)([urls.localUrlForBrowser, baseUrl]);
-    logger_1.default.success `Docusaurus website is running at url=${openUrl}.`;
+    logger_1.default.success `Docusaurus website is running at: url=${openUrl}`;
     // Reload files processing.
     const reload = lodash_1.default.debounce(() => {
         loadSite()
             .then(({ baseUrl: newBaseUrl }) => {
             const newOpenUrl = (0, utils_1.normalizeUrl)([urls.localUrlForBrowser, newBaseUrl]);
             if (newOpenUrl !== openUrl) {
-                logger_1.default.success `Docusaurus website is running at url=${newOpenUrl}.`;
+                logger_1.default.success `Docusaurus website is running at: url=${newOpenUrl}`;
             }
         })
             .catch((err) => {
@@ -93,7 +93,7 @@ async function start(siteDir, cliOptions) {
         ...{ pollingOptions },
     });
     ['add', 'change', 'unlink', 'addDir', 'unlinkDir'].forEach((event) => fsWatcher.on(event, reload));
-    let config = (0, webpack_merge_1.default)(await (0, client_1.default)(props), {
+    let config = (0, webpack_merge_1.default)(await (0, client_1.default)(props, cliOptions.minify), {
         watchOptions: {
             ignored: /node_modules\/(?!@docusaurus)/,
             poll: cliOptions.poll,

package/lib/commands/swizzle/actions.js

@@ -8,10 +8,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.wrap = exports.eject = exports.getAction = exports.SwizzleActions = void 0;
 const tslib_1 = require("tslib");
-const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 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"));
 const utils_1 = require("@docusaurus/utils");
 const prompts_1 = require("./prompts");
 exports.SwizzleActions = ['wrap', 'eject'];
@@ -43,19 +43,17 @@ async function eject({ siteDir, themePath, componentName, }) {
         // This should never happen
         throw new Error(logger_1.default.interpolate `No files to copy from path=${fromPath} with glob code=${globPatternPosix}`);
     }
-    const toPath = isDirectory
-        ? path_1.default.join(siteDir, utils_1.THEME_PATH, componentName)
-        : path_1.default.join(siteDir, utils_1.THEME_PATH);
+    const toPath = path_1.default.join(siteDir, utils_1.THEME_PATH);
     await fs_extra_1.default.ensureDir(toPath);
     const createdFiles = await Promise.all(filesToCopy.map(async (sourceFile) => {
-        const fileName = path_1.default.basename(sourceFile);
-        const targetFile = path_1.default.join(toPath, fileName);
+        const targetFile = path_1.default.join(toPath, path_1.default.relative(themePath, sourceFile));
         try {
             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 path=${sourceFile} to path=${targetFile}`);
+            logger_1.default.error `Could not copy file from path=${sourceFile} to path=${targetFile}`;
+            throw err;
         }
         return targetFile;
     }));
@@ -72,8 +70,8 @@ async function wrap({ siteDir, themePath, componentName: themeComponentName, typ
     const toPath = path_1.default.resolve(siteDir, utils_1.THEME_PATH, wrapperFileName);
     const content = typescript
         ? `import React, {ComponentProps} from 'react';
-import type ${componentName}Type from '@theme/${themeComponentName}';
 import ${componentName} from '@theme-${importType}/${themeComponentName}';
+import type ${componentName}Type from '@theme/${themeComponentName}';
 
 type Props = ComponentProps<typeof ${componentName}Type>;
 

package/lib/commands/swizzle/common.js

@@ -8,9 +8,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findClosestValue = exports.findStringIgnoringCase = exports.normalizeOptions = exports.actionStatusSuffix = exports.actionStatusColor = exports.actionStatusLabel = exports.PartiallySafeHint = exports.SwizzleActionsStatuses = exports.SwizzleActions = void 0;
 const tslib_1 = require("tslib");
-const leven_1 = tslib_1.__importDefault(require("leven"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const leven_1 = tslib_1.__importDefault(require("leven"));
 exports.SwizzleActions = ['wrap', 'eject'];
 exports.SwizzleActionsStatuses = [
     'safe',

package/lib/commands/swizzle/components.js

@@ -8,10 +8,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getComponentName = exports.getThemeComponents = exports.listComponentNames = exports.readComponentNames = void 0;
 const tslib_1 = require("tslib");
-const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 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"));
 const utils_1 = require("@docusaurus/utils");
 const prompts_1 = require("./prompts");
 const common_1 = require("./common");

package/lib/commands/swizzle/config.js

@@ -7,20 +7,20 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThemeSwizzleConfig = exports.normalizeSwizzleConfig = void 0;
+const tslib_1 = require("tslib");
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_validation_1 = require("@docusaurus/utils-validation");
 const common_1 = require("./common");
 const themes_1 = require("./themes");
 function getModuleSwizzleConfig(swizzlePlugin) {
-    const getSwizzleConfig = swizzlePlugin.plugin.plugin?.getSwizzleConfig ??
-        swizzlePlugin.plugin.pluginModule?.module.getSwizzleConfig ??
-        swizzlePlugin.plugin.pluginModule?.module?.getSwizzleConfig;
+    const getSwizzleConfig = swizzlePlugin.plugin.plugin.getSwizzleConfig ??
+        swizzlePlugin.plugin.pluginModule?.module.getSwizzleConfig;
     if (getSwizzleConfig) {
         return getSwizzleConfig();
     }
     // TODO deprecate getSwizzleComponentList later
-    const getSwizzleComponentList = swizzlePlugin.plugin.plugin?.getSwizzleComponentList ??
-        swizzlePlugin.plugin.pluginModule?.module.getSwizzleComponentList ??
-        swizzlePlugin.plugin.pluginModule?.module?.getSwizzleComponentList;
+    const getSwizzleComponentList = swizzlePlugin.plugin.plugin.getSwizzleComponentList ??
+        swizzlePlugin.plugin.pluginModule?.module.getSwizzleComponentList;
     if (getSwizzleComponentList) {
         const safeComponents = getSwizzleComponentList() ?? [];
         const safeComponentConfig = {
@@ -74,8 +74,9 @@ function getThemeSwizzleConfig(themeName, plugins) {
         try {
             return normalizeSwizzleConfig(config);
         }
-        catch (e) {
-            throw new Error(`Invalid Swizzle config for theme ${themeName}.\n${e.message}`);
+        catch (err) {
+            logger_1.default.error `Invalid Swizzle config for theme name=${themeName}.`;
+            throw err;
         }
     }
     return FallbackSwizzleConfig;

package/lib/commands/swizzle/prompts.js

@@ -13,14 +13,14 @@ const prompts_1 = tslib_1.__importDefault(require("prompts"));
 const common_1 = require("./common");
 const ExitTitle = logger_1.default.yellow('[Exit]');
 async function askThemeName(themeNames) {
-    const { themeName } = await (0, prompts_1.default)({
+    const { themeName } = (await (0, prompts_1.default)({
         type: 'select',
         name: 'themeName',
         message: 'Select a theme to swizzle:',
         choices: themeNames
             .map((theme) => ({ title: theme, value: theme }))
             .concat({ title: ExitTitle, value: '[Exit]' }),
-    });
+    }));
     if (!themeName || themeName === '[Exit]') {
         process.exit(0);
     }
@@ -37,7 +37,7 @@ async function askComponentName(themeComponents) {
             partiallySafe,
         })}`;
     }
-    const { componentName } = await (0, prompts_1.default)({
+    const { componentName } = (await (0, prompts_1.default)({
         type: 'autocomplete',
         name: 'componentName',
         message: `
@@ -57,7 +57,7 @@ ${common_1.PartiallySafeHint} = not safe for all swizzle actions
         async suggest(input, choices) {
             return choices.filter((choice) => choice.title.toLowerCase().includes(input.toLowerCase()));
         },
-    });
+    }));
     logger_1.default.newLine();
     if (!componentName || componentName === '[Exit]') {
         return process.exit(0);
@@ -66,7 +66,7 @@ ${common_1.PartiallySafeHint} = not safe for all swizzle actions
 }
 exports.askComponentName = askComponentName;
 async function askSwizzleDangerousComponent() {
-    const { switchToDanger } = await (0, prompts_1.default)({
+    const { switchToDanger } = (await (0, prompts_1.default)({
         type: 'select',
         name: 'switchToDanger',
         message: `Do you really want to swizzle this unsafe internal component?`,
@@ -78,7 +78,7 @@ async function askSwizzleDangerousComponent() {
             },
             { title: ExitTitle, value: '[Exit]' },
         ],
-    });
+    }));
     if (typeof switchToDanger === 'undefined' || switchToDanger === '[Exit]') {
         return process.exit(0);
     }
@@ -86,7 +86,7 @@ async function askSwizzleDangerousComponent() {
 }
 exports.askSwizzleDangerousComponent = askSwizzleDangerousComponent;
 async function askSwizzleAction(componentConfig) {
-    const { action } = await (0, prompts_1.default)({
+    const { action } = (await (0, prompts_1.default)({
         type: 'select',
         name: 'action',
         message: `Which swizzle action do you want to do?`,
@@ -101,7 +101,7 @@ async function askSwizzleAction(componentConfig) {
             },
             { title: ExitTitle, value: '[Exit]' },
         ],
-    });
+    }));
     if (typeof action === 'undefined' || action === '[Exit]') {
         return process.exit(0);
     }

package/lib/commands/swizzle/tables.js

@@ -8,9 +8,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.themeComponentsTable = exports.helpTables = void 0;
 const tslib_1 = require("tslib");
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const cli_table3_1 = tslib_1.__importDefault(require("cli-table3"));
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const actions_1 = require("./actions");
 const common_1 = require("./common");
 function tableStatusLabel(status) {

package/lib/commands/swizzle/themes.js

@@ -8,10 +8,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThemePath = exports.getThemeName = exports.getThemeNames = exports.getPluginByThemeName = exports.pluginToThemeName = void 0;
 const tslib_1 = require("tslib");
-const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const leven_1 = tslib_1.__importDefault(require("leven"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const leven_1 = tslib_1.__importDefault(require("leven"));
 const prompts_1 = require("./prompts");
 const common_1 = require("./common");
 function pluginToThemeName(plugin) {
@@ -65,7 +65,7 @@ function handleInvalidThemeName({ themeNameParam, themeNames, }) {
         : logger_1.default.interpolate `Themes available for swizzle: ${themeNames}`}`;
     return process.exit(1);
 }
-async function validateThemeName({ themeNameParam, themeNames, }) {
+function validateThemeName({ themeNameParam, themeNames, }) {
     const isValidName = themeNames.includes(themeNameParam);
     if (!isValidName) {
         return handleInvalidThemeName({

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

package/lib/commands/writeHeadingIds.js

@@ -32,7 +32,7 @@ async function transformMarkdownFile(filepath, options) {
 async function getPathsToWatch(siteDir) {
     const context = await (0, server_1.loadContext)({ siteDir });
     const plugins = await (0, init_1.initPlugins)(context);
-    return plugins.flatMap((plugin) => plugin?.getPathsToWatch?.() ?? []);
+    return plugins.flatMap((plugin) => plugin.getPathsToWatch?.() ?? []);
 }
 async function writeHeadingIds(siteDir, files, options) {
     const markdownFiles = await (0, utils_2.safeGlobby)(files ?? (await getPathsToWatch(siteDir)), {

package/lib/server/brokenLinks.js

@@ -8,14 +8,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleBrokenLinks = void 0;
 const tslib_1 = require("tslib");
-const react_router_config_1 = require("react-router-config");
 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"));
+const combine_promises_1 = tslib_1.__importDefault(require("combine-promises"));
+const react_router_config_1 = require("react-router-config");
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("./utils");
-const path_1 = tslib_1.__importDefault(require("path"));
-const combine_promises_1 = tslib_1.__importDefault(require("combine-promises"));
-const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 // matchRoutes does not support qs/anchors, so we remove it!
 function onlyPathname(link) {
     return link.split('#')[0].split('?')[0];

package/lib/server/config.js

@@ -11,10 +11,25 @@ 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 logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 const configValidation_1 = require("./configValidation");
+async function findConfig(siteDir) {
+    // We could support .mjs, .ts, etc. in the future
+    const candidates = ['.js', '.cjs'].map((ext) => utils_1.DEFAULT_CONFIG_FILE_NAME + ext);
+    const configPath = await (0, utils_1.findAsyncSequential)(candidates.map((file) => path_1.default.join(siteDir, file)), fs_extra_1.default.pathExists);
+    if (!configPath) {
+        logger_1.default.error('No config file found.');
+        logger_1.default.info `Expected one of:${candidates}
+You can provide a custom config path with the code=${'--config'} option.`;
+        throw new Error();
+    }
+    return configPath;
+}
 async function loadSiteConfig({ siteDir, customConfigFilePath, }) {
-    const siteConfigPath = path_1.default.resolve(siteDir, customConfigFilePath ?? utils_1.DEFAULT_CONFIG_FILE_NAME);
+    const siteConfigPath = customConfigFilePath
+        ? path_1.default.resolve(siteDir, customConfigFilePath)
+        : await findConfig(siteDir);
     if (!(await fs_extra_1.default.pathExists(siteConfigPath))) {
         throw new Error(`Config file at "${siteConfigPath}" not found.`);
     }
@@ -22,7 +37,7 @@ async function loadSiteConfig({ siteDir, customConfigFilePath, }) {
     const loadedConfig = typeof importedConfig === 'function'
         ? await importedConfig()
         : await importedConfig;
-    const siteConfig = (0, configValidation_1.validateConfig)(loadedConfig);
+    const siteConfig = (0, configValidation_1.validateConfig)(loadedConfig, path_1.default.relative(siteDir, siteConfigPath));
     return { siteConfig, siteConfigPath };
 }
 exports.loadSiteConfig = loadSiteConfig;

package/lib/server/configValidation.d.ts

@@ -4,9 +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 type { DocusaurusConfig, I18nConfig } from '@docusaurus/types';
 import { Joi } from '@docusaurus/utils-validation';
+import type { DocusaurusConfig, I18nConfig } from '@docusaurus/types';
 export declare const DEFAULT_I18N_CONFIG: I18nConfig;
 export declare const DEFAULT_CONFIG: Pick<DocusaurusConfig, 'i18n' | 'onBrokenLinks' | 'onBrokenMarkdownLinks' | 'onDuplicateRoutes' | 'plugins' | 'themes' | 'presets' | 'stylesheets' | 'scripts' | 'clientModules' | 'customFields' | 'themeConfig' | 'titleDelimiter' | 'noIndex' | 'tagline' | 'baseUrlIssueBanner' | 'staticDirectories'>;
-export declare const ConfigSchema: Joi.ObjectSchema<any>;
-export declare function validateConfig(config: Partial<DocusaurusConfig>): DocusaurusConfig;
+export declare const ConfigSchema: Joi.ObjectSchema<DocusaurusConfig>;
+export declare function validateConfig(config: unknown, siteConfigPath: string): DocusaurusConfig;

package/lib/server/configValidation.js

@@ -65,7 +65,7 @@ function createPluginSchema(theme) {
     [function myPlugin() { },options]
   ],
 };`;
-            error.message = ` => Bad Docusaurus ${theme ? 'theme' : 'plugin'} value as path [${error.path}].
+            error.message = ` => Bad Docusaurus ${theme ? 'theme' : 'plugin'} value ${error.path.reduce((acc, cur) => typeof cur === 'string' ? `${acc}.${cur}` : `${acc}[${cur}]`)}.
 ${validConfigExample}
 `;
         });
@@ -100,7 +100,7 @@ const I18N_CONFIG_SCHEMA = utils_validation_1.Joi.object({
     .default(exports.DEFAULT_I18N_CONFIG);
 const SiteUrlSchema = utils_validation_1.URISchema.required().custom((value, helpers) => {
     try {
-        const { pathname } = new URL(value);
+        const { pathname } = new URL(String(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`,
@@ -139,6 +139,7 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
     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(),
+    githubPort: utils_validation_1.Joi.string(),
     plugins: utils_validation_1.Joi.array().items(PluginSchema).default(exports.DEFAULT_CONFIG.plugins),
     themes: utils_validation_1.Joi.array().items(ThemeSchema).default(exports.DEFAULT_CONFIG.themes),
     presets: utils_validation_1.Joi.array().items(PresetSchema).default(exports.DEFAULT_CONFIG.presets),
@@ -180,7 +181,7 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
     'docusaurus.configValidationWarning': 'Docusaurus config validation warning. Field {#label}: {#warningMessage}',
 });
 // TODO move to @docusaurus/utils-validation
-function validateConfig(config) {
+function validateConfig(config, siteConfigPath) {
     const { error, warning, value } = exports.ConfigSchema.validate(config, {
         abortEarly: false,
     });
@@ -188,7 +189,7 @@ function validateConfig(config) {
     if (error) {
         const unknownFields = error.details.reduce((formattedError, err) => {
             if (err.type === 'object.unknown') {
-                return `${formattedError}"${err.path}",`;
+                return `${formattedError}"${err.path.reduce((acc, cur) => typeof cur === 'string' ? `${acc}.${cur}` : `${acc}[${cur}]`)}",`;
             }
             return formattedError;
         }, '');
@@ -196,7 +197,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/api/docusaurus-config/#customfields`
+            ? `${formattedError}These field(s) (${unknownFields}) are not recognized in ${siteConfigPath}.\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.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHostPort = void 0;
 const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
-const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
 const utils_1 = require("@docusaurus/utils");
 const prompts_1 = tslib_1.__importDefault(require("prompts"));
 const execOptions = {
@@ -55,14 +55,14 @@ async function choosePort(host, defaultPort) {
         }
         clearConsole();
         const existingProcess = getProcessForPort(defaultPort);
-        const { shouldChangePort } = await (0, prompts_1.default)({
+        const { shouldChangePort } = (await (0, prompts_1.default)({
             type: 'confirm',
             name: 'shouldChangePort',
             message: logger_1.default.yellow(`${logger_1.default.bold('[WARNING]')} ${message}${existingProcess ? ` Probably:\n  ${existingProcess}` : ''}
 
 Would you like to run the app on another port instead?`),
             initial: true,
-        });
+        }));
         return shouldChangePort ? port : null;
     }
     catch (err) {

package/lib/server/htmlTags.js

@@ -8,10 +8,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadHtmlTags = void 0;
 const tslib_1 = require("tslib");
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const html_tags_1 = tslib_1.__importDefault(require("html-tags"));
 const void_1 = tslib_1.__importDefault(require("html-tags/void"));
 const escape_html_1 = tslib_1.__importDefault(require("escape-html"));
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
 function assertIsHtmlTagObject(val) {
     if (typeof val !== 'object' || !val) {
         throw new Error(`"${val}" is not a valid HTML tag object.`);

package/lib/server/i18n.js

@@ -8,8 +8,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadI18n = exports.getDefaultLocaleConfig = void 0;
 const tslib_1 = require("tslib");
-const rtl_detect_1 = require("rtl-detect");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const rtl_detect_1 = require("rtl-detect");
 function getDefaultLocaleLabel(locale) {
     const languageName = new Intl.DisplayNames(locale, { type: 'language' }).of(locale);
     return (languageName.charAt(0).toLocaleUpperCase(locale) + languageName.substring(1));

package/lib/server/index.js

@@ -8,9 +8,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.load = exports.loadContext = void 0;
 const tslib_1 = require("tslib");
-const utils_1 = require("@docusaurus/utils");
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const utils_1 = require("@docusaurus/utils");
 const config_1 = require("./config");
 const clientModules_1 = require("./clientModules");
 const plugins_1 = require("./plugins");
@@ -90,7 +90,7 @@ 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
 \`docusaurus clear\` command.
 `);
-    const genSiteConfig = (0, utils_1.generate)(generatedFilesDir, utils_1.DEFAULT_CONFIG_FILE_NAME, `/*
+    const genSiteConfig = (0, utils_1.generate)(generatedFilesDir, `${utils_1.DEFAULT_CONFIG_FILE_NAME}.mjs`, `/*
  * AUTOGENERATED - DON'T EDIT
  * Your edits in this file will be overwritten in the next build!
  * Modify the docusaurus.config.js file at your site's root instead.

package/lib/server/plugins/configs.js

@@ -19,7 +19,7 @@ async function normalizePluginConfig(pluginConfig, configPath, pluginRequire) {
         const pluginPath = pluginRequire.resolve(pluginModuleImport);
         const pluginModule = (0, import_fresh_1.default)(pluginPath);
         return {
-            plugin: pluginModule?.default ?? pluginModule,
+            plugin: pluginModule.default ?? pluginModule,
             options: {},
             pluginModule: {
                 path: pluginModuleImport,
@@ -44,7 +44,7 @@ async function normalizePluginConfig(pluginConfig, configPath, pluginRequire) {
         const pluginPath = pluginRequire.resolve(pluginModuleImport);
         const pluginModule = (0, import_fresh_1.default)(pluginPath);
         return {
-            plugin: pluginModule?.default ?? pluginModule,
+            plugin: pluginModule.default ?? pluginModule,
             options: pluginConfig[1],
             pluginModule: {
                 path: pluginModuleImport,

package/lib/server/plugins/index.js

@@ -8,11 +8,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPlugins = void 0;
 const tslib_1 = require("tslib");
-const utils_1 = require("@docusaurus/utils");
 const path_1 = tslib_1.__importDefault(require("path"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const utils_1 = require("@docusaurus/utils");
 const init_1 = require("./init");
 const synthetic_1 = require("./synthetic");
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const translations_1 = require("../translations/translations");
 const routeConfig_1 = require("./routeConfig");
 /**
@@ -33,7 +33,7 @@ async function loadPlugins(context) {
     // translation files that the plugin declares.
     const loadedPlugins = await Promise.all(plugins.map(async (plugin) => {
         const content = await plugin.loadContent?.();
-        const rawTranslationFiles = (await plugin?.getTranslationFiles?.({ content })) ?? [];
+        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,

package/lib/server/plugins/init.js

@@ -11,15 +11,15 @@ const tslib_1 = require("tslib");
 const module_1 = require("module");
 const path_1 = tslib_1.__importDefault(require("path"));
 const utils_1 = require("@docusaurus/utils");
+const utils_validation_1 = require("@docusaurus/utils-validation");
 const siteMetadata_1 = require("../siteMetadata");
 const pluginIds_1 = require("./pluginIds");
-const utils_validation_1 = require("@docusaurus/utils-validation");
 const configs_1 = require("./configs");
 function getOptionValidationFunction(normalizedPluginConfig) {
     if (normalizedPluginConfig.pluginModule) {
         // Support both CommonJS and ES modules
-        return (normalizedPluginConfig.pluginModule.module?.default?.validateOptions ??
-            normalizedPluginConfig.pluginModule.module?.validateOptions);
+        return (normalizedPluginConfig.pluginModule.module.default?.validateOptions ??
+            normalizedPluginConfig.pluginModule.module.validateOptions);
     }
     return normalizedPluginConfig.plugin.validateOptions;
 }
@@ -42,7 +42,7 @@ async function initPlugins(context) {
     const pluginConfigs = await (0, configs_1.loadPluginConfigs)(context);
     async function doGetPluginVersion(normalizedPluginConfig) {
         if (normalizedPluginConfig.pluginModule?.path) {
-            const pluginPath = pluginRequire.resolve(normalizedPluginConfig.pluginModule?.path);
+            const pluginPath = pluginRequire.resolve(normalizedPluginConfig.pluginModule.path);
             return (0, siteMetadata_1.getPluginVersion)(pluginPath, context.siteDir);
         }
         return { type: 'local' };

package/lib/server/plugins/routeConfig.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 { RouteConfig } from '@docusaurus/types';
 import { type ApplyTrailingSlashParams } from '@docusaurus/utils-common';
+import type { RouteConfig } from '@docusaurus/types';
 /** Recursively applies trailing slash config to all nested routes. */
 export declare function applyRouteTrailingSlash(route: RouteConfig, params: ApplyTrailingSlashParams): RouteConfig;
 export declare function sortConfig(routeConfigs: RouteConfig[], baseUrl?: string): void;

package/lib/server/plugins/routeConfig.js

@@ -38,8 +38,8 @@ function sortConfig(routeConfigs, baseUrl = '/') {
         }
         // Higher priority get placed first.
         if (a.priority || b.priority) {
-            const priorityA = a.priority || 0;
-            const priorityB = b.priority || 0;
+            const priorityA = a.priority ?? 0;
+            const priorityB = b.priority ?? 0;
             const score = priorityB - priorityA;
             if (score !== 0) {
                 return score;

package/lib/server/plugins/synthetic.js

@@ -74,7 +74,7 @@ function createMDXFallbackPlugin({ siteDir, siteConfig, }) {
             // processed by content plugins mdx loaders. This works, but a bit
             // hacky... Not sure there's a way to handle that differently in webpack
             function getMDXFallbackExcludedPaths() {
-                const rules = config?.module?.rules;
+                const rules = config.module?.rules;
                 return rules.flatMap((rule) => {
                     const isMDXRule = rule.test instanceof RegExp && rule.test.test('x.mdx');
                     return isMDXRule ? rule.include : [];