@docusaurus/core 3.10.1 → 4.0.0-canary-6808

package/bin/beforeCli.mjs

@@ -10,14 +10,14 @@
 import fs from 'fs-extra';
 import path from 'path';
 import {createRequire} from 'module';
-import execa from 'execa';
+import {execa} from 'execa';
 import {logger} from '@docusaurus/logger';
 import semver from 'semver';
 import updateNotifier from 'update-notifier';
 import boxen from 'boxen';
 import {DOCUSAURUS_VERSION} from '@docusaurus/utils';
 
-const packageJson = /** @type {import("../package.json")} */ (
+const packageJson = /** @type {typeof import("../package.json")} */ (
   createRequire(import.meta.url)('../package.json')
 );
 /** @type {Record<string, any>} */
@@ -111,15 +111,13 @@ export default async function beforeCli() {
         return undefined;
       }
 
-      const yarnVersionResult = await execa.command('yarn --version');
-      if (yarnVersionResult.exitCode === 0) {
-        const majorVersion = parseInt(
-          yarnVersionResult.stdout?.trim().split('.')[0] ?? '',
-          10,
-        );
-        if (!Number.isNaN(majorVersion)) {
-          return majorVersion;
-        }
+      const yarnVersionResult = await execa`yarn --version`;
+      const majorVersion = parseInt(
+        yarnVersionResult.stdout?.trim().split('.')[0] ?? '',
+        10,
+      );
+      if (!Number.isNaN(majorVersion)) {
+        return majorVersion;
       }
 
       return undefined;

package/lib/client/BaseUrlIssueBanner/index.js

@@ -53,7 +53,7 @@ function insertBanner() {
   var suggestedBaseUrl = actualHomePagePath.substr(-1) === '/'
         ? actualHomePagePath
         : actualHomePagePath + '/';
-  suggestionContainer.innerHTML = suggestedBaseUrl;
+  suggestionContainer.textContent = suggestedBaseUrl;
 }
 `;
 }

package/lib/client/exports/ComponentCreator.js

@@ -94,14 +94,12 @@ export default function ComponentCreator(path, hash) {
                 });
                 val[keyPaths[keyPaths.length - 1]] = chunk;
             });
-            /* eslint-disable no-underscore-dangle */
             const Component = loadedModules.__comp;
             delete loadedModules.__comp;
             const routeContext = loadedModules.__context;
             delete loadedModules.__context;
             const routeProps = loadedModules.__props;
             delete loadedModules.__props;
-            /* eslint-enable no-underscore-dangle */
             // Is there any way to put this RouteContextProvider upper in the tree?
             return (<RouteContextProvider value={routeContext}>
           <Component {...loadedModules} {...routeProps} {...props}/>

package/lib/client/exports/Link.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 React from 'react';
+import { type ReactNode } from 'react';
 import type { Props } from '@docusaurus/Link';
-declare const _default: React.ForwardRefExoticComponent<Omit<Props, "ref"> & React.RefAttributes<HTMLAnchorElement>>;
-export default _default;
+declare function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLinkCheck': noBrokenLinkCheck, autoAddBaseUrl, ...props }: Props): ReactNode;
+export default Link;

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, useImperativeHandle, useRef, } from 'react';
+import React, { useCallback, useEffect, useImperativeHandle, useRef, } from 'react';
 import { NavLink, Link as RRLink } from 'react-router-dom';
 import { applyTrailingSlash } from '@docusaurus/utils-common';
 import useDocusaurusContext from './useDocusaurusContext';
@@ -18,14 +18,14 @@ import { useBaseUrlUtils } from './useBaseUrl';
 // 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 }, forwardedRef) {
+function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLinkCheck': noBrokenLinkCheck, autoAddBaseUrl = true, ...props }) {
     const { siteConfig } = useDocusaurusContext();
     const { trailingSlash, baseUrl } = siteConfig;
     const router = siteConfig.future.experimental_router;
     const { withBaseUrl } = useBaseUrlUtils();
     const brokenLinks = useBrokenLinks();
     const innerRef = useRef(null);
-    useImperativeHandle(forwardedRef, () => innerRef.current);
+    useImperativeHandle(props.ref, () => 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
@@ -64,18 +64,23 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
     const LinkComponent = (isNavLink ? NavLink : RRLink);
     const IOSupported = ExecutionEnvironment.canUseIntersectionObserver;
     const ioRef = useRef(undefined);
-    const handleRef = (el) => {
+    const handleRef = useCallback((el) => {
         innerRef.current = el;
+        ioRef.current?.disconnect();
+        ioRef.current = undefined;
         if (IOSupported && el && isInternal) {
             // If IO supported and element reference found, set up Observer.
-            ioRef.current = new window.IntersectionObserver((entries) => {
+            const observer = new window.IntersectionObserver((entries) => {
                 entries.forEach((entry) => {
                     if (el === entry.target) {
                         // 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);
-                            ioRef.current.disconnect();
+                            observer.unobserve(el);
+                            observer.disconnect();
+                            if (ioRef.current === observer) {
+                                ioRef.current = undefined;
+                            }
                             if (targetLink != null) {
                                 window.docusaurus.prefetch(targetLink);
                             }
@@ -84,9 +89,10 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
                 });
             });
             // Add element to the observer.
-            ioRef.current.observe(el);
+            ioRef.current = observer;
+            observer.observe(el);
         }
-    };
+    }, [IOSupported, isInternal, targetLink]);
     const onInteractionEnter = () => {
         if (!preloaded.current && targetLink != null) {
             window.docusaurus.preload(targetLink);
@@ -100,13 +106,7 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
                 window.docusaurus.prefetch(targetLink);
             }
         }
-        // When unmounting, stop intersection observer from watching.
-        return () => {
-            if (IOSupported && ioRef.current) {
-                ioRef.current.disconnect();
-            }
-        };
-    }, [ioRef, targetLink, IOSupported, isInternal]);
+    }, [targetLink, IOSupported, isInternal]);
     // It is simple local anchor link targeting current page?
     const isAnchorLink = targetLink?.startsWith('#') ?? false;
     // See also RR logic:
@@ -139,4 +139,4 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
     // element"
     {...(isNavLink && { isActive, activeClassName })} {...testOnlyProps}/>);
 }
-export default React.forwardRef(Link);
+export default Link;

package/lib/client/exports/isInternalUrl.js

@@ -8,7 +8,7 @@
 // Spec: https://datatracker.ietf.org/doc/html/rfc3986#section-3.1
 // In particular: scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
 export function hasProtocol(url) {
-    return /^(?:[A-Za-z][A-Za-z\d+.-]*:|\/\/)/.test(url);
+    return /^(?:[A-Z][A-Z\d+.-]*:|\/\/)/i.test(url);
 }
 export default function isInternalUrl(url) {
     return typeof url !== 'undefined' && !hasProtocol(url);

package/lib/client/preload.js

@@ -15,8 +15,6 @@ import { matchRoutes } from 'react-router-config';
  * @returns Promise object represents whether pathname has been preloaded
  */
 export default function preload(pathname) {
-    const matches = Array.from(new Set([pathname, decodeURI(pathname)]))
-        .map((p) => matchRoutes(routes, p))
-        .flat();
+    const matches = Array.from(new Set([pathname, decodeURI(pathname)])).flatMap((p) => matchRoutes(routes, p));
     return Promise.all(matches.map((match) => match.route.component.preload?.()));
 }

package/lib/client/serverEntry.js

@@ -13,7 +13,7 @@ import preload from './preload';
 import App from './App';
 import { createStatefulBrokenLinks, BrokenLinksProvider, } from './BrokenLinksContext';
 import { toPageCollectedMetadataInternal } from './serverHelmetUtils';
-const render = async ({ pathname, v4RemoveLegacyPostBuildHeadAttribute, }) => {
+const render = async ({ pathname }) => {
     await preload(pathname);
     const modules = new Set();
     const routerContext = {};
@@ -33,11 +33,6 @@ const render = async ({ pathname, v4RemoveLegacyPostBuildHeadAttribute, }) => {
     const html = await renderToHtml(app);
     const { helmet } = helmetContext;
     const metadata = toPageCollectedMetadataInternal({ helmet });
-    // TODO Docusaurus v4 remove with deprecated postBuild({head}) API
-    //  the returned collectedData must be serializable to run in workers
-    if (v4RemoveLegacyPostBuildHeadAttribute) {
-        metadata.helmet = null;
-    }
     const collectedData = {
         metadata,
         anchors: statefulBrokenLinks.getCollectedAnchors(),

package/lib/client/serverHelmetUtils.js

@@ -23,7 +23,6 @@ export function toPageCollectedMetadataInternal({ helmet, }) {
     const tags = getBuildMetaTags(helmet);
     const noIndex = tags.some(isNoIndexTag);
     return {
-        helmet, // TODO Docusaurus v4 remove
         public: {
             noIndex,
         },

package/lib/commands/build/buildLocale.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 { BuildCLIOptions } from './build';
+import type { BuildCLIOptions } from './build';
 export type BuildLocaleParams = {
     siteDir: string;
     locale: string;

package/lib/commands/build/buildLocale.js

@@ -99,9 +99,6 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
     logger_1.default.success `Generated static files in path=${path_1.default.relative(process.cwd(), outDir)}.`;
 }
 async function executePluginsPostBuild({ plugins, props, collectedData, }) {
-    const head = props.siteConfig.future.v4.removeLegacyPostBuildHeadAttribute
-        ? {}
-        : lodash_1.default.mapValues(collectedData, (d) => d.metadata.helmet);
     const routesBuildMetadata = lodash_1.default.mapValues(collectedData, (d) => d.metadata.public);
     await Promise.all(plugins.map(async (plugin) => {
         if (!plugin.postBuild) {
@@ -109,7 +106,6 @@ async function executePluginsPostBuild({ plugins, props, collectedData, }) {
         }
         await plugin.postBuild({
             ...props,
-            head,
             routesBuildMetadata,
             content: plugin.content,
         });

package/lib/commands/build/buildUtils.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 { BuildCLIOptions } from './build';
+import type { BuildCLIOptions } from './build';
 /**
  * We disable locale path localization if CLI has a single "--locale" option
  * yarn build --locale fr => baseUrl=/ instead of baseUrl=/fr/

package/lib/commands/cli.js

@@ -109,6 +109,9 @@ async function createCLIProgram({ cli, cliArgs, siteDir, config, }) {
         .option('--no-open', 'do not open page in the browser (default: false)')
         .option('--poll [interval]', 'use polling rather than watching for reload (default: false). Can specify a poll interval in milliseconds', normalizePollValue)
         .option('--no-minify', 'build website without minimizing JS bundles (default: false)')
+        .option('--https', 'serve the dev site over HTTPS using a self-signed cert (default: false). Preferred over the HTTPS=true env var. Implied when both --ssl-cert and --ssl-key are provided.')
+        .option('--ssl-cert <path>', 'path to a TLS certificate file (implies HTTPS). Preferred over the SSL_CRT_FILE env var; CLI takes precedence if both are set.')
+        .option('--ssl-key <path>', 'path to a TLS private key file (implies HTTPS). Preferred over the SSL_KEY_FILE env var; CLI takes precedence if both are set.')
         .action(start_1.start);
     cli
         .command('serve [siteDir]')

package/lib/commands/deploy.js

@@ -12,7 +12,7 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const os_1 = tslib_1.__importDefault(require("os"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
-const execa_1 = tslib_1.__importDefault(require("execa"));
+const execa_1 = require("execa");
 const utils_1 = require("@docusaurus/utils");
 const site_1 = require("../server/site");
 const build_1 = require("./build/build");
@@ -24,14 +24,12 @@ function obfuscateGitPass(str) {
 const debugMode = !!process.env.DOCUSAURUS_DEPLOY_DEBUG;
 // Log executed commands so that user can figure out mistakes on his own
 // for example: https://github.com/facebook/docusaurus/issues/3875
-function exec(cmd, options) {
+async function exec(file, args, options) {
     const log = options?.log ?? true;
-    const failfast = options?.failfast ?? false;
+    const failfast = options?.failfast ?? true;
+    const cmd = [file, ...args].join(' ');
     try {
-        // TODO migrate to execa(file,[...args]) instead
-        //  Use async/await everything
-        //  Avoid execa.command: the args need to be escaped manually
-        const result = execa_1.default.commandSync(cmd);
+        const result = await (0, execa_1.execa)(file, args, { reject: false });
         if (log || debugMode) {
             logger_1.default.info `code=${obfuscateGitPass(cmd)} subdue=${`code: ${result.exitCode}`}`;
         }
@@ -39,7 +37,8 @@ function exec(cmd, options) {
             console.log(result);
         }
         if (failfast && result.exitCode !== 0) {
-            throw new Error(`Command returned unexpected exitCode ${result.exitCode}`);
+            throw new Error(`Command returned unexpected exitCode ${result.exitCode}
+${result.stderr}`);
         }
         return result;
     }
@@ -48,13 +47,8 @@ function exec(cmd, options) {
 In CWD code=${process.cwd()}`, { cause: err });
     }
 }
