@docusaurus/plugin-content-blog 3.5.0 → 3.5.2-canary-6121

package/lib/authors.d.ts

@@ -10,6 +10,10 @@ type AuthorsParam = {
     authorsMap: AuthorsMap | undefined;
     baseUrl: string;
 };
+export declare function normalizeImageUrl({ imageURL, baseUrl, }: {
+    imageURL: string | undefined;
+    baseUrl: string;
+}): string | undefined;
 export declare function getBlogPostAuthors(params: AuthorsParam): Author[];
 /**
  * Group blog posts by author key

package/lib/authors.js

@@ -6,16 +6,29 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeImageUrl = normalizeImageUrl;
 exports.getBlogPostAuthors = getBlogPostAuthors;
 exports.groupBlogPostsByAuthorKey = groupBlogPostsByAuthorKey;
 const tslib_1 = require("tslib");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
+const authorsSocials_1 = require("./authorsSocials");
 function normalizeImageUrl({ imageURL, baseUrl, }) {
     return imageURL?.startsWith('/')
         ? (0, utils_1.normalizeUrl)([baseUrl, imageURL])
         : imageURL;
 }
+function normalizeAuthorUrl({ author, baseUrl, }) {
+    if (author.key) {
+        // Ensures invariant: global authors should have already been normalized
+        if (author.imageURL?.startsWith('/') &&
+            !author.imageURL.startsWith(baseUrl)) {
+            throw new Error(`Docusaurus internal bug: global authors image ${author.imageURL} should start with the expected baseUrl=${baseUrl}`);
+        }
+        return author.imageURL;
+    }
+    return normalizeImageUrl({ imageURL: author.imageURL, baseUrl });
+}
 // Legacy v1/early-v2 front matter fields
 // We may want to deprecate those in favor of using only frontMatter.authors
 // TODO Docusaurus v4: remove this legacy front matter
@@ -54,7 +67,10 @@ function getFrontMatterAuthors(params) {
                 // becoming a name and may end up unnoticed
                 return { key: authorInput };
             }
-            return authorInput;
+            return {
+                ...authorInput,
+                socials: (0, authorsSocials_1.normalizeSocials)(authorInput.socials ?? {}),
+            };
         }
         return Array.isArray(frontMatter.authors)
             ? frontMatter.authors.map(normalizeAuthor)
@@ -88,7 +104,8 @@ ${Object.keys(authorsMap)
             ...author,
             key: author.key ?? null,
             page: author.page ?? null,
-            imageURL: normalizeImageUrl({ imageURL: author.imageURL, baseUrl }),
+            // global author images have already been normalized
+            imageURL: normalizeAuthorUrl({ author, baseUrl }),
         };
     }
 }

package/lib/authorsMap.d.ts

@@ -18,6 +18,7 @@ export declare function getAuthorsMap(params: {
     authorsMapPath: string;
     authorsBaseRoutePath: string;
     contentPaths: BlogContentPaths;
+    baseUrl: string;
 }): Promise<AuthorsMap | undefined>;
 export declare function validateAuthorsMap(content: unknown): AuthorsMapInput;
 export {};

package/lib/authorsMap.js

@@ -15,6 +15,7 @@ const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
 const utils_validation_1 = require("@docusaurus/utils-validation");
 const authorsSocials_1 = require("./authorsSocials");
+const authors_1 = require("./authors");
 const AuthorPageSchema = utils_validation_1.Joi.object({
     permalink: utils_validation_1.Joi.string().required(),
 });
@@ -63,7 +64,7 @@ function checkAuthorsMapPermalinkCollisions(authorsMap) {
         throw new Error(`The following permalinks are duplicated:\n${errorMessage}`);
     }
 }
-function normalizeAuthor({ authorsBaseRoutePath, authorKey, author, }) {
+function normalizeAuthor({ authorsBaseRoutePath, authorKey, baseUrl, author, }) {
     function getAuthorPage() {
         if (!author.page) {
             return null;
@@ -77,12 +78,13 @@ function normalizeAuthor({ authorsBaseRoutePath, authorKey, author, }) {
         ...author,
         key: authorKey,
         page: getAuthorPage(),
+        imageURL: (0, authors_1.normalizeImageUrl)({ imageURL: author.imageURL, baseUrl }),
         socials: author.socials ? (0, authorsSocials_1.normalizeSocials)(author.socials) : undefined,
     };
 }
-function normalizeAuthorsMap({ authorsBaseRoutePath, authorsMapInput, }) {
+function normalizeAuthorsMap({ authorsBaseRoutePath, authorsMapInput, baseUrl, }) {
     return lodash_1.default.mapValues(authorsMapInput, (author, authorKey) => {
-        return normalizeAuthor({ authorsBaseRoutePath, authorKey, author });
+        return normalizeAuthor({ authorsBaseRoutePath, authorKey, author, baseUrl });
     });
 }
 function validateAuthorsMapInput(content) {

package/lib/authorsSocials.js

@@ -27,6 +27,10 @@ const PredefinedPlatformNormalizers = {
 };
 function normalizeSocialEntry([platform, value]) {
     const normalizer = PredefinedPlatformNormalizers[platform.toLowerCase()];
+    if (typeof value !== 'string') {
+        throw new Error(`Author socials should be usernames/userIds/handles, or fully qualified HTTP(s) absolute URLs.
+Social platform '${platform}' has illegal value '${value}'`);
+    }
     const isAbsoluteUrl = value.startsWith('http://') || value.startsWith('https://');
     if (isAbsoluteUrl) {
         return [platform, value];

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 { BlogContent, BlogPost } from '@docusaurus/plugin-content-blog';
+export declare function createContentHelpers(): {
+    updateContent: (content: BlogContent) => void;
+    sourceToBlogPost: Map<string, BlogPost>;
+    sourceToPermalink: Map<string, string>;
+};

package/lib/contentHelpers.js

@@ -0,0 +1,30 @@
+"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 indexBlogPostsBySource(content) {
+    return new Map(content.blogPosts.map((blogPost) => [blogPost.metadata.source, blogPost]));
+}
+// TODO this is bad, we should have a better way to do this (new lifecycle?)
+//  The source to blog/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 sourceToBlogPost = new Map();
+    const sourceToPermalink = new Map();
+    // Mutable map update :/
+    function updateContent(content) {
+        sourceToBlogPost.clear();
+        sourceToPermalink.clear();
+        indexBlogPostsBySource(content).forEach((value, key) => {
+            sourceToBlogPost.set(key, value);
+            sourceToPermalink.set(key, value.metadata.permalink);
+        });
+    }
+    return { updateContent, sourceToBlogPost, sourceToPermalink };
+}

package/lib/index.js

@@ -13,34 +13,15 @@ const path_1 = tslib_1.__importDefault(require("path"));
 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 blogUtils_1 = require("./blogUtils");
 const footnoteIDFixer_1 = tslib_1.__importDefault(require("./remark/footnoteIDFixer"));
 const translations_1 = require("./translations");
 const feed_1 = require("./feed");
 const routes_1 = require("./routes");
 const authorsMap_1 = require("./authorsMap");
+const contentHelpers_1 = require("./contentHelpers");
 const PluginName = 'docusaurus-plugin-content-blog';
-// 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) {
-        return new Map(content.blogPosts.map(({ metadata: { 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 };
-}
 async function pluginContentBlog(context, options) {
     const { siteDir, siteConfig, generatedFilesDir, localizationDir, i18n: { currentLocale }, } = context;
     const router = siteConfig.future.experimental_router;
@@ -68,7 +49,76 @@ async function pluginContentBlog(context, options) {
         filePath: options.authorsMapPath,
         contentPaths,
     });
-    const sourceToPermalinkHelper = createSourceToPermalinkHelper();
+    const contentHelpers = (0, contentHelpers_1.createContentHelpers)();
+    async function createBlogMDXLoaderRule() {
+        const { admonitions, rehypePlugins, remarkPlugins, recmaPlugins, truncateMarker, beforeDefaultRemarkPlugins, beforeDefaultRehypePlugins, } = options;
+        const contentDirs = (0, utils_1.getContentPathList)(contentPaths);
+        const mdxLoaderItem = await (0, mdx_loader_1.createMDXLoaderItem)({
+            useCrossCompilerCache: siteConfig.future.experimental_faster.mdxCrossCompilerCache,
+            admonitions,
+            remarkPlugins,
+            rehypePlugins,
+            recmaPlugins,
+            beforeDefaultRemarkPlugins: [
+                footnoteIDFixer_1.default,
+                ...beforeDefaultRemarkPlugins,
+            ],
+            beforeDefaultRehypePlugins,
+            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`);
+            },
+            // For blog posts a title in markdown is always removed
+            // Blog posts title are rendered separately
+            removeContentTitle: true,
+            // createAssets converts relative paths to require() calls
+            createAssets: ({ filePath }) => {
+                const blogPost = contentHelpers.sourceToBlogPost.get((0, utils_1.aliasedSitePath)(filePath, siteDir));
+                if (!blogPost) {
+                    throw new Error(`Blog post not found for  filePath=${filePath}`);
+                }
+                return {
+                    image: blogPost.metadata.frontMatter.image,
+                    authorsImageUrls: blogPost.metadata.authors.map((author) => author.imageURL),
+                };
+            },
+            markdownConfig: siteConfig.markdown,
+            resolveMarkdownLink: ({ linkPathname, sourceFilePath }) => {
+                const permalink = (0, utils_1.resolveMarkdownLinkPathname)(linkPathname, {
+                    sourceFilePath,
+                    sourceToPermalink: contentHelpers.sourceToPermalink,
+                    siteDir,
+                    contentPaths,
+                });
+                if (permalink === null) {
+                    logger_1.default.report(onBrokenMarkdownLinks) `Blog markdown link couldn't be resolved: (url=${linkPathname}) in source file path=${sourceFilePath}`;
+                }
+                return permalink;
+            },
+        });
+        function createBlogMarkdownLoader() {
+            const markdownLoaderOptions = {
+                truncateMarker,
+            };
+            return {
+                loader: path_1.default.resolve(__dirname, './markdownLoader.js'),
+                options: markdownLoaderOptions,
+            };
+        }
+        return {
+            test: /\.mdx?$/i,
+            include: contentDirs
+                // Trailing slash is important, see https://github.com/facebook/docusaurus/pull/3970
+                .map(utils_1.addTrailingPathSeparator),
+            use: [mdxLoaderItem, createBlogMarkdownLoader()],
+        };
+    }
+    const blogMDXLoaderRule = await createBlogMDXLoaderRule();
     return {
         name: PluginName,
         getPathsToWatch() {
@@ -100,6 +150,7 @@ async function pluginContentBlog(context, options) {
                     routeBasePath,
                     authorsBasePath,
                 ]),
+                baseUrl,
             });
             (0, authorsMap_1.checkAuthorsMapPermalinkCollisions)(authorsMap);
             let blogPosts = await (0, blogUtils_1.generateBlogPosts)(contentPaths, context, options, authorsMap);
@@ -166,7 +217,7 @@ async function pluginContentBlog(context, options) {
             };
         },
         async contentLoaded({ content, actions }) {
-            sourceToPermalinkHelper.update(content);
+            contentHelpers.updateContent(content);
             await (0, routes_1.createAllRoutes)({
                 baseUrl,
                 content,
@@ -179,66 +230,6 @@ async function pluginContentBlog(context, options) {
             return (0, translations_1.translateContent)(content, translationFiles);
         },
         configureWebpack() {
-            const { admonitions, rehypePlugins, remarkPlugins, recmaPlugins, truncateMarker, beforeDefaultRemarkPlugins, beforeDefaultRehypePlugins, } = options;
-            const contentDirs = (0, utils_1.getContentPathList)(contentPaths);
-            function createMDXLoader() {
-                const loaderOptions = {
-                    admonitions,
-                    remarkPlugins,
-                    rehypePlugins,
-                    recmaPlugins,
-                    beforeDefaultRemarkPlugins: [
-                        footnoteIDFixer_1.default,
-                        ...beforeDefaultRemarkPlugins,
-                    ],
-                    beforeDefaultRehypePlugins,
-                    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`);
-                    },
-                    // For blog posts a title in markdown is always removed
-                    // Blog posts title are rendered separately
-                    removeContentTitle: true,
-                    // Assets allow to convert some relative images paths to
-                    // require() calls
-                    // @ts-expect-error: TODO fix typing issue
-                    createAssets: ({ frontMatter, metadata, }) => ({
-                        image: frontMatter.image,
-                        authorsImageUrls: metadata.authors.map((author) => author.imageURL),
-                    }),
-                    markdownConfig: siteConfig.markdown,
-                    resolveMarkdownLink: ({ linkPathname, sourceFilePath }) => {
-                        const permalink = (0, utils_1.resolveMarkdownLinkPathname)(linkPathname, {
-                            sourceFilePath,
-                            sourceToPermalink: sourceToPermalinkHelper.get(),
-                            siteDir,
-                            contentPaths,
-                        });
-                        if (permalink === null) {
-                            logger_1.default.report(onBrokenMarkdownLinks) `Blog markdown link couldn't be resolved: (url=${linkPathname}) in source file path=${sourceFilePath}`;
-                        }
-                        return permalink;
-                    },
-                };
-                return {
-                    loader: require.resolve('@docusaurus/mdx-loader'),
-                    options: loaderOptions,
-                };
-            }
-            function createBlogMarkdownLoader() {
-                const loaderOptions = {
-                    truncateMarker,
-                };
-                return {
-                    loader: path_1.default.resolve(__dirname, './markdownLoader.js'),
-                    options: loaderOptions,
-                };
-            }
             return {
                 resolve: {
                     alias: {
@@ -246,15 +237,7 @@ async function pluginContentBlog(context, options) {
                     },
                 },
                 module: {
-                    rules: [
-                        {
-                            test: /\.mdx?$/i,
-                            include: contentDirs
-                                // Trailing slash is important, see https://github.com/facebook/docusaurus/pull/3970
-                                .map(utils_1.addTrailingPathSeparator),
-                            use: [createMDXLoader(), createBlogMarkdownLoader()],
-                        },
-                    ],
+                    rules: [blogMDXLoaderRule],
                 },
             };
         },

package/lib/options.js

@@ -56,9 +56,9 @@ exports.DEFAULT_OPTIONS = {
     showLastUpdateTime: false,
     showLastUpdateAuthor: false,
     processBlogPosts: async () => undefined,
-    onInlineTags: 'warn',
     tags: undefined,
     authorsBasePath: 'authors',
+    onInlineTags: 'warn',
     onInlineAuthors: 'warn',
     onUntruncatedBlogPosts: 'warn',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-blog",
-  "version": "3.5.0",
+  "version": "3.5.2-canary-6121",
   "description": "Blog plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-content-blog.d.ts",
@@ -31,15 +31,15 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "3.5.0",
-    "@docusaurus/logger": "3.5.0",
-    "@docusaurus/mdx-loader": "3.5.0",
-    "@docusaurus/theme-common": "3.5.0",
-    "@docusaurus/types": "3.5.0",
-    "@docusaurus/utils": "3.5.0",
-    "@docusaurus/utils-common": "3.5.0",
-    "@docusaurus/utils-validation": "3.5.0",
-    "cheerio": "^1.0.0-rc.12",
+    "@docusaurus/core": "3.5.2-canary-6121",
+    "@docusaurus/logger": "3.5.2-canary-6121",
+    "@docusaurus/mdx-loader": "3.5.2-canary-6121",
+    "@docusaurus/theme-common": "3.5.2-canary-6121",
+    "@docusaurus/types": "3.5.2-canary-6121",
+    "@docusaurus/utils": "3.5.2-canary-6121",
+    "@docusaurus/utils-common": "3.5.2-canary-6121",
+    "@docusaurus/utils-validation": "3.5.2-canary-6121",
+    "cheerio": "1.0.0-rc.12",
     "feed": "^4.2.2",
     "fs-extra": "^11.1.1",
     "lodash": "^4.17.21",
@@ -62,5 +62,5 @@
     "@total-typescript/shoehorn": "^0.1.2",
     "tree-node-cli": "^1.6.0"
   },
-  "gitHead": "cb5829f3c34b26d798b869e38ee25073488140bd"
+  "gitHead": "896e16cdd4bdd1811d287dc60ff932ca00be57e4"
 }

package/src/authors.ts

@@ -7,6 +7,7 @@
 
 import _ from 'lodash';
 import {normalizeUrl} from '@docusaurus/utils';
+import {normalizeSocials} from './authorsSocials';
 import type {
   Author,
   AuthorsMap,
@@ -21,18 +22,41 @@ type AuthorsParam = {
   baseUrl: string;
 };
 
-function normalizeImageUrl({
+export function normalizeImageUrl({
   imageURL,
   baseUrl,
 }: {
   imageURL: string | undefined;
   baseUrl: string;
-}) {
+}): string | undefined {
   return imageURL?.startsWith('/')
     ? normalizeUrl([baseUrl, imageURL])
     : imageURL;
 }
 
+function normalizeAuthorUrl({
+  author,
+  baseUrl,
+}: {
+  author: Author;
+  baseUrl: string;
+}): string | undefined {
+  if (author.key) {
+    // Ensures invariant: global authors should have already been normalized
+    if (
+      author.imageURL?.startsWith('/') &&
+      !author.imageURL.startsWith(baseUrl)
+    ) {
+      throw new Error(
+        `Docusaurus internal bug: global authors image ${author.imageURL} should start with the expected baseUrl=${baseUrl}`,
+      );
+    }
+
+    return author.imageURL;
+  }
+  return normalizeImageUrl({imageURL: author.imageURL, baseUrl});
+}
+
 // Legacy v1/early-v2 front matter fields
 // We may want to deprecate those in favor of using only frontMatter.authors
 // TODO Docusaurus v4: remove this legacy front matter
@@ -84,7 +108,10 @@ function getFrontMatterAuthors(params: AuthorsParam): Author[] {
         // becoming a name and may end up unnoticed
         return {key: authorInput};
       }
-      return authorInput;
+      return {
+        ...authorInput,
+        socials: normalizeSocials(authorInput.socials ?? {}),
+      };
     }
 
     return Array.isArray(frontMatter.authors)
@@ -116,13 +143,14 @@ ${Object.keys(authorsMap)
       // Author def from authorsMap can be locally overridden by front matter
       ...getAuthorsMapAuthor(frontMatterAuthor.key),
       ...frontMatterAuthor,
-    };
+    } as Author;
 
     return {
       ...author,
       key: author.key ?? null,
       page: author.page ?? null,
-      imageURL: normalizeImageUrl({imageURL: author.imageURL, baseUrl}),
+      // global author images have already been normalized
+      imageURL: normalizeAuthorUrl({author, baseUrl}),
     };
   }
 }

package/src/authorsMap.ts

@@ -9,12 +9,13 @@ import _ from 'lodash';
 import {readDataFile, normalizeUrl} from '@docusaurus/utils';
 import {Joi, URISchema} from '@docusaurus/utils-validation';
 import {AuthorSocialsSchema, normalizeSocials} from './authorsSocials';
+import {normalizeImageUrl} from './authors';
 import type {BlogContentPaths} from './types';
 import type {
-  Author,
   AuthorAttributes,
   AuthorPage,
   AuthorsMap,
+  AuthorWithKey,
 } from '@docusaurus/plugin-content-blog';
 
 type AuthorInput = AuthorAttributes & {
@@ -93,12 +94,14 @@ export function checkAuthorsMapPermalinkCollisions(
 function normalizeAuthor({
   authorsBaseRoutePath,
   authorKey,
+  baseUrl,
   author,
 }: {
   authorsBaseRoutePath: string;
   authorKey: string;
+  baseUrl: string;
   author: AuthorInput;
-}): Author & {key: string} {
+}): AuthorWithKey {
   function getAuthorPage(): AuthorPage | null {
     if (!author.page) {
       return null;
@@ -114,6 +117,7 @@ function normalizeAuthor({
     ...author,
     key: authorKey,
     page: getAuthorPage(),
+    imageURL: normalizeImageUrl({imageURL: author.imageURL, baseUrl}),
     socials: author.socials ? normalizeSocials(author.socials) : undefined,
   };
 }
@@ -121,12 +125,14 @@ function normalizeAuthor({
 function normalizeAuthorsMap({
   authorsBaseRoutePath,
   authorsMapInput,
+  baseUrl,
 }: {
   authorsBaseRoutePath: string;
   authorsMapInput: AuthorsMapInput;
+  baseUrl: string;
 }): AuthorsMap {
   return _.mapValues(authorsMapInput, (author, authorKey) => {
-    return normalizeAuthor({authorsBaseRoutePath, authorKey, author});
+    return normalizeAuthor({authorsBaseRoutePath, authorKey, author, baseUrl});
   });
 }
 
@@ -153,6 +159,7 @@ export async function getAuthorsMap(params: {
   authorsMapPath: string;
   authorsBaseRoutePath: string;
   contentPaths: BlogContentPaths;
+  baseUrl: string;
 }): Promise<AuthorsMap | undefined> {
   const authorsMapInput = await getAuthorsMapInput(params);
   if (!authorsMapInput) {

package/src/authorsSocials.ts

@@ -41,6 +41,12 @@ type SocialEntry = [string, string];
 
 function normalizeSocialEntry([platform, value]: SocialEntry): SocialEntry {
   const normalizer = PredefinedPlatformNormalizers[platform.toLowerCase()];
+  if (typeof value !== 'string') {
+    throw new Error(
+      `Author socials should be usernames/userIds/handles, or fully qualified HTTP(s) absolute URLs.
+Social platform '${platform}' has illegal value '${value}'`,
+    );
+  }
   const isAbsoluteUrl =
     value.startsWith('http://') || value.startsWith('https://');
   if (isAbsoluteUrl) {

package/src/contentHelpers.ts

@@ -0,0 +1,35 @@
+/**
+ * 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 {BlogContent, BlogPost} from '@docusaurus/plugin-content-blog';
+
+function indexBlogPostsBySource(content: BlogContent): Map<string, BlogPost> {
+  return new Map(
+    content.blogPosts.map((blogPost) => [blogPost.metadata.source, blogPost]),
+  );
+}
+
+// TODO this is bad, we should have a better way to do this (new lifecycle?)
+//  The source to blog/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 sourceToBlogPost = new Map<string, BlogPost>();
+  const sourceToPermalink = new Map<string, string>();
+
+  // Mutable map update :/
+  function updateContent(content: BlogContent): void {
+    sourceToBlogPost.clear();
+    sourceToPermalink.clear();
+    indexBlogPostsBySource(content).forEach((value, key) => {
+      sourceToBlogPost.set(key, value);
+      sourceToPermalink.set(key, value.metadata.permalink);
+    });
+  }
+
+  return {updateContent, sourceToBlogPost, sourceToPermalink};
+}

package/src/index.ts

@@ -19,9 +19,9 @@ import {
   getDataFilePath,
   DEFAULT_PLUGIN_ID,
   resolveMarkdownLinkPathname,
-  type SourceToPermalink,
 } from '@docusaurus/utils';
 import {getTagsFilePathsToWatch} from '@docusaurus/utils-validation';
+import {createMDXLoaderItem} from '@docusaurus/mdx-loader';
 import {
   getBlogTags,
   paginateBlogPosts,
@@ -36,49 +36,20 @@ import {createBlogFeedFiles, createFeedHtmlHeadTags} from './feed';
 
 import {createAllRoutes} from './routes';
 import {checkAuthorsMapPermalinkCollisions, getAuthorsMap} from './authorsMap';
+import {createContentHelpers} from './contentHelpers';
 import type {BlogContentPaths, BlogMarkdownLoaderOptions} from './types';
 import type {LoadContext, Plugin} from '@docusaurus/types';
 import type {
   PluginOptions,
-  BlogPostFrontMatter,
-  BlogPostMetadata,
   Assets,
   BlogTags,
   BlogContent,
   BlogPaginated,
 } from '@docusaurus/plugin-content-blog';
-import type {Options as MDXLoaderOptions} from '@docusaurus/mdx-loader/lib/loader';
-import type {RuleSetUseItem} from 'webpack';
+import type {RuleSetRule, RuleSetUseItem} from 'webpack';
 
 const PluginName = 'docusaurus-plugin-content-blog';
 
-// 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: BlogContent): SourceToPermalink {
-    return new Map(
-      content.blogPosts.map(({metadata: {source, permalink}}) => [
-        source,
-        permalink,
-      ]),
-    );
-  }
-
-  // Mutable map update :/
-  function update(content: BlogContent): void {
-    sourceToPermalink.clear();
-    computeSourceToPermalink(content).forEach((value, key) => {
-      sourceToPermalink.set(key, value);
-    });
-  }
-
-  return {get: () => sourceToPermalink, update};
-}
-
 export default async function pluginContentBlog(
   context: LoadContext,
   options: PluginOptions,
@@ -125,7 +96,99 @@ export default async function pluginContentBlog(
     contentPaths,
   });
 
-  const sourceToPermalinkHelper = createSourceToPermalinkHelper();
+  const contentHelpers = createContentHelpers();
+
+  async function createBlogMDXLoaderRule(): Promise<RuleSetRule> {
+    const {
+      admonitions,
+      rehypePlugins,
+      remarkPlugins,
+      recmaPlugins,
+      truncateMarker,
+      beforeDefaultRemarkPlugins,
+      beforeDefaultRehypePlugins,
+    } = options;
+
+    const contentDirs = getContentPathList(contentPaths);
+
+    const mdxLoaderItem = await createMDXLoaderItem({
+      useCrossCompilerCache:
+        siteConfig.future.experimental_faster.mdxCrossCompilerCache,
+      admonitions,
+      remarkPlugins,
+      rehypePlugins,
+      recmaPlugins,
+      beforeDefaultRemarkPlugins: [
+        footnoteIDFixer,
+        ...beforeDefaultRemarkPlugins,
+      ],
+      beforeDefaultRehypePlugins,
+      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`);
+      },
+      // For blog posts a title in markdown is always removed
+      // Blog posts title are rendered separately
+      removeContentTitle: true,
+      // createAssets converts relative paths to require() calls
+      createAssets: ({filePath}: {filePath: string}): Assets => {
+        const blogPost = contentHelpers.sourceToBlogPost.get(
+          aliasedSitePath(filePath, siteDir),
+        )!;
+        if (!blogPost) {
+          throw new Error(`Blog post not found for  filePath=${filePath}`);
+        }
+        return {
+          image: blogPost.metadata.frontMatter.image as string,
+          authorsImageUrls: blogPost.metadata.authors.map(
+            (author) => author.imageURL,
+          ),
+        };
+      },
+      markdownConfig: siteConfig.markdown,
+      resolveMarkdownLink: ({linkPathname, sourceFilePath}) => {
+        const permalink = resolveMarkdownLinkPathname(linkPathname, {
+          sourceFilePath,
+          sourceToPermalink: contentHelpers.sourceToPermalink,
+          siteDir,
+          contentPaths,
+        });
+        if (permalink === null) {
+          logger.report(
+            onBrokenMarkdownLinks,
+          )`Blog markdown link couldn't be resolved: (url=${linkPathname}) in source file path=${sourceFilePath}`;
+        }
+        return permalink;
+      },
+    });
+
+    function createBlogMarkdownLoader(): RuleSetUseItem {
+      const markdownLoaderOptions: BlogMarkdownLoaderOptions = {
+        truncateMarker,
+      };
+      return {
+        loader: path.resolve(__dirname, './markdownLoader.js'),
+        options: markdownLoaderOptions,
+      };
+    }
+
+    return {
+      test: /\.mdx?$/i,
+      include: contentDirs
+        // Trailing slash is important, see https://github.com/facebook/docusaurus/pull/3970
+        .map(addTrailingPathSeparator),
+      use: [mdxLoaderItem, createBlogMarkdownLoader()],
+    };
+  }
+
+  const blogMDXLoaderRule = await createBlogMDXLoaderRule();
 
   return {
     name: PluginName,
@@ -177,6 +240,7 @@ export default async function pluginContentBlog(
           routeBasePath,
           authorsBasePath,
         ]),
+        baseUrl,
       });
       checkAuthorsMapPermalinkCollisions(authorsMap);
 
@@ -257,7 +321,7 @@ export default async function pluginContentBlog(
     },
 
     async contentLoaded({content, actions}) {
-      sourceToPermalinkHelper.update(content);
+      contentHelpers.updateContent(content);
 
       await createAllRoutes({
         baseUrl,
@@ -273,91 +337,6 @@ export default async function pluginContentBlog(
     },
 
     configureWebpack() {
-      const {
-        admonitions,
-        rehypePlugins,
-        remarkPlugins,
-        recmaPlugins,
-        truncateMarker,
-        beforeDefaultRemarkPlugins,
-        beforeDefaultRehypePlugins,
-      } = options;
-
-      const contentDirs = getContentPathList(contentPaths);
-
-      function createMDXLoader(): RuleSetUseItem {
-        const loaderOptions: MDXLoaderOptions = {
-          admonitions,
-          remarkPlugins,
-          rehypePlugins,
-          recmaPlugins,
-          beforeDefaultRemarkPlugins: [
-            footnoteIDFixer,
-            ...beforeDefaultRemarkPlugins,
-          ],
-          beforeDefaultRehypePlugins,
-          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`);
-          },
-          // For blog posts a title in markdown is always removed
-          // Blog posts title are rendered separately
-          removeContentTitle: true,
-          // Assets allow to convert some relative images paths to
-          // require() calls
-          // @ts-expect-error: TODO fix typing issue
-          createAssets: ({
-            frontMatter,
-            metadata,
-          }: {
-            frontMatter: BlogPostFrontMatter;
-            metadata: BlogPostMetadata;
-          }): Assets => ({
-            image: frontMatter.image,
-            authorsImageUrls: metadata.authors.map((author) => author.imageURL),
-          }),
-          markdownConfig: siteConfig.markdown,
-          resolveMarkdownLink: ({linkPathname, sourceFilePath}) => {
-            const permalink = resolveMarkdownLinkPathname(linkPathname, {
-              sourceFilePath,
-              sourceToPermalink: sourceToPermalinkHelper.get(),
-              siteDir,
-              contentPaths,
-            });
-            if (permalink === null) {
-              logger.report(
-                onBrokenMarkdownLinks,
-              )`Blog markdown link couldn't be resolved: (url=${linkPathname}) in source file path=${sourceFilePath}`;
-            }
-            return permalink;
-          },
-        };
-        return {
-          loader: require.resolve('@docusaurus/mdx-loader'),
-          options: loaderOptions,
-        };
-      }
-
-      function createBlogMarkdownLoader(): RuleSetUseItem {
-        const loaderOptions: BlogMarkdownLoaderOptions = {
-          truncateMarker,
-        };
-        return {
-          loader: path.resolve(__dirname, './markdownLoader.js'),
-          options: loaderOptions,
-        };
-      }
-
       return {
         resolve: {
           alias: {
@@ -365,15 +344,7 @@ export default async function pluginContentBlog(
           },
         },
         module: {
-          rules: [
-            {
-              test: /\.mdx?$/i,
-              include: contentDirs
-                // Trailing slash is important, see https://github.com/facebook/docusaurus/pull/3970
-                .map(addTrailingPathSeparator),
-              use: [createMDXLoader(), createBlogMarkdownLoader()],
-            },
-          ],
+          rules: [blogMDXLoaderRule],
         },
       };
     },

package/src/options.ts

@@ -68,9 +68,9 @@ export const DEFAULT_OPTIONS: PluginOptions = {
   showLastUpdateTime: false,
   showLastUpdateAuthor: false,
   processBlogPosts: async () => undefined,
-  onInlineTags: 'warn',
   tags: undefined,
   authorsBasePath: 'authors',
+  onInlineTags: 'warn',
   onInlineAuthors: 'warn',
   onUntruncatedBlogPosts: 'warn',
 };