@astrojs/mdx 5.0.0-alpha.0 → 5.0.0-beta.10

package/dist/rehype-optimize-static.js

@@ -122,11 +122,17 @@ function isMdxComponentNode(node) {
   return node.type === "mdxJsxFlowElement" || node.type === "mdxJsxTextElement";
 }
 function getExportConstComponentObjectKeys(node) {
-  const exportNamedDeclaration = node.data?.estree?.body[0];
-  if (exportNamedDeclaration?.type !== "ExportNamedDeclaration") return;
-  const variableDeclaration = exportNamedDeclaration.declaration;
-  if (variableDeclaration?.type !== "VariableDeclaration") return;
-  const variableInit = variableDeclaration.declarations[0]?.init;
+  let variableInit;
+  for (const part of node.data?.estree?.body || []) {
+    if (part.type !== "ExportNamedDeclaration" || part.declaration?.type !== "VariableDeclaration") {
+      continue;
+    }
+    const declarator = part.declaration.declarations.find(({ id }) => id.name === "components");
+    if (declarator) {
+      variableInit = declarator.init;
+      break;
+    }
+  }
   if (variableInit?.type !== "ObjectExpression") return;
   const keys = [];
   for (const propertyNode of variableInit.properties) {

package/dist/server.js

@@ -33,7 +33,7 @@ async function renderToStaticMarkup(Component, props = {}, { default: children =
   }
 }
 function throwEnhancedErrorIfMdxComponent(error, Component) {
-  if (Component[Symbol.for("mdx-component")]) {
+  if (Component[/* @__PURE__ */ Symbol.for("mdx-component")]) {
     if (AstroError.is(error)) return;
     error.title = error.name;
     error.hint = `This issue often occurs when your MDX component encounters runtime errors.`;

package/dist/utils.js

@@ -1,6 +1,6 @@
 import { parseFrontmatter } from "@astrojs/markdown-remark";
 import { parse } from "acorn";
-import colors from "picocolors";
+import colors from "piccolore";
 function appendForwardSlash(path) {
   return path.endsWith("/") ? path : path + "/";
 }

package/dist/vite-plugin-mdx-postprocess.js

@@ -10,15 +10,24 @@ const astroTagComponentImportRegex = /[\s,{]__astro_tag_component__[\s,}]/;
 function vitePluginMdxPostprocess(astroConfig) {
   return {
     name: "@astrojs/mdx-postprocess",
-    transform(code, id, opts) {
-      if (!id.endsWith(".mdx")) return;
-      const fileInfo = getFileInfo(id, astroConfig);
-      const [imports, exports] = parse(code);
-      code = injectUnderscoreFragmentImport(code, imports);
-      code = injectMetadataExports(code, exports, fileInfo);
-      code = transformContentExport(code, exports);
-      code = annotateContentExport(code, id, !!opts?.ssr, imports);
-      return { code, map: null };
+    transform: {
+      filter: {
+        id: /\.mdx$/
+      },
+      handler(code, id) {
+        const fileInfo = getFileInfo(id, astroConfig);
+        const [imports, exports] = parse(code);
+        code = injectUnderscoreFragmentImport(code, imports);
+        code = injectMetadataExports(code, exports, fileInfo);
+        code = transformContentExport(code, exports);
+        code = annotateContentExport(
+          code,
+          id,
+          this.environment.name === "ssr" || this.environment.name === "prerender",
+          imports
+        );
+        return { code, map: null };
+      }
     }
   };
 }

package/dist/vite-plugin-mdx.js

@@ -18,48 +18,58 @@ function vitePluginMdx(opts) {
         resolved.plugins.splice(jsxPluginIndex, 1);
       }
     },
-    async resolveId(source, importer, options) {
-      if (importer?.endsWith(".mdx") && source[0] !== "/") {
-        let resolved = await this.resolve(source, importer, options);
-        if (!resolved) resolved = await this.resolve("./" + source, importer, options);
-        return resolved;
+    resolveId: {
+      filter: {
+        // Do not match sources that start with /
+        id: /^[^/]/
+      },
+      async handler(source, importer, options) {
+        if (importer?.endsWith(".mdx")) {
+          let resolved = await this.resolve(source, importer, options);
+          if (!resolved) resolved = await this.resolve("./" + source, importer, options);
+          return resolved;
+        }
       }
     },
     // Override transform to alter code before MDX compilation
     // ex. inject layouts
-    async transform(code, id) {
-      if (!id.endsWith(".mdx")) return;
-      const { frontmatter, content } = safeParseFrontmatter(code, id);
-      const vfile = new VFile({
-        value: content,
-        path: id,
-        data: {
-          astro: {
-            frontmatter
-          },
-          applyFrontmatterExport: {
-            srcDir: opts.srcDir
+    transform: {
+      filter: {
+        id: /\.mdx$/
+      },
+      async handler(code, id) {
+        const { frontmatter, content } = safeParseFrontmatter(code, id);
+        const vfile = new VFile({
+          value: content,
+          path: id,
+          data: {
+            astro: {
+              frontmatter
+            },
+            applyFrontmatterExport: {
+              srcDir: opts.srcDir
+            }
           }
-        }
-      });
-      if (!processor) {
-        processor = createMdxProcessor(opts.mdxOptions, {
-          sourcemap: sourcemapEnabled
         });
-      }
-      try {
-        const compiled = await processor.process(vfile);
-        return {
-          code: String(compiled.value),
-          map: compiled.map,
-          meta: getMdxMeta(vfile)
-        };
-      } catch (e) {
-        const err = e;
-        err.name = "MDXError";
-        err.loc = { file: id, line: e.line, column: e.column };
-        Error.captureStackTrace(err);
-        throw err;
+        if (!processor) {
+          processor = createMdxProcessor(opts.mdxOptions, {
+            sourcemap: sourcemapEnabled
+          });
+        }
+        try {
+          const compiled = await processor.process(vfile);
+          return {
+            code: String(compiled.value),
+            map: compiled.map,
+            meta: getMdxMeta(vfile)
+          };
+        } catch (e) {
+          const err = e;
+          err.name = "MDXError";
+          err.loc = { file: id, line: e.line, column: e.column };
+          Error.captureStackTrace(err);
+          throw err;
+        }
       }
     }
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/mdx",
   "description": "Add support for MDX pages in your Astro site",
-  "version": "5.0.0-alpha.0",
+  "version": "5.0.0-beta.10",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -29,27 +29,29 @@
   ],
   "dependencies": {
     "@mdx-js/mdx": "^3.1.1",
-    "acorn": "^8.15.0",
-    "es-module-lexer": "^1.7.0",
+    "acorn": "^8.16.0",
+    "es-module-lexer": "^2.0.0",
     "estree-util-visit": "^2.0.0",
     "hast-util-to-html": "^9.0.5",
-    "picocolors": "^1.1.1",
+    "piccolore": "^0.1.3",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.1",
     "remark-smartypants": "^3.0.2",
     "source-map": "^0.7.6",
-    "unist-util-visit": "^5.0.0",
+    "unist-util-visit": "^5.1.0",
     "vfile": "^6.0.3",
-    "@astrojs/markdown-remark": "7.0.0-alpha.0"
+    "@astrojs/markdown-remark": "7.0.0-beta.9"
   },
   "peerDependencies": {
     "astro": "^6.0.0-alpha.0"
   },
   "devDependencies": {
+    "@shikijs/rehype": "^4.0.0",
+    "@shikijs/twoslash": "^4.0.0",
     "@types/estree": "^1.0.8",
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.4",
-    "cheerio": "1.1.2",
+    "cheerio": "1.2.0",
     "linkedom": "^0.18.12",
     "mdast-util-mdx": "^3.0.0",
     "mdast-util-mdx-jsx": "^3.2.0",
@@ -57,16 +59,15 @@
     "rehype-pretty-code": "^0.14.1",
     "remark-math": "^6.0.0",
     "remark-rehype": "^11.1.2",
-    "remark-shiki-twoslash": "^3.1.3",
     "remark-toc": "^9.0.0",
-    "shiki": "^3.12.0",
+    "shiki": "^4.0.0",
     "unified": "^11.0.5",
-    "vite": "^7.1.7",
-    "astro": "6.0.0-alpha.0",
-    "astro-scripts": "0.0.14"
+    "vite": "^7.3.1",
+    "astro-scripts": "0.0.14",
+    "astro": "6.0.0-beta.18"
   },
   "engines": {
-    "node": "^20.19.5 || >=22.12.0"
+    "node": "^20.19.1 || >=22.12.0"
   },
   "publishConfig": {
     "provenance": true