@astrojs/markdoc 0.11.5-beta.1 → 0.11.5

package/dist/content-entry-type.js

@@ -1,9 +1,9 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { parseFrontmatter } from "@astrojs/markdown-remark";
 import Markdoc from "@markdoc/markdoc";
 import { emitESMImage } from "astro/assets/utils";
+import matter from "gray-matter";
 import { htmlTokenTransform } from "./html/transform/html-token-transform.js";
 import { setupConfig } from "./runtime.js";
 import { getMarkdocTokenizer } from "./tokenizer.js";
@@ -15,20 +15,12 @@ async function getContentEntryType({
 }) {
   return {
     extensions: [".mdoc"],
-    getEntryInfo({ fileUrl, contents }) {
-      const parsed = safeParseFrontmatter(contents, fileURLToPath(fileUrl));
-      return {
-        data: parsed.frontmatter,
-        body: parsed.content.trim(),
-        slug: parsed.frontmatter.slug,
-        rawData: parsed.rawFrontmatter
-      };
-    },
+    getEntryInfo,
     handlePropagation: true,
     async getRenderModule({ contents, fileUrl, viteId }) {
-      const parsed = safeParseFrontmatter(contents, fileURLToPath(fileUrl));
+      const entry = getEntryInfo({ contents, fileUrl });
       const tokenizer = getMarkdocTokenizer(options);
-      let tokens = tokenizer.tokenize(parsed.content);
+      let tokens = tokenizer.tokenize(entry.body);
       if (options?.allowHTML) {
         tokens = htmlTokenTransform(tokenizer, tokens);
       }
@@ -42,6 +34,7 @@ async function getContentEntryType({
         ast,
         /* Raised generics issue with Markdoc core https://github.com/markdoc/markdoc/discussions/400 */
         markdocConfig,
+        entry,
         viteId,
         astroConfig,
         filePath
@@ -58,6 +51,7 @@ async function getContentEntryType({
           raiseValidationErrors({
             ast: partialAst,
             markdocConfig,
+            entry,
             viteId,
             astroConfig,
             filePath: partialPath
@@ -189,6 +183,7 @@ async function resolvePartials({
 function raiseValidationErrors({
   ast,
   markdocConfig,
+  entry,
   viteId,
   astroConfig,
   filePath
@@ -202,6 +197,7 @@ function raiseValidationErrors({
     !(e.error.id === "attribute-value-invalid" && /^Partial .+ not found/.test(e.error.message));
   });
   if (validationErrors.length) {
+    const frontmatterBlockOffset = entry.rawData.split("\n").length + 2;
     const rootRelativePath = path.relative(fileURLToPath(astroConfig.root), filePath);
     throw new MarkdocError({
       message: [
@@ -211,7 +207,7 @@ function raiseValidationErrors({
       location: {
         // Error overlay does not support multi-line or ranges.
         // Just point to the first line.
-        line: validationErrors[0].lines[0],
+        line: frontmatterBlockOffset + validationErrors[0].lines[0],
         file: viteId
       }
     });
@@ -228,6 +224,15 @@ function getUsedTags(markdocAst) {
   }
   return tags;
 }
+function getEntryInfo({ fileUrl, contents }) {
+  const parsed = parseFrontmatter(contents, fileURLToPath(fileUrl));
+  return {
+    data: parsed.data,
+    body: parsed.content,
+    slug: parsed.data.slug,
+    rawData: parsed.matter
+  };
+}
 async function emitOptimizedImages(nodeChildren, ctx) {
   for (const node of nodeChildren) {
     let isComponent = node.type === "tag" && node.tag === "image";
@@ -288,9 +293,10 @@ function getStringifiedMap(componentConfigMap, componentNamePrefix) {
   stringifiedComponentMap += "}";
   return stringifiedComponentMap;
 }
-function safeParseFrontmatter(fileContents, filePath) {
+function parseFrontmatter(fileContents, filePath) {
   try {
-    return parseFrontmatter(fileContents, { frontmatter: "empty-with-lines" });
+    matter.clearCache();
+    return matter(fileContents);
   } catch (e) {
     if (e.name === "YAMLException") {
       const err = e;

package/dist/extensions/shiki.js

@@ -2,22 +2,14 @@ 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({
-    langs: config?.langs,
-    theme: config?.theme,
-    themes: config?.themes
-  });
+  const highlighter = await createShikiHighlighter(config);
   return {
     nodes: {
       fence: {
         attributes: Markdoc.nodes.fence.attributes,
         async transform({ attributes }) {
           const lang = typeof attributes.language === "string" ? attributes.language : "plaintext";
-          const html = await highlighter.codeToHtml(attributes.content, lang, {
-            wrap: config?.wrap,
-            defaultColor: config?.defaultColor,
-            transformers: config?.transformers
-          });
+          const html = await highlighter.highlight(attributes.content, lang);
           return unescapeHTML(html);
         }
       }

package/dist/index.js

@@ -25,7 +25,7 @@ function markdocIntegration(options) {
         });
       },
       "astro:server:setup": async ({ server }) => {
-        server.watcher.on("all", (event, entry) => {
+        server.watcher.on("all", (_event, entry) => {
           if (SUPPORTED_MARKDOC_CONFIG_FILES.some((f) => entry.endsWith(f))) {
             server.restart();
           }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/markdoc",
   "description": "Add support for Markdoc in your Astro site",
-  "version": "0.11.5-beta.1",
+  "version": "0.11.5",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -59,20 +59,21 @@
     "@markdoc/markdoc": "^0.4.0",
     "esbuild": "^0.21.5",
     "github-slugger": "^2.0.0",
+    "gray-matter": "^4.0.3",
     "htmlparser2": "^9.1.0",
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/markdown-remark": "6.0.0-beta.2",
+    "@astrojs/markdown-remark": "5.3.0",
     "@astrojs/prism": "3.1.0"
   },
   "peerDependencies": {
-    "astro": "^5.0.0-alpha.0"
+    "astro": "^3.0.0 || ^4.0.0"
   },
   "devDependencies": {
     "@types/markdown-it": "^14.1.2",
     "devalue": "^5.1.1",
     "linkedom": "^0.18.5",
     "vite": "^5.4.8",
-    "astro": "5.0.0-beta.3",
+    "astro": "4.16.0",
     "astro-scripts": "0.0.14"
   },
   "engines": {