@docusaurus/plugin-content-blog 0.0.0-5044 → 0.0.0-5049

package/lib/authors.js

@@ -29,7 +29,11 @@ const AuthorsMapSchema = utils_validation_1.Joi.object()
     'object.base': "The authors map file should contain an object where each entry contains an author key and the corresponding author's data.",
 });
 function validateAuthorsMap(content) {
-    return utils_validation_1.Joi.attempt(content, AuthorsMapSchema);
+    const { error, value } = AuthorsMapSchema.validate(content);
+    if (error) {
+        throw error;
+    }
+    return value;
 }
 exports.validateAuthorsMap = validateAuthorsMap;
 async function getAuthorsMap(params) {

package/lib/blogUtils.js

@@ -161,7 +161,7 @@ async function processBlogSourceFile(blogSourceRelative, contentPaths, context,
     const formattedDate = formatBlogPostDate(i18n.currentLocale, date, i18n.localeConfigs[i18n.currentLocale].calendar);
     const title = frontMatter.title ?? contentTitle ?? parsedBlogFileName.text;
     const description = frontMatter.description ?? excerpt ?? '';
-    const slug = frontMatter.slug || parsedBlogFileName.slug;
+    const slug = frontMatter.slug ?? parsedBlogFileName.slug;
     const permalink = (0, utils_1.normalizeUrl)([baseUrl, routeBasePath, slug]);
     function getBlogEditUrl() {
         const blogPathRelative = path_1.default.relative(blogDirPath, path_1.default.resolve(blogSourceAbsolute));
@@ -210,7 +210,7 @@ async function processBlogSourceFile(blogSourceRelative, contentPaths, context,
                     defaultReadingTime,
                 })
                 : undefined,
-            truncated: truncateMarker?.test(content) || false,
+            truncated: truncateMarker.test(content),
             authors,
             frontMatter,
         },

package/lib/index.js

@@ -105,9 +105,6 @@ async function pluginContentBlog(context, options) {
             };
         },
         async contentLoaded({ content: blogContents, actions }) {
-            if (!blogContents) {
-                return;
-            }
             const { blogListComponent, blogPostComponent, blogTagsListComponent, blogTagsPostsComponent, blogArchiveComponent, routeBasePath, archiveBasePath, } = options;
             const { addRoute, createData } = actions;
             const { blogSidebarTitle, blogPosts, blogListPaginated, blogTags, blogTagsListPath, } = blogContents;
@@ -334,10 +331,7 @@ async function pluginContentBlog(context, options) {
             });
         },
         injectHtmlTags({ content }) {
-            if (!content.blogPosts.length) {
-                return {};
-            }
-            if (!options.feedOptions?.type) {
+            if (!content.blogPosts.length || !options.feedOptions.type) {
                 return {};
             }
             const feedTypes = options.feedOptions.type;

package/lib/markdownLoader.js

@@ -25,6 +25,6 @@ function markdownLoader(source) {
     if (truncated) {
         finalContent = (0, blogUtils_1.truncate)(finalContent, markdownLoaderOptions.truncateMarker);
     }
-    return callback?.(null, finalContent);
+    return callback(null, finalContent);
 }
 exports.default = markdownLoader;

package/lib/options.d.ts

@@ -7,4 +7,4 @@
 import type { PluginOptions, Options } from '@docusaurus/plugin-content-blog';
 import type { OptionValidationContext } from '@docusaurus/types';
 export declare const DEFAULT_OPTIONS: PluginOptions;
-export declare function validateOptions({ validate, options, }: OptionValidationContext<Options, PluginOptions>): PluginOptions;
+export declare function validateOptions({ validate, options, }: OptionValidationContext<Options | undefined, PluginOptions>): PluginOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-blog",
-  "version": "0.0.0-5044",
+  "version": "0.0.0-5049",
   "description": "Blog plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-content-blog.d.ts",
@@ -18,12 +18,12 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "0.0.0-5044",
-    "@docusaurus/logger": "0.0.0-5044",
-    "@docusaurus/mdx-loader": "0.0.0-5044",
-    "@docusaurus/utils": "0.0.0-5044",
-    "@docusaurus/utils-common": "0.0.0-5044",
-    "@docusaurus/utils-validation": "0.0.0-5044",
+    "@docusaurus/core": "0.0.0-5049",
+    "@docusaurus/logger": "0.0.0-5049",
+    "@docusaurus/mdx-loader": "0.0.0-5049",
+    "@docusaurus/utils": "0.0.0-5049",
+    "@docusaurus/utils-common": "0.0.0-5049",
+    "@docusaurus/utils-validation": "0.0.0-5049",
     "cheerio": "^1.0.0-rc.11",
     "feed": "^4.2.2",
     "fs-extra": "^10.1.0",
@@ -36,7 +36,7 @@
     "webpack": "^5.72.1"
   },
   "devDependencies": {
-    "@docusaurus/types": "0.0.0-5044",
+    "@docusaurus/types": "0.0.0-5049",
     "escape-string-regexp": "^4.0.0"
   },
   "peerDependencies": {
@@ -46,5 +46,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "9ffd6ca265dc2af7ed5b96daf5ebf32708e899cf"
+  "gitHead": "527b2a01c46b67483327a1a6873fccf81bc19e2c"
 }

package/src/authors.ts

@@ -44,7 +44,11 @@ const AuthorsMapSchema = Joi.object<AuthorsMap>()
   });
 
 export function validateAuthorsMap(content: unknown): AuthorsMap {
-  return Joi.attempt(content, AuthorsMapSchema);
+  const {error, value} = AuthorsMapSchema.validate(content);
+  if (error) {
+    throw error;
+  }
+  return value;
 }
 
 export async function getAuthorsMap(params: {

package/src/blogUtils.ts

@@ -264,7 +264,7 @@ async function processBlogSourceFile(
   const title = frontMatter.title ?? contentTitle ?? parsedBlogFileName.text;
   const description = frontMatter.description ?? excerpt ?? '';
 
-  const slug = frontMatter.slug || parsedBlogFileName.slug;
+  const slug = frontMatter.slug ?? parsedBlogFileName.slug;
 
   const permalink = normalizeUrl([baseUrl, routeBasePath, slug]);
 
@@ -323,7 +323,7 @@ async function processBlogSourceFile(
             defaultReadingTime,
           })
         : undefined,
-      truncated: truncateMarker?.test(content) || false,
+      truncated: truncateMarker.test(content),
       authors,
       frontMatter,
     },

package/src/index.ts

@@ -176,10 +176,6 @@ export default async function pluginContentBlog(
     },
 
     async contentLoaded({content: blogContents, actions}) {
-      if (!blogContents) {
-        return;
-      }
-
       const {
         blogListComponent,
         blogPostComponent,
@@ -500,11 +496,7 @@ export default async function pluginContentBlog(
     },
 
     injectHtmlTags({content}) {
-      if (!content.blogPosts.length) {
-        return {};
-      }
-
-      if (!options.feedOptions?.type) {
+      if (!content.blogPosts.length || !options.feedOptions.type) {
         return {};
       }
 

package/src/markdownLoader.ts

@@ -34,5 +34,5 @@ export default function markdownLoader(
     finalContent = truncate(finalContent, markdownLoaderOptions.truncateMarker);
   }
 
-  return callback?.(null, finalContent);
+  return callback(null, finalContent);
 }

package/src/options.ts

@@ -135,10 +135,7 @@ const PluginOptionSchema = Joi.object<PluginOptions>({
 export function validateOptions({
   validate,
   options,
-}: OptionValidationContext<Options, PluginOptions>): PluginOptions {
-  const validatedOptions = validate(
-    PluginOptionSchema,
-    options,
-  ) as PluginOptions;
+}: OptionValidationContext<Options | undefined, PluginOptions>): PluginOptions {
+  const validatedOptions = validate(PluginOptionSchema, options);
   return validatedOptions;
 }