From 7c2133d0b96cd156d863e2326fc1cec5513afff6 Mon Sep 17 00:00:00 2001
From: Guillaume Chau <guillaume.b.chau@gmail.com>
Date: Mon, 19 Dec 2022 14:13:43 +0100
Subject: [PATCH] feat: complete transition to shiki-es
---
packages/histoire/package.json | 2 +-
packages/histoire/src/node/markdown.ts | 4 ++--
packages/histoire/src/node/vite.ts | 2 +-
pnpm-lock.yaml | 7 +++++--
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/packages/histoire/package.json b/packages/histoire/package.json
index 891d6d12..63883b82 100644
--- a/packages/histoire/package.json
+++ b/packages/histoire/package.json
@@ -66,7 +66,7 @@
"pathe": "^0.2.0",
"picocolors": "^1.0.0",
"sade": "^1.8.1",
- "shiki": "0.11.1",
+ "shiki-es": "^0.1.2",
"sirv": "^2.0.2",
"tinypool": "^0.1.2",
"vite-node": "0.26.0"
diff --git a/packages/histoire/src/node/markdown.ts b/packages/histoire/src/node/markdown.ts
index 5e0d1d42..35e55837 100644
--- a/packages/histoire/src/node/markdown.ts
+++ b/packages/histoire/src/node/markdown.ts
@@ -1,6 +1,6 @@
import MarkdownIt from 'markdown-it'
import matter from 'gray-matter'
-import shiki from 'shiki'
+import { getHighlighter } from 'shiki-es'
import anchor from 'markdown-it-anchor'
import attrs from 'markdown-it-attrs'
import emoji from 'markdown-it-emoji'
@@ -28,7 +28,7 @@ function notifyMarkdownListChange () {
}
export async function createMarkdownRenderer (ctx: Context) {
- const highlighter = await shiki.getHighlighter({
+ const highlighter = await getHighlighter({
theme: 'github-dark',
})
diff --git a/packages/histoire/src/node/vite.ts b/packages/histoire/src/node/vite.ts
index be394b58..66c8aa37 100644
--- a/packages/histoire/src/node/vite.ts
+++ b/packages/histoire/src/node/vite.ts
@@ -141,7 +141,7 @@ export async function getViteConfigWithPlugins (isServer: boolean, ctx: Context)
],
include: optimizeDeps([
'flexsearch',
- 'shiki',
+ 'shiki-es',
// Shiki dependencies
'vscode-oniguruma',
'vscode-textmate',
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fb76dc98..53889af1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -281,7 +281,7 @@ importers:
picocolors: ^1.0.0
rollup: ^3.5.1
sade: ^1.8.1
- shiki: 0.11.1
+ shiki-es: ^0.1.2
sirv: ^2.0.2
tinypool: ^0.1.2
typescript: ^4.7.4
@@ -315,7 +315,7 @@ importers:
pathe: 0.2.0
picocolors: 1.0.0
sade: 1.8.1
- shiki: 0.11.1
+ shiki-es: 0.1.2
sirv: 2.0.2
tinypool: 0.1.3
vite-node: 0.26.0_@types+node@17.0.45
@@ -10791,6 +10791,7 @@ packages:
jsonc-parser: 3.2.0
vscode-oniguruma: 1.7.0
vscode-textmate: 6.0.0
+ dev: true
/side-channel/1.0.4:
resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
@@ -12361,9 +12362,11 @@ packages:
/vscode-oniguruma/1.7.0:
resolution: {integrity: sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==}
+ dev: true
/vscode-textmate/6.0.0:
resolution: {integrity: sha512-gu73tuZfJgu+mvCSy4UZwd2JXykjK9zAZsfmDeut5dx/1a7FeTk0XwJsSuqQn+cuMCGVbIBfl+s53X4T19DnzQ==}
+ dev: true
/vscode-uri/3.0.7:
resolution: {integrity: sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA==}