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

package/lib/client/clientEntry.js

@@ -7,21 +7,27 @@
 import React from 'react';
 import { hydrate, render } from 'react-dom';
 import { BrowserRouter } from 'react-router-dom';
+import { HelmetProvider } from 'react-helmet-async';
 import routes from '@generated/routes';
 import ExecutionEnvironment from './exports/ExecutionEnvironment';
 import App from './App';
 import preload from './preload';
 import docusaurus from './docusaurus';
-// Client-side render (e.g: running in browser) to become single-page application (SPA).
+// Client-side render (e.g: running in browser) to become single-page
+// application (SPA).
 if (ExecutionEnvironment.canUseDOM) {
     window.docusaurus = docusaurus;
-    // For production, attempt to hydrate existing markup for performant first-load experience.
+    // For production, attempt to hydrate existing markup for performant
+    // first-load experience.
     // For development, there is no existing markup so we had to render it.
-    // Note that we also preload async component to avoid first-load loading screen.
+    // We also preload async component to avoid first-load loading screen.
     const renderMethod = process.env.NODE_ENV === 'production' ? hydrate : render;
     preload(routes, window.location.pathname).then(() => {
-        renderMethod(React.createElement(BrowserRouter, null,
-            React.createElement(App, null)), document.getElementById('__docusaurus'));
+        renderMethod(<HelmetProvider>
+        <BrowserRouter>
+          <App />
+        </BrowserRouter>
+      </HelmetProvider>, document.getElementById('__docusaurus'));
     });
     // Webpack Hot Module Replacement API
     if (module.hot) {

package/lib/client/docusaurus.js

@@ -23,7 +23,7 @@ const canPreload = (routePath) => !isSlowConnection() && !loaded[routePath];
 // Remove the last part containing the route hash
 // input: /blog/2018/12/14/Happy-First-Birthday-Slash-fe9
 // output: /blog/2018/12/14/Happy-First-Birthday-Slash
-const removeRouteNameHash = (str) => str.replace(/(-[^-]+)$/, '');
+const removeRouteNameHash = (str) => str.replace(/-[^-]+$/, '');
 const getChunkNamesToLoad = (path) => Object.entries(routesChunkNames)
     .filter(([routeNameWithHash]) => removeRouteNameHash(routeNameWithHash) === path)
     .flatMap(([, routeChunks]) => 
@@ -41,11 +41,13 @@ const docusaurus = {
         const chunkNamesNeeded = matches.flatMap((match) => getChunkNamesToLoad(match.route.path));
         // Prefetch all webpack chunk assets file needed.
         chunkNamesNeeded.forEach((chunkName) => {
-            // "__webpack_require__.gca" is a custom function provided by ChunkAssetPlugin.
-            // Pass it the chunkName or chunkId you want to load and it will return the URL for that chunk.
+            // "__webpack_require__.gca" is a custom function provided by
+            // ChunkAssetPlugin. Pass it the chunkName or chunkId you want to load and
+            // it will return the URL for that chunk.
             // eslint-disable-next-line camelcase
             const chunkAsset = __webpack_require__.gca(chunkName);
-            // In some cases, webpack might decide to optimize further & hence the chunk assets are merged to another chunk/previous chunk.
+            // In some cases, webpack might decide to optimize further & hence the
+            // chunk assets are merged to another chunk/previous chunk.
             // Hence, we can safely filter it out/don't need to load it.
             if (chunkAsset && !/undefined/.test(chunkAsset)) {
                 prefetchHelper(chunkAsset);

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

@@ -5,8 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 /// <reference types="react" />
-declare function BrowserOnly({ children, fallback, }: {
+export default function BrowserOnly({ children, fallback, }: {
     children: () => JSX.Element;
     fallback?: JSX.Element;
 }): JSX.Element | null;
-export default BrowserOnly;

package/lib/client/exports/BrowserOnly.js

@@ -8,7 +8,7 @@ import React, { isValidElement } from 'react';
 import useIsBrowser from '@docusaurus/useIsBrowser';
 // Similar comp to the one described here:
 // https://www.joshwcomeau.com/react/the-perils-of-rehydration/#abstractions
-function BrowserOnly({ children, fallback, }) {
+export default function BrowserOnly({ children, fallback, }) {
     const isBrowser = useIsBrowser();
     if (isBrowser) {
         if (typeof children !== 'function' &&
@@ -16,8 +16,7 @@ function BrowserOnly({ children, fallback, }) {
             throw new Error(`Docusaurus error: The children of <BrowserOnly> must be a "render function", e.g. <BrowserOnly>{() => <span>{window.location.href}</span>}</BrowserOnly>.
 Current type: ${isValidElement(children) ? 'React element' : typeof children}`);
         }
-        return React.createElement(React.Fragment, null, children());
+        return <>{children()}</>;
     }
     return fallback || null;
 }
-export default BrowserOnly;

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

@@ -5,5 +5,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 import Loadable from 'react-loadable';
-declare function ComponentCreator(path: string, hash: string): ReturnType<typeof Loadable>;
-export default ComponentCreator;
+export default function ComponentCreator(path: string, hash: string): ReturnType<typeof Loadable>;

package/lib/client/exports/ComponentCreator.js

@@ -10,7 +10,7 @@ import Loading from '@theme/Loading';
 import routesChunkNames from '@generated/routesChunkNames';
 import registry from '@generated/registry';
 import flat from '../flat';
-function ComponentCreator(path, hash) {
+export default function ComponentCreator(path, hash) {
     // 404 page
     if (path === '*') {
         return Loadable({
@@ -32,17 +32,19 @@ function ComponentCreator(path, hash) {
         content.foo: () => import('./doc1.md'),
       }
     - optsModules: ['./Pages.js', './doc1.md']
-    - optsWebpack: [require.resolveWeak('./Pages.js'), require.resolveWeak('./doc1.md')]
+    - optsWebpack: [
+        require.resolveWeak('./Pages.js'),
+        require.resolveWeak('./doc1.md'),
+      ]
     */
     const flatChunkNames = flat(chunkNames);
     Object.keys(flatChunkNames).forEach((key) => {
         const chunkRegistry = registry[flatChunkNames[key]];
         if (chunkRegistry) {
-            /* eslint-disable prefer-destructuring */
+            // eslint-disable-next-line prefer-destructuring
             optsLoader[key] = chunkRegistry[0];
             optsModules.push(chunkRegistry[1]);
             optsWebpack.push(chunkRegistry[2]);
-            /* eslint-enable prefer-destructuring */
         }
     });
     return Loadable.Map({
@@ -70,8 +72,7 @@ function ComponentCreator(path, hash) {
             });
             const Component = loadedModules.component;
             delete loadedModules.component;
-            return React.createElement(Component, { ...loadedModules, ...props });
+            return <Component {...loadedModules} {...props}/>;
         },
     });
 }
-export default ComponentCreator;

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

@@ -10,9 +10,9 @@ import type { Props } from '@docusaurus/ErrorBoundary';
 interface State {
     error: Error | null;
 }
-declare class ErrorBoundary extends React.Component<Props, State> {
+export default class ErrorBoundary extends React.Component<Props, State> {
     constructor(props: Props);
     componentDidCatch(error: Error): void;
     render(): ReactNode;
 }
-export default ErrorBoundary;
+export {};

package/lib/client/exports/ErrorBoundary.js

@@ -7,7 +7,7 @@
 import React from 'react';
 import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
 import DefaultFallback from '@theme/Error';
-class ErrorBoundary extends React.Component {
+export default class ErrorBoundary extends React.Component {
     constructor(props) {
         super(props);
         this.state = { error: null };
@@ -34,4 +34,3 @@ class ErrorBoundary extends React.Component {
         null);
     }
 }
-export default ErrorBoundary;

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

@@ -6,6 +6,5 @@
  */
 /// <reference types="@docusaurus/module-type-aliases" />
 /// <reference types="react" />
-import type { HeadProps } from '@docusaurus/Head';
-declare function Head(props: HeadProps): JSX.Element;
-export default Head;
+import type { Props } from '@docusaurus/Head';
+export default function Head(props: Props): JSX.Element;

package/lib/client/exports/Head.js

@@ -5,8 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import React from 'react';
-import { Helmet } from 'react-helmet';
-function Head(props) {
-    return React.createElement(Helmet, { ...props });
+import { Helmet } from 'react-helmet-async';
+export default function Head(props) {
+    return <Helmet {...props}/>;
 }
-export default Head;

package/lib/client/exports/Interpolate.js

@@ -26,29 +26,26 @@ export function interpolate(text, values) {
             elements.push(element);
             return ValueFoundMarker;
         }
-        else {
-            return match; // no match? add warning?
-        }
+        return match; // no match? add warning?
     });
     // No interpolation to be done: just return the text
     if (elements.length === 0) {
         return text;
     }
     // Basic string interpolation: returns interpolated string
-    else if (elements.every((el) => typeof el === 'string')) {
+    if (elements.every((el) => typeof el === 'string')) {
         return processedText
             .split(ValueFoundMarker)
             .reduce((str, value, index) => { var _a; return str.concat(value).concat((_a = elements[index]) !== null && _a !== void 0 ? _a : ''); }, '');
     }
     // JSX interpolation: returns ReactNode
-    else {
-        return processedText.split(ValueFoundMarker).reduce((array, value, index) => [
-            ...array,
-            React.createElement(React.Fragment, { key: index },
-                value,
-                elements[index]),
-        ], []);
-    }
+    return processedText.split(ValueFoundMarker).reduce((array, value, index) => [
+        ...array,
+        <React.Fragment key={index}>
+        {value}
+        {elements[index]}
+      </React.Fragment>,
+    ], []);
 }
 export default function Interpolate({ children, values, }) {
     if (typeof children !== 'string') {

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

@@ -4,14 +4,20 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-/// <reference types="@docusaurus/module-type-aliases" />
-/// <reference types="react" />
-import type { LinkProps } from '@docusaurus/Link';
+import React from 'react';
 import type docusaurus from '../docusaurus';
 declare global {
     interface Window {
         docusaurus: typeof docusaurus;
     }
 }
-declare function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLinkCheck': noBrokenLinkCheck, autoAddBaseUrl, ...props }: LinkProps): JSX.Element;
-export default Link;
+declare const _default: React.ForwardRefExoticComponent<Pick<Partial<import("react-router-dom").NavLinkProps<unknown>> & React.ClassAttributes<HTMLAnchorElement> & React.AnchorHTMLAttributes<HTMLAnchorElement> & {
+    readonly className?: string | undefined;
+    readonly style?: React.CSSProperties | undefined;
+    readonly isNavLink?: boolean | undefined;
+    readonly to?: string | undefined;
+    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>>;
+export default _default;

package/lib/client/exports/Link.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, { useEffect, useRef } from 'react';
+import React, { useEffect, useImperativeHandle, useRef, } from 'react';
 import { NavLink, Link as RRLink } from 'react-router-dom';
 import useDocusaurusContext from './useDocusaurusContext';
 import isInternalUrl from './isInternalUrl';
@@ -18,11 +18,13 @@ import { applyTrailingSlash } from '@docusaurus/utils-common';
 // this is because useBaseUrl() actually transforms relative links
 // like "introduction" to "/baseUrl/introduction" => bad behavior to fix
 const shouldAddBaseUrlAutomatically = (to) => to.startsWith('/');
-function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLinkCheck': noBrokenLinkCheck, autoAddBaseUrl = true, ...props }) {
+function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLinkCheck': noBrokenLinkCheck, autoAddBaseUrl = true, ...props }, forwardedRef) {
     var _a;
     const { siteConfig: { trailingSlash, baseUrl }, } = useDocusaurusContext();
     const { withBaseUrl } = useBaseUrlUtils();
     const linksCollector = useLinksCollector();
+    const innerRef = useRef(null);
+    useImperativeHandle(forwardedRef, () => innerRef.current);
     // IMPORTANT: using to or href should not change anything
     // For example, MDX links will ALWAYS give us the href props
     // Using one prop or the other should not be used to distinguish
@@ -57,7 +59,7 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
         ioRef.current = new window.IntersectionObserver((entries) => {
             entries.forEach((entry) => {
                 if (el === entry.target) {
-                    // If element is in viewport, stop listening/observing and run callback.
+                    // If element is in viewport, stop observing and run callback.
                     // https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API
                     if (entry.isIntersecting || entry.intersectionRatio > 0) {
                         ioRef.current.unobserve(el);
@@ -71,8 +73,9 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
         ioRef.current.observe(el);
     };
     const handleRef = (ref) => {
+        innerRef.current = ref;
         if (IOSupported && ref && isInternal) {
-            // If IO supported and element reference found, setup Observer functionality.
+            // If IO supported and element reference found, set up Observer.
             handleIntersection(ref, () => {
                 if (targetLink != null) {
                     window.docusaurus.prefetch(targetLink);
@@ -107,7 +110,10 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
     }
     return isRegularHtmlLink ? (
     // eslint-disable-next-line jsx-a11y/anchor-has-content
-    React.createElement("a", { href: targetLink, ...(targetLinkUnprefixed &&
-            !isInternal && { target: '_blank', rel: 'noopener noreferrer' }), ...props })) : (React.createElement(LinkComponent, { ...props, onMouseEnter: onMouseEnter, innerRef: handleRef, to: targetLink || '', ...(isNavLink && { isActive, activeClassName }) }));
+    <a ref={innerRef} href={targetLink} {...(targetLinkUnprefixed &&
+        !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 })}/>);
 }
-export default Link;
+export default React.forwardRef(Link);

package/lib/client/exports/Translate.js

@@ -22,7 +22,8 @@ export function translate({ message, id }, values) {
     return interpolate(localizedMessage, values);
 }
 // Maybe we'll want to improve this component with additional features
-// Like toggling a translation mode that adds a little translation button near the text?
+// Like toggling a translation mode that adds a little translation button near
+// the text?
 export default function Translate({ children, id, values, }) {
     if (children && typeof children !== 'string') {
         console.warn('Illegal <Translate> children', children);

package/lib/client/exports/browserContext.js

@@ -10,12 +10,13 @@ import React, { useEffect, useState } from 'react';
 // On first client-side render, we need to render exactly as the server rendered
 // isBrowser is set to true only after a successful hydration
 // Note, isBrowser is not part of useDocusaurusContext() for perf reasons
-// Using useDocusaurusContext() (much more common need) should not trigger re-rendering after a successful hydration
+// Using useDocusaurusContext() (much more common need) should not trigger
+// re-rendering after a successful hydration
 export const Context = React.createContext(false);
 export function BrowserContextProvider({ children, }) {
     const [isBrowser, setIsBrowser] = useState(false);
     useEffect(() => {
         setIsBrowser(true);
     }, []);
-    return React.createElement(Context.Provider, { value: isBrowser }, children);
+    return <Context.Provider value={isBrowser}>{children}</Context.Provider>;
 }

package/lib/client/exports/docusaurusContext.js

@@ -21,5 +21,5 @@ const contextValue = {
 };
 export const Context = React.createContext(contextValue);
 export function DocusaurusContextProvider({ children, }) {
-    return React.createElement(Context.Provider, { value: contextValue }, children);
+    return <Context.Provider value={contextValue}>{children}</Context.Provider>;
 }

package/lib/client/exports/isInternalUrl.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 export function hasProtocol(url) {
-    return /^(\w*:|\/\/)/.test(url) === true;
+    return /^(?:\w*:|\/\/)/.test(url) === true;
 }
 export default function isInternalUrl(url) {
     return typeof url !== 'undefined' && !hasProtocol(url);

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

@@ -4,5 +4,4 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { renderRoutes } from 'react-router-config';
-export default renderRoutes;
+export { renderRoutes as default } from 'react-router-config';

package/lib/client/exports/renderRoutes.js

@@ -4,5 +4,4 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { renderRoutes } from 'react-router-config';
-export default renderRoutes;
+export { renderRoutes as default } from 'react-router-config';

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

@@ -4,4 +4,4 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-export * from 'react-router-dom';
+export { useHistory, useLocation, Redirect, matchPath } from 'react-router-dom';

package/lib/client/exports/router.js

@@ -4,4 +4,4 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-export * from 'react-router-dom';
+export { useHistory, useLocation, Redirect, matchPath } from 'react-router-dom';

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

@@ -5,5 +5,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { DocusaurusContext } from '@docusaurus/types';
-declare function useDocusaurusContext(): DocusaurusContext;
-export default useDocusaurusContext;
+export default function useDocusaurusContext(): DocusaurusContext;

package/lib/client/exports/useDocusaurusContext.js

@@ -6,7 +6,6 @@
  */
 import { useContext } from 'react';
 import { Context } from './docusaurusContext';
-function useDocusaurusContext() {
+export default function useDocusaurusContext() {
     return useContext(Context);
 }
-export default useDocusaurusContext;

package/lib/client/flat.d.ts

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

package/lib/client/flat.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 const isTree = (x) => typeof x === 'object' && !!x && Object.keys(x).length > 0;
-function flat(target) {
+export default function flat(target) {
     const delimiter = '.';
     const output = {};
     function step(object, prefix) {
@@ -23,4 +23,3 @@ function flat(target) {
     step(target);
     return output;
 }
-export default flat;

package/lib/client/normalizeLocation.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 { Location } from '@docusaurus/history';
-declare function normalizeLocation<T extends Location>(location: T): T;
-export default normalizeLocation;
+import type { Location } from 'history';
+export default function normalizeLocation<T extends Location>(location: T): T;

package/lib/client/normalizeLocation.js

@@ -6,7 +6,7 @@
  */
 // Memoize previously normalized pathnames.
 const pathnames = {};
-function normalizeLocation(location) {
+export default function normalizeLocation(location) {
     if (pathnames[location.pathname]) {
         return {
             ...location,
@@ -24,4 +24,3 @@ function normalizeLocation(location) {
         pathname,
     };
 }
-export default normalizeLocation;

package/lib/client/prefetch.d.ts

@@ -4,5 +4,4 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-declare function prefetch(url: string): Promise<void>;
-export default prefetch;
+export default function prefetch(url: string): Promise<void>;

package/lib/client/prefetch.js

@@ -55,7 +55,7 @@ const supportedPrefetchStrategy = support('prefetch')
     ? linkPrefetchStrategy
     : xhrPrefetchStrategy;
 const preFetched = {};
-function prefetch(url) {
+export default function prefetch(url) {
     return new Promise((resolve) => {
         if (preFetched[url]) {
             resolve();
@@ -69,4 +69,3 @@ function prefetch(url) {
             .catch(() => { }); // 404s are logged to the console anyway.
     });
 }
-export default prefetch;

package/lib/client/preload.d.ts

@@ -7,7 +7,8 @@
 import { type RouteConfig } from 'react-router-config';
 /**
  * Helper function to make sure all async components for that particular route
- * is preloaded before rendering. This is especially useful to avoid loading screens.
+ * is preloaded before rendering. This is especially useful to avoid loading
+ * screens.
  *
  * @param routes react-router-config
  * @param pathname the route pathname, example: /docs/installation

package/lib/client/preload.js

@@ -7,7 +7,8 @@
 import { matchRoutes } from 'react-router-config';
 /**
  * Helper function to make sure all async components for that particular route
- * is preloaded before rendering. This is especially useful to avoid loading screens.
+ * is preloaded before rendering. This is especially useful to avoid loading
+ * screens.
  *
  * @param routes react-router-config
  * @param pathname the route pathname, example: /docs/installation

package/lib/client/serverEntry.js

@@ -8,7 +8,7 @@ import * as eta from 'eta';
 import React from 'react';
 import { StaticRouter } from 'react-router-dom';
 import ReactDOMServer from 'react-dom/server';
-import { Helmet } from 'react-helmet';
+import { HelmetProvider } from 'react-helmet-async';
 import { getBundles } from 'react-loadable-ssr-addon-v5-slorber';
 import Loadable from 'react-loadable';
 import { minify } from 'html-minifier-terser';
@@ -20,10 +20,10 @@ import App from './App';
 import { createStatefulLinksCollector, ProvideLinksCollector, } from './LinksCollector';
 import logger from '@docusaurus/logger';
 // eslint-disable-next-line no-restricted-imports
-import { memoize } from 'lodash';
+import _ from 'lodash';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const packageJson = require('../../package.json');
-const getCompiledSSRTemplate = memoize((template) => eta.compile(template.trim(), {
+const getCompiledSSRTemplate = _.memoize((template) => eta.compile(template.trim(), {
     rmWhitespace: true,
 }));
 function renderSSRTemplate(ssrTemplate, data) {
@@ -34,32 +34,37 @@ export default async function render(locals) {
     try {
         return await doRender(locals);
     }
-    catch (e) {
-        logger.error `Docusaurus Node/SSR could not render static page with path path=${locals.path} because of following error:
-${e.stack}`;
-        const isNotDefinedErrorRegex = /(window|document|localStorage|navigator|alert|location|buffer|self) is not defined/i;
-        if (isNotDefinedErrorRegex.test(e.message)) {
+    catch (err) {
+        logger.error `Docusaurus server-side rendering could not render static page with path path=${locals.path}.`;
+        const isNotDefinedErrorRegex = /(?:window|document|localStorage|navigator|alert|location|buffer|self) is not defined/i;
+        if (isNotDefinedErrorRegex.test(err.message)) {
             logger.info `It looks like you are using code that should run on the client-side only.
 To get around it, try using code=${'<BrowserOnly>'} (path=${'https://docusaurus.io/docs/docusaurus-core/#browseronly'}) or code=${'ExecutionEnvironment'} (path=${'https://docusaurus.io/docs/docusaurus-core/#executionenvironment'}).
 It might also require to wrap your client code in code=${'useEffect'} hook and/or import a third-party library dynamically (if any).`;
         }
-        throw new Error('Server-side rendering fails due to the error above.');
+        throw err;
     }
 }
-// Renderer for static-site-generator-webpack-plugin (async rendering via promises).
+// Renderer for static-site-generator-webpack-plugin (async rendering).
 async function doRender(locals) {
     const { routesLocation, headTags, preBodyTags, postBodyTags, onLinksCollected, baseUrl, ssrTemplate, noIndex, } = locals;
     const location = routesLocation[locals.path];
     await preload(routes, location);
     const modules = new Set();
     const context = {};
+    const helmetContext = {};
     const linksCollector = createStatefulLinksCollector();
-    const appHtml = ReactDOMServer.renderToString(React.createElement(Loadable.Capture, { report: (moduleName) => modules.add(moduleName) },
-        React.createElement(StaticRouter, { location: location, context: context },
-            React.createElement(ProvideLinksCollector, { linksCollector: linksCollector },
-                React.createElement(App, null)))));
+    const appHtml = ReactDOMServer.renderToString(<Loadable.Capture report={(moduleName) => modules.add(moduleName)}>
+      <HelmetProvider context={helmetContext}>
+        <StaticRouter location={location} context={context}>
+          <ProvideLinksCollector linksCollector={linksCollector}>
+            <App />
+          </ProvideLinksCollector>
+        </StaticRouter>
+      </HelmetProvider>
+    </Loadable.Capture>);
     onLinksCollected(location, linksCollector.getCollectedLinks());
-    const helmet = Helmet.renderStatic();
+    const { helmet } = helmetContext;
     const htmlAttributes = helmet.htmlAttributes.toString();
     const bodyAttributes = helmet.bodyAttributes.toString();
     const metaStrings = [
@@ -104,9 +109,8 @@ async function doRender(locals) {
             minifyJS: true,
         });
     }
-    catch (e) {
-        logger.error `Minification of page path=${locals.path} failed because of following error:
-${e.stack}`;
-        throw e;
+    catch (err) {
+        logger.error `Minification of page path=${locals.path} failed.`;
+        throw err;
     }
 }

package/lib/client/theme-fallback/Error/index.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 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="@docusaurus/module-type-aliases" />
+/// <reference types="react" />
+import type { Props } from '@theme/Error';
+export default function Error({ error, tryAgain }: Props): JSX.Element;