astro-mermaid 2.0.3 → 2.0.4

package/astro-mermaid-integration.js

@@ -255,24 +255,63 @@ export default function astroMermaid(options = {}) {
           viteOptimizeDepsInclude.push('@mermaid-js/layout-elk');
         }
 
-        // Update markdown config to use both remark and rehype plugins
-        updateConfig({
-          markdown: {
-            remarkPlugins: [
-              ...(config.markdown?.remarkPlugins || []),
-              [remarkMermaidPlugin, { logger }]
-            ],
-            rehypePlugins: [
-              ...(config.markdown?.rehypePlugins || []),
-              [rehypeMermaidPlugin, { logger }]
-            ]
-          },
-          vite: {
-            optimizeDeps: {
-              include: viteOptimizeDepsInclude
+        const remarkEntry = [remarkMermaidPlugin, { logger }];
+        const rehypeEntry = [rehypeMermaidPlugin, { logger }];
+        const viteConfig = { optimizeDeps: { include: viteOptimizeDepsInclude } };
+
+        // Astro 6.4+ deprecated `markdown.remarkPlugins` / `markdown.rehypePlugins`
+        // in favor of passing plugins to `unified({...})` via `markdown.processor`.
+        // On 6.4+ Astro always supplies a default unified processor, so its
+        // presence is our signal to use the new API and avoid the deprecation
+        // warning. Older Astro versions have no processor — fall back to the
+        // (still-supported there) plugin arrays. Fixes #62.
+        const existingProcessor = config.markdown?.processor;
+        let usedProcessor = false;
+
+        if (existingProcessor) {
+          try {
+            const { unified, isUnifiedProcessor } = await import('@astrojs/markdown-remark');
+            if (isUnifiedProcessor(existingProcessor)) {
+              const existingOptions = existingProcessor.options || {};
+              updateConfig({
+                markdown: {
+                  processor: unified({
+                    ...existingOptions,
+                    remarkPlugins: [...(existingOptions.remarkPlugins || []), remarkEntry],
+                    rehypePlugins: [...(existingOptions.rehypePlugins || []), rehypeEntry]
+                  })
+                },
+                vite: viteConfig
+              });
+              usedProcessor = true;
             }
+          } catch (error) {
+            // Dynamic import failed, the unified processor helpers are not
+            // exported, or updateConfig rejected the processor — fall through
+            // to the legacy plugin arrays below.
+            logger.warn(
+              `Could not configure the unified markdown processor, falling back ` +
+              `to remark/rehype plugin arrays: ${error.message}`
+            );
           }
-        });
+        }
+
+        if (!usedProcessor) {
+          // Update markdown config to use both remark and rehype plugins
+          updateConfig({
+            markdown: {
+              remarkPlugins: [
+                ...(config.markdown?.remarkPlugins || []),
+                remarkEntry
+              ],
+              rehypePlugins: [
+                ...(config.markdown?.rehypePlugins || []),
+                rehypeEntry
+              ]
+            },
+            vite: viteConfig
+          });
+        }
 
         // Validate and serialize icon packs for client-side use.
         // Only the pack name and either inline icon data or a JSON URL string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-mermaid",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "An Astro integration for rendering Mermaid diagrams with automatic theme switching and client-side rendering",
   "type": "module",
   "main": "./astro-mermaid-integration.js",
@@ -43,6 +43,14 @@
     "mdast-util-to-string": "^4.0.0",
     "unist-util-visit": "^5.0.0"
   },
+  "overrides": {
+    "vite": "^7.3.5",
+    "esbuild": "^0.28.1",
+    "ip-address": "^10.1.1",
+    "js-yaml": "^4.2.0",
+    "picomatch": "^4.0.4",
+    "tar": "^7.5.16"
+  },
   "scripts": {
     "test": "vitest",
     "test:ui": "vitest --ui",
@@ -52,7 +60,7 @@
   "devDependencies": {
     "@types/hast": "^3.0.4",
     "@vitest/ui": "^4.1.8",
-    "astro": "^6.0.0",
+    "astro": "^6.4.6",
     "hast-util-from-html": "^2.0.3",
     "mermaid": "^11.0.0",
     "rehype-parse": "^9.0.1",