@astrojs/markdown-remark 0.6.2 → 0.7.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @astrojs/markdown-remark
 
+## 0.7.0-next.0
+
+### Minor Changes
+
+- [#2824](https://github.com/withastro/astro/pull/2824) [`0a3d3e51`](https://github.com/withastro/astro/commit/0a3d3e51a66af80fa949ba0f5e2104439d2be634) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Change shiki to our default markdown syntax highlighter. This includes updates to all relevant starter projects that used Prism-specific styles.
+
+## 0.6.4
+
+### Patch Changes
+
+- [#2706](https://github.com/withastro/astro/pull/2706) [`b2c37385`](https://github.com/withastro/astro/commit/b2c37385f94614232d9a378ef2ef3264d5405cc8) Thanks [@JuanM04](https://github.com/JuanM04)! - Changed `data-astro-raw` to `is:raw` internally
+
+## 0.6.3
+
+### Patch Changes
+
+- [#2697](https://github.com/withastro/astro/pull/2697) [`91765d79`](https://github.com/withastro/astro/commit/91765d79b1ec1181417fb6a4604a9e20564bb10e) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Improve performance by optimizing calls to `getHighlighter`
+
 ## 0.6.2
 
 ### Patch Changes

package/LICENSE

@@ -0,0 +1,49 @@
+MIT License
+
+Copyright (c) 2021 Fred K. Schott
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+"""
+This license applies to parts of the `packages/astro-parser` subdirectory originating from the
+https://github.com/sveltejs/svelte repository:
+
+
+Copyright (c) 2016-21 [these people](https://github.com/sveltejs/svelte/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"""
+
+
+"""
+This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/sveltejs/kit repository:
+
+Copyright (c) 2020 [these people](https://github.com/sveltejs/kit/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"""

package/dist/index.js

@@ -43,12 +43,12 @@ async function renderMarkdownWithFrontmatter(contents, opts) {
 const DEFAULT_REMARK_PLUGINS = ["remark-gfm", "remark-smartypants"];
 const DEFAULT_REHYPE_PLUGINS = ["rehype-slug"];
 async function renderMarkdown(content, opts) {
-  var _a, _b, _c, _d;
-  let { remarkPlugins = [], rehypePlugins = [] } = opts != null ? opts : {};
+  var _a;
+  let { remarkPlugins = [], rehypePlugins = [] } = opts ?? {};
   const scopedClassName = (_a = opts == null ? void 0 : opts.$) == null ? void 0 : _a.scopedClassName;
-  const mode = (_b = opts == null ? void 0 : opts.mode) != null ? _b : "mdx";
-  const syntaxHighlight = (_c = opts == null ? void 0 : opts.syntaxHighlight) != null ? _c : "prism";
-  const shikiConfig = (_d = opts == null ? void 0 : opts.shikiConfig) != null ? _d : {};
+  const mode = (opts == null ? void 0 : opts.mode) ?? "mdx";
+  const syntaxHighlight = (opts == null ? void 0 : opts.syntaxHighlight) ?? "shiki";
+  const shikiConfig = (opts == null ? void 0 : opts.shikiConfig) ?? {};
   const isMDX = mode === "mdx";
   const { headers, rehypeCollectHeaders } = createCollectHeaders();
   await Promise.all([loadRemarkExpressions(), loadRemarkJsx()]);
@@ -65,10 +65,10 @@ async function renderMarkdown(content, opts) {
   if (scopedClassName) {
     parser.use([scopedStyles(scopedClassName)]);
   }
-  if (syntaxHighlight === "prism") {
+  if (syntaxHighlight === "shiki") {
+    parser.use([await remarkShiki(shikiConfig, scopedClassName)]);
+  } else if (syntaxHighlight === "prism") {
     parser.use([remarkPrism(scopedClassName)]);
-  } else if (syntaxHighlight === "shiki") {
-    parser.use([await remarkShiki(shikiConfig)]);
   }
   parser.use([[markdownToHtml, { allowDangerousHtml: true, passThrough: ["raw", "mdxTextExpression", "mdxJsxTextElement", "mdxJsxFlowElement"] }]]);
   loadedRehypePlugins.forEach(([plugin, opts2]) => {
@@ -96,4 +96,3 @@ export {
   renderMarkdown,
   renderMarkdownWithFrontmatter
 };
-//# sourceMappingURL=data:application/json;base64,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

package/dist/load-plugins.js

@@ -19,4 +19,3 @@ function loadPlugins(items) {
 export {
   loadPlugins
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2xvYWQtcGx1Z2lucy50cyJdLAogICJtYXBwaW5ncyI6ICJBQUdBLDRCQUE0QixHQUFxRDtBQUNoRixNQUFJLE9BQU8sTUFBTSxVQUFVO0FBQzFCLFVBQU0sZUFBZSxNQUFNLE9BQU87QUFDbEMsV0FBTyxhQUFhO0FBQUE7QUFHckIsU0FBTztBQUFBO0FBR0QscUJBQXFCLE9BQW9EO0FBQy9FLFNBQU8sTUFBTSxJQUFJLENBQUMsTUFBTTtBQUN2QixXQUFPLElBQUksUUFBUSxDQUFDLFNBQVMsV0FBVztBQUN2QyxVQUFJLE1BQU0sUUFBUSxJQUFJO0FBQ3JCLGNBQU0sQ0FBQyxRQUFRLFFBQVE7QUFDdkIsZUFBTyxhQUFhLFFBQ2xCLEtBQUssQ0FBQyxNQUFNLFFBQVEsQ0FBQyxHQUFHLFFBQ3hCLE1BQU0sQ0FBQyxNQUFNLE9BQU87QUFBQTtBQUd2QixhQUFPLGFBQWEsR0FDbEIsS0FBSyxDQUFDLE1BQU0sUUFBUSxDQUFDLEtBQ3JCLE1BQU0sQ0FBQyxNQUFNLE9BQU87QUFBQTtBQUFBO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==

package/dist/rehype-collect-headers.d.ts

@@ -1,6 +1,5 @@
-import type { Root } from 'hast';
 /**  */
 export default function createCollectHeaders(): {
     headers: any[];
-    rehypeCollectHeaders: () => (tree: Root) => void;
+    rehypeCollectHeaders: () => (tree: any) => void;
 };

package/dist/rehype-collect-headers.js

@@ -5,13 +5,13 @@ function createCollectHeaders() {
   function rehypeCollectHeaders() {
     return function(tree) {
       visit(tree, (node) => {
-        var _a, _b;
+        var _a;
         if (node.type !== "element")
           return;
         const { tagName } = node;
         if (tagName[0] !== "h")
           return;
-        const [_, level] = (_a = tagName.match(/h([0-6])/)) != null ? _a : [];
+        const [_, level] = tagName.match(/h([0-6])/) ?? [];
         if (!level)
           return;
         const depth = Number.parseInt(level);
@@ -19,7 +19,7 @@ function createCollectHeaders() {
         visit(node, "text", (child) => {
           text += child.value;
         });
-        let slug = ((_b = node == null ? void 0 : node.properties) == null ? void 0 : _b.id) || slugger.slug(text);
+        let slug = ((_a = node == null ? void 0 : node.properties) == null ? void 0 : _a.id) || slugger.slug(text);
         node.properties = node.properties || {};
         node.properties.id = slug;
         headers.push({ depth, slug, text });
@@ -34,4 +34,3 @@ function createCollectHeaders() {
 export {
   createCollectHeaders as default
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlaHlwZS1jb2xsZWN0LWhlYWRlcnMudHMiXSwKICAibWFwcGluZ3MiOiAiQUFBQTtBQUVBO0FBR2UsZ0NBQWdDO0FBQzlDLFFBQU0sVUFBaUI7QUFFdkIsa0NBQWdDO0FBQy9CLFdBQU8sU0FBVSxNQUFZO0FBQzVCLFlBQU0sTUFBTSxDQUFDLFNBQVM7QUFWekI7QUFXSSxZQUFJLEtBQUssU0FBUztBQUFXO0FBQzdCLGNBQU0sRUFBRSxZQUFZO0FBQ3BCLFlBQUksUUFBUSxPQUFPO0FBQUs7QUFDeEIsY0FBTSxDQUFDLEdBQUcsU0FBUyxjQUFRLE1BQU0sZ0JBQWQsWUFBNkI7QUFDaEQsWUFBSSxDQUFDO0FBQU87QUFDWixjQUFNLFFBQVEsT0FBTyxTQUFTO0FBRTlCLFlBQUksT0FBTztBQUVYLGNBQU0sTUFBTSxRQUFRLENBQUMsVUFBVTtBQUM5QixrQkFBUSxNQUFNO0FBQUE7QUFHZixZQUFJLE9BQU8sb0NBQU0sZUFBTixtQkFBa0IsT0FBTSxRQUFRLEtBQUs7QUFFaEQsYUFBSyxhQUFhLEtBQUssY0FBYztBQUNyQyxhQUFLLFdBQVcsS0FBSztBQUNyQixnQkFBUSxLQUFLLEVBQUUsT0FBTyxNQUFNO0FBQUE7QUFBQTtBQUFBO0FBSy9CLFNBQU87QUFBQSxJQUNOO0FBQUEsSUFDQTtBQUFBO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==

package/dist/rehype-escape.js

@@ -3,7 +3,7 @@ function rehypeEscape() {
   return function(node) {
     return visit(node, "element", (el) => {
       if (el.tagName === "code" || el.tagName === "pre") {
-        el.properties["data-astro-raw"] = true;
+        el.properties["is:raw"] = true;
       }
       return el;
     });
@@ -12,4 +12,3 @@ function rehypeEscape() {
 export {
   rehypeEscape as default
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlaHlwZS1lc2NhcGUudHMiXSwKICAibWFwcGluZ3MiOiAiQUFBQTtBQUVlLHdCQUE2QjtBQUMzQyxTQUFPLFNBQVUsTUFBZ0I7QUFDaEMsV0FBTyxNQUFNLE1BQU0sV0FBVyxDQUFDLE9BQU87QUFDckMsVUFBSSxHQUFHLFlBQVksVUFBVSxHQUFHLFlBQVksT0FBTztBQUNsRCxXQUFHLFdBQVcsb0JBQW9CO0FBQUE7QUFFbkMsYUFBTztBQUFBO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K

package/dist/rehype-expressions.js

@@ -12,4 +12,3 @@ function rehypeExpressions() {
 export {
   rehypeExpressions as default
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlaHlwZS1leHByZXNzaW9ucy50cyJdLAogICJtYXBwaW5ncyI6ICJBQUFBO0FBRWUsNkJBQWtDO0FBQ2hELFNBQU8sU0FBVSxNQUFnQjtBQUNoQyxXQUFPLElBQUksTUFBTSxDQUFDLFVBQVU7QUFDM0IsVUFBSSxNQUFNLFNBQVMscUJBQXFCO0FBQ3ZDLGVBQU8sRUFBRSxNQUFNLFFBQVEsT0FBTyxJQUFLLE1BQWM7QUFBQTtBQUVsRCxhQUFPO0FBQUE7QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=

package/dist/rehype-islands.js

@@ -40,4 +40,3 @@ function rehypeIslands() {
 export {
   rehypeIslands as default
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlaHlwZS1pc2xhbmRzLnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBSUEsTUFBTSxRQUFRO0FBTUMseUJBQThCO0FBQzVDLFNBQU8sU0FBVSxNQUFnQjtBQUNoQyxXQUFPLE1BQU0sTUFBTSxXQUFXLENBQUMsT0FBTztBQUVyQyxVQUFJLEdBQUcsV0FBVyxjQUFjO0FBQy9CLGNBQU0sSUFBSSxRQUFRLENBQUMsT0FBTyxPQUFPLFdBQVc7QUFDM0MsY0FBSSxNQUFNLFNBQVMsUUFBUTtBQUcxQixnQkFBSSxVQUFVLE1BQU0sTUFBTSxRQUFRLFVBQVUsTUFBTSxTQUFTLE1BQU07QUFDaEUscUJBQU8sU0FBUyxPQUFPLE9BQU8sR0FBRyxpQ0FBSyxRQUFMLEVBQVksTUFBTSxXQUFXLE9BQU8sTUFBTSxNQUFNLFFBQVEsUUFBUSxJQUFJLFFBQVEsT0FBTyxJQUFJO0FBQ3hILHFCQUFPLENBQUMsTUFBTTtBQUFBO0FBTWYsa0JBQU0sUUFBUSxNQUFNLE1BQU0sUUFBUSxRQUFRO0FBQzFDLG1CQUFPO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=

package/dist/rehype-jsx.js

@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { map } from "unist-util-map";
-const MDX_ELEMENTS = new Set(["mdxJsxFlowElement", "mdxJsxTextElement"]);
+const MDX_ELEMENTS = /* @__PURE__ */ new Set(["mdxJsxFlowElement", "mdxJsxTextElement"]);
 function rehypeJsx() {
   return function(node) {
     return map(node, (child) => {
@@ -47,4 +47,3 @@ function rehypeJsx() {
 export {
   rehypeJsx as default
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlaHlwZS1qc3gudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFFQSxNQUFNLGVBQWUsSUFBSSxJQUFJLENBQUMscUJBQXFCO0FBQ3BDLHFCQUEwQjtBQUN4QyxTQUFPLFNBQVUsTUFBZ0I7QUFDaEMsV0FBTyxJQUFJLE1BQU0sQ0FBQyxVQUFlO0FBQ2hDLFVBQUksTUFBTSxTQUFTLFdBQVc7QUFDN0IsZUFBTyxpQ0FBSyxRQUFMLEVBQVksU0FBUyxHQUFHLE1BQU07QUFBQTtBQUV0QyxVQUFJLGFBQWEsSUFBSSxNQUFNLE9BQU87QUFDakMsZUFBTyxpQ0FDSCxRQURHO0FBQUEsVUFFTixNQUFNO0FBQUEsVUFDTixTQUFTLEdBQUcsTUFBTTtBQUFBLFVBQ2xCLFlBQVksTUFBTSxXQUFXLE9BQU8sQ0FBQyxLQUFZLFVBQWU7QUFDL0QsZ0JBQUksT0FBTyxNQUFNO0FBQ2pCLGdCQUFJLFFBQVEsT0FBTyxTQUFTLFVBQVU7QUFDckMscUJBQU8sSUFBSSxLQUFLO0FBQUEsdUJBQ04sU0FBUyxNQUFNO0FBQ3pCLHFCQUFPO0FBQUE7QUFFUixtQkFBTyxPQUFPLE9BQU8sS0FBSyxHQUFHLE1BQU0sT0FBTztBQUFBLGFBQ3hDO0FBQUE7QUFBQTtBQUdMLGFBQU87QUFBQTtBQUFBO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==

package/dist/remark-expressions.js

@@ -29,4 +29,3 @@ export {
   loadRemarkExpressions,
   remarkExpressions
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlbWFyay1leHByZXNzaW9ucy50cyJdLAogICJtYXBwaW5ncyI6ICJBQUNBLElBQUk7QUFDSixJQUFJO0FBQ0osSUFBSTtBQUVHLDJCQUFzQyxTQUFjO0FBQzFELE1BQUksV0FBVyxXQUFXO0FBQzFCLE1BQUksT0FBTyxLQUFLO0FBRWhCLE1BQUksdUJBQXVCLGNBQWM7QUFDekMsTUFBSSwwQkFBMEI7QUFDOUIsTUFBSSx3QkFBd0I7QUFFNUIsZUFBYSxPQUFZLE9BQVk7QUFFcEMsUUFBSSxLQUFLO0FBQVEsV0FBSyxPQUFPLEtBQUs7QUFBQTtBQUM3QixXQUFLLFNBQVMsQ0FBQztBQUFBO0FBQUE7QUFJdEIsdUNBQThDO0FBQzdDLE1BQUksQ0FBQyxlQUFlO0FBQ25CLFVBQU0seUJBQXlCLE1BQU0sT0FBTztBQUM1QyxvQkFBZ0IsdUJBQXVCO0FBQUE7QUFFeEMsTUFBSSxDQUFDLDZCQUE2QixDQUFDLHlCQUF5QjtBQUMzRCxVQUFNLHlCQUF5QixNQUFNLE9BQU87QUFDNUMsZ0NBQTRCLHVCQUF1QjtBQUNuRCw4QkFBMEIsdUJBQXVCO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K

package/dist/remark-jsx.js

@@ -28,4 +28,3 @@ export {
   loadRemarkJsx,
   remarkJsx
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlbWFyay1qc3gudHMiXSwKICAibWFwcGluZ3MiOiAiQUFDQSxJQUFJO0FBQ0osSUFBSTtBQUNKLElBQUk7QUFFRyxtQkFBOEIsU0FBYztBQUNsRCxNQUFJLFdBQVcsV0FBVztBQUMxQixNQUFJLE9BQU8sS0FBSztBQUdoQixNQUFJLDBCQUEwQjtBQUM5QixNQUFJLHdCQUF3QjtBQUU1QixlQUFhLE9BQVksT0FBWTtBQUVwQyxRQUFJLEtBQUs7QUFBUSxXQUFLLE9BQU8sS0FBSztBQUFBO0FBQzdCLFdBQUssU0FBUyxDQUFDO0FBQUE7QUFBQTtBQUl0QiwrQkFBc0M7QUFDckMsTUFBSSxDQUFDLFFBQVE7QUFDWixVQUFNLGtCQUFrQixNQUFNLE9BQU87QUFDckMsYUFBUyxnQkFBZ0I7QUFBQTtBQUUxQixNQUFJLENBQUMsc0JBQXNCLENBQUMsa0JBQWtCO0FBQzdDLFVBQU0sa0JBQWtCLE1BQU0sT0FBTztBQUNyQyx5QkFBcUIsZ0JBQWdCO0FBQ3JDLHVCQUFtQixnQkFBZ0I7QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=

package/dist/remark-prism.js

@@ -2,8 +2,8 @@ import { visit } from "unist-util-visit";
 import Prism from "prismjs";
 import { addAstro } from "@astrojs/prism";
 import loadLanguages from "prismjs/components/index.js";
-const noVisit = new Set(["root", "html", "text"]);
-const languageMap = new Map([["ts", "typescript"]]);
+const noVisit = /* @__PURE__ */ new Set(["root", "html", "text"]);
+const languageMap = /* @__PURE__ */ new Map([["ts", "typescript"]]);
 function runHighlighter(lang, code) {
   let classLanguage = `language-${lang}`;
   if (lang == null) {
@@ -43,7 +43,7 @@ function transformer(className) {
       if (className) {
         classes.push(className);
       }
-      node.value = `<pre class="${classes.join(" ")}"><code data-astro-raw class="${classLanguage}">${html}</code></pre>`;
+      node.value = `<pre class="${classes.join(" ")}"><code is:raw class="${classLanguage}">${html}</code></pre>`;
       return node;
     };
     return visit(tree, "code", visitor);
@@ -56,4 +56,3 @@ var remark_prism_default = plugin;
 export {
   remark_prism_default as default
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlbWFyay1wcmlzbS50cyJdLAogICJtYXBwaW5ncyI6ICJBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsTUFBTSxVQUFVLElBQUksSUFBSSxDQUFDLFFBQVEsUUFBUTtBQUV6QyxNQUFNLGNBQWMsSUFBSSxJQUFJLENBQUMsQ0FBQyxNQUFNO0FBRXBDLHdCQUF3QixNQUFjLE1BQWM7QUFDbkQsTUFBSSxnQkFBZ0IsWUFBWTtBQUVoQyxNQUFJLFFBQVEsTUFBTTtBQUNqQixXQUFPO0FBQUE7QUFHUixRQUFNLGVBQWUsQ0FBQyxVQUFpQjtBQUN0QyxRQUFJLFNBQVEsQ0FBQyxNQUFNLFVBQVUsUUFBTztBQUNuQyxvQkFBYyxDQUFDO0FBQUE7QUFBQTtBQUlqQixNQUFJLFlBQVksSUFBSSxPQUFPO0FBQzFCLGlCQUFhLFlBQVksSUFBSTtBQUFBLGFBQ25CLFNBQVMsU0FBUztBQUM1QixpQkFBYTtBQUNiLGFBQVM7QUFBQSxTQUNIO0FBQ04saUJBQWE7QUFDYixpQkFBYTtBQUFBO0FBR2QsTUFBSSxRQUFRLENBQUMsTUFBTSxVQUFVLE9BQU87QUFDbkMsWUFBUSxLQUFLLGdDQUFnQztBQUFBO0FBRzlDLFFBQU0sVUFBVSxNQUFNLFVBQVU7QUFDaEMsTUFBSSxPQUFPO0FBQ1gsTUFBSSxTQUFTO0FBQ1osV0FBTyxNQUFNLFVBQVUsTUFBTSxTQUFTO0FBQUE7QUFHdkMsU0FBTyxFQUFFLGVBQWU7QUFBQTtBQU16QixxQkFBcUIsV0FBd0I7QUFDNUMsU0FBTyxTQUFVLE1BQVc7QUFDM0IsVUFBTSxVQUFVLENBQUMsU0FBYztBQUM5QixVQUFJLEVBQUUsTUFBTSxVQUFVO0FBQ3RCLFdBQUssT0FBTztBQUVaLFVBQUksRUFBRSxNQUFNLGtCQUFrQixlQUFlLE1BQU07QUFDbkQsVUFBSSxVQUFVLENBQUM7QUFDZixVQUFJLFdBQVc7QUFDZCxnQkFBUSxLQUFLO0FBQUE7QUFFZCxXQUFLLFFBQVEsZUFBZSxRQUFRLEtBQUsscUNBQXFDLGtCQUFrQjtBQUNoRyxhQUFPO0FBQUE7QUFFUixXQUFPLE1BQU0sTUFBTSxRQUFRO0FBQUE7QUFBQTtBQUk3QixnQkFBZ0IsV0FBd0I7QUFDdkMsU0FBTyxZQUFZLEtBQUssTUFBTTtBQUFBO0FBRy9CLElBQU8sdUJBQVE7IiwKICAibmFtZXMiOiBbXQp9Cg==

package/dist/remark-scoped-styles.js

@@ -1,12 +1,12 @@
 import { visit } from "unist-util-visit";
-const noVisit = new Set(["root", "html", "text"]);
+const noVisit = /* @__PURE__ */ new Set(["root", "html", "text"]);
 function scopedStyles(className) {
   const visitor = (node) => {
-    var _a, _b;
+    var _a;
     if (noVisit.has(node.type))
       return;
     const { data } = node;
-    let currentClassName = (_b = (_a = data == null ? void 0 : data.hProperties) == null ? void 0 : _a.class) != null ? _b : "";
+    let currentClassName = ((_a = data == null ? void 0 : data.hProperties) == null ? void 0 : _a.class) ?? "";
     node.data = node.data || {};
     node.data.hProperties = node.data.hProperties || {};
     node.data.hProperties.class = `${className} ${currentClassName}`.trim();
@@ -17,4 +17,3 @@ function scopedStyles(className) {
 export {
   scopedStyles as default
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlbWFyay1zY29wZWQtc3R5bGVzLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBQUE7QUFDQSxNQUFNLFVBQVUsSUFBSSxJQUFJLENBQUMsUUFBUSxRQUFRO0FBRzFCLHNCQUFzQixXQUFtQjtBQUN2RCxRQUFNLFVBQVUsQ0FBQyxTQUFjO0FBTGhDO0FBTUUsUUFBSSxRQUFRLElBQUksS0FBSztBQUFPO0FBRTVCLFVBQU0sRUFBRSxTQUFTO0FBQ2pCLFFBQUksbUJBQW1CLHlDQUFNLGdCQUFOLG1CQUFtQixVQUFuQixZQUE0QjtBQUNuRCxTQUFLLE9BQU8sS0FBSyxRQUFRO0FBQ3pCLFNBQUssS0FBSyxjQUFjLEtBQUssS0FBSyxlQUFlO0FBQ2pELFNBQUssS0FBSyxZQUFZLFFBQVEsR0FBRyxhQUFhLG1CQUFtQjtBQUVqRSxXQUFPO0FBQUE7QUFFUixTQUFPLE1BQU0sQ0FBQyxTQUFjLE1BQU0sTUFBTTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=

package/dist/remark-shiki.d.ts

@@ -26,5 +26,5 @@ export interface ShikiConfig {
      */
     wrap?: boolean | null;
 }
-declare const remarkShiki: ({ langs, theme, wrap }: ShikiConfig) => Promise<() => (tree: any) => void>;
+declare const remarkShiki: ({ langs, theme, wrap }: ShikiConfig, scopedClassName?: string | null | undefined) => Promise<() => (tree: any) => void>;
 export default remarkShiki;

package/dist/remark-shiki.js

@@ -1,21 +1,29 @@
 import { getHighlighter } from "shiki";
 import { visit } from "unist-util-visit";
-const remarkShiki = async ({ langs = [], theme = "github-dark", wrap = false }) => {
-  const highlighter = await getHighlighter({ theme });
+const highlighterCache = /* @__PURE__ */ new Map();
+const remarkShiki = async ({ langs = [], theme = "github-dark", wrap = false }, scopedClassName) => {
+  const cacheID = typeof theme === "string" ? theme : theme.name;
+  let highlighter = highlighterCache.get(cacheID);
+  if (!highlighter) {
+    highlighter = await getHighlighter({ theme });
+    highlighterCache.set(cacheID, highlighter);
+  }
   for (const lang of langs) {
     await highlighter.loadLanguage(lang);
   }
   return () => (tree) => {
     visit(tree, "code", (node) => {
-      var _a;
-      let html = highlighter.codeToHtml(node.value, { lang: (_a = node.lang) != null ? _a : "plaintext" });
-      html = html.replace('<pre class="shiki"', '<pre data-astro-raw class="astro-code"');
+      let html = highlighter.codeToHtml(node.value, { lang: node.lang ?? "plaintext" });
+      html = html.replace('<pre class="shiki"', `<pre is:raw class="astro-code${scopedClassName ? " " + scopedClassName : ""}"`);
       html = html.replace(/style="(background-)?color: var\(--shiki-/g, 'style="$1color: var(--astro-code-');
       if (wrap === false) {
         html = html.replace(/style="(.*?)"/, 'style="$1; overflow-x: auto;"');
       } else if (wrap === true) {
         html = html.replace(/style="(.*?)"/, 'style="$1; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;"');
       }
+      if (scopedClassName) {
+        html = html.replace(/\<span class="line"\>/g, `<span class="line ${scopedClassName}"`);
+      }
       node.type = "html";
       node.value = html;
       node.children = [];
@@ -26,4 +34,3 @@ var remark_shiki_default = remarkShiki;
 export {
   remark_shiki_default as default
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlbWFyay1zaGlraS50cyJdLAogICJtYXBwaW5ncyI6ICJBQUNBO0FBQ0E7QUE4QkEsTUFBTSxjQUFjLE9BQU8sRUFBRSxRQUFRLElBQUksUUFBUSxlQUFlLE9BQU8sWUFBeUI7QUFDL0YsUUFBTSxjQUFjLE1BQU0sZUFBZSxFQUFFO0FBRTNDLGFBQVcsUUFBUSxPQUFPO0FBQ3pCLFVBQU0sWUFBWSxhQUFhO0FBQUE7QUFHaEMsU0FBTyxNQUFNLENBQUMsU0FBYztBQUMzQixVQUFNLE1BQU0sUUFBUSxDQUFDLFNBQVM7QUF4Q2hDO0FBeUNHLFVBQUksT0FBTyxZQUFZLFdBQVcsS0FBSyxPQUFPLEVBQUUsTUFBTSxXQUFLLFNBQUwsWUFBYTtBQUduRSxhQUFPLEtBQUssUUFBUSxzQkFBc0I7QUFFMUMsYUFBTyxLQUFLLFFBQVEsOENBQThDO0FBR2xFLFVBQUksU0FBUyxPQUFPO0FBQ25CLGVBQU8sS0FBSyxRQUFRLGlCQUFpQjtBQUFBLGlCQUMzQixTQUFTLE1BQU07QUFDekIsZUFBTyxLQUFLLFFBQVEsaUJBQWlCO0FBQUE7QUFHdEMsV0FBSyxPQUFPO0FBQ1osV0FBSyxRQUFRO0FBQ2IsV0FBSyxXQUFXO0FBQUE7QUFBQTtBQUFBO0FBS25CLElBQU8sdUJBQVE7IiwKICAibmFtZXMiOiBbXQp9Cg==

package/dist/remark-slug.js

@@ -21,4 +21,3 @@ function remarkSlug() {
 export {
   remarkSlug as default
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlbWFyay1zbHVnLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBS0E7QUFDQTtBQUNBO0FBRUEsTUFBTSxRQUFRLElBQUk7QUFPSCxzQkFBc0I7QUFDcEMsU0FBTyxDQUFDLFNBQWM7QUFDckIsVUFBTTtBQUNOLFVBQU0sTUFBTSxDQUFDLFNBQVM7QUFDckIsY0FBUSxJQUFJO0FBQUE7QUFFYixVQUFNLE1BQU0sV0FBVyxDQUFDLFNBQVM7QUFDaEMsWUFBTSxPQUFPLEtBQUssUUFBUyxNQUFLLE9BQU87QUFDdkMsWUFBTSxRQUFrQyxLQUFLLGVBQWdCLE1BQUssY0FBYztBQUNoRixVQUFJLEtBQUssTUFBTTtBQUNmLFdBQUssS0FBSyxNQUFNLEtBQUssT0FBTyxLQUFLLFFBQVEsTUFBTSxLQUFLLFNBQVM7QUFDN0QsV0FBSyxLQUFLO0FBQ1YsWUFBTSxLQUFLO0FBQUE7QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=

package/dist/remark-unwrap.js

@@ -1,7 +1,7 @@
 import { visit as _visit, SKIP } from "unist-util-visit";
 const visit = _visit;
 function remarkUnwrap() {
-  const astroRootNodes = new Set();
+  const astroRootNodes = /* @__PURE__ */ new Set();
   let insideAstroRoot = false;
   return (tree) => {
     insideAstroRoot = false;
@@ -29,4 +29,3 @@ function remarkUnwrap() {
 export {
   remarkUnwrap as default
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlbWFyay11bndyYXAudHMiXSwKICAibWFwcGluZ3MiOiAiQUFBQTtBQUlBLE1BQU0sUUFBUTtBQUdDLHdCQUF3QjtBQUN0QyxRQUFNLGlCQUFpQixJQUFJO0FBQzNCLE1BQUksa0JBQWtCO0FBRXRCLFNBQU8sQ0FBQyxTQUFjO0FBRXJCLHNCQUFrQjtBQUNsQixtQkFBZTtBQUVmLFVBQU0sTUFBTSxRQUFRLENBQUMsU0FBUztBQUM3QixVQUFJLEtBQUssTUFBTSxRQUFRLGlCQUFpQixNQUFNLENBQUMsaUJBQWlCO0FBQy9ELDBCQUFrQjtBQUFBO0FBRW5CLFVBQUksS0FBSyxNQUFNLFFBQVEsa0JBQWtCLE1BQU0saUJBQWlCO0FBQy9ELDBCQUFrQjtBQUFBO0FBRW5CLHFCQUFlLElBQUk7QUFBQTtBQUdwQixVQUFNLE1BQU0sYUFBYSxDQUFDLE1BQU0sT0FBTyxXQUFXO0FBQ2pELFVBQUksVUFBVSxPQUFPLFVBQVUsWUFBWSxzQkFBc0IsT0FBTztBQUN2RSxlQUFPLFNBQVMsT0FBTyxPQUFPLEdBQUcsR0FBRyxLQUFLO0FBQ3pDLGVBQU8sQ0FBQyxNQUFNO0FBQUE7QUFBQTtBQUFBO0FBS2pCLGlDQUErQixNQUFXO0FBQ3pDLFdBQU8sS0FBSyxTQUFTLElBQUksQ0FBQyxVQUFlLGVBQWUsSUFBSSxRQUFRLE9BQU8sQ0FBQyxLQUFjLE1BQWdCLE1BQU0sTUFBTSxHQUFJO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K

package/dist/types.d.ts

@@ -3,7 +3,7 @@ import type { ShikiConfig } from './remark-shiki';
 export declare type Plugin = string | [string, any] | unified.Plugin | [unified.Plugin, any];
 export interface AstroMarkdownOptions {
     mode?: 'md' | 'mdx';
-    syntaxHighlight?: 'prism' | 'shiki' | false;
+    syntaxHighlight?: 'shiki' | 'prism' | false;
     shikiConfig?: ShikiConfig;
     remarkPlugins?: Plugin[];
     rehypePlugins?: Plugin[];

package/dist/types.js

@@ -1 +0,0 @@
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFtdLAogICJtYXBwaW5ncyI6ICIiLAogICJuYW1lcyI6IFtdCn0K

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "0.6.2",
+  "version": "0.7.0-next.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -15,36 +15,38 @@
   "exports": {
     ".": "./dist/index.js"
   },
-  "scripts": {
-    "prepublish": "yarn build",
-    "build": "astro-scripts build \"src/**/*.ts\" && tsc -p tsconfig.json",
-    "postbuild": "astro-scripts copy \"src/**/*.js\"",
-    "dev": "astro-scripts dev \"src/**/*.ts\""
-  },
   "dependencies": {
     "@astrojs/prism": "^0.4.0",
     "assert": "^2.0.0",
     "github-slugger": "^1.4.0",
     "gray-matter": "^4.0.3",
-    "mdast-util-mdx-expression": "^1.1.1",
-    "mdast-util-mdx-jsx": "^1.1.3",
+    "mdast-util-mdx-expression": "^1.2.0",
+    "mdast-util-mdx-jsx": "^1.2.0",
+    "mdast-util-to-string": "^3.1.0",
     "micromark-extension-mdx-expression": "^1.0.3",
-    "micromark-extension-mdx-jsx": "^1.0.2",
-    "prismjs": "^1.25.0",
-    "rehype-raw": "^6.1.0",
-    "rehype-slug": "^5.0.0",
-    "rehype-stringify": "^9.0.2",
+    "micromark-extension-mdx-jsx": "^1.0.3",
+    "prismjs": "^1.27.0",
+    "rehype-raw": "^6.1.1",
+    "rehype-slug": "^5.0.1",
+    "rehype-stringify": "^9.0.3",
     "remark-gfm": "^3.0.1",
     "remark-parse": "^10.0.1",
-    "remark-rehype": "^10.0.1",
+    "remark-rehype": "^10.1.0",
     "remark-smartypants": "^2.0.0",
-    "shiki": "^0.10.0",
-    "unified": "^10.1.1",
+    "shiki": "^0.10.1",
+    "unified": "^10.1.2",
     "unist-util-map": "^3.0.0",
     "unist-util-visit": "^4.1.0"
   },
   "devDependencies": {
     "@types/github-slugger": "^1.3.0",
-    "@types/prismjs": "^1.16.6"
+    "@types/prismjs": "^1.26.0",
+    "astro-scripts": "0.0.2"
+  },
+  "scripts": {
+    "prepublish": "pnpm build",
+    "build": "astro-scripts build \"src/**/*.ts\" && tsc -p tsconfig.json",
+    "postbuild": "astro-scripts copy \"src/**/*.js\"",
+    "dev": "astro-scripts dev \"src/**/*.ts\""
   }
-}
+}

package/src/index.ts

@@ -38,7 +38,7 @@ export async function renderMarkdown(content: string, opts?: MarkdownRenderingOp
 	let { remarkPlugins = [], rehypePlugins = [] } = opts ?? {};
 	const scopedClassName = opts?.$?.scopedClassName;
 	const mode = opts?.mode ?? 'mdx';
-	const syntaxHighlight = opts?.syntaxHighlight ?? 'prism';
+	const syntaxHighlight = opts?.syntaxHighlight ?? 'shiki';
 	const shikiConfig = opts?.shikiConfig ?? {};
 	const isMDX = mode === 'mdx';
 	const { headers, rehypeCollectHeaders } = createCollectHeaders();
@@ -67,10 +67,10 @@ export async function renderMarkdown(content: string, opts?: MarkdownRenderingOp
 		parser.use([scopedStyles(scopedClassName)]);
 	}
 
-	if (syntaxHighlight === 'prism') {
+	if (syntaxHighlight === 'shiki') {
+		parser.use([await remarkShiki(shikiConfig, scopedClassName)]);
+	} else if (syntaxHighlight === 'prism') {
 		parser.use([remarkPrism(scopedClassName)]);
-	} else if (syntaxHighlight === 'shiki') {
-		parser.use([await remarkShiki(shikiConfig)]);
 	}
 
 	parser.use([[markdownToHtml as any, { allowDangerousHtml: true, passThrough: ['raw', 'mdxTextExpression', 'mdxJsxTextElement', 'mdxJsxFlowElement'] }]]);

package/src/rehype-collect-headers.ts

@@ -1,5 +1,4 @@
 import { visit } from 'unist-util-visit';
-import type { Root, Properties } from 'hast';
 import slugger from 'github-slugger';
 
 /**  */
@@ -7,7 +6,7 @@ export default function createCollectHeaders() {
 	const headers: any[] = [];
 
 	function rehypeCollectHeaders() {
-		return function (tree: Root) {
+		return function (tree: any) {
 			visit(tree, (node) => {
 				if (node.type !== 'element') return;
 				const { tagName } = node;

package/src/rehype-escape.ts

@@ -4,7 +4,7 @@ export default function rehypeEscape(): any {
 	return function (node: any): any {
 		return visit(node, 'element', (el) => {
 			if (el.tagName === 'code' || el.tagName === 'pre') {
-				el.properties['data-astro-raw'] = true;
+				el.properties['is:raw'] = true;
 			}
 			return el;
 		});

package/src/remark-prism.ts

@@ -56,7 +56,7 @@ function transformer(className: MaybeString) {
 			if (className) {
 				classes.push(className);
 			}
-			node.value = `<pre class="${classes.join(' ')}"><code data-astro-raw class="${classLanguage}">${html}</code></pre>`;
+			node.value = `<pre class="${classes.join(' ')}"><code is:raw class="${classLanguage}">${html}</code></pre>`;
 			return node;
 		};
 		return visit(tree, 'code', visitor);

package/src/remark-shiki.ts

@@ -30,19 +30,34 @@ export interface ShikiConfig {
 	wrap?: boolean | null;
 }
 
-const remarkShiki = async ({ langs = [], theme = 'github-dark', wrap = false }: ShikiConfig) => {
-	const highlighter = await getHighlighter({ theme });
+/**
+ * getHighlighter() is the most expensive step of Shiki. Instead of calling it on every page,
+ * cache it here as much as possible. Make sure that your highlighters can be cached, state-free.
+ */
+const highlighterCache = new Map<string, shiki.Highlighter>();
 
+const remarkShiki = async ({ langs = [], theme = 'github-dark', wrap = false }: ShikiConfig, scopedClassName?: string | null) => {
+	const cacheID: string = typeof theme === 'string' ? theme : theme.name;
+	let highlighter = highlighterCache.get(cacheID);
+	if (!highlighter) {
+		highlighter = await getHighlighter({ theme });
+		highlighterCache.set(cacheID, highlighter);
+	}
 	for (const lang of langs) {
 		await highlighter.loadLanguage(lang);
 	}
-
 	return () => (tree: any) => {
 		visit(tree, 'code', (node) => {
-			let html = highlighter.codeToHtml(node.value, { lang: node.lang ?? 'plaintext' });
+			let html = highlighter!.codeToHtml(node.value, { lang: node.lang ?? 'plaintext' });
+
+			// Q: Couldn't these regexes match on a user's inputted code blocks?
+			// A: Nope! All rendered HTML is properly escaped.
+			// Ex. If a user typed `<span class="line"` into a code block,
+			// It would become this before hitting our regexes:
+			// &lt;span class=&quot;line&quot;
 
-			// Replace "shiki" class naming with "astro" and add "data-astro-raw".
-			html = html.replace('<pre class="shiki"', '<pre data-astro-raw class="astro-code"');
+			// Replace "shiki" class naming with "astro" and add "is:raw".
+			html = html.replace('<pre class="shiki"', `<pre is:raw class="astro-code${scopedClassName ? ' ' + scopedClassName : ''}"`);
 			// Replace "shiki" css variable naming with "astro".
 			html = html.replace(/style="(background-)?color: var\(--shiki-/g, 'style="$1color: var(--astro-code-');
 			// Handle code wrapping
@@ -53,6 +68,11 @@ const remarkShiki = async ({ langs = [], theme = 'github-dark', wrap = false }:
 				html = html.replace(/style="(.*?)"/, 'style="$1; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;"');
 			}
 
+			// Apply scopedClassName to all nested lines
+			if (scopedClassName) {
+				html = html.replace(/\<span class="line"\>/g, `<span class="line ${scopedClassName}"`);
+			}
+
 			node.type = 'html';
 			node.value = html;
 			node.children = [];

package/src/types.ts

@@ -5,7 +5,7 @@ export type Plugin = string | [string, any] | unified.Plugin | [unified.Plugin,
 
 export interface AstroMarkdownOptions {
 	mode?: 'md' | 'mdx';
-	syntaxHighlight?: 'prism' | 'shiki' | false;
+	syntaxHighlight?: 'shiki' | 'prism' | false;
 	shikiConfig?: ShikiConfig;
 	remarkPlugins?: Plugin[];
 	rehypePlugins?: Plugin[];