-// Execa escape args and add necessary quotes automatically
-// When using Execa.command, the args containing spaces must be escaped manually
-function escapeArg(arg) {
-    return arg.replaceAll(' ', '\\ ');
-}
-function hasGit() {
-    return exec('git --version').exitCode === 0;
+async function hasGit() {
+    return (await exec('git', ['--version'], { failfast: false })).exitCode === 0;
 }
 async function deploy(siteDirParam = '.', cliOptions = {}) {
     const siteDir = await fs_extra_1.default.realpath(siteDirParam);
@@ -70,23 +64,16 @@ This behavior can have SEO impacts and create relative link issues.
 `);
     }
     logger_1.default.info('Deploy command invoked...');
-    if (!hasGit()) {
+    if (!(await hasGit())) {
         throw new Error('Git not installed or not added to PATH!');
     }
     // Source repo is the repo from where the command is invoked
-    const { stdout } = exec('git remote get-url origin', {
+    const sourceRepoUrl = (await exec('git', ['remote', 'get-url', 'origin'], {
         log: false,
-        failfast: true,
-    });
-    const sourceRepoUrl = stdout.trim();
+    })).stdout.trim();
     // The source branch; defaults to the currently checked out branch
     const sourceBranch = process.env.CURRENT_BRANCH ??
-        exec('git rev-parse --abbrev-ref HEAD', {
-            log: false,
-            failfast: true,
-        })
-            ?.stdout?.toString()
-            .trim();
+        (await exec('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { log: false })).stdout.trim();
     const gitUser = process.env.GIT_USER;
     let useSSH = process.env.USE_SSH !== undefined &&
         process.env.USE_SSH.toLowerCase() === 'true';
@@ -116,10 +103,7 @@ This behavior can have SEO impacts and create relative link issues.
     // We never deploy on pull request.
     const isPullRequest = process.env.CI_PULL_REQUEST ?? process.env.CIRCLE_PULL_REQUEST;
     if (isPullRequest) {
-        exec('echo "Skipping deploy on a pull request."', {
-            log: false,
-            failfast: true,
-        });
+        logger_1.default.info('Skipping deploy on a pull request.');
         process.exit(0);
     }
     // github.io indicates organization repos that deploy via default branch. All
@@ -158,7 +142,7 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
     }
     // Save the commit hash that triggers publish-gh-pages before checking
     // out to deployment branch.
-    const currentCommit = exec('git rev-parse HEAD')?.stdout?.toString().trim();
+    const currentCommit = (await exec('git', ['rev-parse', 'HEAD'])).stdout.trim();
     const runDeploy = async (outputDirectory) => {
         const targetDirectory = cliOptions.targetDir ?? '.';
         const fromPath = outputDirectory;
@@ -167,43 +151,47 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
         // Clones the repo into the temp folder and checks out the target branch.
         // If the branch doesn't exist, it creates a new one based on the
         // repository default branch.
-        if (exec(`git clone --depth 1 --branch ${deploymentBranch} ${deploymentRepoURL} ${escapeArg(toPath)}`).exitCode !== 0) {
-            exec(`git clone --depth 1 ${deploymentRepoURL} ${escapeArg(toPath)}`);
-            exec(`git checkout -b ${deploymentBranch}`);
+        const cloneResult = await exec('git', [
+            'clone',
+            '--depth',
+            '1',
+            '--branch',
+            deploymentBranch,
+            deploymentRepoURL,
+            toPath,
+        ], { failfast: false });
+        if (cloneResult.exitCode !== 0) {
+            await exec('git', ['clone', '--depth', '1', deploymentRepoURL, toPath]);
+            await exec('git', ['checkout', '-b', deploymentBranch]);
         }
         // Clear out any existing contents in the target directory
-        exec(`git rm -rf ${escapeArg(targetDirectory)}`, {
-            log: false,
-            failfast: true,
-        });
+        await exec('git', ['rm', '-rf', targetDirectory], { log: false });
         const targetPath = path_1.default.join(toPath, targetDirectory);
         try {
             await fs_extra_1.default.copy(fromPath, targetPath);
         }
         catch (err) {
-            logger_1.default.error `Copying build assets from path=${fromPath} to path=${targetPath} failed.`;
-            throw err;
+            throw new Error(`Failed to copy build assets from path=${fromPath} to path=${targetPath}.`, { cause: err });
         }
-        exec('git add --all', { failfast: true });
+        await exec('git', ['add', '--all']);
         const gitUserName = process.env.GIT_USER_NAME;
         if (gitUserName) {
-            exec(`git config user.name ${escapeArg(gitUserName)}`, { failfast: true });
+            await exec('git', ['config', 'user.name', gitUserName]);
         }
         const gitUserEmail = process.env.GIT_USER_EMAIL;
         if (gitUserEmail) {
-            exec(`git config user.email ${escapeArg(gitUserEmail)}`, {
-                failfast: true,
-            });
+            await exec('git', ['config', 'user.email', gitUserEmail]);
         }
         const commitMessage = process.env.CUSTOM_COMMIT_MESSAGE ??
             `Deploy website - based on ${currentCommit}`;
-        const commitResults = exec(`git commit -m ${escapeArg(commitMessage)} --allow-empty`);
-        if (exec(`git push --force origin ${deploymentBranch}`).exitCode !== 0) {
+        // The commit might return a non-zero value when site is up to date.
+        const commitResults = await exec('git', ['commit', '-m', commitMessage, '--allow-empty'], { failfast: false });
+        const pushResult = await exec('git', ['push', '--force', 'origin', deploymentBranch], { failfast: false });
+        if (pushResult.exitCode !== 0) {
             throw new Error('Running "git push" command failed. Does the GitHub user account you are using have push access to the repository?');
         }
         else if (commitResults.exitCode === 0) {
-            // The commit might return a non-zero value when site is up to date.
-            let websiteURL = '';
+            let websiteURL;
             if (githubHost === 'github.com') {
                 websiteURL = projectName.includes('.github.io')
                     ? `https://${organizationName}.github.io/`
@@ -213,13 +201,8 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
                 // GitHub enterprise hosting.
                 websiteURL = `https://${githubHost}/pages/${organizationName}/${projectName}/`;
             }
-            try {
-                exec(`echo "Website is live at ${websiteURL}."`, { failfast: true });
-                process.exit(0);
-            }
-            catch (err) {
-                throw new Error(`Failed to execute command: ${err}`);
-            }
+            logger_1.default.success `Website is live at url=${websiteURL}.`;
+            process.exit(0);
         }
     };
     if (!cliOptions.skipBuild) {

package/lib/commands/serve.js

@@ -19,6 +19,7 @@ const openBrowser_1 = tslib_1.__importDefault(require("./utils/openBrowser/openB
 const config_1 = require("../server/config");
 const build_1 = require("./build/build");
 const getHostPort_1 = require("../server/getHostPort");
+const listenToServer_1 = require("./utils/listenToServer");
 function redirect(res, location) {
     res.writeHead(302, {
         Location: location,
@@ -56,7 +57,7 @@ async function serve(siteDirParam = '.', cliOptions = {}) {
         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}$/);
+            const looksLikeAsset = !!req.url.match(/\.[a-z\d]{1,4}$/i);
             if (!looksLikeAsset) {
                 const normalizedUrl = (0, utils_common_1.applyTrailingSlash)(req.url, {
                     trailingSlash,
@@ -84,7 +85,7 @@ async function serve(siteDirParam = '.', cliOptions = {}) {
     });
     const url = servingUrl + baseUrl;
     logger_1.default.success `Serving path=${buildDir} directory at: url=${url}`;
-    server.listen(port);
+    await (0, listenToServer_1.listenToServer)({ server, host, port });
     if (cliOptions.open && !process.env.CI) {
         await (0, openBrowser_1.default)(url);
     }

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

@@ -11,5 +11,8 @@ export type StartCLIOptions = HostPortOptions & Pick<LoadContextParams, 'locale'
     open?: boolean;
     poll?: boolean | number;
     minify?: boolean;
+    https?: true;
+    sslCert?: string;
+    sslKey?: string;
 };
 export declare function start(siteDirParam?: string, cliOptions?: Partial<StartCLIOptions>): Promise<void>;

package/lib/commands/start/webpack.js

@@ -41,7 +41,11 @@ function registerWebpackE2ETestHook(compiler) {
 async function createDevServerConfig({ cliOptions, props, host, port, }) {
     const { baseUrl, siteDir, siteConfig } = props;
     const pollingOptions = (0, watcher_1.createPollingOptions)(cliOptions);
-    const httpsConfig = await (0, getHttpsConfig_1.default)();
+    const httpsConfig = await (0, getHttpsConfig_1.default)({
+        https: cliOptions.https,
+        sslCert: cliOptions.sslCert,
+        sslKey: cliOptions.sslKey,
+    });
     // https://webpack.js.org/configuration/dev-server
     return {
         hot: cliOptions.hotOnly ? 'only' : true,
@@ -134,5 +138,19 @@ async function createWebpackDevServer({ props, cliOptions, openUrlContext, }) {
     });
     // Allow plugin authors to customize/override devServer config
     const devServerConfig = (0, webpack_merge_1.default)([defaultDevServerConfig, config.devServer].filter(Boolean));
-    return new webpack_dev_server_1.default(devServerConfig, compiler);
+    return createDevServer({
+        devServerConfig,
+        compiler,
+        currentBundler: props.currentBundler,
+    });
+}
+async function createDevServer({ devServerConfig, compiler, currentBundler, }) {
+    if (currentBundler.name === 'webpack') {
+        return new webpack_dev_server_1.default(devServerConfig, compiler);
+    }
+    else {
+        const RspackDevServer = await (0, bundler_1.importRspackDevServer)();
+        // @ts-expect-error: different types
+        return new RspackDevServer(devServerConfig, compiler);
+    }
 }

package/lib/commands/swizzle/actions.js

@@ -39,6 +39,11 @@ async function eject({ siteDir, themePath, componentName, typescript, }) {
         : `${fromPath}.*`;
     const globPatternPosix = (0, utils_1.posixPath)(globPattern);
     const filesToCopy = await (0, utils_1.Globby)(globPatternPosix, {
+        // Workaround for Tinyglobby bug?
+        // We glob absolute from the theme root path, not from cwd
+        // See https://github.com/SuperchupuDev/tinyglobby/issues/186
+        cwd: themePath,
+        absolute: true,
         ignore: lodash_1.default.compact([
             '**/*.{story,stories,test,tests}.{js,jsx,ts,tsx}',
             // When ejecting JS components, we want to avoid emitting TS files

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

@@ -0,0 +1,5 @@
+export declare function listenToServer({ server, port, host, }: {
+    server: import('node:http').Server;
+    port: number;
+    host: string;
+}): Promise<void>;

package/lib/commands/utils/listenToServer.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listenToServer = listenToServer;
+/**
+ * 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.
+ */
+const logger_1 = require("@docusaurus/logger");
+async function listenToServer({ server, port, host, }) {
+    return new Promise((resolve, reject) => {
+        server.once('listening', () => resolve());
+        server.once('error', (err) => {
+            if (err.code === 'EADDRINUSE') {
+                reject(new Error(logger_1.logger.interpolate `Address in use, another server is already listening on the requested port number=${port} and host name=${host}`, { cause: err }));
+            }
+            else {
+                reject(err);
+            }
+        });
+        server.listen(port, host);
+    });
+}

package/lib/commands/utils/openBrowser/openBrowser.js

@@ -15,7 +15,7 @@ const tslib_1 = require("tslib");
 /* eslint-disable */
 const child_process_1 = require("child_process");
 const util_1 = require("util");
-const open_1 = tslib_1.__importDefault(require("open"));
+const open_1 = tslib_1.__importStar(require("open"));
 const logger_1 = require("@docusaurus/logger");
 const execPromise = (0, util_1.promisify)(child_process_1.exec);
 // Not sure if we need this, but let's keep a secret escape hatch
@@ -101,9 +101,9 @@ function toOpenApp(params) {
         return undefined;
     }
     // Handles "cross-platform" shortcuts like "chrome", "firefox", "edge"
-    if (open_1.default.apps[params.browser]) {
+    if (open_1.apps[params.browser]) {
         return {
-            name: open_1.default.apps[params.browser],
+            name: open_1.apps[params.browser],
             arguments: params.browserArgs,
         };
     }

package/lib/commands/writeHeadingIds.js

@@ -63,9 +63,9 @@ async function writeHeadingIds(siteDirParam = '.', files = [], options = {}) {
     validateOptions(options);
     const siteDir = await fs_extra_1.default.realpath(siteDirParam);
     const patterns = files.length ? files : await getPathsToWatch(siteDir);
-    const markdownFiles = await (0, utils_1.safeGlobby)(patterns, {
-        expandDirectories: ['**/*.{md,mdx}'],
-    });
+    const markdownFiles = (await (0, utils_1.safeGlobby)(patterns, {
+        expandDirectories: true,
+    })).filter((file) => file.endsWith('.md') || file.endsWith('.mdx'));
     if (markdownFiles.length === 0) {
         logger_1.default.warn `No markdown files found in siteDir path=${siteDir} for patterns: ${patterns}`;
         return;

package/lib/server/codegen/codegenRoutes.js

@@ -85,7 +85,6 @@ ${indent(parts.join(',\n'))}
 }
 const isModule = (value) => typeof value === 'string' ||
     (typeof value === 'object' &&
-        // eslint-disable-next-line no-underscore-dangle
         !!value?.__import);
 /**
  * Takes a {@link Module} (which is nothing more than a path plus some metadata

package/lib/server/config.js

@@ -33,7 +33,7 @@ async function loadSiteConfig({ siteDir, customConfigFilePath, }) {
     if (!(await fs_extra_1.default.pathExists(siteConfigPath))) {
         throw new Error(`Config file at "${siteConfigPath}" not found.`);
     }
-    const importedConfig = await (0, utils_1.loadFreshModule)(siteConfigPath);
+    const importedConfig = await (0, utils_1.loadFreshModule)(siteConfigPath, { default: true });
     const loadedConfig = typeof importedConfig === 'function'
         ? await importedConfig()
         : await importedConfig;