@docusaurus/core 0.0.0-4685 → 0.0.0-4693

package/lib/client/exports/BrowserOnly.js

@@ -18,5 +18,5 @@ Current type: ${isValidElement(children) ? 'React element' : typeof children}`);
         }
         return <>{children()}</>;
     }
-    return fallback || null;
+    return fallback ?? null;
 }

package/lib/client/exports/Link.d.ts

@@ -19,5 +19,5 @@ declare const _default: React.ForwardRefExoticComponent<Pick<Partial<import("rea
     readonly href?: string | undefined;
     readonly autoAddBaseUrl?: boolean | undefined;
     readonly 'data-noBrokenLinkCheck'?: boolean | undefined;
-}, "children" | "replace" | "slot" | "style" | "title" | "component" | "location" | "exact" | "sensitive" | "strict" | "id" | "dir" | "rel" | "href" | "key" | "type" | "isNavLink" | "className" | "to" | "innerRef" | "download" | "hrefLang" | "media" | "ping" | "target" | "referrerPolicy" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "draggable" | "hidden" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "activeClassName" | "activeStyle" | "isActive" | "data-noBrokenLinkCheck" | "autoAddBaseUrl"> & React.RefAttributes<HTMLAnchorElement>>;
+}, "children" | "replace" | "slot" | "style" | "title" | "location" | "component" | "exact" | "sensitive" | "strict" | "id" | "dir" | "rel" | "href" | "key" | "type" | "isNavLink" | "className" | "to" | "innerRef" | "download" | "hrefLang" | "media" | "ping" | "target" | "referrerPolicy" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "draggable" | "hidden" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "activeClassName" | "activeStyle" | "isActive" | "data-noBrokenLinkCheck" | "autoAddBaseUrl"> & React.RefAttributes<HTMLAnchorElement>>;
 export default _default;

package/lib/client/exports/Link.js

@@ -110,7 +110,7 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
     return isRegularHtmlLink ? (
     // eslint-disable-next-line jsx-a11y/anchor-has-content
     <a ref={innerRef} href={targetLink} {...(targetLinkUnprefixed &&
-        !isInternal && { target: '_blank', rel: 'noopener noreferrer' })} {...props}/>) : (<LinkComponent {...props} onMouseEnter={onMouseEnter} innerRef={handleRef} to={targetLink || ''} 
+        !isInternal && { target: '_blank', rel: 'noopener noreferrer' })} {...props}/>) : (<LinkComponent {...props} onMouseEnter={onMouseEnter} innerRef={handleRef} to={targetLink} 
     // avoid "React does not recognize the `activeClassName` prop on a DOM
     // element"
     {...(isNavLink && { isActive, activeClassName })}/>);

package/lib/client/preload.js

@@ -16,13 +16,7 @@ import { matchRoutes } from 'react-router-config';
  */
 export default function preload(routes, pathname) {
     const matches = matchRoutes(routes, pathname);
-    return Promise.all(matches.map((match) => {
-        const { component } = match.route;
-        // @ts-expect-error: ComponentCreator injected this method.
-        if (component && component.preload) {
-            // @ts-expect-error: checked above.
-            return component.preload();
-        }
-        return undefined;
-    }));
+    return Promise.all(
+    // @ts-expect-error: ComponentCreator injected this method.
+    matches.map((match) => match.route.component?.preload?.()));
 }

package/lib/client/serverEntry.js

@@ -81,13 +81,13 @@ async function doRender(locals) {
     // manifest information.
     const modulesToBeLoaded = [...manifest.entrypoints, ...Array.from(modules)];
     const bundles = getBundles(manifest, modulesToBeLoaded);
-    const stylesheets = (bundles.css || []).map((b) => b.file);
-    const scripts = (bundles.js || []).map((b) => b.file);
+    const stylesheets = (bundles.css ?? []).map((b) => b.file);
+    const scripts = (bundles.js ?? []).map((b) => b.file);
     const renderedHtml = renderSSRTemplate(ssrTemplate, {
         appHtml,
         baseUrl,
-        htmlAttributes: htmlAttributes || '',
-        bodyAttributes: bodyAttributes || '',
+        htmlAttributes,
+        bodyAttributes,
         headTags,
         preBodyTags,
         postBodyTags,

package/lib/commands/commandUtils.js

@@ -11,7 +11,7 @@ const tslib_1 = require("tslib");
 const choosePort_1 = tslib_1.__importDefault(require("../choosePort"));
 const utils_1 = require("@docusaurus/utils");
 function getCLIOptionHost(hostOption) {
-    return hostOption || 'localhost';
+    return hostOption ?? 'localhost';
 }
 exports.getCLIOptionHost = getCLIOptionHost;
 async function getCLIOptionPort(portOption, host) {

package/lib/commands/start.js

@@ -60,17 +60,16 @@ async function start(siteDir, cliOptions) {
             logger_1.default.error(err.stack);
         });
     }, 500);
-    const { siteConfig, plugins = [] } = props;
+    const { siteConfig, plugins } = props;
     const normalizeToSiteDir = (filepath) => {
         if (filepath && path_1.default.isAbsolute(filepath)) {
             return (0, utils_1.posixPath)(path_1.default.relative(siteDir, filepath));
         }
         return (0, utils_1.posixPath)(filepath);
     };
-    const pluginPaths = []
-        .concat(...plugins
-        .map((plugin) => plugin.getPathsToWatch?.() ?? [])
-        .filter(Boolean))
+    const pluginPaths = plugins
+        .flatMap((plugin) => plugin.getPathsToWatch?.() ?? [])
+        .filter(Boolean)
         .map(normalizeToSiteDir);
     const pathsToWatch = [
         ...pluginPaths,

package/lib/server/brokenLinks.d.ts

@@ -5,20 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { RouteConfig, ReportingSeverity } from '@docusaurus/types';
-declare type BrokenLink = {
-    link: string;
-    resolvedLink: string;
-};
-export declare function getAllBrokenLinks({ allCollectedLinks, routes, }: {
-    allCollectedLinks: Record<string, string[]>;
-    routes: RouteConfig[];
-}): Record<string, BrokenLink[]>;
-export declare function getBrokenLinksErrorMessage(allBrokenLinks: Record<string, BrokenLink[]>): string | undefined;
-export declare function filterExistingFileLinks({ baseUrl, outDir, allCollectedLinks, }: {
-    baseUrl: string;
-    outDir: string;
-    allCollectedLinks: Record<string, string[]>;
-}): Promise<Record<string, string[]>>;
 export declare function handleBrokenLinks({ allCollectedLinks, onBrokenLinks, routes, baseUrl, outDir, }: {
     allCollectedLinks: Record<string, string[]>;
     onBrokenLinks: ReportingSeverity;
@@ -26,4 +12,3 @@ export declare function handleBrokenLinks({ allCollectedLinks, onBrokenLinks, ro
     baseUrl: string;
     outDir: string;
 }): Promise<void>;
-export {};

package/lib/server/brokenLinks.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleBrokenLinks = exports.filterExistingFileLinks = exports.getBrokenLinksErrorMessage = exports.getAllBrokenLinks = void 0;
+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"));
@@ -57,7 +57,6 @@ function getAllBrokenLinks({ allCollectedLinks, routes, }) {
     // remove pages without any broken link
     return lodash_1.default.pickBy(allBrokenLinks, (brokenLinks) => brokenLinks.length > 0);
 }
-exports.getAllBrokenLinks = getAllBrokenLinks;
 function getBrokenLinksErrorMessage(allBrokenLinks) {
     if (Object.keys(allBrokenLinks).length === 0) {
         return undefined;
@@ -93,8 +92,7 @@ function getBrokenLinksErrorMessage(allBrokenLinks) {
 It looks like some of the broken links we found appear in many pages of your site.
 Maybe those broken links appear on all pages through your site layout?
 We recommend that you check your theme configuration for such links (particularly, theme navbar and footer).
-Frequent broken links are linking to:${frequentLinks}
-`;
+Frequent broken links are linking to:${frequentLinks}`;
     }
     return `Docusaurus found broken links!
 
