@astrojs/markdown-remark 6.0.1 → 6.1.0

package/dist/frontmatter.js

@@ -1,4 +1,5 @@
 import yaml from "js-yaml";
+import * as toml from "smol-toml";
 function isFrontmatterValid(frontmatter) {
   try {
     JSON.stringify(frontmatter);
@@ -7,16 +8,21 @@ function isFrontmatterValid(frontmatter) {
   }
   return typeof frontmatter === "object" && frontmatter !== null;
 }
-const frontmatterRE = /(?:^\uFEFF?|^\s*\n)---([\s\S]*?\n)---/;
+const frontmatterRE = /(?:^\uFEFF?|^\s*\n)(?:---|\+\+\+)([\s\S]*?\n)(?:---|\+\+\+)/;
+const frontmatterTypeRE = /(?:^\uFEFF?|^\s*\n)(---|\+\+\+)/;
 function extractFrontmatter(code) {
   return frontmatterRE.exec(code)?.[1];
 }
+function getFrontmatterParser(code) {
+  return frontmatterTypeRE.exec(code)?.[1] === "+++" ? ["+++", toml.parse] : ["---", yaml.load];
+}
 function parseFrontmatter(code, options) {
   const rawFrontmatter = extractFrontmatter(code);
   if (rawFrontmatter == null) {
     return { frontmatter: {}, rawFrontmatter: "", content: code };
   }
-  const parsed = yaml.load(rawFrontmatter);
+  const [delims, parser] = getFrontmatterParser(code);
+  const parsed = parser(rawFrontmatter);
   const frontmatter = parsed && typeof parsed === "object" ? parsed : {};
   let content;
   switch (options?.frontmatter ?? "remove") {
@@ -24,16 +30,19 @@ function parseFrontmatter(code, options) {
       content = code;
       break;
     case "remove":
-      content = code.replace(`---${rawFrontmatter}---`, "");
+      content = code.replace(`${delims}${rawFrontmatter}${delims}`, "");
       break;
     case "empty-with-spaces":
       content = code.replace(
-        `---${rawFrontmatter}---`,
+        `${delims}${rawFrontmatter}${delims}`,
         `   ${rawFrontmatter.replace(/[^\r\n]/g, " ")}   `
       );
       break;
     case "empty-with-lines":
-      content = code.replace(`---${rawFrontmatter}---`, rawFrontmatter.replace(/[^\r\n]/g, ""));
+      content = code.replace(
+        `${delims}${rawFrontmatter}${delims}`,
+        rawFrontmatter.replace(/[^\r\n]/g, "")
+      );
       break;
   }
   return {

package/dist/import-plugin-default.js

@@ -4,13 +4,19 @@ import { resolve as importMetaResolve } from "import-meta-resolve";
 let cwdUrlStr;
 async function importPlugin(p) {
   try {
-    const importResult2 = await import(p);
+    const importResult2 = await import(
+      /* @vite-ignore */
+      p
+    );
     return importResult2.default;
   } catch {
   }
   cwdUrlStr ??= pathToFileURL(path.join(process.cwd(), "package.json")).toString();
   const resolved = importMetaResolve(p, cwdUrlStr);
-  const importResult = await import(resolved);
+  const importResult = await import(
+    /* @vite-ignore */
+    resolved
+  );
   return importResult.default;
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "6.0.1",
+  "version": "6.1.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -37,7 +37,8 @@
     "remark-parse": "^11.0.0",
     "remark-rehype": "^11.1.1",
     "remark-smartypants": "^3.0.2",
-    "shiki": "^1.23.1",
+    "shiki": "^1.29.1",
+    "smol-toml": "^1.3.1",
     "unified": "^11.0.5",
     "unist-util-remove-position": "^5.0.0",
     "unist-util-visit": "^5.0.0",
@@ -51,7 +52,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mdast": "^4.0.4",
     "@types/unist": "^3.0.3",
-    "esbuild": "^0.21.5",
+    "esbuild": "^0.24.2",
     "mdast-util-mdx-expression": "^2.0.1",
     "astro-scripts": "0.0.14"
   },