feat: migrate to shiki v2

slidevjs · Jan 20, 2025 · 5e8cd4a · 5e8cd4a
1 parent 0a0f95f
commit 5e8cd4a
Show file tree

Hide file tree

Showing 6 changed files with 580 additions and 531 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "version": "51.0.1",
   "private": true,
-  "packageManager": "pnpm@9.14.4",
+  "packageManager": "pnpm@9.15.4",
   "scripts": {
     "dev": "vitepress",
     "build": "vitepress build",

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "type": "module",
   "version": "51.0.1",
   "private": true,
-  "packageManager": "[email protected].3",
+  "packageManager": "[email protected].4",
   "engines": {
     "node": ">=18.0.0"
   },

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -32,6 +32,7 @@
     "@iconify-json/carbon": "catalog:",
     "@iconify-json/ph": "catalog:",
     "@iconify-json/svg-spinners": "catalog:",
+    "@shikijs/engine-javascript": "catalog:",
     "@shikijs/monaco": "catalog:",
     "@shikijs/vitepress-twoslash": "catalog:",
     "@slidev/parser": "workspace:*",

diff --git a/packages/slidev/node/virtual/shiki.ts b/packages/slidev/node/virtual/shiki.ts
@@ -59,6 +59,7 @@ export const templateShiki: VirtualModuleTemplate = {
     const lines: string[] = []
     lines.push(
       `import { createHighlighterCore } from "${await resolveImportUrl('shiki/core')}"`,
+      `import { createJavaScriptRegexEngine } from "${await resolveImportUrl('@shikijs/engine-javascript')}"`,
       `export { shikiToMonaco } from "${await resolveImportUrl('@shikijs/monaco')}"`,
 
       `export const languages = ${JSON.stringify(langNames)}`,
@@ -67,7 +68,7 @@ export const templateShiki: VirtualModuleTemplate = {
       'export const shiki = createHighlighterCore({',
       `  themes: [${themesInit.join(',')}],`,
       `  langs: [${langsInit.join(',')}],`,
-      `  loadWasm: import('${await resolveImportUrl('shiki/wasm')}'),`,
+      `  engine: createJavaScriptRegexEngine(),`,
       '})',
 
       'let highlight',