Skip to content

Commit c413c35

Browse files
refactor: use JavaScriptRegexp Engine for shiki, drop wasm (#592)
1 parent a134eaf commit c413c35

File tree

7 files changed

+42
-40
lines changed

7 files changed

+42
-40
lines changed

packages/applet/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@vue/devtools-ui": "workspace:^",
3636
"lodash-es": "^4.17.21",
3737
"perfect-debounce": "^1.0.0",
38-
"shiki": "^1.14.1",
38+
"shiki": "^1.16.1",
3939
"splitpanes": "^3.1.5",
4040
"vue-virtual-scroller": "2.0.0-beta.8"
4141
},

packages/chrome-extension/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
}
3434
],
3535
"content_security_policy": {
36-
"extension_pages": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'"
36+
"extension_pages": "script-src 'self'; object-src 'self'"
3737
},
3838
"description": "DevTools browser extension for Vue.js",
3939
"devtools_page": "pages/devtools-background.html",

packages/client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"fast-deep-equal": "^3.1.3",
3737
"fuse.js": "^7.0.0",
3838
"minimatch": "^10.0.1",
39-
"shiki": "^1.14.1",
39+
"shiki": "^1.16.1",
4040
"splitpanes": "^3.1.5",
4141
"vis-network": "^9.1.9",
4242
"vite-hot-client": "^0.2.3",

packages/firefox-extension/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"run_at": "document_idle"
3535
}
3636
],
37-
"content_security_policy": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'",
37+
"content_security_policy": "script-src 'self'; object-src 'self'",
3838
"description": "DevTools browser extension for Vue.js",
3939
"devtools_page": "devtools-background.html",
4040
"icons": {

packages/ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"peerDependencies": {
3434
"@unocss/reset": ">=0.50.0-0",
3535
"floating-vue": ">=2.0.0-0",
36-
"shiki": ">=1.10.0",
36+
"shiki": ">=1.16.0",
3737
"unocss": ">=0.50.0-0",
3838
"vue": ">=3.0.0-0"
3939
},

packages/ui/src/composables/shiki.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { BuiltinLanguage, HighlighterCore } from 'shiki'
2-
import { createHighlighterCore } from 'shiki/core'
3-
import getWasm from 'shiki/wasm'
2+
import { createHighlighterCore, createJavaScriptRegexEngine } from 'shiki/core'
43
import { shallowRef } from 'vue'
54

65
export const shiki = shallowRef<HighlighterCore>()
@@ -9,6 +8,7 @@ let promise: Promise<any> | null = null
98

109
export function renderCodeHighlight(code: string, lang: BuiltinLanguage | 'text' = 'text') {
1110
if (!promise && !shiki.value) {
11+
const jsEngine = createJavaScriptRegexEngine()
1212
// Only loading when needed
1313
promise = createHighlighterCore({
1414
themes: [
@@ -27,7 +27,7 @@ export function renderCodeHighlight(code: string, lang: BuiltinLanguage | 'text'
2727
import('shiki/langs/diff.mjs'),
2828
import('shiki/langs/shellscript.mjs'),
2929
],
30-
loadWasm: getWasm,
30+
engine: jsEngine,
3131
}).then((i) => {
3232
shiki.value = i
3333
})

pnpm-lock.yaml

Lines changed: 34 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)