@astrojs/mdx 4.0.0-alpha.2 → 4.0.0-beta.2

package/dist/index.js

@@ -1,7 +1,7 @@
 import fs from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 import { markdownConfigDefaults } from "@astrojs/markdown-remark";
-import { ignoreStringPlugins, parseFrontmatter } from "./utils.js";
+import { ignoreStringPlugins, safeParseFrontmatter } from "./utils.js";
 import { vitePluginMdxPostprocess } from "./vite-plugin-mdx-postprocess.js";
 import { vitePluginMdx } from "./vite-plugin-mdx.js";
 function getContainerRenderer() {
@@ -25,12 +25,12 @@ function mdx(partialMdxOptions = {}) {
         addContentEntryType({
           extensions: [".mdx"],
           async getEntryInfo({ fileUrl, contents }) {
-            const parsed = parseFrontmatter(contents, fileURLToPath(fileUrl));
+            const parsed = safeParseFrontmatter(contents, fileURLToPath(fileUrl));
             return {
-              data: parsed.data,
-              body: parsed.content,
-              slug: parsed.data.slug,
-              rawData: parsed.matter
+              data: parsed.frontmatter,
+              body: parsed.content.trim(),
+              slug: parsed.frontmatter.slug,
+              rawData: parsed.rawFrontmatter
             };
           },
           contentModuleTypes: await fs.readFile(

package/dist/rehype-optimize-static.js

@@ -19,7 +19,10 @@ const rehypeOptimizeStatic = (options) => {
     const elementStack = [];
     const elementMetadatas = /* @__PURE__ */ new WeakMap();
     const isNodeNonStatic = (node) => {
-      return node.type.startsWith("mdx") || ignoreElementNames.has(node.tagName);
+      return node.type.startsWith("mdx") || // @ts-expect-error `node` should never have `type: 'root'`, but in some cases plugins may inject it as children,
+      // which MDX will render as a fragment instead (an MDX fragment is a `mdxJsxFlowElement` type).
+      node.type === "root" || // @ts-expect-error Access `.tagName` naively for perf
+      ignoreElementNames.has(node.tagName);
     };
     visit(tree, {
       // @ts-expect-error Force coerce node as hast node

package/dist/utils.d.ts

@@ -1,6 +1,5 @@
 import type { Options as AcornOpts } from 'acorn';
 import type { AstroConfig, AstroIntegrationLogger } from 'astro';
-import matter from 'gray-matter';
 import type { MdxjsEsm } from 'mdast-util-mdx';
 import type { PluggableList } from 'unified';
 export interface FileInfo {
@@ -13,6 +12,6 @@ export declare function getFileInfo(id: string, config: AstroConfig): FileInfo;
  * Match YAML exception handling from Astro core errors
  * @see 'astro/src/core/errors.ts'
  */
-export declare function parseFrontmatter(code: string, id: string): matter.GrayMatterFile<string>;
+export declare function safeParseFrontmatter(code: string, id: string): import("@astrojs/markdown-remark").ParseFrontmatterResult;
 export declare function jsToTreeNode(jsString: string, acornOpts?: AcornOpts): MdxjsEsm;
 export declare function ignoreStringPlugins(plugins: any[], logger: AstroIntegrationLogger): PluggableList;

package/dist/utils.js

@@ -1,5 +1,5 @@
+import { parseFrontmatter } from "@astrojs/markdown-remark";
 import { parse } from "acorn";
-import matter from "gray-matter";
 import { bold } from "kleur/colors";
 function appendForwardSlash(path) {
   return path.endsWith("/") ? path : path + "/";
@@ -28,9 +28,9 @@ function getFileInfo(id, config) {
   }
   return { fileId, fileUrl };
 }
-function parseFrontmatter(code, id) {
+function safeParseFrontmatter(code, id) {
   try {
-    return matter(code);
+    return parseFrontmatter(code, { frontmatter: "empty-with-spaces" });
   } catch (e) {
     if (e.name === "YAMLException") {
       const err = e;
@@ -85,5 +85,5 @@ export {
   getFileInfo,
   ignoreStringPlugins,
   jsToTreeNode,
-  parseFrontmatter
+  safeParseFrontmatter
 };

package/dist/vite-plugin-mdx.js

@@ -1,9 +1,10 @@
 import { getAstroMetadata } from "astro/jsx/rehype.js";
 import { VFile } from "vfile";
 import { createMdxProcessor } from "./plugins.js";
-import { parseFrontmatter } from "./utils.js";
+import { safeParseFrontmatter } from "./utils.js";
 function vitePluginMdx(mdxOptions) {
   let processor;
+  let sourcemapEnabled;
   return {
     name: "@mdx-js/rollup",
     enforce: "pre",
@@ -11,10 +12,7 @@ function vitePluginMdx(mdxOptions) {
       processor = void 0;
     },
     configResolved(resolved) {
-      if (Object.keys(mdxOptions).length === 0) return;
-      processor = createMdxProcessor(mdxOptions, {
-        sourcemap: !!resolved.build.sourcemap
-      });
+      sourcemapEnabled = !!resolved.build.sourcemap;
       const jsxPluginIndex = resolved.plugins.findIndex((p) => p.name === "astro:jsx");
       if (jsxPluginIndex !== -1) {
         resolved.plugins.splice(jsxPluginIndex, 1);
@@ -31,10 +29,9 @@ function vitePluginMdx(mdxOptions) {
     // ex. inject layouts
     async transform(code, id) {
       if (!id.endsWith(".mdx")) return;
-      const { data: frontmatter, content: pageContent, matter } = parseFrontmatter(code, id);
-      const frontmatterLines = matter ? matter.match(/\n/g)?.join("") + "\n\n" : "";
+      const { frontmatter, content } = safeParseFrontmatter(code, id);
       const vfile = new VFile({
-        value: frontmatterLines + pageContent,
+        value: content,
         path: id,
         data: {
           astro: {
@@ -43,9 +40,7 @@ function vitePluginMdx(mdxOptions) {
         }
       });
       if (!processor) {
-        return this.error(
-          "MDX processor is not initialized. This is an internal error. Please file an issue."
-        );
+        processor = createMdxProcessor(mdxOptions, { sourcemap: sourcemapEnabled });
       }
       try {
         const compiled = await processor.process(vfile);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/mdx",
   "description": "Add support for MDX pages in your Astro site",
-  "version": "4.0.0-alpha.2",
+  "version": "4.0.0-beta.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -32,8 +32,7 @@
     "acorn": "^8.12.1",
     "es-module-lexer": "^1.5.4",
     "estree-util-visit": "^2.0.0",
-    "gray-matter": "^4.0.3",
-    "hast-util-to-html": "^9.0.2",
+    "hast-util-to-html": "^9.0.3",
     "kleur": "^4.1.5",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.0",
@@ -41,30 +40,30 @@
     "source-map": "^0.7.4",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.3",
-    "@astrojs/markdown-remark": "6.0.0-alpha.1"
+    "@astrojs/markdown-remark": "6.0.0-beta.2"
   },
   "peerDependencies": {
     "astro": "^5.0.0-alpha.0"
   },
   "devDependencies": {
-    "@types/estree": "^1.0.5",
+    "@types/estree": "^1.0.6",
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.4",
     "cheerio": "1.0.0",
-    "linkedom": "^0.18.4",
+    "linkedom": "^0.18.5",
     "mdast-util-mdx": "^3.0.0",
     "mdast-util-mdx-jsx": "^3.1.3",
     "mdast-util-to-string": "^4.0.0",
     "rehype-mathjax": "^6.0.0",
     "rehype-pretty-code": "^0.14.0",
     "remark-math": "^6.0.0",
-    "remark-rehype": "^11.1.0",
+    "remark-rehype": "^11.1.1",
     "remark-shiki-twoslash": "^3.1.3",
     "remark-toc": "^9.0.0",
-    "shiki": "^1.16.1",
+    "shiki": "^1.21.0",
     "unified": "^11.0.5",
-    "vite": "^5.4.2",
-    "astro": "5.0.0-alpha.3",
+    "vite": "^5.4.8",
+    "astro": "5.0.0-beta.3",
     "astro-scripts": "0.0.14"
   },
   "engines": {