@docusaurus/plugin-content-docs 3.5.1 → 3.5.2-canary-6122

package/lib/cli.d.ts

@@ -6,4 +6,8 @@
  */
 import type { PluginOptions } from '@docusaurus/plugin-content-docs';
 import type { LoadContext } from '@docusaurus/types';
-export declare function cliDocsVersionCommand(version: unknown, { id: pluginId, path: docsPath, sidebarPath }: PluginOptions, { siteDir, i18n }: LoadContext): Promise<void>;
+declare function cliDocsVersionCommand(version: unknown, { id: pluginId, path: docsPath, sidebarPath }: PluginOptions, { siteDir, i18n }: LoadContext): Promise<void>;
+declare const _default: {
+    cliDocsVersionCommand: typeof cliDocsVersionCommand;
+};
+export default _default;

package/lib/cli.js

@@ -6,7 +6,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cliDocsVersionCommand = cliDocsVersionCommand;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -89,3 +88,16 @@ async function cliDocsVersionCommand(version, { id: pluginId, path: docsPath, si
     await fs_extra_1.default.outputFile((0, files_1.getVersionsFilePath)(siteDir, pluginId), `${JSON.stringify(versions, null, 2)}\n`);
     logger_1.default.success `name=${pluginIdLogPrefix}: version name=${version} created!`;
 }
+// TODO try to remove this workaround
+// Why use a default export instead of named exports here?
+// This is only to make Jest mocking happy
+// After upgrading Jest/SWC we got this weird mocking error in extendCli tests
+// "spyOn: Cannot redefine property cliDocsVersionCommand"
+// I tried various workarounds, and it's the only one that worked :/
+// See also:
+// - https://pyk.sh/fixing-typeerror-cannot-redefine-property-x-error-in-jest-tests#heading-solution-2-using-barrel-imports
+// - https://github.com/aelbore/esbuild-jest/issues/26
+// - https://stackoverflow.com/questions/67872622/jest-spyon-not-working-on-index-file-cannot-redefine-property/69951703#69951703
+exports.default = {
+    cliDocsVersionCommand,
+};

package/lib/contentHelpers.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import type { DocMetadata, LoadedContent } from '@docusaurus/plugin-content-docs';
+export declare function createContentHelpers(): {
+    updateContent: (content: LoadedContent) => void;
+    sourceToDoc: Map<string, DocMetadata>;
+    sourceToPermalink: Map<string, string>;
+};

package/lib/contentHelpers.js

@@ -0,0 +1,31 @@
+"use strict";
+/**
+ * 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createContentHelpers = createContentHelpers;
+function indexDocsBySource(content) {
+    const allDocs = content.loadedVersions.flatMap((v) => v.docs);
+    return new Map(allDocs.map((doc) => [doc.source, doc]));
+}
+// TODO this is bad, we should have a better way to do this (new lifecycle?)
+//  The source to doc/permalink is a mutable map passed to the mdx loader
+//  See https://github.com/facebook/docusaurus/pull/10457
+//  See https://github.com/facebook/docusaurus/pull/10185
+function createContentHelpers() {
+    const sourceToDoc = new Map();
+    const sourceToPermalink = new Map();
+    // Mutable map update :/
+    function updateContent(content) {
+        sourceToDoc.clear();
+        sourceToPermalink.clear();
+        indexDocsBySource(content).forEach((value, key) => {
+            sourceToDoc.set(key, value);
+            sourceToPermalink.set(key, value.permalink);
+        });
+    }
+    return { updateContent, sourceToDoc, sourceToPermalink };
+}

package/lib/index.js

@@ -14,35 +14,18 @@ const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 const utils_validation_1 = require("@docusaurus/utils-validation");
+const mdx_loader_1 = require("@docusaurus/mdx-loader");
 const sidebars_1 = require("./sidebars");
 const generator_1 = require("./sidebars/generator");
 const docs_1 = require("./docs");
 const versions_1 = require("./versions");
-const cli_1 = require("./cli");
+const cli_1 = tslib_1.__importDefault(require("./cli"));
 const constants_1 = require("./constants");
 const globalData_1 = require("./globalData");
 const translations_1 = require("./translations");
 const routes_1 = require("./routes");
 const utils_2 = require("./sidebars/utils");
-// TODO this is bad, we should have a better way to do this (new lifecycle?)
-//  The source to permalink is currently a mutable map passed to the mdx loader
-//  for link resolution
-//  see https://github.com/facebook/docusaurus/pull/10185
-function createSourceToPermalinkHelper() {
-    const sourceToPermalink = new Map();
-    function computeSourceToPermalink(content) {
-        const allDocs = content.loadedVersions.flatMap((v) => v.docs);
-        return new Map(allDocs.map(({ source, permalink }) => [source, permalink]));
-    }
-    // Mutable map update :/
-    function update(content) {
-        sourceToPermalink.clear();
-        computeSourceToPermalink(content).forEach((value, key) => {
-            sourceToPermalink.set(key, value);
-        });
-    }
-    return { get: () => sourceToPermalink, update };
-}
+const contentHelpers_1 = require("./contentHelpers");
 async function pluginContentDocs(context, options) {
     const { siteDir, generatedFilesDir, baseUrl, siteConfig } = context;
     // Mutate options to resolve sidebar path according to siteDir
@@ -57,7 +40,54 @@ async function pluginContentDocs(context, options) {
     const aliasedSource = (source) => `~docs/${(0, utils_1.posixPath)(path_1.default.relative(pluginDataDirRoot, source))}`;
     // TODO env should be injected into all plugins
     const env = process.env.NODE_ENV;
-    const sourceToPermalinkHelper = createSourceToPermalinkHelper();
+    const contentHelpers = (0, contentHelpers_1.createContentHelpers)();
+    async function createDocsMDXLoaderRule() {
+        const { rehypePlugins, remarkPlugins, recmaPlugins, beforeDefaultRehypePlugins, beforeDefaultRemarkPlugins, } = options;
+        const contentDirs = versionsMetadata
+            .flatMap(utils_1.getContentPathList)
+            // Trailing slash is important, see https://github.com/facebook/docusaurus/pull/3970
+            .map(utils_1.addTrailingPathSeparator);
+        return (0, mdx_loader_1.createMDXLoaderRule)({
+            include: contentDirs,
+            options: {
+                useCrossCompilerCache: siteConfig.future.experimental_faster.mdxCrossCompilerCache,
+                admonitions: options.admonitions,
+                remarkPlugins,
+                rehypePlugins,
+                recmaPlugins,
+                beforeDefaultRehypePlugins,
+                beforeDefaultRemarkPlugins,
+                staticDirs: siteConfig.staticDirectories.map((dir) => path_1.default.resolve(siteDir, dir)),
+                siteDir,
+                isMDXPartial: (0, utils_1.createAbsoluteFilePathMatcher)(options.exclude, contentDirs),
+                metadataPath: (mdxPath) => {
+                    // Note that metadataPath must be the same/in-sync as
+                    // the path from createData for each MDX.
+                    const aliasedPath = (0, utils_1.aliasedSitePath)(mdxPath, siteDir);
+                    return path_1.default.join(dataDir, `${(0, utils_1.docuHash)(aliasedPath)}.json`);
+                },
+                // createAssets converts relative paths to require() calls
+                createAssets: ({ frontMatter }) => ({
+                    image: frontMatter.image,
+                }),
+                markdownConfig: siteConfig.markdown,
+                resolveMarkdownLink: ({ linkPathname, sourceFilePath }) => {
+                    const version = (0, versions_1.getVersionFromSourceFilePath)(sourceFilePath, versionsMetadata);
+                    const permalink = (0, utils_1.resolveMarkdownLinkPathname)(linkPathname, {
+                        sourceFilePath,
+                        sourceToPermalink: contentHelpers.sourceToPermalink,
+                        siteDir,
+                        contentPaths: version,
+                    });
+                    if (permalink === null) {
+                        logger_1.default.report(siteConfig.onBrokenMarkdownLinks) `Docs markdown link couldn't be resolved: (url=${linkPathname}) in source file path=${sourceFilePath} for version number=${version.versionName}`;
+                    }
+                    return permalink;
+                },
+            },
+        });
+    }
+    const docsMDXLoaderRule = await createDocsMDXLoaderRule();
     return {
         name: 'docusaurus-plugin-content-docs',
         extendCli(cli) {
@@ -74,7 +104,7 @@ async function pluginContentDocs(context, options) {
                 .command(command)
                 .arguments('<version>')
                 .description(commandDescription)
-                .action((version) => (0, cli_1.cliDocsVersionCommand)(version, options, context));
+                .action((version) => cli_1.default.cliDocsVersionCommand(version, options, context));
         },
         getTranslationFiles({ content }) {
             return (0, translations_1.getLoadedContentTranslationFiles)(content);
@@ -175,7 +205,7 @@ async function pluginContentDocs(context, options) {
             return (0, translations_1.translateLoadedContent)(content, translationFiles);
         },
         async contentLoaded({ content, actions }) {
-            sourceToPermalinkHelper.update(content);
+            contentHelpers.updateContent(content);
             const versions = content.loadedVersions.map(versions_1.toFullVersion);
             await (0, routes_1.createAllRoutes)({
                 baseUrl,
@@ -190,54 +220,7 @@ async function pluginContentDocs(context, options) {
                 breadcrumbs: options.breadcrumbs,
             });
         },
-        configureWebpack(_config, isServer, utils, content) {
-            const { rehypePlugins, remarkPlugins, recmaPlugins, beforeDefaultRehypePlugins, beforeDefaultRemarkPlugins, } = options;
-            const contentDirs = versionsMetadata
-                .flatMap(utils_1.getContentPathList)
-                // Trailing slash is important, see https://github.com/facebook/docusaurus/pull/3970
-                .map(utils_1.addTrailingPathSeparator);
-            function createMDXLoader() {
-                const loaderOptions = {
-                    admonitions: options.admonitions,
-                    remarkPlugins,
-                    rehypePlugins,
-                    recmaPlugins,
-                    beforeDefaultRehypePlugins,
-                    beforeDefaultRemarkPlugins,
-                    staticDirs: siteConfig.staticDirectories.map((dir) => path_1.default.resolve(siteDir, dir)),
-                    siteDir,
-                    isMDXPartial: (0, utils_1.createAbsoluteFilePathMatcher)(options.exclude, contentDirs),
-                    metadataPath: (mdxPath) => {
-                        // Note that metadataPath must be the same/in-sync as
-                        // the path from createData for each MDX.
-                        const aliasedPath = (0, utils_1.aliasedSitePath)(mdxPath, siteDir);
-                        return path_1.default.join(dataDir, `${(0, utils_1.docuHash)(aliasedPath)}.json`);
-                    },
-                    // Assets allow to convert some relative images paths to
-                    // require(...) calls
-                    createAssets: ({ frontMatter }) => ({
-                        image: frontMatter.image,
-                    }),
-                    markdownConfig: siteConfig.markdown,
-                    resolveMarkdownLink: ({ linkPathname, sourceFilePath }) => {
-                        const version = (0, versions_1.getVersionFromSourceFilePath)(sourceFilePath, content.loadedVersions);
-                        const permalink = (0, utils_1.resolveMarkdownLinkPathname)(linkPathname, {
-                            sourceFilePath,
-                            sourceToPermalink: sourceToPermalinkHelper.get(),
-                            siteDir,
-                            contentPaths: version,
-                        });
-                        if (permalink === null) {
-                            logger_1.default.report(siteConfig.onBrokenMarkdownLinks) `Docs markdown link couldn't be resolved: (url=${linkPathname}) in source file path=${sourceFilePath} for version number=${version.versionName}`;
-                        }
-                        return permalink;
-                    },
-                };
-                return {
-                    loader: require.resolve('@docusaurus/mdx-loader'),
-                    options: loaderOptions,
-                };
-            }
+        configureWebpack() {
             return {
                 ignoreWarnings: [
                     // Suppress warnings about non-existing of versions file.
@@ -250,13 +233,7 @@ async function pluginContentDocs(context, options) {
                     },
                 },
                 module: {
-                    rules: [
-                        {
-                            test: /\.mdx?$/i,
-                            include: contentDirs,
-                            use: [createMDXLoader()],
-                        },
-                    ],
+                    rules: [docsMDXLoaderRule],
                 },
             };
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-docs",
-  "version": "3.5.1",
+  "version": "3.5.2-canary-6122",
   "description": "Docs plugin for Docusaurus.",
   "main": "lib/index.js",
   "sideEffects": false,
@@ -35,15 +35,15 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "3.5.1",
-    "@docusaurus/logger": "3.5.1",
-    "@docusaurus/mdx-loader": "3.5.1",
-    "@docusaurus/module-type-aliases": "3.5.1",
-    "@docusaurus/theme-common": "3.5.1",
-    "@docusaurus/types": "3.5.1",
-    "@docusaurus/utils": "3.5.1",
-    "@docusaurus/utils-common": "3.5.1",
-    "@docusaurus/utils-validation": "3.5.1",
+    "@docusaurus/core": "3.5.2-canary-6122",
+    "@docusaurus/logger": "3.5.2-canary-6122",
+    "@docusaurus/mdx-loader": "3.5.2-canary-6122",
+    "@docusaurus/module-type-aliases": "3.5.2-canary-6122",
+    "@docusaurus/theme-common": "3.5.2-canary-6122",
+    "@docusaurus/types": "3.5.2-canary-6122",
+    "@docusaurus/utils": "3.5.2-canary-6122",
+    "@docusaurus/utils-common": "3.5.2-canary-6122",
+    "@docusaurus/utils-validation": "3.5.2-canary-6122",
     "@types/react-router-config": "^5.0.7",
     "combine-promises": "^1.1.0",
     "fs-extra": "^11.1.1",
@@ -67,5 +67,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "5acbc57bd62f3f808ef72007cd67d4c410d13829"
+  "gitHead": "13455a98d6f59bad263db5629d67cbed578c4250"
 }

package/src/cli.ts

@@ -53,7 +53,7 @@ async function createVersionedSidebarFile({
 }
 
 // Tests depend on non-default export for mocking.
-export async function cliDocsVersionCommand(
+async function cliDocsVersionCommand(
   version: unknown,
   {id: pluginId, path: docsPath, sidebarPath}: PluginOptions,
   {siteDir, i18n}: LoadContext,
@@ -142,3 +142,17 @@ export async function cliDocsVersionCommand(
 
   logger.success`name=${pluginIdLogPrefix}: version name=${version} created!`;
 }
+
+// TODO try to remove this workaround
+// Why use a default export instead of named exports here?
+// This is only to make Jest mocking happy
+// After upgrading Jest/SWC we got this weird mocking error in extendCli tests
+// "spyOn: Cannot redefine property cliDocsVersionCommand"
+// I tried various workarounds, and it's the only one that worked :/
+// See also:
+// - https://pyk.sh/fixing-typeerror-cannot-redefine-property-x-error-in-jest-tests#heading-solution-2-using-barrel-imports
+// - https://github.com/aelbore/esbuild-jest/issues/26
+// - https://stackoverflow.com/questions/67872622/jest-spyon-not-working-on-index-file-cannot-redefine-property/69951703#69951703
+export default {
+  cliDocsVersionCommand,
+};

package/src/contentHelpers.ts

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import type {DocMetadata, LoadedContent} from '@docusaurus/plugin-content-docs';
+
+function indexDocsBySource(content: LoadedContent): Map<string, DocMetadata> {
+  const allDocs = content.loadedVersions.flatMap((v) => v.docs);
+  return new Map(allDocs.map((doc) => [doc.source, doc]));
+}
+
+// TODO this is bad, we should have a better way to do this (new lifecycle?)
+//  The source to doc/permalink is a mutable map passed to the mdx loader
+//  See https://github.com/facebook/docusaurus/pull/10457
+//  See https://github.com/facebook/docusaurus/pull/10185
+export function createContentHelpers() {
+  const sourceToDoc = new Map<string, DocMetadata>();
+  const sourceToPermalink = new Map<string, string>();
+
+  // Mutable map update :/
+  function updateContent(content: LoadedContent): void {
+    sourceToDoc.clear();
+    sourceToPermalink.clear();
+    indexDocsBySource(content).forEach((value, key) => {
+      sourceToDoc.set(key, value);
+      sourceToPermalink.set(key, value.permalink);
+    });
+  }
+
+  return {updateContent, sourceToDoc, sourceToPermalink};
+}

package/src/index.ts

@@ -19,13 +19,13 @@ import {
   createSlugger,
   resolveMarkdownLinkPathname,
   DEFAULT_PLUGIN_ID,
-  type SourceToPermalink,
   type TagsFile,
 } from '@docusaurus/utils';
 import {
   getTagsFile,
   getTagsFilePathsToWatch,
 } from '@docusaurus/utils-validation';
+import {createMDXLoaderRule} from '@docusaurus/mdx-loader';
 import {loadSidebars, resolveSidebarPathOption} from './sidebars';
 import {CategoryMetadataFilenamePattern} from './sidebars/generator';
 import {
@@ -40,7 +40,7 @@ import {
   readVersionsMetadata,
   toFullVersion,
 } from './versions';
-import {cliDocsVersionCommand} from './cli';
+import cliDocs from './cli';
 import {VERSIONS_JSON_FILE} from './constants';
 import {toGlobalDataVersion} from './globalData';
 import {
@@ -49,8 +49,8 @@ import {
 } from './translations';
 import {createAllRoutes} from './routes';
 import {createSidebarsUtils} from './sidebars/utils';
-import type {Options as MDXLoaderOptions} from '@docusaurus/mdx-loader';
 
+import {createContentHelpers} from './contentHelpers';
 import type {
   PluginOptions,
   DocMetadataBase,
@@ -61,30 +61,7 @@ import type {
 } from '@docusaurus/plugin-content-docs';
 import type {LoadContext, Plugin} from '@docusaurus/types';
 import type {DocFile, FullVersion} from './types';
-import type {RuleSetUseItem} from 'webpack';
-
-// TODO this is bad, we should have a better way to do this (new lifecycle?)
-//  The source to permalink is currently a mutable map passed to the mdx loader
-//  for link resolution
-//  see https://github.com/facebook/docusaurus/pull/10185
-function createSourceToPermalinkHelper() {
-  const sourceToPermalink: SourceToPermalink = new Map();
-
-  function computeSourceToPermalink(content: LoadedContent): SourceToPermalink {
-    const allDocs = content.loadedVersions.flatMap((v) => v.docs);
-    return new Map(allDocs.map(({source, permalink}) => [source, permalink]));
-  }
-
-  // Mutable map update :/
-  function update(content: LoadedContent): void {
-    sourceToPermalink.clear();
-    computeSourceToPermalink(content).forEach((value, key) => {
-      sourceToPermalink.set(key, value);
-    });
-  }
-
-  return {get: () => sourceToPermalink, update};
-}
+import type {RuleSetRule} from 'webpack';
 
 export default async function pluginContentDocs(
   context: LoadContext,
@@ -112,7 +89,74 @@ export default async function pluginContentDocs(
   // TODO env should be injected into all plugins
   const env = process.env.NODE_ENV as DocEnv;
 
-  const sourceToPermalinkHelper = createSourceToPermalinkHelper();
+  const contentHelpers = createContentHelpers();
+
+  async function createDocsMDXLoaderRule(): Promise<RuleSetRule> {
+    const {
+      rehypePlugins,
+      remarkPlugins,
+      recmaPlugins,
+      beforeDefaultRehypePlugins,
+      beforeDefaultRemarkPlugins,
+    } = options;
+    const contentDirs = versionsMetadata
+      .flatMap(getContentPathList)
+      // Trailing slash is important, see https://github.com/facebook/docusaurus/pull/3970
+      .map(addTrailingPathSeparator);
+
+    return createMDXLoaderRule({
+      include: contentDirs,
+      options: {
+        useCrossCompilerCache:
+          siteConfig.future.experimental_faster.mdxCrossCompilerCache,
+        admonitions: options.admonitions,
+        remarkPlugins,
+        rehypePlugins,
+        recmaPlugins,
+        beforeDefaultRehypePlugins,
+        beforeDefaultRemarkPlugins,
+        staticDirs: siteConfig.staticDirectories.map((dir) =>
+          path.resolve(siteDir, dir),
+        ),
+        siteDir,
+        isMDXPartial: createAbsoluteFilePathMatcher(
+          options.exclude,
+          contentDirs,
+        ),
+        metadataPath: (mdxPath: string) => {
+          // Note that metadataPath must be the same/in-sync as
+          // the path from createData for each MDX.
+          const aliasedPath = aliasedSitePath(mdxPath, siteDir);
+          return path.join(dataDir, `${docuHash(aliasedPath)}.json`);
+        },
+        // createAssets converts relative paths to require() calls
+        createAssets: ({frontMatter}: {frontMatter: DocFrontMatter}) => ({
+          image: frontMatter.image,
+        }),
+        markdownConfig: siteConfig.markdown,
+        resolveMarkdownLink: ({linkPathname, sourceFilePath}) => {
+          const version = getVersionFromSourceFilePath(
+            sourceFilePath,
+            versionsMetadata,
+          );
+          const permalink = resolveMarkdownLinkPathname(linkPathname, {
+            sourceFilePath,
+            sourceToPermalink: contentHelpers.sourceToPermalink,
+            siteDir,
+            contentPaths: version,
+          });
+          if (permalink === null) {
+            logger.report(
+              siteConfig.onBrokenMarkdownLinks,
+            )`Docs markdown link couldn't be resolved: (url=${linkPathname}) in source file path=${sourceFilePath} for version number=${version.versionName}`;
+          }
+          return permalink;
+        },
+      },
+    });
+  }
+
+  const docsMDXLoaderRule = await createDocsMDXLoaderRule();
 
   return {
     name: 'docusaurus-plugin-content-docs',
@@ -134,7 +178,7 @@ export default async function pluginContentDocs(
         .arguments('<version>')
         .description(commandDescription)
         .action((version: unknown) =>
-          cliDocsVersionCommand(version, options, context),
+          cliDocs.cliDocsVersionCommand(version, options, context),
         );
     },
 
@@ -270,7 +314,7 @@ export default async function pluginContentDocs(
     },
 
     async contentLoaded({content, actions}) {
-      sourceToPermalinkHelper.update(content);
+      contentHelpers.updateContent(content);
 
       const versions: FullVersion[] = content.loadedVersions.map(toFullVersion);
 
@@ -289,74 +333,7 @@ export default async function pluginContentDocs(
       });
     },
 
-    configureWebpack(_config, isServer, utils, content) {
-      const {
-        rehypePlugins,
-        remarkPlugins,
-        recmaPlugins,
-        beforeDefaultRehypePlugins,
-        beforeDefaultRemarkPlugins,
-      } = options;
-
-      const contentDirs = versionsMetadata
-        .flatMap(getContentPathList)
-        // Trailing slash is important, see https://github.com/facebook/docusaurus/pull/3970
-        .map(addTrailingPathSeparator);
-
-      function createMDXLoader(): RuleSetUseItem {
-        const loaderOptions: MDXLoaderOptions = {
-          admonitions: options.admonitions,
-          remarkPlugins,
-          rehypePlugins,
-          recmaPlugins,
-          beforeDefaultRehypePlugins,
-          beforeDefaultRemarkPlugins,
-          staticDirs: siteConfig.staticDirectories.map((dir) =>
-            path.resolve(siteDir, dir),
-          ),
-          siteDir,
-          isMDXPartial: createAbsoluteFilePathMatcher(
-            options.exclude,
-            contentDirs,
-          ),
-          metadataPath: (mdxPath: string) => {
-            // Note that metadataPath must be the same/in-sync as
-            // the path from createData for each MDX.
-            const aliasedPath = aliasedSitePath(mdxPath, siteDir);
-            return path.join(dataDir, `${docuHash(aliasedPath)}.json`);
-          },
-          // Assets allow to convert some relative images paths to
-          // require(...) calls
-          createAssets: ({frontMatter}: {frontMatter: DocFrontMatter}) => ({
-            image: frontMatter.image,
-          }),
-          markdownConfig: siteConfig.markdown,
-          resolveMarkdownLink: ({linkPathname, sourceFilePath}) => {
-            const version = getVersionFromSourceFilePath(
-              sourceFilePath,
-              content.loadedVersions,
-            );
-            const permalink = resolveMarkdownLinkPathname(linkPathname, {
-              sourceFilePath,
-              sourceToPermalink: sourceToPermalinkHelper.get(),
-              siteDir,
-              contentPaths: version,
-            });
-            if (permalink === null) {
-              logger.report(
-                siteConfig.onBrokenMarkdownLinks,
-              )`Docs markdown link couldn't be resolved: (url=${linkPathname}) in source file path=${sourceFilePath} for version number=${version.versionName}`;
-            }
-            return permalink;
-          },
-        };
-
-        return {
-          loader: require.resolve('@docusaurus/mdx-loader'),
-          options: loaderOptions,
-        };
-      }
-
+    configureWebpack() {
       return {
         ignoreWarnings: [
           // Suppress warnings about non-existing of versions file.
@@ -370,13 +347,7 @@ export default async function pluginContentDocs(
           },
         },
         module: {
-          rules: [
-            {
-              test: /\.mdx?$/i,
-              include: contentDirs,
-              use: [createMDXLoader()],
-            },
-          ],
+          rules: [docsMDXLoaderRule],
         },
       };
     },