@docusaurus/core 3.6.3 → 3.7.0

package/lib/client/App.d.ts

@@ -4,5 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import { type ReactNode } from 'react';
 import '@generated/client-modules';
-export default function App(): JSX.Element;
+export default function App(): ReactNode;

package/lib/client/BaseUrlIssueBanner/index.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.
  */
+import { type ReactNode } from 'react';
 import './styles.module.css';
 /**
  * We want to help the users with a bad baseUrl configuration (very common
@@ -16,4 +17,4 @@ import './styles.module.css';
  *
  * @see https://github.com/facebook/docusaurus/pull/3621
  */
-export default function MaybeBaseUrlIssueBanner(): JSX.Element | null;
+export default function MaybeBaseUrlIssueBanner(): ReactNode;

package/lib/client/BrokenLinksContext.d.ts

@@ -15,4 +15,4 @@ export declare const useBrokenLinksContext: () => BrokenLinks;
 export declare function BrokenLinksProvider({ children, brokenLinks, }: {
     children: ReactNode;
     brokenLinks: BrokenLinks;
-}): JSX.Element;
+}): ReactNode;

package/lib/client/ClientLifecyclesDispatcher.d.ts

@@ -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 { type ReactElement } from 'react';
+import type { ReactElement, ReactNode } from 'react';
 import type { ClientModule } from '@docusaurus/types';
 import type { Location } from 'history';
 export declare function dispatchLifecycleAction<K extends keyof ClientModule>(lifecycleAction: K, ...args: Parameters<NonNullable<ClientModule[K]>>): () => void;
@@ -12,5 +12,5 @@ declare function ClientLifecyclesDispatcher({ children, location, previousLocati
     children: ReactElement;
     location: Location;
     previousLocation: Location | null;
-}): JSX.Element;
+}): ReactNode;
 export default ClientLifecyclesDispatcher;

package/lib/client/PendingNavigation.d.ts

@@ -4,11 +4,11 @@
  * 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, { type ReactNode } from 'react';
 import type { Location } from 'history';
 type Props = {
     readonly location: Location;
-    readonly children: JSX.Element;
+    readonly children: ReactNode;
 };
 type State = {
     nextRouteHasLoaded: boolean;
@@ -18,6 +18,6 @@ declare class PendingNavigation extends React.Component<Props, State> {
     private routeUpdateCleanupCb;
     constructor(props: Props);
     shouldComponentUpdate(nextProps: Props, nextState: State): boolean;
-    render(): JSX.Element;
+    render(): ReactNode;
 }
 export default PendingNavigation;

package/lib/client/SiteMetadataDefaults.d.ts

@@ -4,4 +4,5 @@
  * 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 SiteMetadataDefaults(): JSX.Element;
+import { type ReactNode } from 'react';
+export default function SiteMetadataDefaults(): ReactNode;

package/lib/client/browserContext.d.ts

@@ -8,4 +8,4 @@ import React, { type ReactNode } from 'react';
 export declare const Context: React.Context<boolean>;
 export declare function BrowserContextProvider({ children, }: {
     children: ReactNode;
-}): JSX.Element;
+}): ReactNode;

package/lib/client/docusaurusContext.d.ts

@@ -9,4 +9,4 @@ import type { DocusaurusContext } from '@docusaurus/types';
 export declare const Context: React.Context<DocusaurusContext>;
 export declare function DocusaurusContextProvider({ children, }: {
     children: ReactNode;
-}): JSX.Element;
+}): ReactNode;

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

@@ -4,5 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import { type ReactNode } from 'react';
 import type { Props } from '@docusaurus/BrowserOnly';
