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

package/dist/index.js

@@ -11,7 +11,7 @@ function getContainerRenderer() {
   };
 }
 function mdx(partialMdxOptions = {}) {
-  let mdxOptions = {};
+  let vitePluginMdxOptions = {};
   return {
     name: "@astrojs/mdx",
     hooks: {
@@ -19,7 +19,7 @@ function mdx(partialMdxOptions = {}) {
         const { updateConfig, config, addPageExtension, addContentEntryType, addRenderer } = params;
         addRenderer({
           name: "astro:jsx",
-          serverEntrypoint: "@astrojs/mdx/server.js"
+          serverEntrypoint: new URL("../dist/server.js", import.meta.url)
         });
         addPageExtension(".mdx");
         addContentEntryType({
@@ -43,7 +43,7 @@ function mdx(partialMdxOptions = {}) {
         });
         updateConfig({
           vite: {
-            plugins: [vitePluginMdx(mdxOptions), vitePluginMdxPostprocess(config)]
+            plugins: [vitePluginMdx(vitePluginMdxOptions), vitePluginMdxPostprocess(config)]
           }
         });
       },
@@ -56,8 +56,11 @@ function mdx(partialMdxOptions = {}) {
             logger
           )
         });
-        Object.assign(mdxOptions, resolvedMdxOptions);
-        mdxOptions = {};
+        Object.assign(vitePluginMdxOptions, {
+          mdxOptions: resolvedMdxOptions,
+          srcDir: config.srcDir
+        });
+        vitePluginMdxOptions = {};
       }
     }
   };

package/dist/rehype-apply-frontmatter-export.d.ts

@@ -1,2 +1,10 @@
+import type { Root } from 'hast';
 import type { VFile } from 'vfile';
-export declare function rehypeApplyFrontmatterExport(): (tree: any, vfile: VFile) => void;
+declare module 'vfile' {
+    interface DataMap {
+        applyFrontmatterExport?: {
+            srcDir?: URL;
+        };
+    }
+}
+export declare function rehypeApplyFrontmatterExport(): (tree: Root, vfile: VFile) => void;

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

@@ -1,5 +1,8 @@
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { isFrontmatterValid } from "@astrojs/markdown-remark";
 import { jsToTreeNode } from "./utils.js";
