@astrojs/mdx 2.1.0 → 2.2.0

package/dist/index.js

@@ -1,8 +1,8 @@
+import fs from "node:fs/promises";
+import { fileURLToPath } from "node:url";
 import { markdownConfigDefaults, setVfileFrontmatter } from "@astrojs/markdown-remark";
 import astroJSXRenderer from "astro/jsx/renderer.js";
 import { parse as parseESM } from "es-module-lexer";
-import fs from "node:fs/promises";
-import { fileURLToPath } from "node:url";
 import { VFile } from "vfile";
 import { createMdxProcessor } from "./plugins.js";
 import {
@@ -103,7 +103,7 @@ function mdx(partialMdxOptions = {}) {
                   const [moduleImports, moduleExports] = parseESM(code);
                   const importsFromJSXRuntime = moduleImports.filter(({ n }) => n === "astro/jsx-runtime").map(({ ss, se }) => code.substring(ss, se));
                   const hasFragmentImport = importsFromJSXRuntime.some(
-                    (statement) => /[\s,{](Fragment,|Fragment\s*})/.test(statement)
+                    (statement) => /[\s,{](?:Fragment,|Fragment\s*\})/.test(statement)
                   );
                   if (!hasFragmentImport) {
                     code = 'import { Fragment } from "astro/jsx-runtime"\n' + code;

package/dist/plugins.js

@@ -1,8 +1,8 @@
 import {
   rehypeHeadingIds,
-  remarkCollectImages,
-  remarkPrism,
-  remarkShiki
+  rehypePrism,
+  rehypeShiki,
+  remarkCollectImages
 } from "@astrojs/markdown-remark";
 import { createProcessor, nodeTypes } from "@mdx-js/mdx";
 import rehypeRaw from "rehype-raw";
@@ -41,20 +41,7 @@ function getRemarkPlugins(mdxOptions) {
       remarkPlugins.push(remarkSmartypants);
     }
   }
-  remarkPlugins = [
-    ...remarkPlugins,
-    ...mdxOptions.remarkPlugins,
-    remarkCollectImages,
-    remarkImageToComponent
-  ];
-  if (!isPerformanceBenchmark) {
-    if (mdxOptions.syntaxHighlight === "shiki") {
-      remarkPlugins.push([remarkShiki, mdxOptions.shikiConfig]);
-    }
-    if (mdxOptions.syntaxHighlight === "prism") {
-      remarkPlugins.push(remarkPrism);
-    }
-  }
+  remarkPlugins.push(...mdxOptions.remarkPlugins, remarkCollectImages, remarkImageToComponent);
   return remarkPlugins;
 }
 function getRehypePlugins(mdxOptions) {
@@ -64,15 +51,18 @@ function getRehypePlugins(mdxOptions) {
     // rehypeRaw allows custom syntax highlighters to work without added config
     [rehypeRaw, { passThrough: nodeTypes }]
   ];
-  rehypePlugins = [
-    ...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.
-    ...isPerformanceBenchmark ? [] : [rehypeHeadingIds, rehypeInjectHeadingsExport],
-    // computed from `astro.data.frontmatter` in VFile data
-    rehypeApplyFrontmatterExport
-  ];
+  if (!isPerformanceBenchmark) {
+    if (mdxOptions.syntaxHighlight === "shiki") {
+      rehypePlugins.push([rehypeShiki, mdxOptions.shikiConfig]);
+    } else if (mdxOptions.syntaxHighlight === "prism") {
+      rehypePlugins.push(rehypePrism);
+    }
+  }
+  rehypePlugins.push(...mdxOptions.rehypePlugins);
+  if (!isPerformanceBenchmark) {
+    rehypePlugins.push(rehypeHeadingIds, rehypeInjectHeadingsExport);
+  }
+  rehypePlugins.push(rehypeApplyFrontmatterExport);
   if (mdxOptions.optimize) {
     const options = mdxOptions.optimize === true ? void 0 : mdxOptions.optimize;
     rehypePlugins.push([rehypeOptimizeStatic, options]);

package/dist/utils.js

@@ -17,7 +17,7 @@ function getFileInfo(id, config) {
   let fileUrl;
   const isPage = fileId.includes("/pages/");
   if (isPage) {
-    fileUrl = fileId.replace(/^.*?\/pages\//, sitePathname).replace(/(\/index)?\.mdx$/, "");
+    fileUrl = fileId.replace(/^.*?\/pages\//, sitePathname).replace(/(?:\/index)?\.mdx$/, "");
   } else if (url?.pathname.startsWith(config.root.pathname)) {
     fileUrl = url.pathname.slice(config.root.pathname.length);
   } else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/mdx",
   "description": "Add support for MDX pages in your Astro site",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -41,7 +41,7 @@
     "source-map": "^0.7.4",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.1",
-    "@astrojs/markdown-remark": "4.2.0"
+    "@astrojs/markdown-remark": "4.3.0"
   },
   "peerDependencies": {
     "astro": "^4.0.0"
@@ -52,22 +52,20 @@
     "@types/mdast": "^4.0.3",
     "@types/mocha": "^10.0.4",
     "@types/yargs-parser": "^21.0.3",
-    "chai": "^4.3.7",
     "cheerio": "1.0.0-rc.12",
     "linkedom": "^0.16.4",
     "mdast-util-mdx": "^3.0.0",
     "mdast-util-to-string": "^4.0.0",
-    "mocha": "^10.2.0",
     "reading-time": "^1.5.0",
     "rehype-mathjax": "^5.0.0",
-    "rehype-pretty-code": "^0.10.2",
+    "rehype-pretty-code": "^0.13.0",
     "remark-math": "^6.0.0",
     "remark-rehype": "^11.0.0",
     "remark-shiki-twoslash": "^3.1.3",
     "remark-toc": "^9.0.0",
     "unified": "^11.0.4",
-    "vite": "^5.0.12",
-    "astro": "4.2.4",
+    "vite": "^5.1.4",
+    "astro": "4.5.0",
     "astro-scripts": "0.0.14"
   },
   "engines": {
@@ -80,7 +78,6 @@
     "build": "astro-scripts build \"src/**/*.ts\" && tsc",
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "test": "mocha --exit --timeout 20000",
-    "test:match": "mocha --timeout 20000 -g"
+    "test": "astro-scripts test --timeout 70000 \"test/**/*.test.js\""
   }
 }