@astrojs/markdoc 0.7.0 → 0.7.2

package/dist/content-entry-type.js

@@ -80,7 +80,7 @@ async function getContentEntryType({
       });
       const res = `import { Renderer } from '@astrojs/markdoc/components';
 import { createGetHeadings, createContentComponent } from '@astrojs/markdoc/runtime';
-${markdocConfigUrl ? `import markdocConfig from ${JSON.stringify(markdocConfigUrl.pathname)};` : "const markdocConfig = {};"}
+${markdocConfigUrl ? `import markdocConfig from ${JSON.stringify(fileURLToPath(markdocConfigUrl))};` : "const markdocConfig = {};"}
 
 import { assetsConfig } from '@astrojs/markdoc/runtime-assets-config';
 markdocConfig.nodes = { ...assetsConfig.nodes, ...markdocConfig.nodes };
@@ -164,7 +164,7 @@ function getStringifiedImports(componentConfigMap, componentNamePrefix, root) {
   let stringifiedComponentImports = "";
   for (const [key, config] of Object.entries(componentConfigMap)) {
     const importName = config.namedExport ? `{ ${config.namedExport} as ${componentNamePrefix + toImportName(key)} }` : componentNamePrefix + toImportName(key);
-    const resolvedPath = config.type === "local" ? new URL(config.path, root).pathname : config.path;
+    const resolvedPath = config.type === "local" ? fileURLToPath(new URL(config.path, root)) : config.path;
     stringifiedComponentImports += `import ${importName} from ${JSON.stringify(resolvedPath)};
 `;
   }

package/dist/extensions/shiki.d.ts

@@ -1,3 +1,3 @@
 import type { ShikiConfig } from 'astro';
 import type { AstroMarkdocConfig } from '../config.js';
-export default function shiki({ langs, theme, wrap, }?: ShikiConfig): Promise<AstroMarkdocConfig>;
+export default function shiki(config?: ShikiConfig): Promise<AstroMarkdocConfig>;

package/dist/extensions/shiki.js

@@ -1,90 +1,21 @@
+import { createShikiHighlighter } from "@astrojs/markdown-remark";
 import Markdoc from "@markdoc/markdoc";
 import { unescapeHTML } from "astro/runtime/server/index.js";
-import { bundledLanguages, getHighlighter } from "shikiji";
-const ASTRO_COLOR_REPLACEMENTS = {
-  "#000001": "var(--astro-code-color-text)",
-  "#000002": "var(--astro-code-color-background)",
-  "#000004": "var(--astro-code-token-constant)",
-  "#000005": "var(--astro-code-token-string)",
-  "#000006": "var(--astro-code-token-comment)",
-  "#000007": "var(--astro-code-token-keyword)",
-  "#000008": "var(--astro-code-token-parameter)",
-  "#000009": "var(--astro-code-token-function)",
-  "#000010": "var(--astro-code-token-string-expression)",
-  "#000011": "var(--astro-code-token-punctuation)",
-  "#000012": "var(--astro-code-token-link)"
-};
-const COLOR_REPLACEMENT_REGEX = new RegExp(
-  `(${Object.keys(ASTRO_COLOR_REPLACEMENTS).join("|")})`,
-  "g"
-);
-const PRE_SELECTOR = /<pre class="(.*?)shiki(.*?)"/;
-const LINE_SELECTOR = /<span class="line"><span style="(.*?)">([\+|\-])/g;
-const INLINE_STYLE_SELECTOR = /style="(.*?)"/;
-const INLINE_STYLE_SELECTOR_GLOBAL = /style="(.*?)"/g;
-const highlighterCache = /* @__PURE__ */ new Map();
-async function shiki({
-  langs = [],
-  theme = "github-dark",
-  wrap = false
-} = {}) {
-  const cacheId = typeof theme === "string" ? theme : theme.name || "";
-  let highlighter = highlighterCache.get(cacheId);
-  if (!highlighter) {
-    highlighter = await getHighlighter({
-      langs: langs.length ? langs : Object.keys(bundledLanguages),
-      themes: [theme]
-    });
-    highlighterCache.set(cacheId, highlighter);
-  }
+async function shiki(config) {
+  const highlighter = await createShikiHighlighter(config);
   return {
     nodes: {
       fence: {
         attributes: Markdoc.nodes.fence.attributes,
         transform({ attributes }) {
-          let lang;
-          if (typeof attributes.language === "string") {
-            const langExists = highlighter.getLoadedLanguages().includes(attributes.language);
-            if (langExists) {
-              lang = attributes.language;
-            } else {
-              console.warn(
-                `[Shiki highlighter] The language "${attributes.language}" doesn't exist, falling back to plaintext.`
-              );
-              lang = "plaintext";
-            }
-          } else {
-            lang = "plaintext";
-          }
-          let html = highlighter.codeToHtml(attributes.content, { lang, theme });
-          html = html.replace(PRE_SELECTOR, `<pre class="$1astro-code$2"`);
-          if (attributes.language === "diff") {
-            html = html.replace(
-              LINE_SELECTOR,
-              '<span class="line"><span style="$1"><span style="user-select: none;">$2</span>'
-            );
-          }
-          if (wrap === false) {
-            html = html.replace(INLINE_STYLE_SELECTOR, 'style="$1; overflow-x: auto;"');
-          } else if (wrap === true) {
-            html = html.replace(
-              INLINE_STYLE_SELECTOR,
-              'style="$1; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;"'
-            );
-          }
-          const themeName = typeof theme === "string" ? theme : theme.name;
-          if (themeName === "css-variables") {
-            html = html.replace(INLINE_STYLE_SELECTOR_GLOBAL, (m) => replaceCssVariables(m));
-          }
+          const lang = typeof attributes.language === "string" ? attributes.language : "plaintext";
+          const html = highlighter.highlight(attributes.content, lang);
           return unescapeHTML(html);
         }
       }
     }
   };
 }
-function replaceCssVariables(str) {
-  return str.replace(COLOR_REPLACEMENT_REGEX, (match) => ASTRO_COLOR_REPLACEMENTS[match] || match);
-}
 export {
   shiki as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/markdoc",
   "description": "Add support for Markdoc in your Astro site",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -63,12 +63,12 @@
     "htmlparser2": "^9.0.0",
     "kleur": "^4.1.5",
     "shikiji": "^0.6.8",
-    "zod": "3.21.1",
+    "zod": "^3.22.4",
     "@astrojs/internal-helpers": "0.2.1",
     "@astrojs/prism": "3.0.0"
   },
   "peerDependencies": {
-    "astro": "^3.3.4"
+    "astro": "^3.0.0"
   },
   "devDependencies": {
     "@types/chai": "^4.3.5",
@@ -81,8 +81,8 @@
     "mocha": "^10.2.0",
     "rollup": "^3.28.1",
     "vite": "^4.4.9",
-    "@astrojs/markdown-remark": "3.3.0",
-    "astro": "3.3.4",
+    "@astrojs/markdown-remark": "3.5.0",
+    "astro": "3.5.4",
     "astro-scripts": "0.0.14"
   },
   "engines": {