@@ -107,7 +105,6 @@ ${Object.entries(allBrokenLinks)
         .join('\n')}
 `;
 }
-exports.getBrokenLinksErrorMessage = getBrokenLinksErrorMessage;
 async function isExistingFile(filePath) {
     try {
         return (await fs_extra_1.default.stat(filePath)).isFile();
@@ -139,7 +136,6 @@ async function filterExistingFileLinks({ baseUrl, outDir, allCollectedLinks, })
     }
     return (0, combine_promises_1.default)(lodash_1.default.mapValues(allCollectedLinks, async (links) => (await Promise.all(links.map(async (link) => ((await linkFileExists(link)) ? '' : link)))).filter(Boolean)));
 }
-exports.filterExistingFileLinks = filterExistingFileLinks;
 async function handleBrokenLinks({ allCollectedLinks, onBrokenLinks, routes, baseUrl, outDir, }) {
     if (onBrokenLinks === 'ignore') {
         return;

package/lib/server/configValidation.d.ts

@@ -7,6 +7,6 @@
 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' | 'tagline' | 'baseUrlIssueBanner' | 'staticDirectories'>;
+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;

package/lib/server/configValidation.js

@@ -23,6 +23,9 @@ exports.DEFAULT_CONFIG = {
     plugins: [],
     themes: [],
     presets: [],
+    stylesheets: [],
+    scripts: [],
+    clientModules: [],
     customFields: {},
     themeConfig: {},
     titleDelimiter: '|',
@@ -131,19 +134,25 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
     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),
     themeConfig: utils_validation_1.Joi.object().unknown().default(exports.DEFAULT_CONFIG.themeConfig),
-    scripts: utils_validation_1.Joi.array().items(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
+    scripts: utils_validation_1.Joi.array()
+        .items(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
         src: utils_validation_1.Joi.string().required(),
         async: utils_validation_1.Joi.bool(),
         defer: utils_validation_1.Joi.bool(),
     })
         // See https://github.com/facebook/docusaurus/issues/3378
-        .unknown()),
+        .unknown())
+        .default(exports.DEFAULT_CONFIG.scripts),
     ssrTemplate: utils_validation_1.Joi.string(),
-    stylesheets: utils_validation_1.Joi.array().items(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
+    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(),
-    }).unknown()),
-    clientModules: utils_validation_1.Joi.array().items(utils_validation_1.Joi.string()),
+    }).unknown())
+        .default(exports.DEFAULT_CONFIG.stylesheets),
+    clientModules: utils_validation_1.Joi.array()
+        .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),

package/lib/server/duplicateRoutes.d.ts

@@ -5,6 +5,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 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

@@ -6,28 +6,26 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleDuplicateRoutes = exports.getDuplicateRoutesMessage = exports.getAllDuplicateRoutes = void 0;
+exports.handleDuplicateRoutes = void 0;
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("./utils");
 function getAllDuplicateRoutes(pluginsRouteConfigs) {
     const allRoutes = (0, utils_2.getAllFinalRoutes)(pluginsRouteConfigs).map((routeConfig) => routeConfig.path);
-    const seenRoutes = {};
+    const seenRoutes = new Set();
     return allRoutes.filter((route) => {
-        if (Object.prototype.hasOwnProperty.call(seenRoutes, route)) {
+        if (seenRoutes.has(route)) {
             return true;
         }
-        seenRoutes[route] = true;
+        seenRoutes.add(route);
         return false;
     });
 }
-exports.getAllDuplicateRoutes = getAllDuplicateRoutes;
 function getDuplicateRoutesMessage(allDuplicateRoutes) {
     const message = allDuplicateRoutes
-        .map((duplicateRoute) => `Attempting to create page at ${duplicateRoute}, but a page already exists at this route`)
+        .map((duplicateRoute) => `- Attempting to create page at ${duplicateRoute}, but a page already exists at this route.`)
         .join('\n');
     return message;
 }
-exports.getDuplicateRoutesMessage = getDuplicateRoutesMessage;
 function handleDuplicateRoutes(pluginsRouteConfigs, onDuplicateRoutes) {
     if (onDuplicateRoutes === 'ignore') {
         return;
@@ -35,7 +33,9 @@ function handleDuplicateRoutes(pluginsRouteConfigs, onDuplicateRoutes) {
     const duplicatePaths = getAllDuplicateRoutes(pluginsRouteConfigs);
     const message = getDuplicateRoutesMessage(duplicatePaths);
     if (message) {
-        const finalMessage = `Duplicate routes found!\n${message}\nThis could lead to non-deterministic routing behavior`;
+        const finalMessage = `Duplicate routes found!
+${message}
+This could lead to non-deterministic routing behavior.`;
         (0, utils_1.reportMessage)(finalMessage, onDuplicateRoutes);
     }
 }

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

@@ -24,7 +24,7 @@ function htmlTagObjectToString(tagDefinition) {
         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 || {};
+    const tagAttributes = tagDefinition.attributes ?? {};
     const attributes = Object.keys(tagAttributes)
         .filter((attributeName) => tagAttributes[attributeName] !== false)
         .map((attributeName) => {

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

@@ -4,6 +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 { InjectedHtmlTags, HtmlTags, LoadedPlugin } from '@docusaurus/types';
-export declare function createHtmlTagsString(tags: HtmlTags): string;
+import type { InjectedHtmlTags, LoadedPlugin } from '@docusaurus/types';
 export declare function loadHtmlTags(plugins: LoadedPlugin[]): InjectedHtmlTags;

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

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadHtmlTags = exports.createHtmlTagsString = void 0;
+exports.loadHtmlTags = void 0;
 const tslib_1 = require("tslib");
 const htmlTags_1 = tslib_1.__importDefault(require("./htmlTags"));
 function toString(val) {
@@ -15,13 +15,12 @@ function toString(val) {
 function createHtmlTagsString(tags) {
     return Array.isArray(tags) ? tags.map(toString).join('\n') : toString(tags);
 }
-exports.createHtmlTagsString = createHtmlTagsString;
 function loadHtmlTags(plugins) {
     const htmlTags = plugins.reduce((acc, plugin) => {
         if (!plugin.injectHtmlTags) {
             return acc;
         }
-        const { headTags, preBodyTags, postBodyTags } = plugin.injectHtmlTags({ content: plugin.content }) || {};
+        const { headTags, preBodyTags, postBodyTags } = plugin.injectHtmlTags({ content: plugin.content }) ?? {};
         return {
             headTags: headTags
                 ? `${acc.headTags}\n${createHtmlTagsString(headTags)}`

package/lib/server/i18n.js

@@ -14,9 +14,6 @@ const rtl_detect_1 = require("rtl-detect");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 function getDefaultLocaleLabel(locale) {
     const languageName = new Intl.DisplayNames(locale, { type: 'language' }).of(locale);
-    if (!languageName) {
-        return locale;
-    }
     return (languageName.charAt(0).toLocaleUpperCase(locale) + languageName.substring(1));
 }
 function getDefaultLocaleConfig(locale) {

package/lib/server/index.js

@@ -100,8 +100,8 @@ async function loadPluginConfigs(context) {
     }
     presetPlugins = presetPlugins.map((plugin) => normalizeShorthand(plugin, 'plugin'));
     presetThemes = presetThemes.map((theme) => normalizeShorthand(theme, 'theme'));
-    const standalonePlugins = (siteConfig.plugins || []).map((plugin) => normalizeShorthand(plugin, 'plugin'));
-    const standaloneThemes = (siteConfig.themes || []).map((theme) => normalizeShorthand(theme, 'theme'));
+    const standalonePlugins = siteConfig.plugins.map((plugin) => normalizeShorthand(plugin, 'plugin'));
+    const standaloneThemes = siteConfig.themes.map((theme) => normalizeShorthand(theme, 'theme'));
     return [
         ...presetPlugins,
         ...presetThemes,
@@ -115,7 +115,7 @@ exports.loadPluginConfigs = loadPluginConfigs;
 // - Resolve aliased theme components
 // - Inject scripts/stylesheets
 function createBootstrapPlugin({ siteConfig, }) {
-    const { stylesheets = [], scripts = [], clientModules: siteConfigClientModules = [], } = siteConfig;
+    const { stylesheets, scripts, clientModules: siteConfigClientModules, } = siteConfig;
     return {
         name: 'docusaurus-bootstrap-plugin',
         content: null,
@@ -208,6 +208,7 @@ async function load(siteDir, options = {}) {
     context.siteConfig.themeConfig = themeConfigTranslated;
     (0, duplicateRoutes_1.handleDuplicateRoutes)(pluginsRouteConfigs, siteConfig.onDuplicateRoutes);
     const genWarning = (0, utils_1.generate)(generatedFilesDir, '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
 \`docusaurus clear\` command.
@@ -215,20 +216,24 @@ next build. You can clear all build artifacts (including this folder) with the
     // Site config must be generated after plugins
     // We want the generated config to have been normalized by the plugins!
     const genSiteConfig = (0, utils_1.generate)(generatedFilesDir, utils_1.DEFAULT_CONFIG_FILE_NAME, `/*
-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.
-*/
-export default ${JSON.stringify(siteConfig, null, 2)};`);
+ * 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.
+ */
+export default ${JSON.stringify(siteConfig, null, 2)};
+`);
     plugins.push(createBootstrapPlugin({ siteConfig }));
     plugins.push(createMDXFallbackPlugin({ siteDir, siteConfig }));
     // Load client modules.
     const clientModules = (0, client_modules_1.default)(plugins);
