@docusaurus/plugin-content-blog 0.0.0-5089 → 0.0.0-5093

package/lib/index.js

@@ -10,24 +10,17 @@ exports.validateOptions = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const utils_1 = require("@docusaurus/utils");
-const remark_admonitions_1 = tslib_1.__importDefault(require("remark-admonitions"));
 const blogUtils_1 = require("./blogUtils");
 const footnoteIDFixer_1 = tslib_1.__importDefault(require("./remark/footnoteIDFixer"));
 const translations_1 = require("./translations");
 const feed_1 = require("./feed");
 async function pluginContentBlog(context, options) {
-    if (options.admonitions) {
-        options.remarkPlugins = options.remarkPlugins.concat([
-            [remark_admonitions_1.default, options.admonitions],
-        ]);
-    }
-    const { siteDir, siteConfig, generatedFilesDir, i18n: { currentLocale }, } = context;
+    const { siteDir, siteConfig, generatedFilesDir, localizationDir, i18n: { currentLocale }, } = context;
     const { onBrokenMarkdownLinks, baseUrl } = siteConfig;
     const contentPaths = {
         contentPath: path_1.default.resolve(siteDir, options.path),
         contentPathLocalized: (0, utils_1.getPluginI18nPath)({
-            siteDir,
-            locale: currentLocale,
+            localizationDir,
             pluginName: 'docusaurus-plugin-content-blog',
             pluginId: options.id,
         }),
@@ -245,7 +238,7 @@ async function pluginContentBlog(context, options) {
             return (0, translations_1.translateContent)(content, translationFiles);
         },
         configureWebpack(_config, isServer, { getJSLoader }, content) {
-            const { rehypePlugins, remarkPlugins, truncateMarker, beforeDefaultRemarkPlugins, beforeDefaultRehypePlugins, } = options;
+            const { admonitions, rehypePlugins, remarkPlugins, truncateMarker, beforeDefaultRemarkPlugins, beforeDefaultRehypePlugins, } = options;
             const markdownLoaderOptions = {
                 siteDir,
                 contentPaths,
@@ -277,6 +270,7 @@ async function pluginContentBlog(context, options) {
                                 {
                                     loader: require.resolve('@docusaurus/mdx-loader'),
                                     options: {
+                                        admonitions,
                                         remarkPlugins,
                                         rehypePlugins,
                                         beforeDefaultRemarkPlugins: [

package/lib/options.js

@@ -13,7 +13,7 @@ exports.DEFAULT_OPTIONS = {
     feedOptions: { type: ['rss', 'atom'], copyright: '' },
     beforeDefaultRehypePlugins: [],
     beforeDefaultRemarkPlugins: [],
-    admonitions: {},
+    admonitions: true,
     truncateMarker: /<!--\s*truncate\s*-->/,
     rehypePlugins: [],
     remarkPlugins: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-blog",
-  "version": "0.0.0-5089",
+  "version": "0.0.0-5093",
   "description": "Blog plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-content-blog.d.ts",
@@ -18,19 +18,18 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "0.0.0-5089",
-    "@docusaurus/logger": "0.0.0-5089",
-    "@docusaurus/mdx-loader": "0.0.0-5089",
-    "@docusaurus/types": "0.0.0-5089",
-    "@docusaurus/utils": "0.0.0-5089",
-    "@docusaurus/utils-common": "0.0.0-5089",
-    "@docusaurus/utils-validation": "0.0.0-5089",
+    "@docusaurus/core": "0.0.0-5093",
+    "@docusaurus/logger": "0.0.0-5093",
+    "@docusaurus/mdx-loader": "0.0.0-5093",
+    "@docusaurus/types": "0.0.0-5093",
+    "@docusaurus/utils": "0.0.0-5093",
+    "@docusaurus/utils-common": "0.0.0-5093",
+    "@docusaurus/utils-validation": "0.0.0-5093",
     "cheerio": "^1.0.0-rc.11",
     "feed": "^4.2.2",
     "fs-extra": "^10.1.0",
     "lodash": "^4.17.21",
     "reading-time": "^1.5.0",
-    "remark-admonitions": "^1.2.1",
     "tslib": "^2.4.0",
     "unist-util-visit": "^2.0.3",
     "utility-types": "^3.10.0",
@@ -47,5 +46,5 @@
   "engines": {
     "node": ">=16.14"
   },
-  "gitHead": "f03215790788b609224a7d79e123fdfb3ecdb717"
+  "gitHead": "2aa3114f2c53ba37b785f22ac723059c7a4a75be"
 }

package/src/index.ts

@@ -21,7 +21,6 @@ import {
   type TagsListItem,
   type TagModule,
 } from '@docusaurus/utils';
-import admonitions from 'remark-admonitions';
 import {
   generateBlogPosts,
   getSourceToPermalink,
@@ -49,16 +48,11 @@ export default async function pluginContentBlog(
   context: LoadContext,
   options: PluginOptions,
 ): Promise<Plugin<BlogContent>> {
-  if (options.admonitions) {
-    options.remarkPlugins = options.remarkPlugins.concat([
-      [admonitions, options.admonitions],
-    ]);
-  }
-
   const {
     siteDir,
     siteConfig,
     generatedFilesDir,
+    localizationDir,
     i18n: {currentLocale},
   } = context;
   const {onBrokenMarkdownLinks, baseUrl} = siteConfig;
@@ -66,8 +60,7 @@ export default async function pluginContentBlog(
   const contentPaths: BlogContentPaths = {
     contentPath: path.resolve(siteDir, options.path),
     contentPathLocalized: getPluginI18nPath({
-      siteDir,
-      locale: currentLocale,
+      localizationDir,
       pluginName: 'docusaurus-plugin-content-blog',
       pluginId: options.id,
     }),
@@ -381,6 +374,7 @@ export default async function pluginContentBlog(
 
     configureWebpack(_config, isServer, {getJSLoader}, content) {
       const {
+        admonitions,
         rehypePlugins,
         remarkPlugins,
         truncateMarker,
@@ -423,6 +417,7 @@ export default async function pluginContentBlog(
                 {
                   loader: require.resolve('@docusaurus/mdx-loader'),
                   options: {
+                    admonitions,
                     remarkPlugins,
                     rehypePlugins,
                     beforeDefaultRemarkPlugins: [

package/src/options.ts

@@ -24,7 +24,7 @@ export const DEFAULT_OPTIONS: PluginOptions = {
   feedOptions: {type: ['rss', 'atom'], copyright: ''},
   beforeDefaultRehypePlugins: [],
   beforeDefaultRemarkPlugins: [],
-  admonitions: {},
+  admonitions: true,
   truncateMarker: /<!--\s*truncate\s*-->/,
   rehypePlugins: [],
   remarkPlugins: [],

package/src/plugin-content-blog.d.ts

@@ -377,7 +377,6 @@ declare module '@docusaurus/plugin-content-blog' {
      * unlocalized file. Ignored when `editUrl` is a function.
      */
     editLocalizedFiles?: boolean;
-    admonitions: {[key: string]: unknown};
     /** Path to the authors map file, relative to the blog content directory. */
     authorsMapPath: string;
     /** A callback to customize the reading time number displayed. */

package/src/deps.d.ts

@@ -1,13 +0,0 @@
-/**
- * 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.
- */
-
-declare module 'remark-admonitions' {
-  type Options = {[key: string]: unknown};
-
-  const plugin: (options?: Options) => void;
-  export = plugin;
-}