@docusaurus/plugin-content-pages 2.0.0-beta.21 → 2.0.0-beta.22

package/lib/index.js

@@ -11,7 +11,6 @@ const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 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 frontMatter_1 = require("./frontMatter");
 function getContentPathList(contentPaths) {
     return [contentPaths.contentPathLocalized, contentPaths.contentPath];
@@ -19,17 +18,11 @@ function getContentPathList(contentPaths) {
 exports.getContentPathList = getContentPathList;
 const isMarkdownSource = (source) => source.endsWith('.md') || source.endsWith('.mdx');
 function pluginContentPages(context, options) {
-    if (options.admonitions) {
-        options.remarkPlugins = options.remarkPlugins.concat([
-            [remark_admonitions_1.default, options.admonitions],
-        ]);
-    }
-    const { siteConfig, siteDir, generatedFilesDir, i18n: { currentLocale }, } = context;
+    const { siteConfig, siteDir, generatedFilesDir, localizationDir } = context;
     const contentPaths = {
         contentPath: path_1.default.resolve(siteDir, options.path),
         contentPathLocalized: (0, utils_1.getPluginI18nPath)({
-            siteDir,
-            locale: currentLocale,
+            localizationDir,
             pluginName: 'docusaurus-plugin-content-pages',
             pluginId: options.id,
         }),
@@ -117,7 +110,7 @@ function pluginContentPages(context, options) {
             }));
         },
         configureWebpack(config, isServer, { getJSLoader }) {
-            const { rehypePlugins, remarkPlugins, beforeDefaultRehypePlugins, beforeDefaultRemarkPlugins, } = options;
+            const { admonitions, rehypePlugins, remarkPlugins, beforeDefaultRehypePlugins, beforeDefaultRemarkPlugins, } = options;
             const contentDirs = getContentPathList(contentPaths);
             return {
                 resolve: {
@@ -137,6 +130,7 @@ function pluginContentPages(context, options) {
                                 {
                                     loader: require.resolve('@docusaurus/mdx-loader'),
                                     options: {
+                                        admonitions,
                                         remarkPlugins,
                                         rehypePlugins,
                                         beforeDefaultRehypePlugins,

package/lib/options.js

@@ -19,7 +19,7 @@ exports.DEFAULT_OPTIONS = {
     rehypePlugins: [],
     beforeDefaultRehypePlugins: [],
     beforeDefaultRemarkPlugins: [],
-    admonitions: {},
+    admonitions: true,
 };
 const PluginOptionSchema = utils_validation_1.Joi.object({
     path: utils_validation_1.Joi.string().default(exports.DEFAULT_OPTIONS.path),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-pages",
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.22",
   "description": "Pages plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-content-pages.d.ts",
@@ -18,14 +18,14 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.21",
-    "@docusaurus/mdx-loader": "2.0.0-beta.21",
-    "@docusaurus/utils": "2.0.0-beta.21",
-    "@docusaurus/utils-validation": "2.0.0-beta.21",
+    "@docusaurus/core": "2.0.0-beta.22",
+    "@docusaurus/mdx-loader": "2.0.0-beta.22",
+    "@docusaurus/types": "2.0.0-beta.22",
+    "@docusaurus/utils": "2.0.0-beta.22",
+    "@docusaurus/utils-validation": "2.0.0-beta.22",
     "fs-extra": "^10.1.0",
-    "remark-admonitions": "^1.2.1",
     "tslib": "^2.4.0",
-    "webpack": "^5.72.1"
+    "webpack": "^5.73.0"
   },
   "devDependencies": {
     "@docusaurus/types": "2.0.0-beta.21"
@@ -37,5 +37,5 @@
   "engines": {
     "node": ">=16.14"
   },
-  "gitHead": "69ac49fc6909517f13615ee40290c4bd00c39df4"
+  "gitHead": "daf9e462c4eebb7ac26a940932311f987e768f87"
 }

package/src/index.ts

@@ -21,7 +21,6 @@ import {
   DEFAULT_PLUGIN_ID,
   parseMarkdownString,
 } from '@docusaurus/utils';
-import admonitions from 'remark-admonitions';
 import {validatePageFrontMatter} from './frontMatter';
 
 import type {LoadContext, Plugin} from '@docusaurus/types';
@@ -43,23 +42,12 @@ export default function pluginContentPages(
   context: LoadContext,
   options: PluginOptions,
 ): Plugin<LoadedContent | null> {
-  if (options.admonitions) {
-    options.remarkPlugins = options.remarkPlugins.concat([
-      [admonitions, options.admonitions],
-    ]);
-  }
-  const {
-    siteConfig,
-    siteDir,
-    generatedFilesDir,
-    i18n: {currentLocale},
-  } = context;
+  const {siteConfig, siteDir, generatedFilesDir, localizationDir} = context;
 
   const contentPaths: PagesContentPaths = {
     contentPath: path.resolve(siteDir, options.path),
     contentPathLocalized: getPluginI18nPath({
-      siteDir,
-      locale: currentLocale,
+      localizationDir,
       pluginName: 'docusaurus-plugin-content-pages',
       pluginId: options.id,
     }),
@@ -176,6 +164,7 @@ export default function pluginContentPages(
 
     configureWebpack(config, isServer, {getJSLoader}) {
       const {
+        admonitions,
         rehypePlugins,
         remarkPlugins,
         beforeDefaultRehypePlugins,
@@ -200,6 +189,7 @@ export default function pluginContentPages(
                 {
                   loader: require.resolve('@docusaurus/mdx-loader'),
                   options: {
+                    admonitions,
                     remarkPlugins,
                     rehypePlugins,
                     beforeDefaultRehypePlugins,

package/src/options.ts

@@ -25,7 +25,7 @@ export const DEFAULT_OPTIONS: PluginOptions = {
   rehypePlugins: [],
   beforeDefaultRehypePlugins: [],
   beforeDefaultRemarkPlugins: [],
-  admonitions: {},
+  admonitions: true,
 };
 
 const PluginOptionSchema = Joi.object<PluginOptions>({

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

@@ -16,7 +16,6 @@ declare module '@docusaurus/plugin-content-pages' {
     include: string[];
     exclude: string[];
     mdxPageComponent: string;
-    admonitions: {[key: string]: unknown};
   };
 
   export type Options = Partial<PluginOptions>;

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;
-}