@astrojs/mdx 0.19.0 → 0.19.1

package/.turbo/turbo-build.log

@@ -1,5 +1,4 @@
-@astrojs/mdx:build: cache hit, replaying output 8f7758540a171891
-@astrojs/mdx:build: 
-@astrojs/mdx:build: > @astrojs/mdx@0.19.0 build /home/runner/work/astro/astro/packages/integrations/mdx
-@astrojs/mdx:build: > astro-scripts build "src/**/*.ts" && tsc
-@astrojs/mdx:build: 
+
+> @astrojs/mdx@0.19.1 build /home/runner/work/astro/astro/packages/integrations/mdx
+> astro-scripts build "src/**/*.ts" && tsc
+

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @astrojs/mdx
 
+## 0.19.1
+
+### Patch 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">`.
+
+- Updated dependencies [[`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7)]:
+  - @astrojs/markdown-remark@2.2.0
+
 ## 0.19.0
 
 ### Minor Changes

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 }) => {
+  theme = normalizeTheme(theme);
   const cacheID = typeof theme === "string" ? theme : theme.name;
   let highlighterAsync = highlighterCacheAsync.get(cacheID);
   if (!highlighterAsync) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/mdx",
   "description": "Add support for MDX pages in your Astro site",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -23,7 +23,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@astrojs/markdown-remark": "^2.1.4",
+    "@astrojs/markdown-remark": "^2.2.0",
     "@astrojs/prism": "^2.1.1",
     "@mdx-js/mdx": "^2.3.0",
     "@mdx-js/rollup": "^2.3.0",
@@ -37,7 +37,7 @@
     "remark-frontmatter": "^4.0.1",
     "remark-gfm": "^3.0.1",
     "remark-smartypants": "^2.0.0",
-    "shiki": "^0.11.1",
+    "shiki": "^0.14.1",
     "source-map": "^0.7.4",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2"
@@ -62,8 +62,8 @@
     "remark-rehype": "^10.1.0",
     "remark-shiki-twoslash": "^3.1.0",
     "remark-toc": "^8.0.1",
-    "vite": "^4.2.1",
-    "astro": "2.3.0",
+    "vite": "^4.3.1",
+    "astro": "2.4.0",
     "astro-scripts": "0.0.14"
   },
   "engines": {

package/src/remark-shiki.ts

@@ -10,7 +10,27 @@ import { visit } from 'unist-util-visit';
  */
 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) => {
+	theme = normalizeTheme(theme);
 	const cacheID: string = typeof theme === 'string' ? theme : theme.name;
 	let highlighterAsync = highlighterCacheAsync.get(cacheID);
 	if (!highlighterAsync) {

package/test/fixtures/mdx-images/package.json

@@ -1,5 +1,6 @@
 {
-  "name": "@test/mdx-page",
+  "name": "@test/mdx-images",
+  "private": true,
   "dependencies": {
     "@astrojs/mdx": "workspace:*",
     "astro": "workspace:*",

package/test/fixtures/mdx-infinite-loop/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@test/mdx-infinite-loop",
   "type": "module",
+  "private": true,
   "dependencies": {
     "@astrojs/mdx": "workspace:*",
     "@astrojs/preact": "workspace:*",

package/test/fixtures/mdx-namespace/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@test/mdx-namespace",
+  "private": true,
   "dependencies": {
     "@astrojs/mdx": "workspace:*",
     "@astrojs/react": "workspace:*",

package/test/fixtures/mdx-page/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@test/mdx-page",
+  "private": true,
   "dependencies": {
     "@astrojs/mdx": "workspace:*",
     "astro": "workspace:*",

package/test/fixtures/mdx-plus-react/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@test/mdx-plus-react",
+  "private": true,
   "dependencies": {
     "@astrojs/mdx": "workspace:*",
     "@astrojs/react": "workspace:*",

package/test/fixtures/mdx-vite-env-vars/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@test/mdx-env-variables",
+  "private": true,
   "dependencies": {
     "astro": "workspace:*",
     "@astrojs/mdx": "workspace:*"

package/test/mdx-syntax-highlighting.test.js

@@ -25,7 +25,7 @@ describe('MDX syntax highlighting', () => {
 
 			const shikiCodeBlock = document.querySelector('pre.astro-code');
 			expect(shikiCodeBlock).to.not.be.null;
-			expect(shikiCodeBlock.getAttribute('style')).to.contain('background-color:#0d1117');
+			expect(shikiCodeBlock.getAttribute('style')).to.contain('background-color:#24292e');
 		});
 
 		it('respects markdown.shikiConfig.theme', async () => {