@astrojs/markdoc 1.0.0-alpha.0 → 1.0.0-alpha.1

package/dist/content-entry-type.js

@@ -61,13 +61,13 @@ async function getContentEntryType({
       const usedTags = getUsedTags(ast);
       let componentConfigByTagMap = {};
       for (const tag of usedTags) {
-        const render = userMarkdocConfig.tags?.[tag]?.render;
+        const render = markdocConfig.tags?.[tag]?.render;
         if (isComponentConfig(render)) {
           componentConfigByTagMap[tag] = render;
         }
       }
       let componentConfigByNodeMap = {};
-      for (const [nodeType, schema] of Object.entries(userMarkdocConfig.nodes ?? {})) {
+      for (const [nodeType, schema] of Object.entries(markdocConfig.nodes ?? {})) {
         const render = schema?.render;
         if (isComponentConfig(render)) {
           componentConfigByNodeMap[nodeType] = render;

package/dist/extensions/shiki.js

@@ -2,14 +2,22 @@ import { createShikiHighlighter } from "@astrojs/markdown-remark";
 import Markdoc from "@markdoc/markdoc";
 import { unescapeHTML } from "astro/runtime/server/index.js";
 async function shiki(config) {
-  const highlighter = await createShikiHighlighter(config);
+  const highlighter = await createShikiHighlighter({
+    langs: config?.langs,
+    theme: config?.theme,
+    themes: config?.themes
+  });
   return {
     nodes: {
       fence: {
         attributes: Markdoc.nodes.fence.attributes,
         async transform({ attributes }) {
           const lang = typeof attributes.language === "string" ? attributes.language : "plaintext";
-          const html = await highlighter.highlight(attributes.content, lang);
+          const html = await highlighter.codeToHtml(attributes.content, lang, {
+            wrap: config?.wrap,
+            defaultColor: config?.defaultColor,
+            transformers: config?.transformers
+          });
           return unescapeHTML(html);
         }
       }

package/dist/runtime.d.ts

@@ -1,7 +1,7 @@
 import type { MarkdownHeading } from '@astrojs/markdown-remark';
 import { type NodeType, type RenderableTreeNode } from '@markdoc/markdoc';
 import type { AstroInstance } from 'astro';
-import { type AstroMarkdocConfig } from './config.js';
+import type { AstroMarkdocConfig } from './config.js';
 import type { MarkdocIntegrationOptions } from './options.js';
 /**
  * Merge user config with default config and set up context (ex. heading ID slugger)

package/dist/runtime.js

@@ -1,7 +1,6 @@
 import Markdoc, {
 } from "@markdoc/markdoc";
 import { createComponent, renderComponent } from "astro/runtime/server/index.js";
-import {} from "./config.js";
 import { setupHeadingConfig } from "./heading-ids.js";
 import { htmlTag } from "./html/tagdefs/html.tag.js";
 async function setupConfig(userConfig = {}, options) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/markdoc",
   "description": "Add support for Markdoc in your Astro site",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -62,7 +62,7 @@
     "gray-matter": "^4.0.3",
     "htmlparser2": "^9.1.0",
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/markdown-remark": "6.0.0-alpha.0",
+    "@astrojs/markdown-remark": "6.0.0-alpha.1",
     "@astrojs/prism": "3.1.0"
   },
   "peerDependencies": {
@@ -72,8 +72,8 @@
     "@types/markdown-it": "^14.1.2",
     "devalue": "^5.0.0",
     "linkedom": "^0.18.4",
-    "vite": "^5.4.1",
-    "astro": "5.0.0-alpha.0",
+    "vite": "^5.4.2",
+    "astro": "5.0.0-alpha.3",
     "astro-scripts": "0.0.14"
   },
   "engines": {