@astrojs/markdown-remark 0.11.3 → 0.11.6

package/.turbo/turbo-build.log

@@ -0,0 +1,5 @@
+@astrojs/markdown-remark:build: cache hit, replaying output 29cccc2060a2f573
+@astrojs/markdown-remark:build: 
+@astrojs/markdown-remark:build: > @astrojs/markdown-remark@0.11.6 build /home/runner/work/astro/astro/packages/markdown/remark
+@astrojs/markdown-remark:build: > astro-scripts build "src/**/*.ts" && tsc -p tsconfig.json
+@astrojs/markdown-remark:build: 

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @astrojs/markdown-remark
 
+## 0.11.6
+
+### Patch Changes
+
+- [#3911](https://github.com/withastro/astro/pull/3911) [`ca45c0c27`](https://github.com/withastro/astro/commit/ca45c0c270f5ca3f7d2fb113a235d415cecdb333) Thanks [@JuanM04](https://github.com/JuanM04)! - Don't throw when Shiki doesn't recognize a language
+
+- Updated dependencies [[`b48767985`](https://github.com/withastro/astro/commit/b48767985359bd359df8071324952ea5f2bc0d86)]:
+  - @astrojs/prism@0.6.0
+
+## 0.11.5
+
+### Patch Changes
+
+- [#3669](https://github.com/withastro/astro/pull/3669) [`93e1020b1`](https://github.com/withastro/astro/commit/93e1020b1e8549b08cf5646e1ebc3ae34e14ebc8) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Tooling: reintroduce smoke test across example projects
+
+## 0.11.4
+
+### Patch Changes
+
+- Updated dependencies [[`1cc5b7890`](https://github.com/withastro/astro/commit/1cc5b78905633608e5b07ad291f916f54e67feb1)]:
+  - @astrojs/prism@0.5.0
+
 ## 0.11.3
 
 ### Patch Changes

package/dist/index.js

@@ -41,8 +41,8 @@ async function renderMarkdown(content, opts = {}) {
   }
   const loadedRemarkPlugins = await Promise.all(loadPlugins(remarkPlugins));
   const loadedRehypePlugins = await Promise.all(loadPlugins(rehypePlugins));
-  loadedRemarkPlugins.forEach(([plugin, opts2]) => {
-    parser.use([[plugin, opts2]]);
+  loadedRemarkPlugins.forEach(([plugin, pluginOpts]) => {
+    parser.use([[plugin, pluginOpts]]);
   });
   if (scopedClassName) {
     parser.use([scopedStyles(scopedClassName)]);
@@ -67,8 +67,8 @@ async function renderMarkdown(content, opts = {}) {
       }
     ]
   ]);
-  loadedRehypePlugins.forEach(([plugin, opts2]) => {
-    parser.use([[plugin, opts2]]);
+  loadedRehypePlugins.forEach(([plugin, pluginOpts]) => {
+    parser.use([[plugin, pluginOpts]]);
   });
   parser.use(isMDX ? [rehypeJsx, rehypeExpressions] : [rehypeRaw]).use(rehypeEscape).use(rehypeIslands).use([rehypeCollectHeaders]).use(rehypeStringify, { allowDangerousHtml: true });
   let result;

package/dist/rehype-collect-headers.js

@@ -18,7 +18,7 @@ function createCollectHeaders() {
         const depth = Number.parseInt(level);
         let text = "";
         let isJSX = false;
-        visit(node, (child, _2, parent) => {
+        visit(node, (child, __, parent) => {
           if (child.type === "element" || parent == null) {
             return;
           }

package/dist/rehype-expressions.js

@@ -1,28 +1,9 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { map } from "unist-util-map";
 function rehypeExpressions() {
   return function(node) {
     return map(node, (child) => {
       if (child.type === "text") {
-        return __spreadProps(__spreadValues({}, child), { type: "raw" });
+        return { ...child, type: "raw" };
       }
       if (child.type === "mdxTextExpression") {
         return { type: "raw", value: `{${child.value}}` };

package/dist/rehype-islands.js

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { SKIP, visit as _visit } from "unist-util-visit";
 const visit = _visit;
 function rehypeIslands() {
@@ -26,10 +7,11 @@ function rehypeIslands() {
         visit(el, "text", (child, index, parent) => {
           if (child.type === "text") {
             if (parent && child.value.indexOf("<!--") > -1 && index != null) {
-              parent.children.splice(index, 1, __spreadProps(__spreadValues({}, child), {
+              parent.children.splice(index, 1, {
+                ...child,
                 type: "comment",
                 value: child.value.replace("<!--", "").replace("-->", "").trim()
-              }));
+              });
               return [SKIP, index];
             }
             child.value = child.value.replace(/\n+/g, "");

package/dist/remark-prism.js

@@ -9,9 +9,9 @@ function runHighlighter(lang, code) {
   if (lang == null) {
     lang = "plaintext";
   }
-  const ensureLoaded = (lang2) => {
-    if (lang2 && !Prism.languages[lang2]) {
-      loadLanguages([lang2]);
+  const ensureLoaded = (language) => {
+    if (language && !Prism.languages[language]) {
+      loadLanguages([language]);
     }
   };
   if (languageMap.has(lang)) {

package/dist/remark-shiki.js

@@ -14,7 +14,19 @@ const remarkShiki = async ({ langs = [], theme = "github-dark", wrap = false },
   }
   return () => (tree) => {
     visit(tree, "code", (node) => {
-      let html = highlighter.codeToHtml(node.value, { lang: node.lang ?? "plaintext" });
+      let lang;
+      if (typeof node.lang === "string") {
+        const langExists = highlighter.getLoadedLanguages().includes(node.lang);
+        if (langExists) {
+          lang = node.lang;
+        } else {
+          console.warn(`The language "${node.lang}" doesn't exist, falling back to plaintext.`);
+          lang = "plaintext";
+        }
+      } else {
+        lang = "plaintext";
+      }
+      let html = highlighter.codeToHtml(node.value, { lang });
       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 (node.lang === "diff") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "0.11.3",
+  "version": "0.11.6",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -13,17 +13,16 @@
   "homepage": "https://astro.build",
   "main": "./dist/index.js",
   "exports": {
-    ".": "./dist/index.js",
-    "./ssr-utils": "./dist/ssr-utils.js"
+    ".": "./dist/index.js"
   },
   "dependencies": {
     "@astrojs/micromark-extension-mdx-jsx": "^1.0.3",
-    "@astrojs/prism": "^0.4.1",
+    "@astrojs/prism": "^0.6.0",
     "acorn": "^8.7.1",
     "acorn-jsx": "^5.3.2",
     "assert": "^2.0.0",
     "github-slugger": "^1.4.0",
-    "mdast-util-mdx-expression": "^1.2.0",
+    "mdast-util-mdx-expression": "^1.2.1",
     "mdast-util-mdx-jsx": "^1.2.0",
     "mdast-util-to-string": "^3.1.0",
     "micromark-extension-mdx-expression": "^1.0.3",
@@ -50,7 +49,7 @@
     "@types/mocha": "^9.1.1",
     "@types/prismjs": "^1.26.0",
     "@types/unist": "^2.0.6",
-    "astro-scripts": "0.0.4",
+    "astro-scripts": "0.0.6",
     "chai": "^4.3.6",
     "micromark-util-types": "^1.0.2",
     "mocha": "^9.2.2"

package/src/index.ts

@@ -57,8 +57,8 @@ export async function renderMarkdown(
 	const loadedRemarkPlugins = await Promise.all(loadPlugins(remarkPlugins));
 	const loadedRehypePlugins = await Promise.all(loadPlugins(rehypePlugins));
 
-	loadedRemarkPlugins.forEach(([plugin, opts]) => {
-		parser.use([[plugin, opts]]);
+	loadedRemarkPlugins.forEach(([plugin, pluginOpts]) => {
+		parser.use([[plugin, pluginOpts]]);
 	});
 
 	if (scopedClassName) {
@@ -87,8 +87,8 @@ export async function renderMarkdown(
 		],
 	]);
 
-	loadedRehypePlugins.forEach(([plugin, opts]) => {
-		parser.use([[plugin, opts]]);
+	loadedRehypePlugins.forEach(([plugin, pluginOpts]) => {
+		parser.use([[plugin, pluginOpts]]);
 	});
 
 	parser
@@ -106,6 +106,7 @@ export async function renderMarkdown(
 		// Ensure that the error message contains the input filename
 		// to make it easier for the user to fix the issue
 		err = prefixError(err, `Failed to parse Markdown file "${input.path}"`);
+		// eslint-disable-next-line no-console
 		console.error(err);
 		throw err;
 	}

package/src/rehype-collect-headers.ts

@@ -20,7 +20,7 @@ export default function createCollectHeaders() {
 
 				let text = '';
 				let isJSX = false;
-				visit(node, (child, _, parent) => {
+				visit(node, (child, __, parent) => {
 					if (child.type === 'element' || parent == null) {
 						return;
 					}

package/src/remark-prism.ts

@@ -13,9 +13,9 @@ function runHighlighter(lang: string, code: string) {
 		lang = 'plaintext';
 	}
 
-	const ensureLoaded = (lang: string) => {
-		if (lang && !Prism.languages[lang]) {
-			loadLanguages([lang]);
+	const ensureLoaded = (language: string) => {
+		if (language && !Prism.languages[language]) {
+			loadLanguages([language]);
 		}
 	};
 
@@ -30,6 +30,7 @@ function runHighlighter(lang: string, code: string) {
 	}
 
 	if (lang && !Prism.languages[lang]) {
+		// eslint-disable-next-line no-console
 		console.warn(`Unable to load the language: ${lang}`);
 	}
 

package/src/remark-shiki.ts

@@ -30,7 +30,21 @@ const remarkShiki = async (
 
 	return () => (tree: any) => {
 		visit(tree, 'code', (node) => {
-			let html = highlighter!.codeToHtml(node.value, { lang: node.lang ?? 'plaintext' });
+			let lang: string;
+
+			if (typeof node.lang === 'string') {
+				const langExists = highlighter.getLoadedLanguages().includes(node.lang);
+				if (langExists) {
+					lang = node.lang;
+				} else {
+					console.warn(`The language "${node.lang}" doesn't exist, falling back to plaintext.`);
+					lang = 'plaintext';
+				}
+			} else {
+				lang = 'plaintext';
+			}
+
+			let html = highlighter!.codeToHtml(node.value, { lang });
 
 			// Q: Couldn't these regexes match on a user's inputted code blocks?
 			// A: Nope! All rendered HTML is properly escaped.

package/dist/ssr-utils.d.ts

@@ -1,2 +0,0 @@
-/** @see {@link "/packages/astro/vite-plugin-markdown"} */
-export declare function slug(value: string): string;

package/dist/ssr-utils.js

@@ -1,8 +0,0 @@
-import Slugger from "github-slugger";
-const slugger = new Slugger();
-function slug(value) {
-  return slugger.slug(value);
-}
-export {
-  slug
-};

package/src/ssr-utils.ts

@@ -1,8 +0,0 @@
-/** Utilities used in deployment-ready SSR bundles */
-import Slugger from 'github-slugger';
-
-const slugger = new Slugger();
-/** @see {@link "/packages/astro/vite-plugin-markdown"} */
-export function slug(value: string): string {
-	return slugger.slug(value);
-}