From 04431c7319c8722f82331534d67de80bb28c6225 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Wed, 30 Nov 2022 13:45:42 +0800
Subject: [PATCH] chore: switch to `shiki-es`

---
 composables/shiki.ts |  4 ++--
 package.json         |  1 +
 pnpm-lock.yaml       | 12 +++++++++---
 scripts/prepare.ts   |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/composables/shiki.ts b/composables/shiki.ts
index 5ca29fd3..67e6d7fe 100644
--- a/composables/shiki.ts
+++ b/composables/shiki.ts
@@ -1,4 +1,4 @@
-import type { Highlighter, Lang } from 'shiki'
+import type { Highlighter, Lang } from 'shiki-es'
 
 export const shiki = ref<Highlighter>()
 
@@ -7,7 +7,7 @@ let shikiImport: Promise<void> | undefined
 
 export function highlightCode(code: string, lang: Lang) {
   if (!shikiImport) {
-    shikiImport = import('shiki')
+    shikiImport = import('shiki-es')
       .then(async (r) => {
         r.setCDN('/shiki/')
         shiki.value = await r.getHighlighter({
diff --git a/package.json b/package.json
index bd6494da..7eeefcbe 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
     "prettier": "^2.8.0",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "shiki": "^0.11.1",
+    "shiki-es": "^0.1.2",
     "simple-git-hooks": "^2.8.1",
     "std-env": "^3.3.1",
     "theme-vitesse": "^0.6.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 29815a44..dba0fb09 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,7 @@ specifiers:
   prettier: ^2.8.0
   rollup-plugin-node-polyfills: ^0.2.1
   shiki: ^0.11.1
+  shiki-es: ^0.1.2
   simple-git-hooks: ^2.8.1
   std-env: ^3.3.1
   theme-vitesse: ^0.6.0
@@ -112,6 +113,7 @@ devDependencies:
   prettier: 2.8.0
   rollup-plugin-node-polyfills: 0.2.1
   shiki: 0.11.1
+  shiki-es: 0.1.2
   simple-git-hooks: 2.8.1
   std-env: 3.3.1
   theme-vitesse: 0.6.0
@@ -7250,11 +7252,15 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /shiki-es/0.1.2:
+    resolution: {integrity: sha512-eqtfk8idlYlSLAn0gp0Ly2+FbKc2d78IddigHSS4iHAnpXoY2kdRzyFGZOdi6TvemYMnRhZBi1HsSqZc5eNKqg==}
+    dev: true
+
   /shiki/0.11.1:
     resolution: {integrity: sha512-EugY9VASFuDqOexOgXR18ZV+TbFrQHeCpEYaXamO+SZlsnT/2LxuLBX25GGtIrwaEVFXUAbUQ601SWE2rMwWHA==}
     dependencies:
       jsonc-parser: 3.2.0
-      vscode-oniguruma: 1.7.0
+      vscode-oniguruma: 1.6.1
       vscode-textmate: 6.0.0
     dev: true
 
@@ -8304,8 +8310,8 @@ packages:
       vscode-languageserver-protocol: 3.16.0
     dev: true
 
-  /vscode-oniguruma/1.7.0:
-    resolution: {integrity: sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==}
+  /vscode-oniguruma/1.6.1:
+    resolution: {integrity: sha512-vc4WhSIaVpgJ0jJIejjYxPvURJavX6QG41vu0mGhqywMkQqulezEqEQ3cO3gc8GvcOpX6ycmKGqRoROEMBNXTQ==}
     dev: true
 
   /vscode-textmate/6.0.0:
diff --git a/scripts/prepare.ts b/scripts/prepare.ts
index f7a2fe7d..85c96ba6 100644
--- a/scripts/prepare.ts
+++ b/scripts/prepare.ts
@@ -2,7 +2,7 @@ import { copy } from 'fs-extra'
 
 const dereference = process.platform === 'win32' ? true : undefined
 
-await copy('node_modules/shiki/', 'public/shiki/', {
+await copy('node_modules/shiki-es/dist/assets', 'public/shiki/', {
   dereference,
   filter: src => src === 'node_modules/shiki/' || src.includes('languages') || src.includes('dist'),
 })