Skip to content

Commit a049f8a

Browse files
authored
chore: replace shikiji with shiki (#1710)
1 parent 834f30e commit a049f8a

File tree

3 files changed

+281
-20
lines changed

3 files changed

+281
-20
lines changed

packages/start/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
},
6161
"devDependencies": {
6262
"solid-js": "^1.9.2",
63-
"vinxi": "^0.4.3",
64-
"typescript": "^5.4.2"
63+
"typescript": "^5.4.2",
64+
"vinxi": "^0.4.3"
6565
},
6666
"dependencies": {
6767
"@vinxi/plugin-directives": "^0.4.3",
@@ -73,7 +73,7 @@
7373
"radix3": "^1.1.0",
7474
"seroval": "^1.0.2",
7575
"seroval-plugins": "^1.0.2",
76-
"shikiji": "^0.9.12",
76+
"shiki": "^1.26.1",
7777
"source-map-js": "^1.0.2",
7878
"terracotta": "^1.0.4",
7979
"tinyglobby": "^0.2.2",

packages/start/src/shared/dev-overlay/CodeView.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
// @refresh skip
2-
import type { BuiltinLanguage, Highlighter } from 'shikiji';
3-
import { getHighlighterCore, loadWasm } from 'shikiji/core';
2+
import { getSingletonHighlighter, type BuiltinLanguage, type Highlighter } from 'shiki';
3+
import { loadWasm } from 'shiki/engine/oniguruma';
44
import { createEffect, createResource, type JSX } from 'solid-js';
55

6-
import url from 'shikiji/onig.wasm?url';
6+
import url from 'shiki/onig.wasm?url';
77

8-
import langJS from 'shikiji/langs/javascript.mjs';
9-
import langJSX from 'shikiji/langs/jsx.mjs';
10-
import langTSX from 'shikiji/langs/tsx.mjs';
11-
import langTS from 'shikiji/langs/typescript.mjs';
12-
import darkPlus from 'shikiji/themes/dark-plus.mjs';
8+
import langJS from 'shiki/langs/javascript.mjs';
9+
import langJSX from 'shiki/langs/jsx.mjs';
10+
import langTSX from 'shiki/langs/tsx.mjs';
11+
import langTS from 'shiki/langs/typescript.mjs';
12+
import darkPlus from 'shiki/themes/dark-plus.mjs';
1313

1414
let HIGHLIGHTER: Highlighter;
1515

1616
async function loadHighlighter() {
1717
if (!HIGHLIGHTER) {
1818
await loadWasm(await fetch(url))
19-
HIGHLIGHTER = await getHighlighterCore({
19+
HIGHLIGHTER = await getSingletonHighlighter({
2020
themes: [
2121
darkPlus,
2222
],

0 commit comments

Comments
 (0)