@docusaurus/core 3.3.2 → 3.5.0

package/bin/docusaurus.mjs

@@ -222,7 +222,8 @@ cli
 
 cli.arguments('<command>').action((cmd) => {
   cli.outputHelp();
-  logger.error`    Unknown command name=${cmd}.`;
+  logger.error`Unknown Docusaurus CLI command name=${cmd}.`;
+  process.exit(1);
 });
 
 // === The above is the commander configuration ===
@@ -247,24 +248,24 @@ function isInternalCommand(command) {
   );
 }
 
-// process.argv always looks like this:
-// [
-//   '/path/to/node',
-//   '/path/to/docusaurus.mjs',
-//   '<subcommand>',
-//   ...subcommandArgs
-// ]
+/**
+ * @param {string | undefined} command
+ */
+function isExternalCommand(command) {
+  return !!(command && !isInternalCommand(command) && !command.startsWith('-'));
+}
 
-// There is no subcommand
-// TODO: can we use commander to handle this case?
-if (process.argv.length < 3 || process.argv[2]?.startsWith('--')) {
+// No command? We print the help message because Commander doesn't
+// Note argv looks like this: ['../node','../docusaurus.mjs','<command>',...rest]
+if (process.argv.length < 3) {
   cli.outputHelp();
+  logger.error`Please provide a Docusaurus CLI command.`;
   process.exit(1);
 }
 
 // There is an unrecognized subcommand
 // Let plugins extend the CLI before parsing
-if (!isInternalCommand(process.argv[2])) {
+if (isExternalCommand(process.argv[2])) {
   // TODO: in this step, we must assume default site structure because there's
   // no way to know the siteDir/config yet. Maybe the root cli should be
   // responsible for parsing these arguments?

package/lib/babel/preset.js

@@ -6,6 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = babelPresets;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 function getTransformOptions(isServer) {
@@ -77,4 +78,3 @@ function babelPresets(api) {
     const callerName = api.caller((caller) => caller?.name);
     return getTransformOptions(callerName === 'server');
 }
-exports.default = babelPresets;

package/lib/client/App.d.ts

@@ -4,7 +4,5 @@
  * 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 '@generated/client-modules';
 export default function App(): JSX.Element;

package/lib/client/BaseUrlIssueBanner/index.d.ts

@@ -4,7 +4,6 @@
  * 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" />
 import './styles.module.css';
 /**
  * We want to help the users with a bad baseUrl configuration (very common

package/lib/client/BrokenLinksContext.d.ts

@@ -4,7 +4,6 @@
  * 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" />
 import { type ReactNode } from 'react';
 import type { BrokenLinks } from '@docusaurus/useBrokenLinks';
 export type StatefulBrokenLinks = BrokenLinks & {

package/lib/client/SiteMetadataDefaults.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.
  */
-/// <reference types="react" />
 export default function SiteMetadataDefaults(): JSX.Element;

package/lib/client/clientEntry.js

@@ -6,12 +6,16 @@
  */
 import React, { startTransition } from 'react';
 import ReactDOM from 'react-dom/client';
-import { BrowserRouter } from 'react-router-dom';
 import { HelmetProvider } from 'react-helmet-async';
+import { BrowserRouter, HashRouter } from 'react-router-dom';
+import siteConfig from '@generated/docusaurus.config';
 import ExecutionEnvironment from './exports/ExecutionEnvironment';
 import App from './App';
 import preload from './preload';
 import docusaurus from './docusaurus';
+function Router({ children }) {
+    return siteConfig.future.experimental_router === 'hash' ? (<HashRouter>{children}</HashRouter>) : (<BrowserRouter>{children}</BrowserRouter>);
+}
 const hydrate = Boolean(process.env.HYDRATE_CLIENT_ENTRY);
 // Client-side render (e.g: running in browser) to become single-page
 // application (SPA).
@@ -19,9 +23,9 @@ if (ExecutionEnvironment.canUseDOM) {
     window.docusaurus = docusaurus;
     const container = document.getElementById('__docusaurus');
     const app = (<HelmetProvider>
-      <BrowserRouter>
+      <Router>
         <App />
-      </BrowserRouter>
+      </Router>
     </HelmetProvider>);
     const onRecoverableError = (error, errorInfo) => {
         console.error('Docusaurus React Root onRecoverableError:', error, errorInfo);

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

@@ -4,7 +4,5 @@
  * 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 '@docusaurus/BrowserOnly';
 export default function BrowserOnly({ children, fallback, }: Props): JSX.Element | null;

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

@@ -4,7 +4,6 @@
  * 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" />
 import React, { type ReactNode } from 'react';
 import type { Props } from '@docusaurus/ErrorBoundary';
 type State = {

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

@@ -4,7 +4,5 @@
  * 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 '@docusaurus/Head';
 export default function Head(props: Props): JSX.Element;

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

@@ -4,7 +4,6 @@
  * 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" />
 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;

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

@@ -4,7 +4,6 @@
  * 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" />
 import React from 'react';
 import type { Props } from '@docusaurus/Link';
 declare const _default: React.ForwardRefExoticComponent<Omit<Props, "ref"> & React.RefAttributes<HTMLAnchorElement>>;

package/lib/client/exports/Link.js

@@ -19,7 +19,9 @@ import { useBaseUrlUtils } from './useBaseUrl';
 // 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 }, forwardedRef) {
-    const { siteConfig: { trailingSlash, baseUrl }, } = useDocusaurusContext();
+    const { siteConfig } = useDocusaurusContext();
+    const { trailingSlash, baseUrl } = siteConfig;
+    const router = siteConfig.future.experimental_router;
     const { withBaseUrl } = useBaseUrlUtils();
     const brokenLinks = useBrokenLinks();
     const innerRef = useRef(null);
@@ -47,6 +49,14 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
     let targetLink = typeof targetLinkWithoutPathnameProtocol !== 'undefined'
         ? maybeAddBaseUrl(targetLinkWithoutPathnameProtocol)
         : undefined;
+    // TODO find a way to solve this problem properly
+    // Fix edge case when useBaseUrl is used on a link
+    // "./" is useful for images and other resources
+    // But we don't need it for <Link>
+    // unfortunately we can't really make the difference :/
+    if (router === 'hash' && targetLink?.startsWith('./')) {
+        targetLink = targetLink?.slice(1);
+    }
     if (targetLink && isInternal) {
         targetLink = applyTrailingSlash(targetLink, { trailingSlash, baseUrl });
     }
@@ -85,7 +95,7 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
     };
     useEffect(() => {
         // If IO is not supported. We prefetch by default (only once).
-        if (!IOSupported && isInternal) {
+        if (!IOSupported && isInternal && ExecutionEnvironment.canUseDOM) {
             if (targetLink != null) {
                 window.docusaurus.prefetch(targetLink);
             }
@@ -103,19 +113,30 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
     // https://github.com/remix-run/react-router/blob/v5/packages/react-router-dom/modules/Link.js#L47
     const hasInternalTarget = !props.target || props.target === '_self';
     // Should we use a regular <a> tag instead of React-Router Link component?
-    const isRegularHtmlLink = !targetLink || !isInternal || !hasInternalTarget || isAnchorLink;
+    const isRegularHtmlLink = !targetLink ||
+        !isInternal ||
+        !hasInternalTarget ||
+        // When using the hash router, we can't use the regular <a> link for anchors
+        // We need to use React Router to navigate to /#/pathname/#anchor
+        // And not /#anchor
+        // See also https://github.com/facebook/docusaurus/pull/10311
+        (isAnchorLink && router !== 'hash');
     if (!noBrokenLinkCheck && (isAnchorLink || !isRegularHtmlLink)) {
         brokenLinks.collectLink(targetLink);
     }
     if (props.id) {
         brokenLinks.collectAnchor(props.id);
     }
+    // These props are only added in unit tests to assert/capture the type of link
+    const testOnlyProps = process.env.NODE_ENV === 'test'
+        ? { 'data-test-link-type': isRegularHtmlLink ? 'regular' : 'react-router' }
+        : {};
     return isRegularHtmlLink ? (
     // eslint-disable-next-line jsx-a11y/anchor-has-content, @docusaurus/no-html-links
     <a ref={innerRef} href={targetLink} {...(targetLinkUnprefixed &&
-        !isInternal && { target: '_blank', rel: 'noopener noreferrer' })} {...props}/>) : (<LinkComponent {...props} onMouseEnter={onInteractionEnter} onTouchStart={onInteractionEnter} innerRef={handleRef} to={targetLink} 
+        !isInternal && { target: '_blank', rel: 'noopener noreferrer' })} {...props} {...testOnlyProps}/>) : (<LinkComponent {...props} onMouseEnter={onInteractionEnter} onTouchStart={onInteractionEnter} innerRef={handleRef} to={targetLink} 
     // Avoid "React does not recognize the `activeClassName` prop on a DOM
     // element"
-    {...(isNavLink && { isActive, activeClassName })}/>);
+    {...(isNavLink && { isActive, activeClassName })} {...testOnlyProps}/>);
 }
 export default React.forwardRef(Link);

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

@@ -4,8 +4,6 @@
  * 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 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;

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

@@ -4,7 +4,14 @@
  * 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" />
 import type { BaseUrlOptions, BaseUrlUtils } from '@docusaurus/useBaseUrl';
+import type { RouterType } from '@docusaurus/types';
+export declare function addBaseUrl({ siteUrl, baseUrl, url, options: { forcePrependBaseUrl, absolute }, router, }: {
+    siteUrl: string;
+    baseUrl: string;
+    url: string;
+    router: RouterType;
+    options?: BaseUrlOptions;
+}): string;
 export declare function useBaseUrlUtils(): BaseUrlUtils;
 export default function useBaseUrl(url: string, options?: BaseUrlOptions): string;

package/lib/client/exports/useBaseUrl.js

@@ -7,12 +7,18 @@
 import { useCallback } from 'react';
 import useDocusaurusContext from './useDocusaurusContext';
 import { hasProtocol } from './isInternalUrl';
-function addBaseUrl(siteUrl, baseUrl, url, { forcePrependBaseUrl = false, absolute = false } = {}) {
+export function addBaseUrl({ siteUrl, baseUrl, url, options: { forcePrependBaseUrl = false, absolute = false } = {}, router, }) {
     // It never makes sense to add base url to a local anchor url, or one with a
     // protocol
     if (!url || url.startsWith('#') || hasProtocol(url)) {
         return url;
     }
+    // TODO hash router + /baseUrl/ is unlikely to work well in all situations
+    // This will support most cases, but not all
+    // See https://github.com/facebook/docusaurus/pull/9859
+    if (router === 'hash') {
+        return url.startsWith('/') ? `.${url}` : `./${url}`;
+    }
     if (forcePrependBaseUrl) {
         return baseUrl + url.replace(/^\//, '');
     }
@@ -27,8 +33,10 @@ function addBaseUrl(siteUrl, baseUrl, url, { forcePrependBaseUrl = false, absolu
     return absolute ? siteUrl + basePath : basePath;
 }
 export function useBaseUrlUtils() {
-    const { siteConfig: { baseUrl, url: siteUrl }, } = useDocusaurusContext();
-    const withBaseUrl = useCallback((url, options) => addBaseUrl(siteUrl, baseUrl, url, options), [siteUrl, baseUrl]);
+    const { siteConfig } = useDocusaurusContext();
+    const { baseUrl, url: siteUrl } = siteConfig;
+    const router = siteConfig.future.experimental_router;
+    const withBaseUrl = useCallback((url, options) => addBaseUrl({ siteUrl, baseUrl, url, options, router }), [siteUrl, baseUrl, router]);
     return {
         withBaseUrl,
     };

package/lib/client/exports/useBrokenLinks.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.
  */
-/// <reference types="@docusaurus/module-type-aliases" />
 import type { BrokenLinks } from '@docusaurus/useBrokenLinks';
 export default function useBrokenLinks(): BrokenLinks;

package/lib/client/hasHydratedDataAttribute.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.
  */
-/// <reference types="react" />
 export default function HasHydratedDataAttribute(): JSX.Element;

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

@@ -4,7 +4,5 @@
  * 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;

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

@@ -4,7 +4,5 @@
  * 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/Layout';
 export default function Layout({ children }: Props): JSX.Element;

package/lib/client/theme-fallback/Loading/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.
  */
-/// <reference types="react" />
 import type { LoadingComponentProps } from 'react-loadable';
 export default function Loading({ error, retry, pastDelay, }: LoadingComponentProps): JSX.Element | null;

package/lib/client/theme-fallback/NotFound/index.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.
  */
-/// <reference types="react" />
 export default function NotFound(): JSX.Element;

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

@@ -4,7 +4,5 @@
  * 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/Root';
 export default function Root({ children }: Props): JSX.Element;

package/lib/client/theme-fallback/SiteMetadata/index.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.
  */
-/// <reference types="react" />
 export default function SiteMetadata(): JSX.Element | null;

package/lib/commands/build.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.build = void 0;
+exports.build = build;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -17,6 +17,7 @@ const site_1 = require("../server/site");
 const brokenLinks_1 = require("../server/brokenLinks");
 const client_1 = require("../webpack/client");
 const server_1 = tslib_1.__importDefault(require("../webpack/server"));
+const configure_1 = require("../webpack/configure");
 const utils_2 = require("../webpack/utils");
 const utils_3 = require("../utils");
 const i18n_1 = require("../server/i18n");
@@ -71,7 +72,6 @@ forceTerminate = true) {
         }
     }));
 }
-exports.build = build;
 async function getLocalesToBuild({ siteDir, cliOptions, }) {
     if (cliOptions.locale) {
         return [cliOptions.locale];
@@ -110,7 +110,8 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
         localizePath: cliOptions.locale ? false : undefined,
     }));
     const { props } = site;
-    const { outDir, plugins } = props;
+    const { outDir, plugins, siteConfig } = props;
+    const router = siteConfig.future.experimental_router;
     // We can build the 2 configs in parallel
     const [{ clientConfig, clientManifestPath }, { serverConfig, serverBundlePath }] = await utils_3.PerfLogger.async('Creating webpack configs', () => Promise.all([
         getBuildClientConfig({
@@ -122,11 +123,19 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
         }),
     ]));
     // Run webpack to build JS bundle (client) and static html files (server).
-    await utils_3.PerfLogger.async('Bundling with Webpack', () => (0, utils_2.compile)([clientConfig, serverConfig]));
+    await utils_3.PerfLogger.async('Bundling with Webpack', () => {
+        if (router === 'hash') {
+            return (0, utils_2.compile)([clientConfig]);
+        }
+        else {
+            return (0, utils_2.compile)([clientConfig, serverConfig]);
+        }
+    });
     const { collectedData } = await utils_3.PerfLogger.async('SSG', () => executeSSG({
         props,
         serverBundlePath,
         clientManifestPath,
+        router,
     }));
     // Remove server.bundle.js because it is not needed.
     await utils_3.PerfLogger.async('Deleting server bundle', () => ensureUnlink(serverBundlePath));
@@ -137,27 +146,35 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
     logger_1.default.success `Generated static files in path=${path_1.default.relative(process.cwd(), outDir)}.`;
     return outDir;
 }
-async function executeSSG({ props, serverBundlePath, clientManifestPath, }) {
+async function executeSSG({ props, serverBundlePath, clientManifestPath, router, }) {
     const manifest = await utils_3.PerfLogger.async('Read client manifest', () => fs_extra_1.default.readJSON(clientManifestPath, 'utf-8'));
     const ssrTemplate = await utils_3.PerfLogger.async('Compile SSR template', () => (0, templates_1.compileSSRTemplate)(props.siteConfig.ssrTemplate ?? ssr_html_template_1.default));
+    const params = {
+        trailingSlash: props.siteConfig.trailingSlash,
+        outDir: props.outDir,
+        baseUrl: props.baseUrl,
+        manifest,
+        headTags: props.headTags,
+        preBodyTags: props.preBodyTags,
+        postBodyTags: props.postBodyTags,
+        ssrTemplate,
+        noIndex: props.siteConfig.noIndex,
+        DOCUSAURUS_VERSION: utils_1.DOCUSAURUS_VERSION,
+    };
+    if (router === 'hash') {
+        utils_3.PerfLogger.start('Generate Hash Router entry point');
+        const content = (0, templates_1.renderHashRouterTemplate)({ params });
+        await (0, ssg_1.generateHashRouterEntrypoint)({ content, params });
+        utils_3.PerfLogger.end('Generate Hash Router entry point');
+        return { collectedData: {} };
+    }
     const renderer = await utils_3.PerfLogger.async('Load App renderer', () => (0, ssg_1.loadAppRenderer)({
         serverBundlePath,
     }));
     const ssgResult = await utils_3.PerfLogger.async('Generate static files', () => (0, ssg_1.generateStaticFiles)({
         pathnames: props.routesPaths,
         renderer,
-        params: {
-            trailingSlash: props.siteConfig.trailingSlash,
-            outDir: props.outDir,
-            baseUrl: props.baseUrl,
-            manifest,
-            headTags: props.headTags,
-            preBodyTags: props.preBodyTags,
-            postBodyTags: props.postBodyTags,
-            ssrTemplate,
-            noIndex: props.siteConfig.noIndex,
-            DOCUSAURUS_VERSION: utils_1.DOCUSAURUS_VERSION,
-        },
+        params,
     }));
     return ssgResult;
 }
@@ -194,11 +211,7 @@ async function getBuildClientConfig({ props, cliOptions, }) {
         bundleAnalyzer: cliOptions.bundleAnalyzer ?? false,
     });
     let { config } = result;
-    config = (0, utils_2.executePluginsConfigurePostCss)({
-        plugins,
-        config,
-    });
-    config = (0, utils_2.executePluginsConfigureWebpack)({
+    config = (0, configure_1.executePluginsConfigureWebpack)({
         plugins,
         config,
         isServer: false,
@@ -212,7 +225,7 @@ async function getBuildServerConfig({ props }) {
         props,
     });
     let { config } = result;
-    config = (0, utils_2.executePluginsConfigureWebpack)({
+    config = (0, configure_1.executePluginsConfigureWebpack)({
         plugins,
         config,
         isServer: true,

package/lib/commands/clear.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clear = void 0;
+exports.clear = clear;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -42,4 +42,3 @@ async function clear(siteDirParam = '.') {
     }));
     await Promise.all([generatedFolder, buildFolder, ...cacheFolders].map(removePath));
 }
-exports.clear = clear;

package/lib/commands/deploy.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deploy = void 0;
+exports.deploy = deploy;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -196,4 +196,3 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
         await runDeploy(outDir);
     }
 }
-exports.deploy = deploy;

package/lib/commands/external.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.externalCommand = void 0;
+exports.externalCommand = externalCommand;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const site_1 = require("../server/site");
@@ -20,4 +20,3 @@ async function externalCommand(cli) {
         plugin.extendCli?.(cli);
     });
 }
-exports.externalCommand = externalCommand;

package/lib/commands/serve.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serve = void 0;
+exports.serve = serve;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const http_1 = tslib_1.__importDefault(require("http"));
@@ -52,10 +52,21 @@ async function serve(siteDirParam = '.', cliOptions = {}) {
         }
         // We do the redirect ourselves for a good reason
         // server-handler is annoying and won't include /baseUrl/ in redirects
-        const normalizedUrl = (0, utils_common_1.applyTrailingSlash)(req.url, { trailingSlash, baseUrl });
-        if (req.url !== normalizedUrl) {
-            redirect(res, normalizedUrl);
-            return;
+        // See https://github.com/facebook/docusaurus/issues/10078#issuecomment-2084932934
+        if (baseUrl !== '/') {
+            // Not super robust, but should be good enough for our use case
+            // See https://github.com/facebook/docusaurus/pull/10090
+            const looksLikeAsset = !!req.url.match(/\.[a-zA-Z\d]{1,4}$/);
+            if (!looksLikeAsset) {
+                const normalizedUrl = (0, utils_common_1.applyTrailingSlash)(req.url, {
+                    trailingSlash,
+                    baseUrl,
+                });
+                if (req.url !== normalizedUrl) {
+                    redirect(res, normalizedUrl);
+                    return;
+                }
+            }
         }
         // Remove baseUrl before calling serveHandler, because /baseUrl/ should
         // serve /build/index.html, not /build/baseUrl/index.html (does not exist)
@@ -78,4 +89,3 @@ async function serve(siteDirParam = '.', cliOptions = {}) {
         (0, openBrowser_1.default)(url);
     }
 }
-exports.serve = serve;

package/lib/commands/start/start.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.start = void 0;
+exports.start = start;
 const tslib_1 = require("tslib");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const openBrowser_1 = tslib_1.__importDefault(require("react-dev-utils/openBrowser"));
@@ -44,4 +44,3 @@ async function start(siteDirParam = '.', cliOptions = {}) {
         (0, openBrowser_1.default)(reloadableSite.getOpenUrl());
     }
 }
-exports.start = start;

package/lib/commands/start/utils.d.ts

@@ -6,12 +6,13 @@
  */
 import _ from 'lodash';
 import type { StartCLIOptions } from './start';
-import type { LoadedPlugin } from '@docusaurus/types';
+import type { LoadedPlugin, RouterType } from '@docusaurus/types';
 export type OpenUrlContext = {
     host: string;
     port: number;
-    getOpenUrl: ({ baseUrl }: {
+    getOpenUrl: ({ baseUrl, router, }: {
         baseUrl: string;
+        router: RouterType;
     }) => string;
 };
 export declare function createOpenUrlContext({ cliOptions, }: {