@astrojs/mdx 3.1.3 → 3.1.5

package/dist/rehype-apply-frontmatter-export.js

@@ -17,24 +17,25 @@ function rehypeApplyFrontmatterExport() {
     if (frontmatter.layout) {
       exportNodes.unshift(
         jsToTreeNode(
+          // NOTE: Use `__astro_*` import names to prevent conflicts with user code
           /** @see 'vite-plugin-markdown' for layout props reference */
-          `import { jsx as layoutJsx } from 'astro/jsx-runtime';
+          `import { jsx as __astro_layout_jsx__ } from 'astro/jsx-runtime';
+import __astro_layout_component__ from ${JSON.stringify(frontmatter.layout)};
 
-				export default async function ({ children }) {
-					const Layout = (await import(${JSON.stringify(frontmatter.layout)})).default;
-					const { layout, ...content } = frontmatter;
-					content.file = file;
-					content.url = url;
-					return layoutJsx(Layout, {
-						file,
-						url,
-						content,
-						frontmatter: content,
-						headings: getHeadings(),
-						'server:root': true,
-						children,
-					});
-				};`
+export default function ({ children }) {
+	const { layout, ...content } = frontmatter;
+	content.file = file;
+	content.url = url;
+	return __astro_layout_jsx__(__astro_layout_component__, {
+		file,
+		url,
+		content,
+		frontmatter: content,
+		headings: getHeadings(),
+		'server:root': true,
+		children,
+	});
+};`
         )
       );
     }

package/dist/vite-plugin-mdx.js

@@ -32,8 +32,9 @@ function vitePluginMdx(mdxOptions) {
     // ex. inject layouts
     async transform(code, id) {
       if (!id.endsWith(".mdx")) return;
-      const { data: frontmatter, content: pageContent } = parseFrontmatter(code, id);
-      const vfile = new VFile({ value: pageContent, path: id });
+      const { data: frontmatter, content: pageContent, matter } = parseFrontmatter(code, id);
+      const frontmatterLines = matter ? matter.match(/\n/g)?.join("") + "\n\n" : "";
+      const vfile = new VFile({ value: frontmatterLines + pageContent, path: id });
       setVfileFrontmatter(vfile, frontmatter);
       if (!processor) {
         return this.error(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/mdx",
   "description": "Add support for MDX pages in your Astro site",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -31,16 +31,15 @@
     "acorn": "^8.12.1",
     "es-module-lexer": "^1.5.4",
     "estree-util-visit": "^2.0.0",
-    "github-slugger": "^2.0.0",
     "gray-matter": "^4.0.3",
-    "hast-util-to-html": "^9.0.1",
+    "hast-util-to-html": "^9.0.2",
     "kleur": "^4.1.5",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.0",
     "remark-smartypants": "^3.0.2",
     "source-map": "^0.7.4",
     "unist-util-visit": "^5.0.0",
-    "vfile": "^6.0.2",
+    "vfile": "^6.0.3",
     "@astrojs/markdown-remark": "5.2.0"
   },
   "peerDependencies": {
@@ -50,22 +49,21 @@
     "@types/estree": "^1.0.5",
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.4",
-    "@types/yargs-parser": "^21.0.3",
-    "cheerio": "1.0.0-rc.12",
+    "cheerio": "1.0.0",
     "linkedom": "^0.18.4",
     "mdast-util-mdx": "^3.0.0",
-    "mdast-util-mdx-jsx": "^3.1.2",
+    "mdast-util-mdx-jsx": "^3.1.3",
     "mdast-util-to-string": "^4.0.0",
-    "reading-time": "^1.5.0",
     "rehype-mathjax": "^6.0.0",
     "rehype-pretty-code": "^0.13.2",
     "remark-math": "^6.0.0",
     "remark-rehype": "^11.1.0",
     "remark-shiki-twoslash": "^3.1.3",
     "remark-toc": "^9.0.0",
+    "shiki": "^1.14.1",
     "unified": "^11.0.5",
-    "vite": "^5.3.4",
-    "astro": "4.12.0",
+    "vite": "^5.4.2",
+    "astro": "4.14.6",
     "astro-scripts": "0.0.14"
   },
   "engines": {