Skip to content

Commit d018045

Browse files
antfuantfu
committedFeb 18, 2025··
fix: use shiki js engine instead of precompiled
·
v2.4.0v2.1.1
1 parent 66d2743 commit d018045

File tree

6 files changed

+583
-783
lines changed

6 files changed

+583
-783
lines changed
 

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "module",
44
"version": "2.1.0",
55
"private": true,
6-
"packageManager": "pnpm@10.4.0",
6+
"packageManager": "pnpm@10.4.1",
77
"repository": {
88
"type": "git",
99
"url": "git+https://github.com/nuxt/devtools.git"

Diff for: ‎packages/devtools-ui-kit/src/unocss.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import {
99
presetAttributify,
1010
presetIcons,
1111
presetTypography,
12-
presetUno,
1312
presetWebFonts,
13+
presetWind3,
1414
transformerDirectives,
1515
transformerVariantGroup,
1616
} from 'unocss'
@@ -167,7 +167,7 @@ export function extendUnocssOptions(user: UnocssNuxtOptions = {}): UnocssNuxtOpt
167167
...user,
168168
preflight: true,
169169
presets: [
170-
presetUno(),
170+
presetWind3(),
171171
presetAttributify(),
172172
presetTypography(),
173173
presetIcons({

Diff for: ‎packages/devtools/client/composables/client-services/shiki.bundle.ts

+19-19
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
createSingletonShorthands,
1111
createdBundledHighlighter,
1212
} from '@shikijs/core'
13-
import { createJavaScriptRawEngine } from '@shikijs/engine-javascript/raw'
13+
import { createJavaScriptRegexEngine } from '@shikijs/engine-javascript'
1414

1515
type BundledLanguage =
1616
| 'json'
@@ -34,23 +34,23 @@ type BundledTheme = 'vitesse-dark' | 'vitesse-light'
3434
type Highlighter = HighlighterGeneric<BundledLanguage, BundledTheme>
3535

3636
const bundledLanguages = {
37-
json: () => import('@shikijs/langs-precompiled/json'),
38-
yaml: () => import('@shikijs/langs-precompiled/yaml'),
39-
yml: () => import('@shikijs/langs-precompiled/yaml'),
40-
css: () => import('@shikijs/langs-precompiled/css'),
41-
javascript: () => import('@shikijs/langs-precompiled/javascript'),
42-
js: () => import('@shikijs/langs-precompiled/javascript'),
43-
typescript: () => import('@shikijs/langs-precompiled/typescript'),
44-
ts: () => import('@shikijs/langs-precompiled/typescript'),
45-
vue: () => import('@shikijs/langs-precompiled/vue'),
46-
'vue-html': () => import('@shikijs/langs-precompiled/vue-html'),
47-
html: () => import('@shikijs/langs-precompiled/html'),
48-
diff: () => import('@shikijs/langs-precompiled/diff'),
49-
shellscript: () => import('@shikijs/langs-precompiled/shellscript'),
50-
bash: () => import('@shikijs/langs-precompiled/shellscript'),
51-
sh: () => import('@shikijs/langs-precompiled/shellscript'),
52-
shell: () => import('@shikijs/langs-precompiled/shellscript'),
53-
zsh: () => import('@shikijs/langs-precompiled/shellscript'),
37+
json: () => import('@shikijs/langs/json'),
38+
yaml: () => import('@shikijs/langs/yaml'),
39+
yml: () => import('@shikijs/langs/yaml'),
40+
css: () => import('@shikijs/langs/css'),
41+
javascript: () => import('@shikijs/langs/javascript'),
42+
js: () => import('@shikijs/langs/javascript'),
43+
typescript: () => import('@shikijs/langs/typescript'),
44+
ts: () => import('@shikijs/langs/typescript'),
45+
vue: () => import('@shikijs/langs/vue'),
46+
'vue-html': () => import('@shikijs/langs/vue-html'),
47+
html: () => import('@shikijs/langs/html'),
48+
diff: () => import('@shikijs/langs/diff'),
49+
shellscript: () => import('@shikijs/langs/shellscript'),
50+
bash: () => import('@shikijs/langs/shellscript'),
51+
sh: () => import('@shikijs/langs/shellscript'),
52+
shell: () => import('@shikijs/langs/shellscript'),
53+
zsh: () => import('@shikijs/langs/shellscript'),
5454
} as Record<BundledLanguage, DynamicImportLanguageRegistration>
5555

5656
const bundledThemes = {
@@ -64,7 +64,7 @@ const createHighlighter = /* @__PURE__ */ createdBundledHighlighter<
6464
>({
6565
langs: bundledLanguages,
6666
themes: bundledThemes,
67-
engine: () => createJavaScriptRawEngine(),
67+
engine: () => createJavaScriptRegexEngine(),
6868
})
6969

7070
const {

Diff for: ‎packages/devtools/scripts/prepare.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ const { code } = await codegen({
2323
'diff',
2424
'shellscript',
2525
],
26-
precompiled: true,
27-
engine: 'javascript-raw',
26+
precompiled: false,
27+
engine: 'javascript',
2828
typescript: true,
2929
header: [
3030
'/* Generate by @shikijs/codegen */',

Diff for: ‎pnpm-lock.yaml

+537-737
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎pnpm-workspace.yaml

+22-22
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,44 @@ packages:
22
- packages/**
33
- playgrounds/**
44
catalog:
5-
'@antfu/eslint-config': ^4.2.1
5+
'@antfu/eslint-config': ^4.3.0
66
'@antfu/ni': ^23.3.1
7-
'@antfu/utils': ^9.0.0
7+
'@antfu/utils': ^9.1.0
88
'@discoveryjs/cli': ^2.13.1
99
'@discoveryjs/discovery': 1.0.0-beta.92
1010
'@exampledev/new.css': ^1.1.3
1111
'@iconify-json/bxl': ^1.2.2
1212
'@iconify-json/carbon': ^1.2.7
1313
'@iconify-json/logos': ^1.2.4
1414
'@iconify-json/ri': ^1.2.5
15-
'@iconify-json/simple-icons': ^1.2.24
15+
'@iconify-json/simple-icons': ^1.2.25
1616
'@iconify-json/tabler': ^1.2.16
1717
'@nuxt/content': ^2.13.4
18-
'@nuxt/eslint': ^1.0.1
18+
'@nuxt/eslint': ^1.1.0
1919
'@nuxt/kit': ^3.15.4
2020
'@nuxt/module-builder': ^0.8.4
2121
'@nuxt/schema': ^3.15.4
2222
'@nuxt/test-utils': ^3.15.4
2323
'@opentelemetry/api': ^1.9.0
2424
'@parcel/watcher': ^2.5.1
2525
'@pinia/nuxt': ^0.10.1
26-
'@shikijs/langs-precompiled': ^2.4.1
26+
'@shikijs/langs-precompiled': ^3.0.0
2727
'@types/diff': ^7.0.1
2828
'@types/markdown-it': ^14.1.2
2929
'@types/markdown-it-link-attributes': ^3.0.5
3030
'@types/node': ^22.13.4
3131
'@types/prompts': ^2.4.9
3232
'@types/which': ^3.0.4
3333
'@types/ws': ^8.5.14
34-
'@unocss/core': ^65.5.0
35-
'@unocss/eslint-config': ^65.5.0
36-
'@unocss/nuxt': ^65.5.0
37-
'@unocss/preset-attributify': ^65.5.0
38-
'@unocss/preset-icons': ^65.5.0
39-
'@unocss/preset-mini': ^65.5.0
40-
'@unocss/preset-uno': ^65.5.0
41-
'@unocss/reset': ^65.5.0
42-
'@unocss/runtime': ^65.5.0
34+
'@unocss/core': ^66.0.0
35+
'@unocss/eslint-config': ^66.0.0
36+
'@unocss/nuxt': ^66.0.0
37+
'@unocss/preset-attributify': ^66.0.0
38+
'@unocss/preset-icons': ^66.0.0
39+
'@unocss/preset-mini': ^66.0.0
40+
'@unocss/preset-uno': ^66.0.0
41+
'@unocss/reset': ^66.0.0
42+
'@unocss/runtime': ^66.0.0
4343
'@vitest/ui': ^3.0.5
4444
'@vue/devtools-applet': ^7.7.2
4545
'@vue/devtools-core': ^7.7.2
@@ -75,7 +75,7 @@ catalog:
7575
image-meta: ^0.2.1
7676
is-installed-globally: ^1.0.0
7777
json-editor-vue: ^0.17.3
78-
launch-editor: ^2.9.1
78+
launch-editor: ^2.10.0
7979
lint-staged: ^15.4.3
8080
local-pkg: ^1.0.0
8181
magicast: ^0.3.5
@@ -98,20 +98,20 @@ catalog:
9898
rc9: ^2.1.2
9999
scule: ^1.3.0
100100
semver: ^7.7.1
101-
shiki: ^2.4.1
102-
shiki-codegen: ^2.4.1
101+
shiki: ^3.0.0
102+
shiki-codegen: ^3.0.0
103103
simple-git: ^3.27.0
104104
simple-git-hooks: ^2.11.1
105-
sirv: ^3.0.0
105+
sirv: ^3.0.1
106106
splitpanes: ^3.1.8
107107
structured-clone-es: ^1.0.0
108-
taze: ^18.5.0
108+
taze: ^18.6.0
109109
theme-vitesse: ^0.8.3
110-
tinyglobby: ^0.2.10
110+
tinyglobby: ^0.2.11
111111
typescript: ^5.7.3
112112
unbuild: ^3.3.1
113-
unimport: ^4.1.1
114-
unocss: ^65.5.0
113+
unimport: ^4.1.2
114+
unocss: ^66.0.0
115115
unplugin-vue-markdown: ^28.3.0
116116
v-lazy-show: ^0.3.0
117117
vanilla-jsoneditor: ^2.4.0

0 commit comments

Comments
 (0)
Please sign in to comment.