-    const genClientModules = (0, utils_1.generate)(generatedFilesDir, 'client-modules.js', `export default [\n${clientModules
+    const genClientModules = (0, utils_1.generate)(generatedFilesDir, 'client-modules.js', `export default [
+${clientModules
         // import() is async so we use require() because client modules can have
         // CSS and the order matters for loading CSS.
         .map((module) => `  require('${(0, utils_1.escapePath)(module)}'),`)
-        .join('\n')}\n];\n`);
+        .join('\n')}
+];
+`);
     // Load extra head & body html tags.
     const { headTags, preBodyTags, postBodyTags } = (0, html_tags_1.loadHtmlTags)(plugins);
     // Routing.
@@ -237,7 +242,8 @@ export default ${JSON.stringify(siteConfig, null, 2)};`);
 ${Object.entries(registry)
         .sort((a, b) => a[0].localeCompare(b[0]))
         .map(([key, chunk]) => `  '${key}': [${chunk.loader}, '${(0, utils_1.escapePath)(chunk.modulePath)}', require.resolveWeak('${(0, utils_1.escapePath)(chunk.modulePath)}')],`)
-        .join('\n')}};\n`);
+        .join('\n')}};
+`);
     const genRoutesChunkNames = (0, utils_1.generate)(generatedFilesDir, 'routesChunkNames.json', JSON.stringify(routesChunkNames, null, 2));
     const genRoutes = (0, utils_1.generate)(generatedFilesDir, 'routes.js', routesConfig);
     const genGlobalData = (0, utils_1.generate)(generatedFilesDir, 'globalData.json', JSON.stringify(globalData, null, 2));

package/lib/server/presets/index.js

@@ -14,9 +14,9 @@ async function loadPresets(context) {
     // We need to resolve presets from the perspective of the siteDir, since the
     // siteDir's package.json declares the dependency on these presets.
     const presetRequire = (0, module_1.createRequire)(context.siteConfigPath);
-    const presets = context.siteConfig.presets || [];
-    const unflatPlugins = [];
-    const unflatThemes = [];
+    const { presets } = context.siteConfig;
+    const plugins = [];
+    const themes = [];
     presets.forEach((presetItem) => {
         let presetModuleImport;
         let presetOptions = {};
@@ -30,15 +30,12 @@ async function loadPresets(context) {
         const presetModule = (0, import_fresh_1.default)(presetRequire.resolve(presetName));
         const preset = (presetModule.default ?? presetModule)(context, presetOptions);
         if (preset.plugins) {
-            unflatPlugins.push(preset.plugins);
+            plugins.push(...preset.plugins.filter(Boolean));
         }
         if (preset.themes) {
-            unflatThemes.push(preset.themes);
+            themes.push(...preset.themes.filter(Boolean));
         }
     });
-    return {
-        plugins: unflatPlugins.flat().filter(Boolean),
-        themes: unflatThemes.flat().filter(Boolean),
-    };
+    return { plugins, themes };
 }
 exports.default = loadPresets;

package/lib/webpack/plugins/CleanWebpackPlugin.js

@@ -86,7 +86,7 @@ class CleanWebpackPlugin {
         const statsAssets = stats.toJson({
             all: false,
             assets: true,
-        }).assets || [];
+        }).assets ?? [];
         const assets = statsAssets.map((asset) => asset.name);
         /**
          * Get all files that were in the previous build but not the current

package/lib/webpack/utils.d.ts

@@ -31,6 +31,12 @@ export declare const getCustomizableJSLoader: (jsLoader?: "babel" | ((isServer:
  */
 export declare function applyConfigureWebpack(configureWebpack: ConfigureWebpackFn, config: Configuration, isServer: boolean, jsLoader: 'babel' | ((isServer: boolean) => RuleSetRule) | undefined, content: unknown): Configuration;
 export declare function applyConfigurePostCss(configurePostCss: NonNullable<ConfigurePostCssFn>, config: Configuration): Configuration;
+declare global {
+    interface Error {
+        /** @see https://webpack.js.org/api/node/#error-handling */
+        details: unknown;
+    }
+}
 export declare function compile(config: Configuration[]): Promise<void>;
 export declare function getHttpsConfig(): Promise<boolean | {
     cert: Buffer;

package/lib/webpack/utils.js

@@ -171,9 +171,7 @@ function compile(config) {
         compiler.run((err, stats) => {
             if (err) {
                 logger_1.default.error(err.stack || err);
-                // @ts-expect-error: see https://webpack.js.org/api/node/#error-handling
                 if (err.details) {
-                    // @ts-expect-error: see https://webpack.js.org/api/node/#error-handling
                     logger_1.default.error(err.details);
                 }
                 reject(err);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4685",
+  "version": "0.0.0-4693",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,13 +41,13 @@
     "@babel/runtime": "^7.17.2",
     "@babel/runtime-corejs3": "^7.17.2",
     "@babel/traverse": "^7.17.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4685",
-    "@docusaurus/logger": "0.0.0-4685",
-    "@docusaurus/mdx-loader": "0.0.0-4685",
+    "@docusaurus/cssnano-preset": "0.0.0-4693",
+    "@docusaurus/logger": "0.0.0-4693",
+    "@docusaurus/mdx-loader": "0.0.0-4693",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4685",
-    "@docusaurus/utils-common": "0.0.0-4685",
-    "@docusaurus/utils-validation": "0.0.0-4685",
+    "@docusaurus/utils": "0.0.0-4693",
+    "@docusaurus/utils-common": "0.0.0-4693",
+    "@docusaurus/utils-validation": "0.0.0-4693",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.1",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.2",
@@ -106,8 +106,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4685",
-    "@docusaurus/types": "0.0.0-4685",
+    "@docusaurus/module-type-aliases": "0.0.0-4693",
+    "@docusaurus/types": "0.0.0-4693",
     "@types/detect-port": "^1.3.2",
     "@types/nprogress": "^0.2.0",
     "@types/react-dom": "^17.0.11",
@@ -128,5 +128,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "3a492428ff3bf2051bc6b660803a735d67c8ae66"
+  "gitHead": "f5ed3eaf62d30a211da3b0aaf76dfc6deafba859"
 }