-export default function BrowserOnly({ children, fallback, }: Props): JSX.Element | null;
+export default function BrowserOnly({ children, fallback }: Props): ReactNode;

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
-export default function BrowserOnly({ children, fallback, }) {
+export default function BrowserOnly({ children, fallback }) {
     const isBrowser = useIsBrowser();
     if (isBrowser) {
         if (typeof children !== 'function' &&

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

@@ -4,5 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import { type ReactNode } from 'react';
 import type { Props } from '@docusaurus/Head';
-export default function Head(props: Props): JSX.Element;
+export default function Head(props: Props): ReactNode;

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

@@ -8,4 +8,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>): JSX.Element;
+export default function Interpolate<Str extends string>({ children, values, }: InterpolateProps<Str>): ReactNode;

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

@@ -4,7 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import { type ReactNode } from '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>): JSX.Element;
+export default function Translate<Str extends string>({ children, id, values, }: TranslateProps<Str>): ReactNode;

package/lib/client/hasHydratedDataAttribute.d.ts

@@ -4,4 +4,5 @@
  * 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 HasHydratedDataAttribute(): JSX.Element;
+import type { ReactNode } from 'react';
+export default function HasHydratedDataAttribute(): ReactNode;

package/lib/client/routeContext.d.ts

@@ -10,4 +10,4 @@ export declare const Context: React.Context<PluginRouteContext | null>;
 export declare function RouteContextProvider({ children, value, }: {
     children: ReactNode;
     value: PluginRouteContext | RouteContext | null;
-}): JSX.Element;
+}): ReactNode;

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

@@ -4,5 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import { type ReactNode } from 'react';
 import type { Props } from '@theme/Error';
-export default function Error({ error, tryAgain }: Props): JSX.Element;
+export default function Error({ error, tryAgain }: Props): ReactNode;

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

@@ -4,5 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import { type ReactNode } from 'react';
 import type { Props } from '@theme/Layout';
-export default function Layout({ children }: Props): JSX.Element;
+export default function Layout({ children }: Props): ReactNode;

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

@@ -4,5 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import { type ReactNode } from 'react';
 import type { LoadingComponentProps } from 'react-loadable';
-export default function Loading({ error, retry, pastDelay, }: LoadingComponentProps): JSX.Element | null;
+export default function Loading({ error, retry, pastDelay, }: LoadingComponentProps): ReactNode;

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

@@ -4,4 +4,5 @@
  * 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 NotFound(): JSX.Element;
+import { type ReactNode } from 'react';
+export default function NotFound(): ReactNode;

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

@@ -4,5 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import { type ReactNode } from 'react';
 import type { Props } from '@theme/Root';
-export default function Root({ children }: Props): JSX.Element;
+export default function Root({ children }: Props): ReactNode;

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

@@ -4,4 +4,5 @@
  * 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 SiteMetadata(): JSX.Element | null;
+import type { ReactNode } from 'react';
+export default function SiteMetadata(): ReactNode;

package/lib/client/theme-fallback/SiteMetadata/index.js

@@ -1,9 +1,3 @@
-/**
- * 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.
- */
 // To be implemented by the theme with <Head>
 export default function SiteMetadata() {
     return null;

package/lib/commands/swizzle/actions.js

@@ -76,14 +76,14 @@ async function wrap({ siteDir, themePath, componentName: themeComponentName, typ
     await fs_extra_1.default.ensureDir(path_1.default.resolve(siteDir, utils_1.THEME_PATH));
     const toPath = path_1.default.resolve(siteDir, utils_1.THEME_PATH, wrapperFileName);
     const content = typescript
-        ? `import React from 'react';
+        ? `import React, {type ReactNode} from 'react';
 import ${componentName} from '@theme-${importType}/${themeComponentName}';
 import type ${componentName}Type from '@theme/${themeComponentName}';
 import type {WrapperProps} from '@docusaurus/types';
 
 type Props = WrapperProps<typeof ${componentName}Type>;
 
-export default function ${wrapperComponentName}(props: Props): JSX.Element {
+export default function ${wrapperComponentName}(props: Props): ReactNode {
   return (
     <>
       <${componentName} {...props} />

package/lib/server/codegen/codegenRoutes.js

@@ -116,14 +116,37 @@ function genChunkNames(routeModule, prefix, name, res) {
  * config node, it returns the node's serialized form, and mutates `registry`,
  * `routesPaths`, and `routesChunkNames` accordingly.
  */
-function genRouteCode(routeConfig, res) {
+function genRouteCode(routeConfig, res, index, level) {
     const { path: routePath, component, modules = {}, context, routes: subroutes, priority, exact, metadata, props, plugin, ...attributes } = routeConfig;
     if (typeof routePath !== 'string' || !component) {
         throw new Error(`Invalid route config: path must be a string and component is required.
 ${JSON.stringify(routeConfig)}`);
     }
-    const routeHash = (0, utils_1.simpleHash)(JSON.stringify(routeConfig), 3);
-    res.routesChunkNames[`${routePath}-${routeHash}`] = {
+    // Because 2 routes with the same path could lead to hash collisions
+    // See https://github.com/facebook/docusaurus/issues/10718#issuecomment-2498516394
+    function generateUniqueRouteKey() {
+        const hashes = [
+            // // OG algo to keep former snapshots
+            () => (0, utils_1.simpleHash)(JSON.stringify(routeConfig), 3),
+            // Other attempts, not ideal but good enough
+            // Technically we could use Math.random() here but it's annoying for tests
+            () => (0, utils_1.simpleHash)(`${level}${index}`, 3),
+            () => (0, utils_1.simpleHash)(JSON.stringify(routeConfig), 4),
+            () => (0, utils_1.simpleHash)(`${level}${index}`, 4),
+        ];
+        for (const tryHash of hashes) {
+            const routeHash = tryHash();
+            const routeKey = `${routePath}-${routeHash}`;
+            if (!res.routesChunkNames[routeKey]) {
+                return { routeKey, routeHash };
+            }
+        }
+        throw new Error(`Docusaurus couldn't generate a unique hash for route ${routeConfig.path} (level=${level} - index=${index}).
+This is a bug, please report it here!
+https://github.com/facebook/docusaurus/issues/10718`);
+    }
+    const { routeKey, routeHash } = generateUniqueRouteKey();
+    res.routesChunkNames[routeKey] = {
         // Avoid clash with a prop called "component"
         ...genChunkNames({ __comp: component }, 'component', component, res),
         ...(context &&
@@ -133,7 +156,7 @@ ${JSON.stringify(routeConfig)}`);
     return serializeRouteConfig({
         routePath: routePath.replace(/'/g, "\\'"),
         routeHash,
-        subroutesCodeStrings: subroutes?.map((r) => genRouteCode(r, res)),
+        subroutesCodeStrings: subroutes?.map((r, i) => genRouteCode(r, res, i, level + 1)),
         exact,
         attributes,
     });
@@ -156,7 +179,7 @@ function generateRoutesCode(routeConfigs) {
     };
     // `genRouteCode` would mutate `res`
     const routeConfigSerialized = routeConfigs
-        .map((r) => genRouteCode(r, res))
+        .map((r, i) => genRouteCode(r, res, i, 0))
         .join(',\n');
     res.routesConfig = `import React from 'react';
 import ComponentCreator from '@docusaurus/ComponentCreator';

package/lib/server/i18n.js

@@ -10,7 +10,6 @@ exports.getDefaultLocaleConfig = getDefaultLocaleConfig;
 exports.loadI18n = loadI18n;
 const tslib_1 = require("tslib");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
-const rtl_detect_1 = require("rtl-detect");
 function inferLanguageDisplayName(locale) {
     const tryLocale = (l) => {
         try {
@@ -58,11 +57,20 @@ function getDefaultCalendar(localeStr) {
     }
     return 'gregory';
 }
+function getDefaultDirection(localeStr) {
+    const locale = new Intl.Locale(localeStr);
+    // see https://github.com/tc39/proposal-intl-locale-info
+    // see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/getTextInfo
+    // Node 18.0 implements a former version of the getTextInfo() proposal
+    // @ts-expect-error: The TC39 proposal was updated
+    const textInto = locale.getTextInfo?.() ?? locale.textInfo;
+    return textInto.direction;
+}
 function getDefaultLocaleConfig(locale) {
     try {
         return {
             label: getDefaultLocaleLabel(locale),
-            direction: (0, rtl_detect_1.getLangDir)(locale),
+            direction: getDefaultDirection(locale),
             htmlLang: locale,
             calendar: getDefaultCalendar(locale),
             path: locale,

package/lib/webpack/base.js

@@ -23,14 +23,18 @@ const LibrariesToTranspile = [
     'copy-text-to-clipboard', // Contains optional catch binding, incompatible with recent versions of Edge
 ];
 const LibrariesToTranspileRegex = new RegExp(LibrariesToTranspile.map((libName) => `(node_modules/${libName})`).join('|'));
-const ReactAliases = process.env
-    .DOCUSAURUS_NO_REACT_ALIASES
-    ? {}
-    : {
-        react: path_1.default.dirname(require.resolve('react/package.json')),
-        'react-dom': path_1.default.dirname(require.resolve('react-dom/package.json')),
-        '@mdx-js/react': path_1.default.dirname(require.resolve('@mdx-js/react')),
+function getReactAliases(siteDir) {
+    // Escape hatch
+    if (process.env.DOCUSAURUS_NO_REACT_ALIASES) {
+        return {};
+    }
+    const resolveSitePkg = (id) => require.resolve(id, { paths: [siteDir] });
+    return {
+        react: path_1.default.dirname(resolveSitePkg('react/package.json')),
+        'react-dom': path_1.default.dirname(resolveSitePkg('react-dom/package.json')),
+        '@mdx-js/react': path_1.default.dirname(resolveSitePkg('@mdx-js/react')),
     };
+}
 function excludeJS(modulePath) {
     // Always transpile client dir
     if (modulePath.startsWith(exports.clientDir)) {
@@ -96,11 +100,11 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
                 // See https://rspack.dev/config/experiments#experimentsincremental
                 // Produces warnings in production builds
                 // See https://github.com/web-infra-dev/rspack/pull/8311#issuecomment-2476014664
-                // @ts-expect-error: Rspack-only
-                // incremental: !isProd,
-                // TODO restore incremental mode in dev + opt-in/opt-out flag?
-                //  temporarily disabled due to https://github.com/facebook/docusaurus/issues/10646#issuecomment-2490675451
-                incremental: undefined,
+                // We use the same integration as Rspress, with ability to disable
+                // See https://github.com/web-infra-dev/rspress/pull/1631
+                // See https://github.com/facebook/docusaurus/issues/10646
+                // @ts-expect-error: Rspack-only, not available in Webpack typedefs
+                incremental: !isProd && !process.env.DISABLE_RSPACK_INCREMENTAL,
             };
         }
         return undefined;
@@ -137,7 +141,7 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
                 process.cwd(),
             ],
             alias: {
-                ...ReactAliases,
+                ...getReactAliases(siteDir),
                 '@site': siteDir,
                 '@generated': generatedFilesDir,
                 ...(await (0, aliases_1.loadDocusaurusAliases)()),
@@ -199,7 +203,6 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
                 fileLoaderUtils.rules.images(),
                 fileLoaderUtils.rules.fonts(),
                 fileLoaderUtils.rules.media(),
-                fileLoaderUtils.rules.svg(),
                 fileLoaderUtils.rules.otherAssets(),
                 {
                     test: /\.[jt]sx?$/i,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "3.6.3",
+  "version": "3.7.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,13 +33,13 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "3.6.3",
-    "@docusaurus/bundler": "3.6.3",
-    "@docusaurus/logger": "3.6.3",
-    "@docusaurus/mdx-loader": "3.6.3",
-    "@docusaurus/utils": "3.6.3",
-    "@docusaurus/utils-common": "3.6.3",
-    "@docusaurus/utils-validation": "3.6.3",
+    "@docusaurus/babel": "3.7.0",
+    "@docusaurus/bundler": "3.7.0",
+    "@docusaurus/logger": "3.7.0",
+    "@docusaurus/mdx-loader": "3.7.0",
+    "@docusaurus/utils": "3.7.0",
+    "@docusaurus/utils-common": "3.7.0",
+    "@docusaurus/utils-validation": "3.7.0",
     "boxen": "^6.2.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -60,13 +60,12 @@
     "p-map": "^4.0.0",
     "prompts": "^2.4.2",
     "react-dev-utils": "^12.0.1",
-    "react-helmet-async": "^1.3.0",
+    "react-helmet-async": "npm:@slorber/react-helmet-async@1.3.0",
     "react-loadable": "npm:@docusaurus/react-loadable@6.0.0",
     "react-loadable-ssr-addon-v5-slorber": "^1.0.1",
     "react-router": "^5.3.4",
     "react-router-config": "^5.1.1",
     "react-router-dom": "^5.3.4",
-    "rtl-detect": "^1.0.4",
     "semver": "^7.5.4",
     "serve-handler": "^6.1.6",
     "shelljs": "^0.8.5",
@@ -78,13 +77,12 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.6.3",
-    "@docusaurus/types": "3.6.3",
+    "@docusaurus/module-type-aliases": "3.7.0",
+    "@docusaurus/types": "3.7.0",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
     "@types/react-router-config": "^5.0.7",
-    "@types/rtl-detect": "^1.0.0",
     "@types/serve-handler": "^6.1.4",
     "@types/update-notifier": "^6.0.4",
     "@types/webpack-bundle-analyzer": "^4.7.0",
@@ -94,11 +92,11 @@
   },
   "peerDependencies": {
     "@mdx-js/react": "^3.0.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "^18.0.0 || ^19.0.0",
+    "react-dom": "^18.0.0 || ^19.0.0"
   },
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "9c0e19c669ffcbc0972bfd8527e8b93f1f74e7d8"
+  "gitHead": "dd59750c16fe6908a26f18806a54d4c3dbe6db43"
 }