@astrojs/mdx 5.0.0-beta.6 → 5.0.0-beta.8

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/vite-plugin-mdx-postprocess.js

@@ -5,6 +5,7 @@ import {
   USES_ASTRO_IMAGE_FLAG
 } from "./rehype-images-to-component.js";
 import { getFileInfo } from "./utils.js";
+import { mdxMetadataMap } from "./vite-plugin-mdx.js";
 const underscoreFragmentImportRegex = /[\s,{]_Fragment[\s,}]/;
 const astroTagComponentImportRegex = /[\s,{]__astro_tag_component__[\s,}]/;
 function vitePluginMdxPostprocess(astroConfig) {
@@ -17,6 +18,13 @@ function vitePluginMdxPostprocess(astroConfig) {
       handler(code, id) {
         const fileInfo = getFileInfo(id, astroConfig);
         const [imports, exports] = parse(code);
+        const usesShiki = astroConfig.markdown.syntaxHighlight === "shiki" || astroConfig.markdown.syntaxHighlight === void 0;
+        const metadata = mdxMetadataMap.get(id);
+        const hasCodeBlocks = metadata?.hasCodeBlocks ?? false;
+        if (usesShiki && hasCodeBlocks) {
+          code = `import 'virtual:astro:shiki-styles.css';
+${code}`;
+        }
         code = injectUnderscoreFragmentImport(code, imports);
         code = injectMetadataExports(code, exports, fileInfo);
         code = transformContentExport(code, exports);

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

@@ -1,5 +1,8 @@
 import type { Plugin } from 'vite';
 import type { MdxOptions } from './index.js';
+export declare const mdxMetadataMap: Map<string, {
+    hasCodeBlocks: boolean;
+}>;
 export interface VitePluginMdxOptions {
     mdxOptions: MdxOptions;
     srcDir: URL;

package/dist/vite-plugin-mdx.js

@@ -2,6 +2,7 @@ import { getAstroMetadata } from "astro/jsx/rehype.js";
 import { VFile } from "vfile";
 import { createMdxProcessor } from "./plugins.js";
 import { safeParseFrontmatter } from "./utils.js";
+const mdxMetadataMap = /* @__PURE__ */ new Map();
 function vitePluginMdx(opts) {
   let processor;
   let sourcemapEnabled;
@@ -58,6 +59,8 @@ function vitePluginMdx(opts) {
         }
         try {
           const compiled = await processor.process(vfile);
+          const hasCodeBlocks = vfile.data.astro?.hasCodeBlocks ?? false;
+          mdxMetadataMap.set(id, { hasCodeBlocks });
           return {
             code: String(compiled.value),
             map: compiled.map,
@@ -87,9 +90,12 @@ function getMdxMeta(vfile) {
       // Setting this vite metadata to `ts` causes Vite to resolve .js
       // extensions to .ts files.
       lang: "ts"
-    }
+    },
+    // Pass hasCodeBlocks flag to postprocess plugin
+    hasCodeBlocks: vfile.data.astro?.hasCodeBlocks ?? false
   };
 }
 export {
+  mdxMetadataMap,
   vitePluginMdx
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/mdx",
   "description": "Add support for MDX pages in your Astro site",
-  "version": "5.0.0-beta.6",
+  "version": "5.0.0-beta.8",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -40,7 +40,7 @@
     "source-map": "^0.7.6",
     "unist-util-visit": "^5.1.0",
     "vfile": "^6.0.3",
-    "@astrojs/markdown-remark": "7.0.0-beta.6"
+    "@astrojs/markdown-remark": "7.0.0-beta.7"
   },
   "peerDependencies": {
     "astro": "^6.0.0-alpha.0"
@@ -62,7 +62,7 @@
     "shiki": "^3.22.0",
     "unified": "^11.0.5",
     "vite": "^7.3.1",
-    "astro": "6.0.0-beta.10",
+    "astro": "6.0.0-beta.13",
     "astro-scripts": "0.0.14"
   },
   "engines": {