@astrojs/mdx 0.14.0 → 0.15.0-beta.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@astrojs/mdx:build: cache hit, replaying output 93db87e92a57f3ab
+@astrojs/mdx:build: cache hit, replaying output a2df0a02dde16921
 @astrojs/mdx:build: 
-@astrojs/mdx:build: > @astrojs/mdx@0.14.0 build /home/runner/work/astro/astro/packages/integrations/mdx
+@astrojs/mdx:build: > @astrojs/mdx@0.15.0-beta.0 build /home/runner/work/astro/astro/packages/integrations/mdx
 @astrojs/mdx:build: > astro-scripts build "src/**/*.ts" && tsc
 @astrojs/mdx:build: 

package/CHANGELOG.md

@@ -1,5 +1,110 @@
 # @astrojs/mdx
 
+## 0.15.0-beta.0
+
+### Minor Changes
+
+- [#5687](https://github.com/withastro/astro/pull/5687) [`e2019be6f`](https://github.com/withastro/astro/commit/e2019be6ffa46fa33d92cfd346f9ecbe51bb7144) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Give remark and rehype plugins access to user frontmatter via frontmatter injection. This means `data.astro.frontmatter` is now the _complete_ Markdown or MDX document's frontmatter, rather than an empty object.
+
+  This allows plugin authors to modify existing frontmatter, or compute new properties based on other properties. For example, say you want to compute a full image URL based on an `imageSrc` slug in your document frontmatter:
+
+  ```ts
+  export function remarkInjectSocialImagePlugin() {
+    return function (tree, file) {
+      const { frontmatter } = file.data.astro;
+      frontmatter.socialImageSrc = new URL(frontmatter.imageSrc, 'https://my-blog.com/').pathname;
+    };
+  }
+  ```
+
+  #### Content Collections - new `remarkPluginFrontmatter` property
+
+  We have changed _inject_ frontmatter to _modify_ frontmatter in our docs to improve discoverability. This is based on support forum feedback, where "injection" is rarely the term used.
+
+  To reflect this, the `injectedFrontmatter` property has been renamed to `remarkPluginFrontmatter`. This should clarify this plugin is still separate from the `data` export Content Collections expose today.
+
+  #### Migration instructions
+
+  Plugin authors should now **check for user frontmatter when applying defaults.**
+
+  For example, say a remark plugin wants to apply a default `title` if none is present. Add a conditional to check if the property is present, and update if none exists:
+
+  ```diff
+  export function remarkInjectTitlePlugin() {
+    return function (tree, file) {
+      const { frontmatter } = file.data.astro;
+  +    if (!frontmatter.title) {
+        frontmatter.title = 'Default title';
+  +    }
+    }
+  }
+  ```
+
+  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or reype.
+
+- [#5684](https://github.com/withastro/astro/pull/5684) [`a9c292026`](https://github.com/withastro/astro/commit/a9c2920264e36cc5dc05f4adc1912187979edb0d) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Refine Markdown and MDX configuration options for ease-of-use.
+
+  #### Markdown
+
+  - **Remove `remark-smartypants`** from Astro's default Markdown plugins.
+  - **Replace the `extendDefaultPlugins` option** with a simplified `gfm` boolean. This is enabled by default, and can be disabled to remove GitHub-Flavored Markdown.
+  - Ensure GitHub-Flavored Markdown is applied whether or not custom `remarkPlugins` or `rehypePlugins` are configured. If you want to apply custom plugins _and_ remove GFM, manually set `gfm: false` in your config.
+
+  #### MDX
+
+  - Support _all_ Markdown configuration options (except `drafts`) from your MDX integration config. This includes `syntaxHighlighting` and `shikiConfig` options to further customize the MDX renderer.
+  - Simplify `extendDefaults` to an `extendMarkdownConfig` option. MDX options will default to their equivalent in your Markdown config. By setting `extendMarkdownConfig` to false, you can "eject" to set your own syntax highlighting, plugins, and more.
+
+  #### Migration
+
+  To preserve your existing Markdown and MDX setup, you may need some configuration changes:
+
+  ##### Smartypants manual installation
+
+  [Smartypants](https://github.com/silvenon/remark-smartypants) has been removed from Astro's default setup. If you rely on this plugin, [install `remark-smartypants`](https://github.com/silvenon/remark-smartypants#installing) and apply to your `astro.config.*`:
+
+  ```diff
+  // astro.config.mjs
+  import { defineConfig } from 'astro/config';
+  + import smartypants from 'remark-smartypants';
+
+  export default defineConfig({
+    markdown: {
+  +   remarkPlugins: [smartypants],
+    }
+  });
+  ```
+
+  ##### Migrate `extendDefaultPlugins` to `gfm`
+
+  You may have disabled Astro's built-in plugins (GitHub-Flavored Markdown and Smartypants) with the `extendDefaultPlugins` option. Since Smartypants has been removed, this has been renamed to `gfm`.
+
+  ```diff
+  // astro.config.mjs
+  import { defineConfig } from 'astro/config';
+
+  export default defineConfig({
+    markdown: {
+  -   extendDefaultPlugins: false,
+  +   gfm: false,
+    }
+  });
+  ```
+
+  Additionally, applying remark and rehype plugins **no longer disables** `gfm`. You will need to opt-out manually by setting `gfm` to `false`.
+
+  ##### Migrate MDX's `extendPlugins` to `extendMarkdownConfig`
+
+  You may have used the `extendPlugins` option to manage plugin defaults in MDX. This has been replaced by 2 flags:
+
+  - `extendMarkdownConfig` (`true` by default) to toggle Markdown config inheritance. This replaces the `extendPlugins: 'markdown'` option.
+  - `gfm` (`true` by default) to toggle GitHub-Flavored Markdown in MDX. This replaces the `extendPlugins: 'defaults'` option.
+
+### Patch Changes
+
+- Updated dependencies [[`e2019be6f`](https://github.com/withastro/astro/commit/e2019be6ffa46fa33d92cfd346f9ecbe51bb7144), [`a9c292026`](https://github.com/withastro/astro/commit/a9c2920264e36cc5dc05f4adc1912187979edb0d)]:
+  - @astrojs/markdown-remark@2.0.0-beta.0
+
 ## 0.14.0
 
 ### Minor Changes

package/README.md

@@ -78,116 +78,100 @@ Visit the [MDX docs](https://mdxjs.com/docs/what-is-mdx/) to learn about using s
 
 Once the MDX integration is installed, no configuration is necessary to use `.mdx` files in your Astro project.
 
-You can extend how your MDX is rendered by adding remark, rehype and recma plugins.
+You can configure how your MDX is rendered with the following options:
 
-- [`extendPlugins`](#extendplugins)
-- [`remarkRehype`](#remarkrehype)
-- [`remarkPlugins`](#remarkplugins)
-- [`rehypePlugins`](#rehypeplugins)
+- [Options inherited from Markdown config](#options-inherited-from-markdown-config)
+- [`extendMarkdownConfig`](#extendmarkdownconfig)
 - [`recmaPlugins`](#recmaplugins)
 
-### `extendPlugins`
+### Options inherited from Markdown config
 
-You can customize how MDX files inherit your project’s existing Markdown configuration using the `extendPlugins` option.
+All [`markdown` configuration options](https://docs.astro.build/en/reference/configuration-reference/#markdown-options) except `drafts` can be configured separately in the MDX integration. This includes remark and rehype plugins, syntax highlighting, and more. Options will default to those in your Markdown config ([see the `extendMarkdownConfig` option](#extendmarkdownconfig) to modify this).
 
-#### `markdown` (default)
+:::note
+There is no separate MDX configuration for [including pages marked as draft in the build](https://docs.astro.build/en/reference/configuration-reference/#markdowndrafts). This Markdown setting will be respected by both Markdown and MDX files and cannot be overriden for MDX files specifically.
+:::
 
-Astro's MDX files will inherit all [`markdown` options](https://docs.astro.build/en/reference/configuration-reference/#markdown-options) in your Astro configuration file, which includes the [GitHub-Flavored Markdown](https://github.com/remarkjs/remark-gfm) and [Smartypants](https://github.com/silvenon/remark-smartypants) plugins by default.
-
-Any additional plugins you apply in your MDX config will be applied *after* your configured Markdown plugins.
-
-#### `astroDefaults`
-
-Astro's MDX files will apply only [Astro's default plugins](/en/reference/configuration-reference/#markdownextenddefaultplugins), without inheriting the rest of your Markdown config. 
-
-This example will apply the default [GitHub-Flavored Markdown](https://github.com/remarkjs/remark-gfm) and [Smartypants](https://github.com/silvenon/remark-smartypants) plugins alongside [`remark-toc`](https://github.com/remarkjs/remark-toc) to your MDX files, while ignoring any `markdown.remarkPlugins` configuration:
-
-```js "extendPlugins: 'astroDefaults'"
+```ts
 // astro.config.mjs
+import { defineConfig } from 'astro/config';
+import mdx from '@astrojs/mdx';
 import remarkToc from 'remark-toc';
+import rehypeMinifyHtml from 'rehype-minify-html';
 
-export default {
-  markdown: {
-    remarkPlugins: [/** ignored */]
-  },
-  integrations: [mdx({
-    remarkPlugins: [remarkToc],
-    // Astro defaults applied
-    extendPlugins: 'astroDefaults',
-  })],
-}
+export default defineConfig({
+  integrations: [
+    mdx({
+      syntaxHighlight: 'shiki',
+      shikiConfig: { theme: 'dracula' },
+      remarkPlugins: [remarkToc],
+      rehypePlugins: [rehypeMinifyHtml],
+      remarkRehype: { footnoteLabel: 'Footnotes' },
+      gfm: false,
+    })
+  ]
+})
 ```
 
-#### `false`
+:::caution
+MDX does not support passing remark and rehype plugins as a string. You should install, import, and apply the plugin function instead.
+:::
 
-Astro's MDX files will not inherit any [`markdown` options](https://docs.astro.build/en/reference/configuration-reference/#markdown-options), nor will any Astro Markdown defaults be applied:
+📚 See the [Markdown Options reference](https://docs.astro.build/en/reference/configuration-reference/#markdown-options) for a complete list of options.
 
-```js "extendPlugins: false"
-// astro.config.mjs
-import remarkToc from 'remark-toc';
-
-export default {
-  integrations: [mdx({
-    remarkPlugins: [remarkToc],
-    // Astro defaults not applied
-    extendPlugins: false,
-  })],
-}
-```
+### `extendMarkdownConfig`
 
-### `remarkRehype`
+- **Type:** `boolean`
+- **Default:** `true`
 
-Markdown content is transformed into HTML through remark-rehype which has [a number of options](https://github.com/remarkjs/remark-rehype#options).
+MDX will extend [your project's existing Markdown configuration](https://docs.astro.build/en/reference/configuration-reference/#markdown-options) by default. To override individual options, you can specify their equivalent in your MDX configuration.
 
-You can set remark-rehype options in your config file:
+For example, say you need to disable GitHub-Flavored Markdown and apply a different set of remark plugins for MDX files. You can apply these options like so, with `extendMarkdownConfig` enabled by default:
 
-```js
+```ts
 // astro.config.mjs
-export default {
-  integrations: [mdx({
-    remarkRehype: {
-      footnoteLabel: 'Catatan kaki',
-      footnoteBackLabel: 'Kembali ke konten',
-    },
-  })],
-};
-```
-This inherits the configuration of [`markdown.remarkRehype`](https://docs.astro.build/en/reference/configuration-reference/#markdownremarkrehype). This behavior can be changed by configuring `extendPlugins`.
-
-### `remarkPlugins`
-
-Browse [awesome-remark](https://github.com/remarkjs/awesome-remark) for a full curated list of [remark plugins](https://github.com/remarkjs/remark/blob/main/doc/plugins.md) to extend your Markdown's capabilities.
-
-This example applies the [`remark-toc`](https://github.com/remarkjs/remark-toc) plugin to `.mdx` files. To customize plugin inheritance from your Markdown config or Astro's defaults, [see the `extendPlugins` option](#extendplugins).
-
-```js
-// astro.config.mjs
-import remarkToc from 'remark-toc';
+import { defineConfig } from 'astro/config';
+import mdx from '@astrojs/mdx';
 
-export default {
-  integrations: [mdx({
-    remarkPlugins: [remarkToc],
-  })],
-}
+export default defineConfig({
+  markdown: {
+    syntaxHighlight: 'prism',
+    remarkPlugins: [remarkPlugin1],
+    gfm: true,
+  },
+  integrations: [
+    mdx({
+      // `syntaxHighlight` inherited from Markdown
+
+      // Markdown `remarkPlugins` ignored,
+      // only `remarkPlugin2` applied.
+      remarkPlugins: [remarkPlugin2],
+      // `gfm` overridden to `false`
+      gfm: false,
+    })
+  ]
+});
 ```
 
-### `rehypePlugins`
-
- Browse [awesome-rehype](https://github.com/rehypejs/awesome-rehype) for a full curated list of [Rehype plugins](https://github.com/rehypejs/rehype/blob/main/doc/plugins.md) to transform the HTML that your Markdown generates.
+You may also need to disable `markdown` config extension in MDX. For this, set `extendMarkdownConfig` to `false`:
 
-We apply our own (non-removable) [`collect-headings`](https://github.com/withastro/astro/blob/main/packages/integrations/mdx/src/rehype-collect-headings.ts) plugin. This applies IDs to all headings (i.e. `h1 -> h6`) in your MDX files to [link to headings via anchor tags](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#linking_to_an_element_on_the_same_page).
-
-This example applies the [`rehype-accessible-emojis`](https://www.npmjs.com/package/rehype-accessible-emojis) plugin to `.mdx` files. To customize plugin inheritance from your Markdown config or Astro's defaults, [see the `extendPlugins` option](#extendplugins).
-
-```js
+```ts
 // astro.config.mjs
-import rehypeAccessibleEmojis from 'rehype-accessible-emojis';
+import { defineConfig } from 'astro/config';
+import mdx from '@astrojs/mdx';
 
-export default {
-  integrations: [mdx({
-    rehypePlugins: [rehypeAccessibleEmojis],
-  })],
-}
+export default defineConfig({
+  markdown: {
+    remarkPlugins: [remarkPlugin1],
+  },
+  integrations: [
+    mdx({
+      // Markdown config now ignored
+      extendMarkdownConfig: false,
+      // No `remarkPlugins` applied
+    })
+  ]
+});
 ```
 
 ### `recmaPlugins`

package/dist/index.d.ts

@@ -1,18 +1,12 @@
+import { markdownConfigDefaults } from '@astrojs/markdown-remark';
 import { PluggableList } from '@mdx-js/mdx/lib/core.js';
 import type { AstroIntegration } from 'astro';
 import type { Options as RemarkRehypeOptions } from 'remark-rehype';
-export declare type MdxOptions = {
-    remarkPlugins?: PluggableList;
-    rehypePlugins?: PluggableList;
-    recmaPlugins?: PluggableList;
-    /**
-     * Choose which remark and rehype plugins to inherit, if any.
-     *
-     * - "markdown" (default) - inherit your project’s markdown plugin config ([see Markdown docs](https://docs.astro.build/en/guides/markdown-content/#configuring-markdown))
-     * - "astroDefaults" - inherit Astro’s default plugins only ([see defaults](https://docs.astro.build/en/reference/configuration-reference/#markdownextenddefaultplugins))
-     * - false - do not inherit any plugins
-     */
-    extendPlugins?: 'markdown' | 'astroDefaults' | false;
-    remarkRehype?: RemarkRehypeOptions;
+export declare type MdxOptions = Omit<typeof markdownConfigDefaults, 'remarkPlugins' | 'rehypePlugins'> & {
+    extendMarkdownConfig: boolean;
+    recmaPlugins: PluggableList;
+    remarkPlugins: PluggableList;
+    rehypePlugins: PluggableList;
+    remarkRehype: RemarkRehypeOptions;
 };
-export default function mdx(mdxOptions?: MdxOptions): AstroIntegration;
+export default function mdx(partialMdxOptions?: Partial<MdxOptions>): AstroIntegration;

package/dist/index.js

@@ -1,37 +1,34 @@
+import { markdownConfigDefaults } from "@astrojs/markdown-remark";
+import { toRemarkInitializeAstroData } from "@astrojs/markdown-remark/dist/internal.js";
 import { compile as mdxCompile } from "@mdx-js/mdx";
 import mdxPlugin from "@mdx-js/rollup";
 import { parse as parseESM } from "es-module-lexer";
 import fs from "node:fs/promises";
 import { VFile } from "vfile";
-import {
-  getRehypePlugins,
-  getRemarkPlugins,
-  recmaInjectImportMetaEnvPlugin,
-  rehypeApplyFrontmatterExport
-} from "./plugins.js";
+import { getRehypePlugins, getRemarkPlugins, recmaInjectImportMetaEnvPlugin } from "./plugins.js";
 import { getFileInfo, parseFrontmatter } from "./utils.js";
 const RAW_CONTENT_ERROR = "MDX does not support rawContent()! If you need to read the Markdown contents to calculate values (ex. reading time), we suggest injecting frontmatter via remark plugins. Learn more on our docs: https://docs.astro.build/en/guides/integrations-guide/mdx/#inject-frontmatter-via-remark-or-rehype-plugins";
 const COMPILED_CONTENT_ERROR = "MDX does not support compiledContent()! If you need to read the HTML contents to calculate values (ex. reading time), we suggest injecting frontmatter via rehype plugins. Learn more on our docs: https://docs.astro.build/en/guides/integrations-guide/mdx/#inject-frontmatter-via-remark-or-rehype-plugins";
-function mdx(mdxOptions = {}) {
+function mdx(partialMdxOptions = {}) {
   return {
     name: "@astrojs/mdx",
     hooks: {
       "astro:config:setup": async ({ updateConfig, config, addPageExtension, command }) => {
         addPageExtension(".mdx");
-        mdxOptions.extendPlugins ?? (mdxOptions.extendPlugins = "markdown");
-        const remarkRehypeOptions = {
-          ...mdxOptions.extendPlugins === "markdown" ? config.markdown.remarkRehype : {},
-          ...mdxOptions.remarkRehype
-        };
+        const extendMarkdownConfig = partialMdxOptions.extendMarkdownConfig ?? defaultOptions.extendMarkdownConfig;
+        const mdxOptions = applyDefaultOptions({
+          options: partialMdxOptions,
+          defaults: extendMarkdownConfig ? config.markdown : defaultOptions
+        });
         const mdxPluginOpts = {
           remarkPlugins: await getRemarkPlugins(mdxOptions, config),
-          rehypePlugins: getRehypePlugins(mdxOptions, config),
+          rehypePlugins: getRehypePlugins(mdxOptions),
           recmaPlugins: mdxOptions.recmaPlugins,
+          remarkRehypeOptions: mdxOptions.remarkRehype,
           jsx: true,
           jsxImportSource: "astro",
           format: "mdx",
-          mdExtensions: [],
-          remarkRehypeOptions
+          mdExtensions: []
         };
         let importMetaEnv = {
           SITE: config.site
@@ -53,9 +50,9 @@ function mdx(mdxOptions = {}) {
                   const { data: frontmatter, content: pageContent } = parseFrontmatter(code, id);
                   const compiled = await mdxCompile(new VFile({ value: pageContent, path: id }), {
                     ...mdxPluginOpts,
-                    rehypePlugins: [
-                      ...mdxPluginOpts.rehypePlugins ?? [],
-                      () => rehypeApplyFrontmatterExport(frontmatter)
+                    remarkPlugins: [
+                      toRemarkInitializeAstroData({ userFrontmatter: frontmatter }),
+                      ...mdxPluginOpts.remarkPlugins ?? []
                     ],
                     recmaPlugins: [
                       ...mdxPluginOpts.recmaPlugins ?? [],
@@ -129,6 +126,29 @@ if (import.meta.hot) {
     }
   };
 }
+const defaultOptions = {
+  ...markdownConfigDefaults,
+  extendMarkdownConfig: true,
+  recmaPlugins: [],
+  remarkPlugins: [],
+  rehypePlugins: [],
+  remarkRehype: {}
+};
+function applyDefaultOptions({
+  options,
+  defaults
+}) {
+  return {
+    syntaxHighlight: options.syntaxHighlight ?? defaults.syntaxHighlight,
+    extendMarkdownConfig: options.extendMarkdownConfig ?? defaults.extendMarkdownConfig,
+    recmaPlugins: options.recmaPlugins ?? defaults.recmaPlugins,
+    remarkRehype: options.remarkRehype ?? defaults.remarkRehype,
+    gfm: options.gfm ?? defaults.gfm,
+    remarkPlugins: options.remarkPlugins ?? defaults.remarkPlugins,
+    rehypePlugins: options.rehypePlugins ?? defaults.rehypePlugins,
+    shikiConfig: options.shikiConfig ?? defaults.shikiConfig
+  };
+}
 function escapeViteEnvReferences(code) {
   return code.replace(/import\.meta\.env/g, "import\\u002Emeta.env");
 }

package/dist/plugins.d.ts

@@ -5,7 +5,6 @@ import { MdxOptions } from './index.js';
 export declare function recmaInjectImportMetaEnvPlugin({ importMetaEnv, }: {
     importMetaEnv: Record<string, any>;
 }): (tree: any) => void;
-export declare function remarkInitializeAstroData(): (tree: any, vfile: VFile) => void;
-export declare function rehypeApplyFrontmatterExport(pageFrontmatter: Record<string, any>): (tree: any, vfile: VFile) => void;
+export declare function rehypeApplyFrontmatterExport(): (tree: any, vfile: VFile) => void;
 export declare function getRemarkPlugins(mdxOptions: MdxOptions, config: AstroConfig): Promise<MdxRollupPluginOptions['remarkPlugins']>;
-export declare function getRehypePlugins(mdxOptions: MdxOptions, config: AstroConfig): MdxRollupPluginOptions['rehypePlugins'];
+export declare function getRehypePlugins(mdxOptions: MdxOptions): MdxRollupPluginOptions['rehypePlugins'];

package/dist/plugins.js

@@ -1,11 +1,14 @@
 import { rehypeHeadingIds } from "@astrojs/markdown-remark";
+import {
+  InvalidAstroDataError,
+  safelyGetAstroData
+} from "@astrojs/markdown-remark/dist/internal.js";
 import { nodeTypes } from "@mdx-js/mdx";
 import { visit as estreeVisit } from "estree-util-visit";
 import { bold, yellow } from "kleur/colors";
 import { pathToFileURL } from "node:url";
 import rehypeRaw from "rehype-raw";
 import remarkGfm from "remark-gfm";
-import remarkSmartypants from "remark-smartypants";
 import { visit } from "unist-util-visit";
 import { rehypeInjectHeadingsExport } from "./rehype-collect-headings.js";
 import rehypeMetaString from "./rehype-meta-string.js";
@@ -34,26 +37,16 @@ function recmaInjectImportMetaEnvPlugin({
     });
   };
 }
-function remarkInitializeAstroData() {
+function rehypeApplyFrontmatterExport() {
   return function(tree, vfile) {
-    if (!vfile.data.astro) {
-      vfile.data.astro = { frontmatter: {} };
-    }
-  };
-}
-function rehypeApplyFrontmatterExport(pageFrontmatter) {
-  return function(tree, vfile) {
-    const { frontmatter: injectedFrontmatter } = safelyGetAstroData(vfile.data);
-    const frontmatter = { ...injectedFrontmatter, ...pageFrontmatter };
+    const astroData = safelyGetAstroData(vfile.data);
+    if (astroData instanceof InvalidAstroDataError)
+      throw new Error(
+        '[MDX] A remark or rehype plugin attempted to inject invalid frontmatter. Ensure "astro.frontmatter" is set to a valid JSON object that is not `null` or `undefined`.'
+      );
+    const { frontmatter } = astroData;
     const exportNodes = [
-      jsToTreeNode(
-        `export const frontmatter = ${JSON.stringify(
-          frontmatter
-        )};
-export const _internal = { injectedFrontmatter: ${JSON.stringify(
-          injectedFrontmatter
-        )} };`
-      )
+      jsToTreeNode(`export const frontmatter = ${JSON.stringify(frontmatter)};`)
     ];
     if (frontmatter.layout) {
       exportNodes.unshift(
@@ -118,68 +111,37 @@ function toRemarkContentRelImageError({ srcDir }) {
     };
   };
 }
-const DEFAULT_REMARK_PLUGINS = [remarkGfm, remarkSmartypants];
-const DEFAULT_REHYPE_PLUGINS = [];
 async function getRemarkPlugins(mdxOptions, config) {
-  let remarkPlugins = [
-    remarkInitializeAstroData
-  ];
-  switch (mdxOptions.extendPlugins) {
-    case false:
-      break;
-    case "astroDefaults":
-      remarkPlugins = [...remarkPlugins, ...DEFAULT_REMARK_PLUGINS];
-      break;
-    default:
-      remarkPlugins = [
-        ...remarkPlugins,
-        ...markdownShouldExtendDefaultPlugins(config) ? DEFAULT_REMARK_PLUGINS : [],
-        ...ignoreStringPlugins(config.markdown.remarkPlugins ?? [])
-      ];
-      break;
+  let remarkPlugins = [];
+  if (mdxOptions.syntaxHighlight === "shiki") {
+    remarkPlugins.push([await remarkShiki(mdxOptions.shikiConfig)]);
   }
-  if (config.markdown.syntaxHighlight === "shiki") {
-    remarkPlugins.push([await remarkShiki(config.markdown.shikiConfig)]);
-  }
-  if (config.markdown.syntaxHighlight === "prism") {
+  if (mdxOptions.syntaxHighlight === "prism") {
     remarkPlugins.push(remarkPrism);
   }
-  remarkPlugins = [...remarkPlugins, ...mdxOptions.remarkPlugins ?? []];
+  if (mdxOptions.gfm) {
+    remarkPlugins.push(remarkGfm);
+  }
+  remarkPlugins = [...remarkPlugins, ...ignoreStringPlugins(mdxOptions.remarkPlugins)];
   if (config.experimental.contentCollections) {
     remarkPlugins.push(toRemarkContentRelImageError(config));
   }
   return remarkPlugins;
 }
-function getRehypePlugins(mdxOptions, config) {
+function getRehypePlugins(mdxOptions) {
   let rehypePlugins = [
     rehypeMetaString,
     [rehypeRaw, { passThrough: nodeTypes }]
   ];
-  switch (mdxOptions.extendPlugins) {
-    case false:
-      break;
-    case "astroDefaults":
-      rehypePlugins = [...rehypePlugins, ...DEFAULT_REHYPE_PLUGINS];
-      break;
-    default:
-      rehypePlugins = [
-        ...rehypePlugins,
-        ...markdownShouldExtendDefaultPlugins(config) ? DEFAULT_REHYPE_PLUGINS : [],
-        ...ignoreStringPlugins(config.markdown.rehypePlugins ?? [])
-      ];
-      break;
-  }
   rehypePlugins = [
     ...rehypePlugins,
-    ...mdxOptions.rehypePlugins ?? [],
+    ...ignoreStringPlugins(mdxOptions.rehypePlugins),
     rehypeHeadingIds,
-    rehypeInjectHeadingsExport
+    rehypeInjectHeadingsExport,
+    rehypeApplyFrontmatterExport
   ];
   return rehypePlugins;
 }
-function markdownShouldExtendDefaultPlugins(config) {
-  return config.markdown.extendDefaultPlugins || config.markdown.remarkPlugins.length === 0 && config.markdown.rehypePlugins.length === 0;
-}
 function ignoreStringPlugins(plugins) {
   let validPlugins = [];
   let hasInvalidPlugin = false;
@@ -201,29 +163,6 @@ function ignoreStringPlugins(plugins) {
   }
   return validPlugins;
 }
-function isValidAstroData(obj) {
-  if (typeof obj === "object" && obj !== null && obj.hasOwnProperty("frontmatter")) {
-    const { frontmatter } = obj;
-    try {
-      JSON.stringify(frontmatter);
-    } catch {
-      return false;
-    }
-    return typeof frontmatter === "object" && frontmatter !== null;
-  }
-  return false;
-}
-function safelyGetAstroData(vfileData) {
-  const { astro } = vfileData;
-  if (!astro)
-    return { frontmatter: {} };
-  if (!isValidAstroData(astro)) {
-    throw Error(
-      `[MDX] A remark or rehype plugin tried to add invalid frontmatter. Ensure "astro.frontmatter" is a JSON object!`
-    );
-  }
-  return astro;
-}
 function getImportMetaEnvVariableName(node) {
   try {
     if (node.object.type !== "MemberExpression" || node.property.type !== "Identifier")
@@ -248,6 +187,5 @@ export {
   getRehypePlugins,
   getRemarkPlugins,
   recmaInjectImportMetaEnvPlugin,
-  rehypeApplyFrontmatterExport,
-  remarkInitializeAstroData
+  rehypeApplyFrontmatterExport
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/mdx",
   "description": "Use MDX within Astro",
-  "version": "0.14.0",
+  "version": "0.15.0-beta.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -23,7 +23,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@astrojs/markdown-remark": "^1.2.0",
+    "@astrojs/markdown-remark": "^2.0.0-beta.0",
     "@astrojs/prism": "^1.0.2",
     "@mdx-js/mdx": "^2.1.2",
     "@mdx-js/rollup": "^2.1.1",
@@ -36,7 +36,6 @@
     "rehype-raw": "^6.1.1",
     "remark-frontmatter": "^4.0.1",
     "remark-gfm": "^3.0.1",
-    "remark-smartypants": "^2.0.0",
     "shiki": "^0.11.1",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2"
@@ -48,7 +47,7 @@
     "@types/mdast": "^3.0.10",
     "@types/mocha": "^9.1.1",
     "@types/yargs-parser": "^21.0.0",
-    "astro": "1.8.0",
+    "astro": "2.0.0-beta.0",
     "astro-scripts": "0.0.9",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",
@@ -61,7 +60,7 @@
     "remark-rehype": "^10.1.0",
     "remark-shiki-twoslash": "^3.1.0",
     "remark-toc": "^8.0.1",
-    "vite": "^3.0.0"
+    "vite": "^4.0.3"
   },
   "engines": {
     "node": "^14.18.0 || >=16.12.0"

package/src/index.ts

@@ -1,3 +1,5 @@
+import { markdownConfigDefaults } from '@astrojs/markdown-remark';
+import { toRemarkInitializeAstroData } from '@astrojs/markdown-remark/dist/internal.js';
 import { compile as mdxCompile } from '@mdx-js/mdx';
 import { PluggableList } from '@mdx-js/mdx/lib/core.js';
 import mdxPlugin, { Options as MdxRollupPluginOptions } from '@mdx-js/rollup';
@@ -7,12 +9,7 @@ import fs from 'node:fs/promises';
 import type { Options as RemarkRehypeOptions } from 'remark-rehype';
 import { VFile } from 'vfile';
 import type { Plugin as VitePlugin } from 'vite';
-import {
-	getRehypePlugins,
-	getRemarkPlugins,
-	recmaInjectImportMetaEnvPlugin,
-	rehypeApplyFrontmatterExport,
-} from './plugins.js';
+import { getRehypePlugins, getRemarkPlugins, recmaInjectImportMetaEnvPlugin } from './plugins.js';
 import { getFileInfo, parseFrontmatter } from './utils.js';
 
 const RAW_CONTENT_ERROR =
@@ -21,44 +18,41 @@ const RAW_CONTENT_ERROR =
 const COMPILED_CONTENT_ERROR =
 	'MDX does not support compiledContent()! If you need to read the HTML contents to calculate values (ex. reading time), we suggest injecting frontmatter via rehype plugins. Learn more on our docs: https://docs.astro.build/en/guides/integrations-guide/mdx/#inject-frontmatter-via-remark-or-rehype-plugins';
 
-export type MdxOptions = {
-	remarkPlugins?: PluggableList;
-	rehypePlugins?: PluggableList;
-	recmaPlugins?: PluggableList;
-	/**
-	 * Choose which remark and rehype plugins to inherit, if any.
-	 *
-	 * - "markdown" (default) - inherit your project’s markdown plugin config ([see Markdown docs](https://docs.astro.build/en/guides/markdown-content/#configuring-markdown))
-	 * - "astroDefaults" - inherit Astro’s default plugins only ([see defaults](https://docs.astro.build/en/reference/configuration-reference/#markdownextenddefaultplugins))
-	 * - false - do not inherit any plugins
-	 */
-	extendPlugins?: 'markdown' | 'astroDefaults' | false;
-	remarkRehype?: RemarkRehypeOptions;
+export type MdxOptions = Omit<typeof markdownConfigDefaults, 'remarkPlugins' | 'rehypePlugins'> & {
+	extendMarkdownConfig: boolean;
+	recmaPlugins: PluggableList;
+	// Markdown allows strings as remark and rehype plugins.
+	// This is not supported by the MDX compiler, so override types here.
+	remarkPlugins: PluggableList;
+	rehypePlugins: PluggableList;
+	remarkRehype: RemarkRehypeOptions;
 };
 
-export default function mdx(mdxOptions: MdxOptions = {}): AstroIntegration {
+export default function mdx(partialMdxOptions: Partial<MdxOptions> = {}): AstroIntegration {
 	return {
 		name: '@astrojs/mdx',
 		hooks: {
 			'astro:config:setup': async ({ updateConfig, config, addPageExtension, command }: any) => {
 				addPageExtension('.mdx');
-				mdxOptions.extendPlugins ??= 'markdown';
 
-				const remarkRehypeOptions = {
-					...(mdxOptions.extendPlugins === 'markdown' ? config.markdown.remarkRehype : {}),
-					...mdxOptions.remarkRehype,
-				};
+				const extendMarkdownConfig =
+					partialMdxOptions.extendMarkdownConfig ?? defaultOptions.extendMarkdownConfig;
+
+				const mdxOptions = applyDefaultOptions({
+					options: partialMdxOptions,
+					defaults: extendMarkdownConfig ? config.markdown : defaultOptions,
+				});
 
 				const mdxPluginOpts: MdxRollupPluginOptions = {
 					remarkPlugins: await getRemarkPlugins(mdxOptions, config),
-					rehypePlugins: getRehypePlugins(mdxOptions, config),
+					rehypePlugins: getRehypePlugins(mdxOptions),
 					recmaPlugins: mdxOptions.recmaPlugins,
+					remarkRehypeOptions: mdxOptions.remarkRehype,
 					jsx: true,
 					jsxImportSource: 'astro',
 					// Note: disable `.md` (and other alternative extensions for markdown files like `.markdown`) support
 					format: 'mdx',
 					mdExtensions: [],
-					remarkRehypeOptions,
 				};
 
 				let importMetaEnv: Record<string, any> = {
@@ -86,9 +80,10 @@ export default function mdx(mdxOptions: MdxOptions = {}): AstroIntegration {
 									const { data: frontmatter, content: pageContent } = parseFrontmatter(code, id);
 									const compiled = await mdxCompile(new VFile({ value: pageContent, path: id }), {
 										...mdxPluginOpts,
-										rehypePlugins: [
-											...(mdxPluginOpts.rehypePlugins ?? []),
-											() => rehypeApplyFrontmatterExport(frontmatter),
+										remarkPlugins: [
+											// Ensure `data.astro` is available to all remark plugins
+											toRemarkInitializeAstroData({ userFrontmatter: frontmatter }),
+											...(mdxPluginOpts.remarkPlugins ?? []),
 										],
 										recmaPlugins: [
 											...(mdxPluginOpts.recmaPlugins ?? []),
@@ -169,6 +164,34 @@ export default function mdx(mdxOptions: MdxOptions = {}): AstroIntegration {
 	};
 }
 
+const defaultOptions: MdxOptions = {
+	...markdownConfigDefaults,
+	extendMarkdownConfig: true,
+	recmaPlugins: [],
+	remarkPlugins: [],
+	rehypePlugins: [],
+	remarkRehype: {},
+};
+
+function applyDefaultOptions({
+	options,
+	defaults,
+}: {
+	options: Partial<MdxOptions>;
+	defaults: MdxOptions;
+}): MdxOptions {
+	return {
+		syntaxHighlight: options.syntaxHighlight ?? defaults.syntaxHighlight,
+		extendMarkdownConfig: options.extendMarkdownConfig ?? defaults.extendMarkdownConfig,
+		recmaPlugins: options.recmaPlugins ?? defaults.recmaPlugins,
+		remarkRehype: options.remarkRehype ?? defaults.remarkRehype,
+		gfm: options.gfm ?? defaults.gfm,
+		remarkPlugins: options.remarkPlugins ?? defaults.remarkPlugins,
+		rehypePlugins: options.rehypePlugins ?? defaults.rehypePlugins,
+		shikiConfig: options.shikiConfig ?? defaults.shikiConfig,
+	};
+}
+
 // Converts the first dot in `import.meta.env` to its Unicode escape sequence,
 // which prevents Vite from replacing strings like `import.meta.env.SITE`
 // in our JS representation of loaded Markdown files

package/src/plugins.ts

@@ -1,8 +1,12 @@
 import { rehypeHeadingIds } from '@astrojs/markdown-remark';
+import {
+	InvalidAstroDataError,
+	safelyGetAstroData,
+} from '@astrojs/markdown-remark/dist/internal.js';
 import { nodeTypes } from '@mdx-js/mdx';
 import type { PluggableList } from '@mdx-js/mdx/lib/core.js';
 import type { Options as MdxRollupPluginOptions } from '@mdx-js/rollup';
-import type { AstroConfig, MarkdownAstroData } from 'astro';
+import type { AstroConfig } from 'astro';
 import type { Literal, MemberExpression } from 'estree';
 import { visit as estreeVisit } from 'estree-util-visit';
 import { bold, yellow } from 'kleur/colors';
@@ -10,9 +14,8 @@ import type { Image } from 'mdast';
 import { pathToFileURL } from 'node:url';
 import rehypeRaw from 'rehype-raw';
 import remarkGfm from 'remark-gfm';
-import remarkSmartypants from 'remark-smartypants';
 import { visit } from 'unist-util-visit';
-import type { Data, VFile } from 'vfile';
+import type { VFile } from 'vfile';
 import { MdxOptions } from './index.js';
 import { rehypeInjectHeadingsExport } from './rehype-collect-headings.js';
 import rehypeMetaString from './rehype-meta-string.js';
@@ -47,26 +50,18 @@ export function recmaInjectImportMetaEnvPlugin({
 	};
 }
 
-export function remarkInitializeAstroData() {
+export function rehypeApplyFrontmatterExport() {
 	return function (tree: any, vfile: VFile) {
-		if (!vfile.data.astro) {
-			vfile.data.astro = { frontmatter: {} };
-		}
-	};
-}
-
-export function rehypeApplyFrontmatterExport(pageFrontmatter: Record<string, any>) {
-	return function (tree: any, vfile: VFile) {
-		const { frontmatter: injectedFrontmatter } = safelyGetAstroData(vfile.data);
-		const frontmatter = { ...injectedFrontmatter, ...pageFrontmatter };
+		const astroData = safelyGetAstroData(vfile.data);
+		if (astroData instanceof InvalidAstroDataError)
+			throw new Error(
+				// Copied from Astro core `errors-data`
+				// TODO: find way to import error data from core
+				'[MDX] A remark or rehype plugin attempted to inject invalid frontmatter. Ensure "astro.frontmatter" is set to a valid JSON object that is not `null` or `undefined`.'
+			);
+		const { frontmatter } = astroData;
 		const exportNodes = [
-			jsToTreeNode(
-				`export const frontmatter = ${JSON.stringify(
-					frontmatter
-				)};\nexport const _internal = { injectedFrontmatter: ${JSON.stringify(
-					injectedFrontmatter
-				)} };`
-			),
+			jsToTreeNode(`export const frontmatter = ${JSON.stringify(frontmatter)};`),
 		];
 		if (frontmatter.layout) {
 			// NOTE(bholmesdev) 08-22-2022
@@ -144,39 +139,22 @@ function toRemarkContentRelImageError({ srcDir }: { srcDir: URL }) {
 	};
 }
 
-const DEFAULT_REMARK_PLUGINS: PluggableList = [remarkGfm, remarkSmartypants];
-const DEFAULT_REHYPE_PLUGINS: PluggableList = [];
-
 export async function getRemarkPlugins(
 	mdxOptions: MdxOptions,
 	config: AstroConfig
 ): Promise<MdxRollupPluginOptions['remarkPlugins']> {
-	let remarkPlugins: PluggableList = [
-		// Set "vfile.data.astro" for plugins to inject frontmatter
-		remarkInitializeAstroData,
-	];
-	switch (mdxOptions.extendPlugins) {
-		case false:
-			break;
-		case 'astroDefaults':
-			remarkPlugins = [...remarkPlugins, ...DEFAULT_REMARK_PLUGINS];
-			break;
-		default:
-			remarkPlugins = [
-				...remarkPlugins,
-				...(markdownShouldExtendDefaultPlugins(config) ? DEFAULT_REMARK_PLUGINS : []),
-				...ignoreStringPlugins(config.markdown.remarkPlugins ?? []),
-			];
-			break;
+	let remarkPlugins: PluggableList = [];
+	if (mdxOptions.syntaxHighlight === 'shiki') {
+		remarkPlugins.push([await remarkShiki(mdxOptions.shikiConfig)]);
 	}
-	if (config.markdown.syntaxHighlight === 'shiki') {
-		remarkPlugins.push([await remarkShiki(config.markdown.shikiConfig)]);
-	}
-	if (config.markdown.syntaxHighlight === 'prism') {
+	if (mdxOptions.syntaxHighlight === 'prism') {
 		remarkPlugins.push(remarkPrism);
 	}
+	if (mdxOptions.gfm) {
+		remarkPlugins.push(remarkGfm);
+	}
 
-	remarkPlugins = [...remarkPlugins, ...(mdxOptions.remarkPlugins ?? [])];
+	remarkPlugins = [...remarkPlugins, ...ignoreStringPlugins(mdxOptions.remarkPlugins)];
 
 	// Apply last in case user plugins resolve relative image paths
 	if (config.experimental.contentCollections) {
@@ -185,49 +163,27 @@ export async function getRemarkPlugins(
 	return remarkPlugins;
 }
 
-export function getRehypePlugins(
-	mdxOptions: MdxOptions,
-	config: AstroConfig
-): MdxRollupPluginOptions['rehypePlugins'] {
+export function getRehypePlugins(mdxOptions: MdxOptions): MdxRollupPluginOptions['rehypePlugins'] {
 	let rehypePlugins: PluggableList = [
 		// ensure `data.meta` is preserved in `properties.metastring` for rehype syntax highlighters
 		rehypeMetaString,
 		// rehypeRaw allows custom syntax highlighters to work without added config
 		[rehypeRaw, { passThrough: nodeTypes }] as any,
 	];
-	switch (mdxOptions.extendPlugins) {
-		case false:
-			break;
-		case 'astroDefaults':
-			rehypePlugins = [...rehypePlugins, ...DEFAULT_REHYPE_PLUGINS];
-			break;
-		default:
-			rehypePlugins = [
-				...rehypePlugins,
-				...(markdownShouldExtendDefaultPlugins(config) ? DEFAULT_REHYPE_PLUGINS : []),
-				...ignoreStringPlugins(config.markdown.rehypePlugins ?? []),
-			];
-			break;
-	}
 
 	rehypePlugins = [
 		...rehypePlugins,
-		...(mdxOptions.rehypePlugins ?? []),
+		...ignoreStringPlugins(mdxOptions.rehypePlugins),
 		// getHeadings() is guaranteed by TS, so this must be included.
 		// We run `rehypeHeadingIds` _last_ to respect any custom IDs set by user plugins.
 		rehypeHeadingIds,
 		rehypeInjectHeadingsExport,
+		// computed from `astro.data.frontmatter` in VFile data
+		rehypeApplyFrontmatterExport,
 	];
 	return rehypePlugins;
 }
 
-function markdownShouldExtendDefaultPlugins(config: AstroConfig): boolean {
-	return (
-		config.markdown.extendDefaultPlugins ||
-		(config.markdown.remarkPlugins.length === 0 && config.markdown.rehypePlugins.length === 0)
-	);
-}
-
 function ignoreStringPlugins(plugins: any[]) {
 	let validPlugins: PluggableList = [];
 	let hasInvalidPlugin = false;
@@ -250,41 +206,6 @@ function ignoreStringPlugins(plugins: any[]) {
 	return validPlugins;
 }
 
-/**
- * Copied from markdown utils
- * @see "vite-plugin-utils"
- */
-function isValidAstroData(obj: unknown): obj is MarkdownAstroData {
-	if (typeof obj === 'object' && obj !== null && obj.hasOwnProperty('frontmatter')) {
-		const { frontmatter } = obj as any;
-		try {
-			// ensure frontmatter is JSON-serializable
-			JSON.stringify(frontmatter);
-		} catch {
-			return false;
-		}
-		return typeof frontmatter === 'object' && frontmatter !== null;
-	}
-	return false;
-}
-
-/**
- * Copied from markdown utils
- * @see "vite-plugin-utils"
- */
-function safelyGetAstroData(vfileData: Data): MarkdownAstroData {
-	const { astro } = vfileData;
-
-	if (!astro) return { frontmatter: {} };
-	if (!isValidAstroData(astro)) {
-		throw Error(
-			`[MDX] A remark or rehype plugin tried to add invalid frontmatter. Ensure "astro.frontmatter" is a JSON object!`
-		);
-	}
-
-	return astro;
-}
-
 /**
  * Check if estree entry is "import.meta.env.VARIABLE"
  * If it is, return the variable name (i.e. "VARIABLE")

package/test/fixtures/mdx-frontmatter-injection/astro.config.mjs

@@ -1,12 +1,12 @@
 import { defineConfig } from 'astro/config';
 import mdx from '@astrojs/mdx';
-import { rehypeReadingTime, remarkTitle } from './src/markdown-plugins.mjs';
+import { rehypeReadingTime, remarkDescription, remarkTitle } from './src/markdown-plugins.mjs';
 
 // https://astro.build/config
 export default defineConfig({
   site: 'https://astro.build/',
 	integrations: [mdx({
-		remarkPlugins: [remarkTitle],
+		remarkPlugins: [remarkTitle, remarkDescription],
 		rehypePlugins: [rehypeReadingTime],
 	})],
 });

package/test/fixtures/mdx-frontmatter-injection/src/markdown-plugins.mjs

@@ -18,3 +18,10 @@ export function remarkTitle() {
 		});
 	};
 }
+
+export function remarkDescription() {
+	return function (tree, vfile) {
+		const { frontmatter } = vfile.data.astro;
+		frontmatter.description = `Processed by remarkDescription plugin: ${frontmatter.description}`
+	};
+}

package/test/fixtures/mdx-frontmatter-injection/src/pages/page-1.mdx

@@ -1,5 +1,6 @@
 ---
 layout: '../layouts/Base.astro'
+description: Page 1 description
 ---
 
 # Page 1

package/test/fixtures/mdx-frontmatter-injection/src/pages/page-2.mdx

@@ -1,5 +1,6 @@
 ---
 layout: '../layouts/Base.astro'
+description: Page 2 description
 ---
 
 # Page 2

package/test/mdx-frontmatter-injection.test.js

@@ -33,14 +33,11 @@ describe('MDX frontmatter injection', () => {
 		}
 	});
 
-	it('overrides injected frontmatter with user frontmatter', async () => {
+	it('allow user frontmatter mutation', async () => {
 		const frontmatterByPage = JSON.parse(await fixture.readFile('/glob.json'));
-		const readingTimes = frontmatterByPage.map(
-			(frontmatter = {}) => frontmatter.injectedReadingTime?.text
-		);
-		const titles = frontmatterByPage.map((frontmatter = {}) => frontmatter.title);
-		expect(titles).to.contain('Overridden title');
-		expect(readingTimes).to.contain('1000 min read');
+		const descriptions = frontmatterByPage.map((frontmatter = {}) => frontmatter.description);
+		expect(descriptions).to.contain('Processed by remarkDescription plugin: Page 1 description');
+		expect(descriptions).to.contain('Processed by remarkDescription plugin: Page 2 description');
 	});
 
 	it('passes injected frontmatter to layouts', async () => {

package/test/mdx-plugins.test.js

@@ -80,91 +80,57 @@ describe('MDX plugins', () => {
 		expect(selectTocLink(document)).to.be.null;
 	});
 
-	it('respects "extendDefaultPlugins" when extending markdown', async () => {
-		const fixture = await buildFixture({
-			markdown: {
-				remarkPlugins: [remarkExamplePlugin],
-				rehypePlugins: [rehypeExamplePlugin],
-				extendDefaultPlugins: true,
-			},
-			integrations: [mdx()],
-		});
-
-		const html = await fixture.readFile(FILE);
-		const { document } = parseHTML(html);
-
-		expect(selectRemarkExample(document)).to.not.be.null;
-		expect(selectRehypeExample(document)).to.not.be.null;
-		expect(selectGfmLink(document)).to.not.be.null;
-	});
-
-	it('extends markdown config with extendPlugins: "markdown"', async () => {
-		const fixture = await buildFixture({
-			markdown: {
-				remarkPlugins: [remarkExamplePlugin],
-				rehypePlugins: [rehypeExamplePlugin],
-			},
-			integrations: [
-				mdx({
-					extendPlugins: 'markdown',
-					remarkPlugins: [remarkToc],
-				}),
-			],
-		});
-
-		const html = await fixture.readFile(FILE);
-		const { document } = parseHTML(html);
-
-		expect(selectRemarkExample(document)).to.not.be.null;
-		expect(selectRehypeExample(document)).to.not.be.null;
-		expect(selectTocLink(document)).to.not.be.null;
-	});
-
-	it('extends default plugins with extendPlugins: "astroDefaults"', async () => {
-		const fixture = await buildFixture({
-			markdown: {
-				// should NOT be applied to MDX
-				remarkPlugins: [remarkToc],
-			},
-			integrations: [
-				mdx({
-					remarkPlugins: [remarkExamplePlugin],
-					rehypePlugins: [rehypeExamplePlugin],
-					extendPlugins: 'astroDefaults',
-				}),
-			],
-		});
-
-		const html = await fixture.readFile(FILE);
-		const { document } = parseHTML(html);
-
-		expect(selectGfmLink(document)).to.not.be.null;
-		// remark and rehype plugins still respected
-		expect(selectRemarkExample(document)).to.not.be.null;
-		expect(selectRehypeExample(document)).to.not.be.null;
-		// Does NOT inherit TOC from markdown config
-		expect(selectTocLink(document)).to.be.null;
-	});
-
-	it('does not extend default plugins with extendPlugins: false', async () => {
-		const fixture = await buildFixture({
-			markdown: {
-				remarkPlugins: [remarkExamplePlugin],
-			},
-			integrations: [
-				mdx({
-					remarkPlugins: [],
-					extendPlugins: false,
-				}),
-			],
+	for (const extendMarkdownConfig of [true, false]) {
+		describe(`extendMarkdownConfig = ${extendMarkdownConfig}`, () => {
+			let fixture;
+			before(async () => {
+				fixture = await buildFixture({
+					markdown: {
+						remarkPlugins: [remarkToc],
+						gfm: false,
+					},
+					integrations: [
+						mdx({
+							extendMarkdownConfig,
+							remarkPlugins: [remarkExamplePlugin],
+							rehypePlugins: [rehypeExamplePlugin],
+						}),
+					],
+				});
+			});
+
+			it('Handles MDX plugins', async () => {
+				const html = await fixture.readFile(FILE);
+				const { document } = parseHTML(html);
+
+				expect(selectRemarkExample(document, 'MDX remark plugins not applied.')).to.not.be.null;
+				expect(selectRehypeExample(document, 'MDX rehype plugins not applied.')).to.not.be.null;
+			});
+
+			it('Handles Markdown plugins', async () => {
+				const html = await fixture.readFile(FILE);
+				const { document } = parseHTML(html);
+
+				expect(
+					selectTocLink(
+						document,
+						'`remarkToc` plugin applied unexpectedly. Should override Markdown config.'
+					)
+				).to.be.null;
+			});
+
+			it('Handles gfm', async () => {
+				const html = await fixture.readFile(FILE);
+				const { document } = parseHTML(html);
+
+				if (extendMarkdownConfig === true) {
+					expect(selectGfmLink(document), 'Does not respect `markdown.gfm` option.').to.be.null;
+				} else {
+					expect(selectGfmLink(document), 'Respects `markdown.gfm` unexpectedly.').to.not.be.null;
+				}
+			});
 		});
-
-		const html = await fixture.readFile(FILE);
-		const { document } = parseHTML(html);
-
-		expect(selectGfmLink(document)).to.be.null;
-		expect(selectRemarkExample(document)).to.be.null;
-	});
+	}
 
 	it('supports custom recma plugins', async () => {
 		const fixture = await buildFixture({

package/test/mdx-syntax-highlighting.test.js

@@ -67,6 +67,32 @@ describe('MDX syntax highlighting', () => {
 			const prismCodeBlock = document.querySelector('pre.language-astro');
 			expect(prismCodeBlock).to.not.be.null;
 		});
+
+		for (const extendMarkdownConfig of [true, false]) {
+			it(`respects syntaxHighlight when extendMarkdownConfig = ${extendMarkdownConfig}`, async () => {
+				const fixture = await loadFixture({
+					root: FIXTURE_ROOT,
+					markdown: {
+						syntaxHighlight: 'shiki',
+					},
+					integrations: [
+						mdx({
+							extendMarkdownConfig,
+							syntaxHighlight: 'prism',
+						}),
+					],
+				});
+				await fixture.build();
+
+				const html = await fixture.readFile('/index.html');
+				const { document } = parseHTML(html);
+
+				const shikiCodeBlock = document.querySelector('pre.astro-code');
+				expect(shikiCodeBlock, 'Markdown config syntaxHighlight used unexpectedly').to.be.null;
+				const prismCodeBlock = document.querySelector('pre.language-astro');
+				expect(prismCodeBlock).to.not.be.null;
+			});
+		}
 	});
 
 	it('supports custom highlighter - shiki-twoslash', async () => {

package/test/fixtures/mdx-frontmatter-injection/src/pages/with-overrides.mdx

@@ -1,7 +0,0 @@
----
-title: 'Overridden title'
-injectedReadingTime: 
-  text: '1000 min read'
----
-
-# Working!