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

package/bin/beforeCli.mjs

@@ -72,8 +72,7 @@ export default async function beforeCli() {
    * @param {import('update-notifier').UpdateInfo} update
    */
   function ignoreUpdate(update) {
-    const isCanaryRelease =
-      update && update.current && update.current.startsWith('0.0.0');
+    const isCanaryRelease = update?.current?.startsWith('0.0.0');
     return isCanaryRelease;
   }
 
@@ -98,9 +97,7 @@ export default async function beforeCli() {
       .filter((p) => p.startsWith('@docusaurus'))
       .map((p) => p.concat('@latest'))
       .join(' ');
-    const isYarnUsed = await fs.pathExists(
-      path.resolve(process.cwd(), 'yarn.lock'),
-    );
+    const isYarnUsed = await fs.pathExists(path.resolve('yarn.lock'));
     const upgradeCommand = isYarnUsed
       ? `yarn upgrade ${siteDocusaurusPackagesForUpdate}`
       : `npm i ${siteDocusaurusPackagesForUpdate}`;

package/bin/docusaurus.mjs

@@ -245,34 +245,33 @@ cli.arguments('<command>').action((cmd) => {
 });
 
 /**
- * @param {string} command
+ * @param {string | undefined} command
  */
 function isInternalCommand(command) {
-  return [
-    'start',
-    'build',
-    'swizzle',
-    'deploy',
-    'serve',
-    'clear',
-    'write-translations',
-    'write-heading-ids',
-  ].includes(command);
+  return (
+    command &&
+    [
+      'start',
+      'build',
+      'swizzle',
+      'deploy',
+      'serve',
+      'clear',
+      'write-translations',
+      'write-heading-ids',
+    ].includes(command)
+  );
 }
 
-async function run() {
-  if (!isInternalCommand(process.argv.slice(2)[0])) {
-    await externalCommand(cli, await resolveDir('.'));
-  }
-
-  cli.parse(process.argv);
+if (!isInternalCommand(process.argv.slice(2)[0])) {
+  await externalCommand(cli, await resolveDir('.'));
+}
 
-  if (!process.argv.slice(2).length) {
-    cli.outputHelp();
-  }
+if (!process.argv.slice(2).length) {
+  cli.outputHelp();
 }
 
-run();
+cli.parse(process.argv);
 
 process.on('unhandledRejection', (err) => {
   logger.error(err);

package/lib/choosePort.js

@@ -22,7 +22,7 @@ const execOptions = {
     stdio: [
         'pipe',
         'pipe',
-        'ignore', // stderr
+        'ignore',
     ],
 };
 // Clears console
@@ -32,20 +32,17 @@ function clearConsole() {
 // Gets process id of what is on port
 function getProcessIdOnPort(port) {
     return (0, child_process_1.execSync)(`lsof -i:${port} -P -t -sTCP:LISTEN`, execOptions)
-        .toString()
         .split('\n')[0]
         .trim();
 }
 // Gets process command
 function getProcessCommand(processId) {
     const command = (0, child_process_1.execSync)(`ps -o command -p ${processId} | sed -n 2p`, execOptions);
-    return command.toString().replace(/\n$/, '');
+    return command.replace(/\n$/, '');
 }
 // Gets directory of a process from its process id
 function getDirectoryOfProcessById(processId) {
-    return (0, child_process_1.execSync)(`lsof -p ${processId} | awk '$4=="cwd" {for (i=9; i<=NF; i++) printf "%s ", $i}'`, execOptions)
-        .toString()
-        .trim();
+    return (0, child_process_1.execSync)(`lsof -p ${processId} | awk '$4=="cwd" {for (i=9; i<=NF; i++) printf "%s ", $i}'`, execOptions).trim();
 }
 // Gets process on port
 function getProcessForPort(port) {

package/lib/client/App.js

@@ -7,11 +7,13 @@
 import React from 'react';
 import routes from '@generated/routes';
 import renderRoutes from './exports/renderRoutes';
-import { BrowserContextProvider } from './exports/browserContext';
-import { DocusaurusContextProvider } from './exports/docusaurusContext';
+import { BrowserContextProvider } from './browserContext';
+import { DocusaurusContextProvider } from './docusaurusContext';
 import PendingNavigation from './PendingNavigation';
 import BaseUrlIssueBanner from './baseUrlIssueBanner/BaseUrlIssueBanner';
+import SiteMetadataDefaults from './SiteMetadataDefaults';
 import Root from '@theme/Root';
+import SiteMetadata from '@theme/SiteMetadata';
 import './client-lifecycles-dispatcher';
 // TODO, quick fix for CSS insertion order
 import ErrorBoundary from '@docusaurus/ErrorBoundary';
@@ -21,6 +23,8 @@ export default function App() {
       <DocusaurusContextProvider>
         <BrowserContextProvider>
           <Root>
+            <SiteMetadataDefaults />
+            <SiteMetadata />
             <BaseUrlIssueBanner />
             <PendingNavigation routes={routes} delay={1000}>
               {renderRoutes(routes)}

package/lib/client/LinksCollector.d.ts

@@ -13,7 +13,7 @@ declare type StatefulLinksCollector = LinksCollector & {
 };
 export declare const createStatefulLinksCollector: () => StatefulLinksCollector;
 export declare const useLinksCollector: () => LinksCollector;
-export declare function ProvideLinksCollector({ children, linksCollector, }: {
+export declare function LinksCollectorProvider({ children, linksCollector, }: {
     children: ReactNode;
     linksCollector: LinksCollector;
 }): JSX.Element;

package/lib/client/LinksCollector.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React, { useContext, createContext } from 'react';
+import React, { useContext } from 'react';
 export const createStatefulLinksCollector = () => {
     // Set to dedup, as it's not useful to collect multiple times the same link
     const allLinks = new Set();
@@ -15,13 +15,13 @@ export const createStatefulLinksCollector = () => {
         getCollectedLinks: () => [...allLinks],
     };
 };
-const Context = createContext({
+const Context = React.createContext({
     collectLink: () => {
         // noop by default for client
         // we only use the broken links checker server-side
     },
 });
 export const useLinksCollector = () => useContext(Context);
-export function ProvideLinksCollector({ children, linksCollector, }) {
+export function LinksCollectorProvider({ children, linksCollector, }) {
     return <Context.Provider value={linksCollector}>{children}</Context.Provider>;
 }

package/lib/client/SiteMetadataDefaults.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 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.
+ */
+/// <reference types="react" />
+export default function SiteMetadataDefaults(): JSX.Element;

package/lib/client/SiteMetadataDefaults.js

@@ -0,0 +1,19 @@
+/**
+ * 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.
+ */
+import React from 'react';
+import Head from '@docusaurus/Head';
+import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
+import useBaseUrl from '@docusaurus/useBaseUrl';
+export default function SiteMetadataDefaults() {
+    const { siteConfig: { favicon, tagline, title }, i18n: { currentLocale, localeConfigs }, } = useDocusaurusContext();
+    const faviconUrl = useBaseUrl(favicon);
+    const { htmlLang, direction: htmlDir } = localeConfigs[currentLocale];
+    return (<Head defaultTitle={`${title}${tagline ? ` · ${tagline}` : ''}`}>
+      <html lang={htmlLang} dir={htmlDir}/>
+      {favicon && <link rel="icon" href={faviconUrl}/>}
+    </Head>);
+}

package/lib/client/clientEntry.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import React from 'react';
-import { hydrate, render } from 'react-dom';
+import ReactDOM from 'react-dom';
 import { BrowserRouter } from 'react-router-dom';
 import { HelmetProvider } from 'react-helmet-async';
 import routes from '@generated/routes';
@@ -21,7 +21,7 @@ if (ExecutionEnvironment.canUseDOM) {
     // first-load experience.
     // For development, there is no existing markup so we had to render it.
     // We also preload async component to avoid first-load loading screen.
-    const renderMethod = process.env.NODE_ENV === 'production' ? hydrate : render;
+    const renderMethod = process.env.NODE_ENV === 'production' ? ReactDOM.hydrate : ReactDOM.render;
     preload(routes, window.location.pathname).then(() => {
         renderMethod(<HelmetProvider>
         <BrowserRouter>

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/ComponentCreator.js

@@ -10,18 +10,27 @@ import Loading from '@theme/Loading';
 import routesChunkNames from '@generated/routesChunkNames';
 import registry from '@generated/registry';
 import flat from '../flat';
+import { RouteContextProvider } from '../routeContext';
 export default function ComponentCreator(path, hash) {
     // 404 page
     if (path === '*') {
         return Loadable({
             loading: Loading,
-            loader: () => import('@theme/NotFound'),
+            loader: async () => {
+                const NotFound = (await import('@theme/NotFound')).default;
+                return (props) => (
+                // Is there a better API for this?
+                <RouteContextProvider value={{ plugin: { name: 'native', id: 'default' } }}>
+            <NotFound {...props}/>
+          </RouteContextProvider>);
+            },
         });
     }
     const chunkNamesKey = `${path}-${hash}`;
     const chunkNames = routesChunkNames[chunkNamesKey];
     const optsModules = [];
     const optsWebpack = [];
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const optsLoader = {};
     /* Prepare opts data that react-loadable needs
     https://github.com/jamiebuilds/react-loadable#declaring-which-modules-are-being-loaded
@@ -38,8 +47,8 @@ export default function ComponentCreator(path, hash) {
       ]
     */
     const flatChunkNames = flat(chunkNames);
-    Object.keys(flatChunkNames).forEach((key) => {
-        const chunkRegistry = registry[flatChunkNames[key]];
+    Object.entries(flatChunkNames).forEach(([key, chunkName]) => {
+        const chunkRegistry = registry[chunkName];
         if (chunkRegistry) {
             // eslint-disable-next-line prefer-destructuring
             optsLoader[key] = chunkRegistry[0];
@@ -56,23 +65,34 @@ export default function ComponentCreator(path, hash) {
             // Clone the original object since we don't want to alter the original.
             const loadedModules = JSON.parse(JSON.stringify(chunkNames));
             Object.keys(loaded).forEach((key) => {
-                let val = loadedModules;
-                const keyPath = key.split('.');
-                for (let i = 0; i < keyPath.length - 1; i += 1) {
-                    val = val[keyPath[i]];
+                const newComp = loaded[key].default;
+                if (!newComp) {
+                    throw new Error(`The page component at ${path} doesn't have a default export. This makes it impossible to render anything. Consider default-exporting a React component.`);
                 }
-                val[keyPath[keyPath.length - 1]] = loaded[key].default;
-                const nonDefaultKeys = Object.keys(loaded[key]).filter((k) => k !== 'default');
-                if (nonDefaultKeys && nonDefaultKeys.length) {
-                    nonDefaultKeys.forEach((nonDefaultKey) => {
-                        val[keyPath[keyPath.length - 1]][nonDefaultKey] =
-                            loaded[key][nonDefaultKey];
+                if (typeof newComp === 'object' || typeof newComp === 'function') {
+                    Object.keys(loaded[key])
+                        .filter((k) => k !== 'default')
+                        .forEach((nonDefaultKey) => {
+                        newComp[nonDefaultKey] = loaded[key][nonDefaultKey];
                     });
                 }
+                let val = loadedModules;
+                const keyPath = key.split('.');
+                keyPath.slice(0, -1).forEach((k) => {
+                    val = val[k];
+                });
+                val[keyPath[keyPath.length - 1]] = newComp;
             });
             const Component = loadedModules.component;
             delete loadedModules.component;
-            return <Component {...loadedModules} {...props}/>;
+            /* eslint-disable no-underscore-dangle */
+            const routeContextModule = loadedModules.__routeContextModule;
+            delete loadedModules.__routeContextModule;
+            /* eslint-enable no-underscore-dangle */
+            // Is there any way to put this RouteContextProvider upper in the tree?
+            return (<RouteContextProvider value={routeContextModule}>
+          <Component {...loadedModules} {...props}/>
+        </RouteContextProvider>);
         },
     });
 }

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

@@ -9,4 +9,4 @@ import { type ReactNode } from 'react';
 import type { InterpolateProps, InterpolateValues } from '@docusaurus/Interpolate';
 export declare function interpolate<Str extends string>(text: Str, values?: InterpolateValues<Str, string | number>): string;
 export declare function interpolate<Str extends string, Value extends ReactNode>(text: Str, values?: InterpolateValues<Str, Value>): ReactNode;
-export default function Interpolate<Str extends string>({ children, values, }: InterpolateProps<Str>): ReactNode;
+export default function Interpolate<Str extends string>({ children, values, }: InterpolateProps<Str>): JSX.Element;

package/lib/client/exports/Interpolate.js

@@ -4,13 +4,13 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React from 'react';
+import React, { isValidElement } from 'react';
 /*
 Minimal implementation of a React interpolate component.
 We don't ship a markdown parser nor a feature-complete i18n library on purpose.
 More details here: https://github.com/facebook/docusaurus/pull/4295
 */
-const ValueRegexp = /{\w+}/g;
+const ValueRegexp = /\{\w+\}/g;
 const ValueFoundMarker = '{}'; // does not care much
 export function interpolate(text, values) {
     const elements = [];
@@ -19,7 +19,7 @@ export function interpolate(text, values) {
         const key = match.substring(1, match.length - 1);
         const value = values?.[key];
         if (typeof value !== 'undefined') {
-            const element = React.isValidElement(value)
+            const element = isValidElement(value)
                 ? value
                 : // For non-React elements: basic primitive->string conversion
                     String(value);
@@ -52,5 +52,5 @@ export default function Interpolate({ children, values, }) {
         console.warn('Illegal <Interpolate> children', children);
         throw new Error('The Docusaurus <Interpolate> component only accept simple string values');
     }
-    return interpolate(children, values);
+    return <>{interpolate(children, values)}</>;
 }

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" | "type" | "key" | "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" | "lang" | "dir" | "rel" | "href" | "key" | "type" | "isNavLink" | "className" | "to" | "innerRef" | "download" | "hrefLang" | "media" | "ping" | "target" | "referrerPolicy" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "draggable" | "hidden" | "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/exports/Translate.d.ts

@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 /// <reference types="@docusaurus/module-type-aliases" />
-import type { ReactNode } from 'react';
+/// <reference types="react" />
 import { type InterpolateValues } from '@docusaurus/Interpolate';
 import type { TranslateParam, TranslateProps } from '@docusaurus/Translate';
 export declare function translate<Str extends string>({ message, id }: TranslateParam<Str>, values?: InterpolateValues<Str, string | number>): string;
-export default function Translate<Str extends string>({ children, id, values, }: TranslateProps<Str>): ReactNode;
+export default function Translate<Str extends string>({ children, id, values, }: TranslateProps<Str>): JSX.Element;

package/lib/client/exports/Translate.js

@@ -4,6 +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 React from 'react';
 import { interpolate } from '@docusaurus/Interpolate';
 // Can't read it from context, due to exposing imperative API
 import codeTranslations from '@generated/codeTranslations';
@@ -29,5 +30,5 @@ export default function Translate({ children, id, values, }) {
         throw new Error('The Docusaurus <Translate> component only accept simple string values');
     }
     const localizedMessage = getLocalizedMessage({ message: children, id });
-    return interpolate(localizedMessage, values);
+    return <>{interpolate(localizedMessage, values)}</>;
 }

package/lib/client/exports/useBaseUrl.js

@@ -21,6 +21,11 @@ function addBaseUrl(siteUrl, baseUrl, url, { forcePrependBaseUrl = false, absolu
     if (forcePrependBaseUrl) {
         return baseUrl + url.replace(/^\//, '');
     }
+    // /baseUrl -> /baseUrl/
+    // https://github.com/facebook/docusaurus/issues/6315
+    if (url === baseUrl.replace(/\/$/, '')) {
+        return baseUrl;
+    }
     // We should avoid adding the baseurl twice if it's already there
     const shouldAddBaseUrl = !url.startsWith(baseUrl);
     const basePath = shouldAddBaseUrl ? baseUrl + url.replace(/^\//, '') : url;

package/lib/client/exports/useDocusaurusContext.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { useContext } from 'react';
-import { Context } from './docusaurusContext';
+import { Context } from '../docusaurusContext';
 export default function useDocusaurusContext() {
     return useContext(Context);
 }

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

@@ -4,6 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-export default function useGlobalData(): Record<string, unknown>;
-export declare function useAllPluginInstancesData<T = unknown>(pluginName: string): Record<string, T>;
-export declare function usePluginData<T = unknown>(pluginName: string, pluginId?: string): T;
+import type { GlobalData } from '@docusaurus/types';
+export default function useGlobalData(): GlobalData;
+export declare function useAllPluginInstancesData(pluginName: string): GlobalData[string];
+export declare function usePluginData(pluginName: string, pluginId?: string): GlobalData[string][string];

package/lib/client/exports/useIsBrowser.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { useContext } from 'react';
-import { Context } from './browserContext';
+import { Context } from '../browserContext';
 export default function useIsBrowser() {
     return useContext(Context);
 }

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

@@ -0,0 +1,8 @@
+/**
+ * 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.
+ */
+import type { PluginRouteContext } from '@docusaurus/types';
+export default function useRouteContext(): PluginRouteContext;

package/lib/client/exports/useRouteContext.js

@@ -0,0 +1,15 @@
+/**
+ * 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.
+ */
+import React from 'react';
+import { Context } from '../routeContext';
+export default function useRouteContext() {
+    const context = React.useContext(Context);
+    if (!context) {
+        throw new Error('Unexpected: no Docusaurus route context found');
+    }
+    return context;
+}

package/lib/client/flat.d.ts

@@ -5,4 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { RouteChunksTree } from '@docusaurus/types';
-export default function flat(target: RouteChunksTree): Record<string, string>;
+export default function flat(target: RouteChunksTree): {
+    [keyPath: string]: string;
+};

package/lib/client/flat.js

@@ -9,8 +9,7 @@ export default function flat(target) {
     const delimiter = '.';
     const output = {};
     function step(object, prefix) {
-        Object.keys(object).forEach((key) => {
-            const value = object[key];
+        Object.entries(object).forEach(([key, value]) => {
             const newKey = prefix ? `${prefix}${delimiter}${key}` : key;
             if (isTree(value)) {
                 step(value, newKey);

package/lib/client/normalizeLocation.js

@@ -13,11 +13,7 @@ export default function normalizeLocation(location) {
             pathname: pathnames[location.pathname],
         };
     }
-    let pathname = location.pathname || '/';
-    pathname = pathname.trim().replace(/\/index\.html$/, '');
-    if (pathname === '') {
-        pathname = '/';
-    }
+    const pathname = location.pathname.trim().replace(/\/index\.html$/, '') || '/';
     pathnames[location.pathname] = pathname;
     return {
         ...location,

package/lib/client/prefetch.js

@@ -30,9 +30,9 @@ function linkPrefetchStrategy(url) {
         link.setAttribute('href', url);
         link.onload = resolve;
         link.onerror = reject;
-        const parentElement = document.getElementsByTagName('head')[0] ||
-            document.getElementsByName('script')[0].parentNode;
-        parentElement.appendChild(link);
+        const parentElement = document.getElementsByTagName('head')[0] ??
+            document.getElementsByName('script')[0]?.parentNode;
+        parentElement?.appendChild(link);
     });
 }
 function xhrPrefetchStrategy(url) {

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/routeContext.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 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.
+ */
+import React, { type ReactNode } from 'react';
+import type { PluginRouteContext, RouteContext } from '@docusaurus/types';
+export declare const Context: React.Context<PluginRouteContext | null>;
+export declare function RouteContextProvider({ children, value, }: {
+    children: ReactNode;
+    value: PluginRouteContext | RouteContext | null;
+}): JSX.Element;

package/lib/client/routeContext.js

@@ -0,0 +1,31 @@
+/**
+ * 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.
+ */
+import React, { useMemo } from 'react';
+export const Context = React.createContext(null);
+function mergeContexts({ parent, value, }) {
+    if (!parent) {
+        if (!value) {
+            throw new Error('Unexpected: no Docusaurus route context found');
+        }
+        else if (!('plugin' in value)) {
+            throw new Error('Unexpected: Docusaurus topmost route context has no `plugin` attribute');
+        }
+        return value;
+    }
+    // TODO deep merge this
+    const data = { ...parent.data, ...value?.data };
+    return {
+        // nested routes are not supposed to override plugin attribute
+        plugin: parent.plugin,
+        data,
+    };
+}
+export function RouteContextProvider({ children, value, }) {
+    const parent = React.useContext(Context);
+    const mergedValue = useMemo(() => mergeContexts({ parent, value }), [parent, value]);
+    return <Context.Provider value={mergedValue}>{children}</Context.Provider>;
+}