@docusaurus/plugin-content-blog 3.9.2-canary-6495 → 3.9.2-canary-6526

package/lib/blogUtils.d.ts

@@ -4,6 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import type { TagsFile } from '@docusaurus/utils';
 import type { LoadContext } from '@docusaurus/types';
 import type { AuthorsMap, PluginOptions, BlogPost, BlogTags, BlogPaginated } from '@docusaurus/plugin-content-blog';
 import type { BlogContentPaths } from './types';
@@ -34,7 +35,7 @@ type ParsedBlogFileName = {
     slug: string;
 };
 export declare function parseBlogFileName(blogSourceRelative: string): ParsedBlogFileName;
-export declare function generateBlogPosts(contentPaths: BlogContentPaths, context: LoadContext, options: PluginOptions, authorsMap?: AuthorsMap): Promise<BlogPost[]>;
+export declare function generateBlogPosts(contentPaths: BlogContentPaths, context: LoadContext, options: PluginOptions, tagsFile: TagsFile | null, authorsMap?: AuthorsMap): Promise<BlogPost[]>;
 export declare function applyProcessBlogPosts({ blogPosts, processBlogPosts, }: {
     blogPosts: BlogPost[];
     processBlogPosts: PluginOptions['processBlogPosts'];

package/lib/blogUtils.js

@@ -20,7 +20,6 @@ const path_1 = tslib_1.__importDefault(require("path"));
 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 frontMatter_1 = require("./frontMatter");
 const authors_1 = require("./authors");
 const authorsProblems_1 = require("./authorsProblems");
@@ -247,7 +246,7 @@ async function processBlogSourceFile(blogSourceRelative, contentPaths, context,
         content,
     };
 }
-async function generateBlogPosts(contentPaths, context, options, authorsMap) {
+async function generateBlogPosts(contentPaths, context, options, tagsFile, authorsMap) {
     const { include, exclude } = options;
     if (!(await fs_extra_1.default.pathExists(contentPaths.contentPath))) {
         return [];
@@ -256,9 +255,6 @@ async function generateBlogPosts(contentPaths, context, options, authorsMap) {
         cwd: contentPaths.contentPath,
         ignore: exclude,
     });
-    // TODO this should be done outside of this function
-    //  directly in plugin loadContent()
-    const tagsFile = await (0, utils_validation_1.getTagsFile)({ contentPaths, tags: options.tags });
     async function doProcessBlogSourceFile(blogSourceFile) {
         try {
             return await processBlogSourceFile(blogSourceFile, contentPaths, context, options, tagsFile, authorsMap);

package/lib/feed.js

@@ -116,7 +116,7 @@ async function resolveXsltFilePaths({ xsltFilePath, contentPaths, }) {
     }
     const parsedPath = path_1.default.parse(xsltAbsolutePath);
     const cssAbsolutePath = path_1.default.resolve(parsedPath.dir, `${parsedPath.name}.css`);
-    if (!(await fs_extra_1.default.pathExists(xsltAbsolutePath))) {
+    if (!(await fs_extra_1.default.pathExists(cssAbsolutePath))) {
         throw new Error(logger_1.default.interpolate `Blog feed XSLT file was found at path=${path_1.default.relative(process.cwd(), xsltAbsolutePath)}
 But its expected co-located CSS file could not be found at path=${path_1.default.relative(process.cwd(), cssAbsolutePath)}
 If you want to provide a custom XSLT file, you must provide a CSS file with the exact same name.`);

package/lib/index.js

@@ -11,6 +11,7 @@ exports.default = pluginContentBlog;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const combine_promises_1 = tslib_1.__importDefault(require("combine-promises"));
 const utils_1 = require("@docusaurus/utils");
 const utils_validation_1 = require("@docusaurus/utils-validation");
 const mdx_loader_1 = require("@docusaurus/mdx-loader");
@@ -141,18 +142,26 @@ async function pluginContentBlog(context, options) {
             const { postsPerPage: postsPerPageOption, routeBasePath, tagsBasePath, blogDescription, blogTitle, blogSidebarTitle, pageBasePath, authorsBasePath, authorsMapPath, } = options;
             const baseBlogUrl = (0, utils_1.normalizeUrl)([baseUrl, routeBasePath]);
             const blogTagsListPath = (0, utils_1.normalizeUrl)([baseBlogUrl, tagsBasePath]);
-            const authorsMap = await (0, authorsMap_1.getAuthorsMap)({
-                contentPaths,
-                authorsMapPath,
-                authorsBaseRoutePath: (0, utils_1.normalizeUrl)([
+            async function getAuthorsMapChecked() {
+                const result = await (0, authorsMap_1.getAuthorsMap)({
+                    contentPaths,
+                    authorsMapPath,
+                    authorsBaseRoutePath: (0, utils_1.normalizeUrl)([
+                        baseUrl,
+                        routeBasePath,
+                        authorsBasePath,
+                    ]),
                     baseUrl,
-                    routeBasePath,
-                    authorsBasePath,
-                ]),
-                baseUrl,
+                });
+                (0, authorsMap_1.checkAuthorsMapPermalinkCollisions)(result);
+                return result;
+            }
+            // Read all the input files in parallel
+            const { authorsMap, tagsFile } = await (0, combine_promises_1.default)({
+                authorsMap: getAuthorsMapChecked(),
+                tagsFile: (0, utils_validation_1.getTagsFile)({ contentPaths, tags: options.tags }),
             });
-            (0, authorsMap_1.checkAuthorsMapPermalinkCollisions)(authorsMap);
-            let blogPosts = await (0, blogUtils_1.generateBlogPosts)(contentPaths, context, options, authorsMap);
+            let blogPosts = await (0, blogUtils_1.generateBlogPosts)(contentPaths, context, options, tagsFile, authorsMap);
             blogPosts = await (0, blogUtils_1.applyProcessBlogPosts)({
                 blogPosts,
                 processBlogPosts: options.processBlogPosts,

package/package.json

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

package/src/blogUtils.ts

@@ -26,7 +26,7 @@ import {
   normalizeTags,
   aliasedSitePathToRelativePath,
 } from '@docusaurus/utils';
-import {getTagsFile} from '@docusaurus/utils-validation';
+
 import {validateBlogPostFrontMatter} from './frontMatter';
 import {getBlogPostAuthors} from './authors';
 import {reportAuthorsProblems} from './authorsProblems';
@@ -388,6 +388,7 @@ export async function generateBlogPosts(
   contentPaths: BlogContentPaths,
   context: LoadContext,
   options: PluginOptions,
+  tagsFile: TagsFile | null,
   authorsMap?: AuthorsMap,
 ): Promise<BlogPost[]> {
   const {include, exclude} = options;
@@ -401,10 +402,6 @@ export async function generateBlogPosts(
     ignore: exclude,
   });
 
-  // TODO this should be done outside of this function
-  //  directly in plugin loadContent()
-  const tagsFile = await getTagsFile({contentPaths, tags: options.tags});
-
   async function doProcessBlogSourceFile(blogSourceFile: string) {
     try {
       return await processBlogSourceFile(

package/src/feed.ts

@@ -213,7 +213,7 @@ async function resolveXsltFilePaths({
     parsedPath.dir,
     `${parsedPath.name}.css`,
   );
-  if (!(await fs.pathExists(xsltAbsolutePath))) {
+  if (!(await fs.pathExists(cssAbsolutePath))) {
     throw new Error(
       logger.interpolate`Blog feed XSLT file was found at path=${path.relative(
         process.cwd(),

package/src/index.ts

@@ -7,6 +7,8 @@
 
 import path from 'path';
 import logger from '@docusaurus/logger';
+import combinePromises from 'combine-promises';
+
 import {
   normalizeUrl,
   docuHash,
@@ -20,7 +22,10 @@ import {
   resolveMarkdownLinkPathname,
   getLocaleConfig,
 } from '@docusaurus/utils';
-import {getTagsFilePathsToWatch} from '@docusaurus/utils-validation';
+import {
+  getTagsFilePathsToWatch,
+  getTagsFile,
+} from '@docusaurus/utils-validation';
 import {createMDXLoaderItem} from '@docusaurus/mdx-loader';
 import {
   getBlogTags,
@@ -227,22 +232,32 @@ export default async function pluginContentBlog(
       const baseBlogUrl = normalizeUrl([baseUrl, routeBasePath]);
       const blogTagsListPath = normalizeUrl([baseBlogUrl, tagsBasePath]);
 
-      const authorsMap = await getAuthorsMap({
-        contentPaths,
-        authorsMapPath,
-        authorsBaseRoutePath: normalizeUrl([
+      async function getAuthorsMapChecked() {
+        const result = await getAuthorsMap({
+          contentPaths,
+          authorsMapPath,
+          authorsBaseRoutePath: normalizeUrl([
+            baseUrl,
+            routeBasePath,
+            authorsBasePath,
+          ]),
           baseUrl,
-          routeBasePath,
-          authorsBasePath,
-        ]),
-        baseUrl,
+        });
+        checkAuthorsMapPermalinkCollisions(result);
+        return result;
+      }
+
+      // Read all the input files in parallel
+      const {authorsMap, tagsFile} = await combinePromises({
+        authorsMap: getAuthorsMapChecked(),
+        tagsFile: getTagsFile({contentPaths, tags: options.tags}),
       });
-      checkAuthorsMapPermalinkCollisions(authorsMap);
 
       let blogPosts = await generateBlogPosts(
         contentPaths,
         context,
         options,
+        tagsFile,
         authorsMap,
       );
       blogPosts = await applyProcessBlogPosts({