@astrojs/markdown-remark 2.1.3 → 2.2.0

package/.turbo/turbo-build.log

@@ -1,5 +1,4 @@
-@astrojs/markdown-remark:build: cache hit, replaying output d62fcf6af591535d
-@astrojs/markdown-remark:build: 
-@astrojs/markdown-remark:build: > @astrojs/markdown-remark@2.1.3 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: 
+
+> @astrojs/markdown-remark@2.2.0 build /home/runner/work/astro/astro/packages/markdown/remark
+> astro-scripts build "src/**/*.ts" && tsc -p tsconfig.json
+

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @astrojs/markdown-remark
 
+## 2.2.0
+
+### Minor Changes
+
+- [#6932](https://github.com/withastro/astro/pull/6932) [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7) Thanks [@bluwy](https://github.com/bluwy)! - Upgrade shiki to v0.14.1. This updates the shiki theme colors and adds the theme name to the `pre` tag, e.g. `<pre class="astro-code github-dark">`.
+
+### Patch Changes
+
+- Updated dependencies [[`818252acd`](https://github.com/withastro/astro/commit/818252acda3c00499cea51ffa0f26d4c2ccd3a02), [`80e3d4d3d`](https://github.com/withastro/astro/commit/80e3d4d3d0f7719d8eae5435bba3805503057511), [`3326492b9`](https://github.com/withastro/astro/commit/3326492b94f76ed2b0154dd9b9a1a9eb883c1e31), [`cac4a321e`](https://github.com/withastro/astro/commit/cac4a321e814fb805eb0e3ced469e25261a50885), [`831b67cdb`](https://github.com/withastro/astro/commit/831b67cdb8250f93f66e3b171fab024652bf80f2), [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7), [`0883fd487`](https://github.com/withastro/astro/commit/0883fd4875548a613df122f0b87a1ca8b7a7cf7d)]:
+  - astro@2.4.0
+
+## 2.1.4
+
+### Patch Changes
+
+- [#6824](https://github.com/withastro/astro/pull/6824) [`2511d58d5`](https://github.com/withastro/astro/commit/2511d58d586af080a78e5ef8a63020b3e17770db) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Add support for using optimized and relative images in MDX files with `experimental.assets`
+
+- Updated dependencies [[`8539eb164`](https://github.com/withastro/astro/commit/8539eb1643864ae7e0f5a080915cd75535f7101b), [`a9c22994e`](https://github.com/withastro/astro/commit/a9c22994e41f92a586d8946988d29e3c62148778), [`948a6d7be`](https://github.com/withastro/astro/commit/948a6d7be0c76fd1dd8550270bd29821075f799c)]:
+  - astro@2.3.0
+
 ## 2.1.3
 
 ### Patch Changes

package/dist/frontmatter-injection.d.ts

@@ -1,4 +1,4 @@
-import type { Data, VFile } from 'vfile';
+import type { VFile, VFileData as Data } from 'vfile';
 import type { MarkdownAstroData } from './types.js';
 export declare class InvalidAstroDataError extends TypeError {
 }

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import type { AstroMarkdownOptions, MarkdownRenderingOptions, MarkdownRenderingResult } from './types';
 export { rehypeHeadingIds } from './rehype-collect-headings.js';
+export { remarkCollectImages } from './remark-collect-images.js';
 export * from './types.js';
 export declare const markdownConfigDefaults: Omit<Required<AstroMarkdownOptions>, 'drafts'>;
 /** Shared utility for rendering markdown */

package/dist/index.js

@@ -1,7 +1,7 @@
 import { toRemarkInitializeAstroData } from "./frontmatter-injection.js";
 import { loadPlugins } from "./load-plugins.js";
 import { rehypeHeadingIds } from "./rehype-collect-headings.js";
-import toRemarkCollectImages from "./remark-collect-images.js";
+import { remarkCollectImages } from "./remark-collect-images.js";
 import remarkPrism from "./remark-prism.js";
 import scopedStyles from "./remark-scoped-styles.js";
 import remarkShiki from "./remark-shiki.js";
@@ -15,6 +15,7 @@ import { unified } from "unified";
 import { VFile } from "vfile";
 import { rehypeImages } from "./rehype-images.js";
 import { rehypeHeadingIds as rehypeHeadingIds2 } from "./rehype-collect-headings.js";
+import { remarkCollectImages as remarkCollectImages2 } from "./remark-collect-images.js";
 export * from "./types.js";
 const markdownConfigDefaults = {
   syntaxHighlight: "shiki",
@@ -69,7 +70,7 @@ async function renderMarkdown(content, opts) {
       parser.use([remarkPrism(scopedClassName)]);
     }
     if (opts.experimentalAssets) {
-      parser.use([toRemarkCollectImages()]);
+      parser.use([remarkCollectImages]);
     }
   }
   parser.use([
@@ -127,5 +128,6 @@ ${err.message}`;
 export {
   markdownConfigDefaults,
   rehypeHeadingIds2 as rehypeHeadingIds,
+  remarkCollectImages2 as remarkCollectImages,
   renderMarkdown
 };

package/dist/remark-collect-images.d.ts

@@ -1,2 +1,2 @@
 import type { MarkdownVFile } from './types';
-export default function toRemarkCollectImages(): () => (tree: any, vfile: MarkdownVFile) => Promise<void>;
+export declare function remarkCollectImages(): (tree: any, vfile: MarkdownVFile) => void;

package/dist/remark-collect-images.js

@@ -1,6 +1,6 @@
 import { visit } from "unist-util-visit";
-function toRemarkCollectImages() {
-  return () => async function(tree, vfile) {
+function remarkCollectImages() {
+  return function(tree, vfile) {
     if (typeof (vfile == null ? void 0 : vfile.path) !== "string")
       return;
     const imagePaths = /* @__PURE__ */ new Set();
@@ -23,5 +23,5 @@ function isValidUrl(str) {
   }
 }
 export {
-  toRemarkCollectImages as default
+  remarkCollectImages
 };

package/dist/remark-shiki.js

@@ -1,7 +1,24 @@
 import { getHighlighter } from "shiki";
 import { visit } from "unist-util-visit";
 const highlighterCacheAsync = /* @__PURE__ */ new Map();
+const compatThemes = {
+  "material-darker": "material-theme-darker",
+  "material-default": "material-theme",
+  "material-lighter": "material-theme-lighter",
+  "material-ocean": "material-theme-ocean",
+  "material-palenight": "material-theme-palenight"
+};
+const normalizeTheme = (theme) => {
+  if (typeof theme === "string") {
+    return compatThemes[theme] || theme;
+  } else if (compatThemes[theme.name]) {
+    return { ...theme, name: compatThemes[theme.name] };
+  } else {
+    return theme;
+  }
+};
 const remarkShiki = async ({ langs = [], theme = "github-dark", wrap = false }, scopedClassName) => {
+  theme = normalizeTheme(theme);
   const cacheID = typeof theme === "string" ? theme : theme.name;
   let highlighterAsync = highlighterCacheAsync.get(cacheID);
   if (!highlighterAsync) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "2.1.3",
+  "version": "2.2.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -17,7 +17,7 @@
     "./dist/internal.js": "./dist/internal.js"
   },
   "peerDependencies": {
-    "astro": "^2.2.0"
+    "astro": "^2.4.0"
   },
   "dependencies": {
     "@astrojs/prism": "^2.1.0",
@@ -29,7 +29,7 @@
     "remark-parse": "^10.0.1",
     "remark-rehype": "^10.1.0",
     "remark-smartypants": "^2.0.0",
-    "shiki": "^0.11.1",
+    "shiki": "^0.14.1",
     "unified": "^10.1.2",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2"
@@ -42,10 +42,10 @@
     "@types/mdast": "^3.0.10",
     "@types/mocha": "^9.1.1",
     "@types/unist": "^2.0.6",
-    "astro-scripts": "0.0.14",
     "chai": "^4.3.6",
     "mdast-util-mdx-expression": "^1.3.1",
-    "mocha": "^9.2.2"
+    "mocha": "^9.2.2",
+    "astro-scripts": "0.0.14"
   },
   "scripts": {
     "prepublish": "pnpm build",

package/src/frontmatter-injection.ts

@@ -1,4 +1,4 @@
-import type { Data, VFile } from 'vfile';
+import type { VFile, VFileData as Data } from 'vfile';
 import type { MarkdownAstroData } from './types.js';
 
 function isValidAstroData(obj: unknown): obj is MarkdownAstroData {

package/src/index.ts

@@ -8,7 +8,7 @@ import type {
 import { toRemarkInitializeAstroData } from './frontmatter-injection.js';
 import { loadPlugins } from './load-plugins.js';
 import { rehypeHeadingIds } from './rehype-collect-headings.js';
-import toRemarkCollectImages from './remark-collect-images.js';
+import { remarkCollectImages } from './remark-collect-images.js';
 import remarkPrism from './remark-prism.js';
 import scopedStyles from './remark-scoped-styles.js';
 import remarkShiki from './remark-shiki.js';
@@ -24,6 +24,7 @@ import { VFile } from 'vfile';
 import { rehypeImages } from './rehype-images.js';
 
 export { rehypeHeadingIds } from './rehype-collect-headings.js';
+export { remarkCollectImages } from './remark-collect-images.js';
 export * from './types.js';
 
 export const markdownConfigDefaults: Omit<Required<AstroMarkdownOptions>, 'drafts'> = {
@@ -96,7 +97,7 @@ export async function renderMarkdown(
 
 		if (opts.experimentalAssets) {
 			// Apply later in case user plugins resolve relative image paths
-			parser.use([toRemarkCollectImages()]);
+			parser.use([remarkCollectImages]);
 		}
 	}
 

package/src/remark-collect-images.ts

@@ -2,18 +2,17 @@ import type { Image } from 'mdast';
 import { visit } from 'unist-util-visit';
 import type { MarkdownVFile } from './types';
 
-export default function toRemarkCollectImages() {
-	return () =>
-		async function (tree: any, vfile: MarkdownVFile) {
-			if (typeof vfile?.path !== 'string') return;
+export function remarkCollectImages() {
+	return function (tree: any, vfile: MarkdownVFile) {
+		if (typeof vfile?.path !== 'string') return;
 
-			const imagePaths = new Set<string>();
-			visit(tree, 'image', (node: Image) => {
-				if (shouldOptimizeImage(node.url)) imagePaths.add(node.url);
-			});
+		const imagePaths = new Set<string>();
+		visit(tree, 'image', (node: Image) => {
+			if (shouldOptimizeImage(node.url)) imagePaths.add(node.url);
+		});
 
-			vfile.data.imagePaths = imagePaths;
-		};
+		vfile.data.imagePaths = imagePaths;
+	};
 }
 
 function shouldOptimizeImage(src: string) {

package/src/remark-shiki.ts

@@ -10,10 +10,30 @@ import type { ShikiConfig } from './types.js';
  */
 const highlighterCacheAsync = new Map<string, Promise<shiki.Highlighter>>();
 
+// Map of old theme names to new names to preserve compatibility when we upgrade shiki
+const compatThemes: Record<string, string> = {
+	'material-darker': 'material-theme-darker',
+	'material-default': 'material-theme',
+	'material-lighter': 'material-theme-lighter',
+	'material-ocean': 'material-theme-ocean',
+	'material-palenight': 'material-theme-palenight',
+};
+
+const normalizeTheme = (theme: string | shiki.IShikiTheme) => {
+	if (typeof theme === 'string') {
+		return compatThemes[theme] || theme;
+	} else if (compatThemes[theme.name]) {
+		return { ...theme, name: compatThemes[theme.name] };
+	} else {
+		return theme;
+	}
+};
+
 const remarkShiki = async (
 	{ langs = [], theme = 'github-dark', wrap = false }: ShikiConfig,
 	scopedClassName?: string | null
 ) => {
+	theme = normalizeTheme(theme);
 	const cacheID: string = typeof theme === 'string' ? theme : theme.name;
 	let highlighterAsync = highlighterCacheAsync.get(cacheID);
 	if (!highlighterAsync) {