+const exportConstPartialTrueRe = /export\s+const\s+partial\s*=\s*true/;
 function rehypeApplyFrontmatterExport() {
   return function(tree, vfile) {
     const frontmatter = vfile.data.astro?.frontmatter;
@@ -9,11 +12,11 @@ function rehypeApplyFrontmatterExport() {
         // 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 exportNodes = [
+    const extraChildren = [
       jsToTreeNode(`export const frontmatter = ${JSON.stringify(frontmatter)};`)
     ];
     if (frontmatter.layout) {
-      exportNodes.unshift(
+      extraChildren.unshift(
         jsToTreeNode(
           // NOTE: Use `__astro_*` import names to prevent conflicts with user code
           /** @see 'vite-plugin-markdown' for layout props reference */
@@ -36,10 +39,45 @@ export default function ({ children }) {
 };`
         )
       );
+    } else if (shouldAddCharset(tree, vfile)) {
+      extraChildren.unshift({
+        type: "mdxJsxFlowElement",
+        name: "meta",
+        attributes: [
+          {
+            type: "mdxJsxAttribute",
+            name: "charset",
+            value: "utf-8"
+          }
+        ],
+        children: []
+      });
     }
-    tree.children = exportNodes.concat(tree.children);
+    tree.children = extraChildren.concat(tree.children);
   };
 }
+function shouldAddCharset(tree, vfile) {
+  const srcDirUrl = vfile.data.applyFrontmatterExport?.srcDir;
+  if (!srcDirUrl) return false;
+  const hasConstPartialTrue = tree.children.some(
+    (node) => node.type === "mdxjsEsm" && exportConstPartialTrueRe.test(node.value)
+  );
+  if (hasConstPartialTrue) return false;
+  const pagesDir = path.join(fileURLToPath(srcDirUrl), "pages").replace(/\\/g, "/");
+  const filePath = vfile.path;
+  if (!filePath.startsWith(pagesDir)) return false;
+  const hasLeadingUnderscoreInPath = filePath.slice(pagesDir.length).replace(/\\/g, "/").split("/").some((part) => part.startsWith("_"));
+  if (hasLeadingUnderscoreInPath) return false;
+  for (const child of tree.children) {
+    if (child.type === "element") break;
+    if (child.type === "mdxJsxFlowElement") {
+      if (child.name == null) break;
+      if (child.name[0] === child.name[0].toLowerCase()) break;
+      return false;
+    }
+  }
+  return true;
+}
 export {
   rehypeApplyFrontmatterExport
 };

package/dist/vite-plugin-mdx.d.ts

@@ -1,3 +1,7 @@
 import type { Plugin } from 'vite';
 import type { MdxOptions } from './index.js';
-export declare function vitePluginMdx(mdxOptions: MdxOptions): Plugin;
+export interface VitePluginMdxOptions {
+    mdxOptions: MdxOptions;
+    srcDir: URL;
+}
+export declare function vitePluginMdx(opts: VitePluginMdxOptions): Plugin;

package/dist/vite-plugin-mdx.js

@@ -2,7 +2,7 @@ import { getAstroMetadata } from "astro/jsx/rehype.js";
 import { VFile } from "vfile";
 import { createMdxProcessor } from "./plugins.js";
 import { safeParseFrontmatter } from "./utils.js";
-function vitePluginMdx(mdxOptions) {
+function vitePluginMdx(opts) {
   let processor;
   let sourcemapEnabled;
   return {
@@ -36,11 +36,14 @@ function vitePluginMdx(mdxOptions) {
         data: {
           astro: {
             frontmatter
+          },
+          applyFrontmatterExport: {
+            srcDir: opts.srcDir
           }
         }
       });
       if (!processor) {
-        processor = createMdxProcessor(mdxOptions, { sourcemap: sourcemapEnabled });
+        processor = createMdxProcessor(opts.mdxOptions, { sourcemap: sourcemapEnabled });
       }
       try {
         const compiled = await processor.process(vfile);

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@astrojs/mdx",
   "description": "Add support for MDX pages in your Astro site",
-  "version": "4.0.0-beta.2",
+  "version": "4.0.0-beta.4",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/withastro/astro.git",
+    "url": "git+https://github.com/withastro/astro.git",
     "directory": "packages/integrations/mdx"
   },
   "keywords": [
@@ -28,8 +28,8 @@
     "template"
   ],
   "dependencies": {
-    "@mdx-js/mdx": "^3.0.1",
-    "acorn": "^8.12.1",
+    "@mdx-js/mdx": "^3.1.0",
+    "acorn": "^8.14.0",
     "es-module-lexer": "^1.5.4",
     "estree-util-visit": "^2.0.0",
     "hast-util-to-html": "^9.0.3",
@@ -60,10 +60,10 @@
     "remark-rehype": "^11.1.1",
     "remark-shiki-twoslash": "^3.1.3",
     "remark-toc": "^9.0.0",
-    "shiki": "^1.21.0",
+    "shiki": "^1.22.2",
     "unified": "^11.0.5",
-    "vite": "^5.4.8",
-    "astro": "5.0.0-beta.3",
+    "vite": "6.0.0-beta.6",
+    "astro": "5.0.0-beta.11",
     "astro-scripts": "0.0.14"
   },
   "engines": {

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

@@ -4,6 +4,7 @@ declare module 'astro:content' {
 			Content: import('astro').MarkdownInstance<{}>['Content'];
 			headings: import('astro').MarkdownHeading[];
 			remarkPluginFrontmatter: Record<string, any>;
+			components: import('astro').MDXInstance<{}>['components'];
 		}>;
 	}
 }