@astrojs/mdx 0.17.0 → 0.18.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@astrojs/mdx:build: cache hit, replaying output 0e77d93ea69c7ebc
-@astrojs/mdx:build: 
-@astrojs/mdx:build: > @astrojs/mdx@0.17.0 build /home/runner/work/astro/astro/packages/integrations/mdx
-@astrojs/mdx:build: > astro-scripts build "src/**/*.ts" && tsc
-@astrojs/mdx:build: 
+@astrojs/mdx:build: cache hit, replaying output 61e81c86fa4b4798
+@astrojs/mdx:build: 
+@astrojs/mdx:build: > @astrojs/mdx@0.18.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,48 @@
 # @astrojs/mdx
 
+## 0.18.0
+
+### Minor Changes
+
+- [#6344](https://github.com/withastro/astro/pull/6344) [`694918a56`](https://github.com/withastro/astro/commit/694918a56b01104831296be0c25456135a63c784) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Add a new experimental flag (`experimental.assets`) to enable our new core Assets story.
+
+  This unlocks a few features:
+
+  - A new built-in image component and JavaScript API to transform and optimize images.
+  - Relative images with automatic optimization in Markdown.
+  - Support for validating assets using content collections.
+  - and more!
+
+  See [Assets (Experimental)](https://docs.astro.build/en/guides/assets/) on our docs site for more information on how to use this feature!
+
+- [#6213](https://github.com/withastro/astro/pull/6213) [`afbbc4d5b`](https://github.com/withastro/astro/commit/afbbc4d5bfafc1779bac00b41c2a1cb1c90f2808) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Updated compilation settings to disable downlevelling for Node 14
+
+### Patch Changes
+
+- [#6209](https://github.com/withastro/astro/pull/6209) [`fec583909`](https://github.com/withastro/astro/commit/fec583909ab62829dc0c1600e2387979365f2b94) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Introduce the (experimental) `@astrojs/markdoc` integration. This unlocks Markdoc inside your Content Collections, bringing support for Astro and UI components in your content. This also improves Astro core internals to make Content Collections extensible to more file types in the future.
+
+  You can install this integration using the `astro add` command:
+
+  ```
+  astro add markdoc
+  ```
+
+  [Read the `@astrojs/markdoc` documentation](https://docs.astro.build/en/guides/integrations-guide/markdoc/) for usage instructions, and browse the [new `with-markdoc` starter](https://astro.new/with-markdoc) to try for yourself.
+
+- Updated dependencies [[`694918a56`](https://github.com/withastro/astro/commit/694918a56b01104831296be0c25456135a63c784), [`afbbc4d5b`](https://github.com/withastro/astro/commit/afbbc4d5bfafc1779bac00b41c2a1cb1c90f2808)]:
+  - @astrojs/markdown-remark@2.1.0
+  - @astrojs/prism@2.1.0
+
+## 0.17.2
+
+### Patch Changes
+
+- [#6296](https://github.com/withastro/astro/pull/6296) [`075b87e8b`](https://github.com/withastro/astro/commit/075b87e8b72a69a608cd2ff1196dc0989e2cf1e1) Thanks [@RaphaelBossek](https://github.com/RaphaelBossek)! - Update to `es-module-lexer@1.1.1`
+
+## 0.17.1
+
+- Updated to es-module-lexer@1.1.1
+
 ## 0.17.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { markdownConfigDefaults } from '@astrojs/markdown-remark';
 import { PluggableList } from '@mdx-js/mdx/lib/core.js';
-import type { AstroIntegration } from 'astro';
+import type { AstroIntegration, ContentEntryType, HookParameters } from 'astro';
 import type { Options as RemarkRehypeOptions } from 'remark-rehype';
 export declare type MdxOptions = Omit<typeof markdownConfigDefaults, 'remarkPlugins' | 'rehypePlugins'> & {
     extendMarkdownConfig: boolean;
@@ -9,4 +9,14 @@ export declare type MdxOptions = Omit<typeof markdownConfigDefaults, 'remarkPlug
     rehypePlugins: PluggableList;
     remarkRehype: RemarkRehypeOptions;
 };
-export default function mdx(partialMdxOptions?: Partial<MdxOptions>): AstroIntegration;
+declare type IntegrationWithPrivateHooks = {
+    name: string;
+    hooks: Omit<AstroIntegration['hooks'], 'astro:config:setup'> & {
+        'astro:config:setup': (params: HookParameters<'astro:config:setup'> & {
+            addPageExtension: (extension: string) => void;
+            addContentEntryType: (contentEntryType: ContentEntryType) => void;
+        }) => void | Promise<void>;
+    };
+};
+export default function mdx(partialMdxOptions?: Partial<MdxOptions>): IntegrationWithPrivateHooks;
+export {};

package/dist/index.js

@@ -4,19 +4,44 @@ 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 { fileURLToPath } from "node:url";
 import { VFile } from "vfile";
 import { getRehypePlugins, getRemarkPlugins, recmaInjectImportMetaEnvPlugin } from "./plugins.js";
-import { getFileInfo, parseFrontmatter } from "./utils.js";
+import { getFileInfo, ignoreStringPlugins, parseFrontmatter } from "./utils.js";
 function mdx(partialMdxOptions = {}) {
   return {
     name: "@astrojs/mdx",
     hooks: {
-      "astro:config:setup": async ({ updateConfig, config, addPageExtension, command }) => {
+      "astro:config:setup": async ({
+        updateConfig,
+        config,
+        addPageExtension,
+        addContentEntryType,
+        command
+      }) => {
         addPageExtension(".mdx");
-        const extendMarkdownConfig = partialMdxOptions.extendMarkdownConfig ?? defaultOptions.extendMarkdownConfig;
+        addContentEntryType({
+          extensions: [".mdx"],
+          async getEntryInfo({ fileUrl, contents }) {
+            const parsed = parseFrontmatter(contents, fileURLToPath(fileUrl));
+            return {
+              data: parsed.data,
+              body: parsed.content,
+              slug: parsed.data.slug,
+              rawData: parsed.matter
+            };
+          },
+          contentModuleTypes: await fs.readFile(
+            new URL("../template/content-module-types.d.ts", import.meta.url),
+            "utf-8"
+          )
+        });
+        const extendMarkdownConfig = partialMdxOptions.extendMarkdownConfig ?? defaultMdxOptions.extendMarkdownConfig;
         const mdxOptions = applyDefaultOptions({
           options: partialMdxOptions,
-          defaults: extendMarkdownConfig ? config.markdown : defaultOptions
+          defaults: markdownConfigToMdxOptions(
+            extendMarkdownConfig ? config.markdown : markdownConfigDefaults
+          )
         });
         const mdxPluginOpts = {
           remarkPlugins: await getRemarkPlugins(mdxOptions, config),
@@ -78,15 +103,15 @@ function mdx(partialMdxOptions = {}) {
                     code = 'import { Fragment } from "astro/jsx-runtime"\n' + code;
                   }
                   const { fileUrl, fileId } = getFileInfo(id, config);
-                  if (!moduleExports.includes("url")) {
+                  if (!moduleExports.find(({ n }) => n === "url")) {
                     code += `
 export const url = ${JSON.stringify(fileUrl)};`;
                   }
-                  if (!moduleExports.includes("file")) {
+                  if (!moduleExports.find(({ n }) => n === "file")) {
                     code += `
 export const file = ${JSON.stringify(fileId)};`;
                   }
-                  if (!moduleExports.includes("Content")) {
+                  if (!moduleExports.find(({ n }) => n === "Content")) {
                     code = code.replace("export default MDXContent;", "");
                     code += `
 export const Content = (props = {}) => MDXContent({
@@ -113,14 +138,19 @@ if (import.meta.hot) {
     }
   };
 }
-const defaultOptions = {
-  ...markdownConfigDefaults,
+const defaultMdxOptions = {
   extendMarkdownConfig: true,
-  recmaPlugins: [],
-  remarkPlugins: [],
-  rehypePlugins: [],
-  remarkRehype: {}
+  recmaPlugins: []
 };
+function markdownConfigToMdxOptions(markdownConfig) {
+  return {
+    ...defaultMdxOptions,
+    ...markdownConfig,
+    remarkPlugins: ignoreStringPlugins(markdownConfig.remarkPlugins),
+    rehypePlugins: ignoreStringPlugins(markdownConfig.rehypePlugins),
+    remarkRehype: markdownConfig.remarkRehype ?? {}
+  };
+}
 function applyDefaultOptions({
   options,
   defaults

package/dist/plugins.js

@@ -5,17 +5,15 @@ import {
 } 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";
 import remarkPrism from "./remark-prism.js";
 import remarkShiki from "./remark-shiki.js";
-import { isRelativePath, jsToTreeNode } from "./utils.js";
+import { jsToTreeNode } from "./utils.js";
+const isPerformanceBenchmark = Boolean(process.env.ASTRO_PERFORMANCE_BENCHMARK);
 function recmaInjectImportMetaEnvPlugin({
   importMetaEnv
 }) {
@@ -75,43 +73,25 @@ function rehypeApplyFrontmatterExport() {
     tree.children = exportNodes.concat(tree.children);
   };
 }
-function toRemarkContentRelImageError({ srcDir }) {
-  const contentDir = new URL("content/", srcDir);
-  return function remarkContentRelImageError() {
-    return (tree, vfile) => {
-      const isContentFile = pathToFileURL(vfile.path).href.startsWith(contentDir.href);
-      if (!isContentFile)
-        return;
-      const relImagePaths = /* @__PURE__ */ new Set();
-      visit(tree, "image", function raiseError(node) {
-        if (isRelativePath(node.url)) {
-          relImagePaths.add(node.url);
-        }
-      });
-      if (relImagePaths.size === 0)
-        return;
-      const errorMessage = `Relative image paths are not supported in the content/ directory. Place local images in the public/ directory and use absolute paths (see https://docs.astro.build/en/guides/images/#in-markdown-files):
-` + [...relImagePaths].map((path) => JSON.stringify(path)).join(",\n");
-      throw new Error(errorMessage);
-    };
-  };
-}
 async function getRemarkPlugins(mdxOptions, config) {
   let remarkPlugins = [];
-  if (mdxOptions.gfm) {
-    remarkPlugins.push(remarkGfm);
-  }
-  if (mdxOptions.smartypants) {
-    remarkPlugins.push(remarkSmartypants);
-  }
-  remarkPlugins = [...remarkPlugins, ...ignoreStringPlugins(mdxOptions.remarkPlugins)];
-  if (mdxOptions.syntaxHighlight === "shiki") {
-    remarkPlugins.push([await remarkShiki(mdxOptions.shikiConfig)]);
+  if (!isPerformanceBenchmark) {
+    if (mdxOptions.gfm) {
+      remarkPlugins.push(remarkGfm);
+    }
+    if (mdxOptions.smartypants) {
+      remarkPlugins.push(remarkSmartypants);
+    }
   }
-  if (mdxOptions.syntaxHighlight === "prism") {
-    remarkPlugins.push(remarkPrism);
+  remarkPlugins = [...remarkPlugins, ...mdxOptions.remarkPlugins];
+  if (!isPerformanceBenchmark) {
+    if (mdxOptions.syntaxHighlight === "shiki") {
+      remarkPlugins.push([await remarkShiki(mdxOptions.shikiConfig)]);
+    }
+    if (mdxOptions.syntaxHighlight === "prism") {
+      remarkPlugins.push(remarkPrism);
+    }
   }
-  remarkPlugins.push(toRemarkContentRelImageError(config));
   return remarkPlugins;
 }
 function getRehypePlugins(mdxOptions) {
@@ -121,34 +101,12 @@ function getRehypePlugins(mdxOptions) {
   ];
   rehypePlugins = [
     ...rehypePlugins,
-    ...ignoreStringPlugins(mdxOptions.rehypePlugins),
-    rehypeHeadingIds,
-    rehypeInjectHeadingsExport,
+    ...mdxOptions.rehypePlugins,
+    ...isPerformanceBenchmark ? [] : [rehypeHeadingIds, rehypeInjectHeadingsExport],
     rehypeApplyFrontmatterExport
   ];
   return rehypePlugins;
 }
-function ignoreStringPlugins(plugins) {
-  let validPlugins = [];
-  let hasInvalidPlugin = false;
-  for (const plugin of plugins) {
-    if (typeof plugin === "string") {
-      console.warn(yellow(`[MDX] ${bold(plugin)} not applied.`));
-      hasInvalidPlugin = true;
-    } else if (Array.isArray(plugin) && typeof plugin[0] === "string") {
-      console.warn(yellow(`[MDX] ${bold(plugin[0])} not applied.`));
-      hasInvalidPlugin = true;
-    } else {
-      validPlugins.push(plugin);
-    }
-  }
-  if (hasInvalidPlugin) {
-    console.warn(
-      `To inherit Markdown plugins in MDX, please use explicit imports in your config instead of "strings." See Markdown docs: https://docs.astro.build/en/guides/markdown-content/#markdown-plugins`
-    );
-  }
-  return validPlugins;
-}
 function getImportMetaEnvVariableName(node) {
   try {
     if (node.object.type !== "MemberExpression" || node.property.type !== "Identifier")

package/dist/rehype-meta-string.js

@@ -4,7 +4,7 @@ function rehypeMetaString() {
     visit(tree, (node) => {
       var _a;
       if (node.type === "element" && node.tagName === "code" && ((_a = node.data) == null ? void 0 : _a.meta)) {
-        node.properties ?? (node.properties = {});
+        node.properties ??= {};
         node.properties.metastring = node.data.meta;
       }
     });

package/dist/utils.d.ts

@@ -1,3 +1,4 @@
+import type { PluggableList } from '@mdx-js/mdx/lib/core.js';
 import type { Options as AcornOpts } from 'acorn';
 import type { AstroConfig } from 'astro';
 import matter from 'gray-matter';
@@ -14,5 +15,5 @@ export declare function getFileInfo(id: string, config: AstroConfig): FileInfo;
  */
 export declare function parseFrontmatter(code: string, id: string): matter.GrayMatterFile<string>;
 export declare function jsToTreeNode(jsString: string, acornOpts?: AcornOpts): MdxjsEsm;
-export declare function isRelativePath(path: string): boolean;
+export declare function ignoreStringPlugins(plugins: any[]): PluggableList;
 export {};

package/dist/utils.js

@@ -1,5 +1,6 @@
 import { parse } from "acorn";
 import matter from "gray-matter";
+import { bold, yellow } from "kleur/colors";
 function appendForwardSlash(path) {
   return path.endsWith("/") ? path : path + "/";
 }
@@ -59,23 +60,30 @@ function jsToTreeNode(jsString, acornOpts = {
     }
   };
 }
-function isRelativePath(path) {
-  return startsWithDotDotSlash(path) || startsWithDotSlash(path);
-}
-function startsWithDotDotSlash(path) {
-  const c1 = path[0];
-  const c2 = path[1];
-  const c3 = path[2];
-  return c1 === "." && c2 === "." && c3 === "/";
-}
-function startsWithDotSlash(path) {
-  const c1 = path[0];
-  const c2 = path[1];
-  return c1 === "." && c2 === "/";
+function ignoreStringPlugins(plugins) {
+  let validPlugins = [];
+  let hasInvalidPlugin = false;
+  for (const plugin of plugins) {
+    if (typeof plugin === "string") {
+      console.warn(yellow(`[MDX] ${bold(plugin)} not applied.`));
+      hasInvalidPlugin = true;
+    } else if (Array.isArray(plugin) && typeof plugin[0] === "string") {
+      console.warn(yellow(`[MDX] ${bold(plugin[0])} not applied.`));
+      hasInvalidPlugin = true;
+    } else {
+      validPlugins.push(plugin);
+    }
+  }
+  if (hasInvalidPlugin) {
+    console.warn(
+      `To inherit Markdown plugins in MDX, please use explicit imports in your config instead of "strings." See Markdown docs: https://docs.astro.build/en/guides/markdown-content/#markdown-plugins`
+    );
+  }
+  return validPlugins;
 }
 export {
   getFileInfo,
-  isRelativePath,
+  ignoreStringPlugins,
   jsToTreeNode,
   parseFrontmatter
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/mdx",
   "description": "Use MDX within Astro",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -23,12 +23,12 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@astrojs/markdown-remark": "^2.0.1",
-    "@astrojs/prism": "^2.0.0",
+    "@astrojs/markdown-remark": "^2.1.0",
+    "@astrojs/prism": "^2.1.0",
     "@mdx-js/mdx": "^2.3.0",
     "@mdx-js/rollup": "^2.3.0",
     "acorn": "^8.8.0",
-    "es-module-lexer": "^0.10.5",
+    "es-module-lexer": "^1.1.1",
     "estree-util-visit": "^1.2.0",
     "github-slugger": "^1.4.0",
     "gray-matter": "^4.0.3",
@@ -48,8 +48,8 @@
     "@types/mdast": "^3.0.10",
     "@types/mocha": "^9.1.1",
     "@types/yargs-parser": "^21.0.0",
-    "astro": "2.0.13",
-    "astro-scripts": "0.0.10",
+    "astro": "2.1.0",
+    "astro-scripts": "0.0.14",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",
     "linkedom": "^0.14.12",
@@ -61,7 +61,7 @@
     "remark-rehype": "^10.1.0",
     "remark-shiki-twoslash": "^3.1.0",
     "remark-toc": "^8.0.1",
-    "vite": "^4.0.3"
+    "vite": "^4.1.2"
   },
   "engines": {
     "node": ">=16.12.0"

package/src/index.ts

@@ -3,14 +3,15 @@ import { toRemarkInitializeAstroData } from '@astrojs/markdown-remark/dist/inter
 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';
-import type { AstroIntegration } from 'astro';
+import type { AstroIntegration, ContentEntryType, HookParameters } from 'astro';
 import { parse as parseESM } from 'es-module-lexer';
 import fs from 'node:fs/promises';
+import { fileURLToPath } from 'node:url';
 import type { Options as RemarkRehypeOptions } from 'remark-rehype';
 import { VFile } from 'vfile';
 import type { Plugin as VitePlugin } from 'vite';
 import { getRehypePlugins, getRemarkPlugins, recmaInjectImportMetaEnvPlugin } from './plugins.js';
-import { getFileInfo, parseFrontmatter } from './utils.js';
+import { getFileInfo, ignoreStringPlugins, parseFrontmatter } from './utils.js';
 
 export type MdxOptions = Omit<typeof markdownConfigDefaults, 'remarkPlugins' | 'rehypePlugins'> & {
 	extendMarkdownConfig: boolean;
@@ -22,19 +23,59 @@ export type MdxOptions = Omit<typeof markdownConfigDefaults, 'remarkPlugins' | '
 	remarkRehype: RemarkRehypeOptions;
 };
 
-export default function mdx(partialMdxOptions: Partial<MdxOptions> = {}): AstroIntegration {
+type IntegrationWithPrivateHooks = {
+	name: string;
+	hooks: Omit<AstroIntegration['hooks'], 'astro:config:setup'> & {
+		'astro:config:setup': (
+			params: HookParameters<'astro:config:setup'> & {
+				// `addPageExtension` and `contentEntryType` are not a public APIs
+				// Add type defs here
+				addPageExtension: (extension: string) => void;
+				addContentEntryType: (contentEntryType: ContentEntryType) => void;
+			}
+		) => void | Promise<void>;
+	};
+};
+
+export default function mdx(
+	partialMdxOptions: Partial<MdxOptions> = {}
+): IntegrationWithPrivateHooks {
 	return {
 		name: '@astrojs/mdx',
 		hooks: {
-			'astro:config:setup': async ({ updateConfig, config, addPageExtension, command }: any) => {
+			'astro:config:setup': async ({
+				updateConfig,
+				config,
+				addPageExtension,
+				addContentEntryType,
+				command,
+			}) => {
 				addPageExtension('.mdx');
+				addContentEntryType({
+					extensions: ['.mdx'],
+					async getEntryInfo({ fileUrl, contents }: { fileUrl: URL; contents: string }) {
+						const parsed = parseFrontmatter(contents, fileURLToPath(fileUrl));
+						return {
+							data: parsed.data,
+							body: parsed.content,
+							slug: parsed.data.slug,
+							rawData: parsed.matter,
+						};
+					},
+					contentModuleTypes: await fs.readFile(
+						new URL('../template/content-module-types.d.ts', import.meta.url),
+						'utf-8'
+					),
+				});
 
 				const extendMarkdownConfig =
-					partialMdxOptions.extendMarkdownConfig ?? defaultOptions.extendMarkdownConfig;
+					partialMdxOptions.extendMarkdownConfig ?? defaultMdxOptions.extendMarkdownConfig;
 
 				const mdxOptions = applyDefaultOptions({
 					options: partialMdxOptions,
-					defaults: extendMarkdownConfig ? config.markdown : defaultOptions,
+					defaults: markdownConfigToMdxOptions(
+						extendMarkdownConfig ? config.markdown : markdownConfigDefaults
+					),
 				});
 
 				const mdxPluginOpts: MdxRollupPluginOptions = {
@@ -112,13 +153,13 @@ export default function mdx(partialMdxOptions: Partial<MdxOptions> = {}): AstroI
 									}
 
 									const { fileUrl, fileId } = getFileInfo(id, config);
-									if (!moduleExports.includes('url')) {
+									if (!moduleExports.find(({ n }) => n === 'url')) {
 										code += `\nexport const url = ${JSON.stringify(fileUrl)};`;
 									}
-									if (!moduleExports.includes('file')) {
+									if (!moduleExports.find(({ n }) => n === 'file')) {
 										code += `\nexport const file = ${JSON.stringify(fileId)};`;
 									}
-									if (!moduleExports.includes('Content')) {
+									if (!moduleExports.find(({ n }) => n === 'Content')) {
 										// Make `Content` the default export so we can wrap `MDXContent` and pass in `Fragment`
 										code = code.replace('export default MDXContent;', '');
 										code += `\nexport const Content = (props = {}) => MDXContent({
@@ -149,15 +190,21 @@ export default function mdx(partialMdxOptions: Partial<MdxOptions> = {}): AstroI
 	};
 }
 
-const defaultOptions: MdxOptions = {
-	...markdownConfigDefaults,
+const defaultMdxOptions = {
 	extendMarkdownConfig: true,
 	recmaPlugins: [],
-	remarkPlugins: [],
-	rehypePlugins: [],
-	remarkRehype: {},
 };
 
+function markdownConfigToMdxOptions(markdownConfig: typeof markdownConfigDefaults): MdxOptions {
+	return {
+		...defaultMdxOptions,
+		...markdownConfig,
+		remarkPlugins: ignoreStringPlugins(markdownConfig.remarkPlugins),
+		rehypePlugins: ignoreStringPlugins(markdownConfig.rehypePlugins),
+		remarkRehype: (markdownConfig.remarkRehype as any) ?? {},
+	};
+}
+
 function applyDefaultOptions({
 	options,
 	defaults,

package/src/plugins.ts

@@ -9,20 +9,19 @@ import type { Options as MdxRollupPluginOptions } from '@mdx-js/rollup';
 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';
-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 { VFile } from 'vfile';
 import { MdxOptions } from './index.js';
 import { rehypeInjectHeadingsExport } from './rehype-collect-headings.js';
 import rehypeMetaString from './rehype-meta-string.js';
 import remarkPrism from './remark-prism.js';
 import remarkShiki from './remark-shiki.js';
-import { isRelativePath, jsToTreeNode } from './utils.js';
+import { jsToTreeNode } from './utils.js';
+
+// Skip nonessential plugins during performance benchmark runs
+const isPerformanceBenchmark = Boolean(process.env.ASTRO_PERFORMANCE_BENCHMARK);
 
 export function recmaInjectImportMetaEnvPlugin({
 	importMetaEnv,
@@ -96,60 +95,33 @@ export function rehypeApplyFrontmatterExport() {
 	};
 }
 
-/**
- * `src/content/` does not support relative image paths.
- * This plugin throws an error if any are found
- */
-function toRemarkContentRelImageError({ srcDir }: { srcDir: URL }) {
-	const contentDir = new URL('content/', srcDir);
-	return function remarkContentRelImageError() {
-		return (tree: any, vfile: VFile) => {
-			const isContentFile = pathToFileURL(vfile.path).href.startsWith(contentDir.href);
-			if (!isContentFile) return;
-
-			const relImagePaths = new Set<string>();
-			visit(tree, 'image', function raiseError(node: Image) {
-				if (isRelativePath(node.url)) {
-					relImagePaths.add(node.url);
-				}
-			});
-			if (relImagePaths.size === 0) return;
-
-			const errorMessage =
-				`Relative image paths are not supported in the content/ directory. Place local images in the public/ directory and use absolute paths (see https://docs.astro.build/en/guides/images/#in-markdown-files):\n` +
-				[...relImagePaths].map((path) => JSON.stringify(path)).join(',\n');
-
-			throw new Error(errorMessage);
-		};
-	};
-}
-
 export async function getRemarkPlugins(
 	mdxOptions: MdxOptions,
 	config: AstroConfig
 ): Promise<MdxRollupPluginOptions['remarkPlugins']> {
 	let remarkPlugins: PluggableList = [];
 
-	if (mdxOptions.gfm) {
-		remarkPlugins.push(remarkGfm);
-	}
-	if (mdxOptions.smartypants) {
-		remarkPlugins.push(remarkSmartypants);
+	if (!isPerformanceBenchmark) {
+		if (mdxOptions.gfm) {
+			remarkPlugins.push(remarkGfm);
+		}
+		if (mdxOptions.smartypants) {
+			remarkPlugins.push(remarkSmartypants);
+		}
 	}
 
-	remarkPlugins = [...remarkPlugins, ...ignoreStringPlugins(mdxOptions.remarkPlugins)];
+	remarkPlugins = [...remarkPlugins, ...mdxOptions.remarkPlugins];
 
-	// Apply syntax highlighters after user plugins to match `markdown/remark` behavior
-	if (mdxOptions.syntaxHighlight === 'shiki') {
-		remarkPlugins.push([await remarkShiki(mdxOptions.shikiConfig)]);
-	}
-	if (mdxOptions.syntaxHighlight === 'prism') {
-		remarkPlugins.push(remarkPrism);
+	if (!isPerformanceBenchmark) {
+		// Apply syntax highlighters after user plugins to match `markdown/remark` behavior
+		if (mdxOptions.syntaxHighlight === 'shiki') {
+			remarkPlugins.push([await remarkShiki(mdxOptions.shikiConfig)]);
+		}
+		if (mdxOptions.syntaxHighlight === 'prism') {
+			remarkPlugins.push(remarkPrism);
+		}
 	}
 
-	// Apply last in case user plugins resolve relative image paths
-	remarkPlugins.push(toRemarkContentRelImageError(config));
-
 	return remarkPlugins;
 }
 
@@ -163,39 +135,16 @@ export function getRehypePlugins(mdxOptions: MdxOptions): MdxRollupPluginOptions
 
 	rehypePlugins = [
 		...rehypePlugins,
-		...ignoreStringPlugins(mdxOptions.rehypePlugins),
+		...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,
+		...(isPerformanceBenchmark ? [] : [rehypeHeadingIds, rehypeInjectHeadingsExport]),
 		// computed from `astro.data.frontmatter` in VFile data
 		rehypeApplyFrontmatterExport,
 	];
 	return rehypePlugins;
 }
 
-function ignoreStringPlugins(plugins: any[]) {
-	let validPlugins: PluggableList = [];
-	let hasInvalidPlugin = false;
-	for (const plugin of plugins) {
-		if (typeof plugin === 'string') {
-			console.warn(yellow(`[MDX] ${bold(plugin)} not applied.`));
-			hasInvalidPlugin = true;
-		} else if (Array.isArray(plugin) && typeof plugin[0] === 'string') {
-			console.warn(yellow(`[MDX] ${bold(plugin[0])} not applied.`));
-			hasInvalidPlugin = true;
-		} else {
-			validPlugins.push(plugin);
-		}
-	}
-	if (hasInvalidPlugin) {
-		console.warn(
-			`To inherit Markdown plugins in MDX, please use explicit imports in your config instead of "strings." See Markdown docs: https://docs.astro.build/en/guides/markdown-content/#markdown-plugins`
-		);
-	}
-	return validPlugins;
-}
-
 /**
  * Check if estree entry is "import.meta.env.VARIABLE"
  * If it is, return the variable name (i.e. "VARIABLE")

package/src/utils.ts

@@ -1,7 +1,9 @@
+import type { PluggableList } from '@mdx-js/mdx/lib/core.js';
 import type { Options as AcornOpts } from 'acorn';
 import { parse } from 'acorn';
 import type { AstroConfig, SSRError } from 'astro';
 import matter from 'gray-matter';
+import { bold, yellow } from 'kleur/colors';
 import type { MdxjsEsm } from 'mdast-util-mdx';
 
 function appendForwardSlash(path: string) {
@@ -83,20 +85,24 @@ export function jsToTreeNode(
 	};
 }
 
-// Following utils taken from `packages/astro/src/core/path.ts`:
-export function isRelativePath(path: string) {
-	return startsWithDotDotSlash(path) || startsWithDotSlash(path);
-}
-
-function startsWithDotDotSlash(path: string) {
-	const c1 = path[0];
-	const c2 = path[1];
-	const c3 = path[2];
-	return c1 === '.' && c2 === '.' && c3 === '/';
-}
-
-function startsWithDotSlash(path: string) {
-	const c1 = path[0];
-	const c2 = path[1];
-	return c1 === '.' && c2 === '/';
+export function ignoreStringPlugins(plugins: any[]): PluggableList {
+	let validPlugins: PluggableList = [];
+	let hasInvalidPlugin = false;
+	for (const plugin of plugins) {
+		if (typeof plugin === 'string') {
+			console.warn(yellow(`[MDX] ${bold(plugin)} not applied.`));
+			hasInvalidPlugin = true;
+		} else if (Array.isArray(plugin) && typeof plugin[0] === 'string') {
+			console.warn(yellow(`[MDX] ${bold(plugin[0])} not applied.`));
+			hasInvalidPlugin = true;
+		} else {
+			validPlugins.push(plugin);
+		}
+	}
+	if (hasInvalidPlugin) {
+		console.warn(
+			`To inherit Markdown plugins in MDX, please use explicit imports in your config instead of "strings." See Markdown docs: https://docs.astro.build/en/guides/markdown-content/#markdown-plugins`
+		);
+	}
+	return validPlugins;
 }

package/template/content-module-types.d.ts

@@ -0,0 +1,9 @@
+declare module 'astro:content' {
+	interface Render {
+		'.mdx': Promise<{
+			Content: import('astro').MarkdownInstance<{}>['Content'];
+			headings: import('astro').MarkdownHeading[];
+			remarkPluginFrontmatter: Record<string, any>;
+		}>;
+	}
+}

package/tsconfig.json

@@ -3,8 +3,8 @@
   "include": ["src"],
   "compilerOptions": {
     "allowJs": true,
-    "module": "ES2020",
+    "module": "ES2022",
     "outDir": "./dist",
-    "target": "ES2020"
+    "target": "ES2021"
   }
 }