fix: use shiki js engine instead of precompiled

nuxt · Feb 18, 2025 · d018045 · d018045
1 parent 66d2743
commit d018045
Show file tree

Hide file tree

Showing 6 changed files with 583 additions and 783 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "version": "2.1.0",
   "private": true,
-  "packageManager": "pnpm@10.4.0",
+  "packageManager": "pnpm@10.4.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/devtools.git"

diff --git a/packages/devtools-ui-kit/src/unocss.ts b/packages/devtools-ui-kit/src/unocss.ts
@@ -9,8 +9,8 @@ import {
   presetAttributify,
   presetIcons,
   presetTypography,
-  presetUno,
   presetWebFonts,
+  presetWind3,
   transformerDirectives,
   transformerVariantGroup,
 } from 'unocss'
@@ -167,7 +167,7 @@ export function extendUnocssOptions(user: UnocssNuxtOptions = {}): UnocssNuxtOpt
     ...user,
     preflight: true,
     presets: [
-      presetUno(),
+      presetWind3(),
       presetAttributify(),
       presetTypography(),
       presetIcons({

diff --git a/packages/devtools/client/composables/client-services/shiki.bundle.ts b/packages/devtools/client/composables/client-services/shiki.bundle.ts
@@ -10,7 +10,7 @@ import {
   createSingletonShorthands,
   createdBundledHighlighter,
 } from '@shikijs/core'
-import { createJavaScriptRawEngine } from '@shikijs/engine-javascript/raw'
+import { createJavaScriptRegexEngine } from '@shikijs/engine-javascript'
 
 type BundledLanguage =
   | 'json'
@@ -34,23 +34,23 @@ type BundledTheme = 'vitesse-dark' | 'vitesse-light'
 type Highlighter = HighlighterGeneric<BundledLanguage, BundledTheme>
 
 const bundledLanguages = {
-  json: () => import('@shikijs/langs-precompiled/json'),
-  yaml: () => import('@shikijs/langs-precompiled/yaml'),
-  yml: () => import('@shikijs/langs-precompiled/yaml'),
-  css: () => import('@shikijs/langs-precompiled/css'),
-  javascript: () => import('@shikijs/langs-precompiled/javascript'),
-  js: () => import('@shikijs/langs-precompiled/javascript'),
-  typescript: () => import('@shikijs/langs-precompiled/typescript'),
-  ts: () => import('@shikijs/langs-precompiled/typescript'),
-  vue: () => import('@shikijs/langs-precompiled/vue'),
-  'vue-html': () => import('@shikijs/langs-precompiled/vue-html'),
-  html: () => import('@shikijs/langs-precompiled/html'),
-  diff: () => import('@shikijs/langs-precompiled/diff'),
-  shellscript: () => import('@shikijs/langs-precompiled/shellscript'),
-  bash: () => import('@shikijs/langs-precompiled/shellscript'),
-  sh: () => import('@shikijs/langs-precompiled/shellscript'),
-  shell: () => import('@shikijs/langs-precompiled/shellscript'),
-  zsh: () => import('@shikijs/langs-precompiled/shellscript'),
+  json: () => import('@shikijs/langs/json'),
+  yaml: () => import('@shikijs/langs/yaml'),
+  yml: () => import('@shikijs/langs/yaml'),
+  css: () => import('@shikijs/langs/css'),
+  javascript: () => import('@shikijs/langs/javascript'),
+  js: () => import('@shikijs/langs/javascript'),
+  typescript: () => import('@shikijs/langs/typescript'),
+  ts: () => import('@shikijs/langs/typescript'),
+  vue: () => import('@shikijs/langs/vue'),
+  'vue-html': () => import('@shikijs/langs/vue-html'),
+  html: () => import('@shikijs/langs/html'),
+  diff: () => import('@shikijs/langs/diff'),
+  shellscript: () => import('@shikijs/langs/shellscript'),
+  bash: () => import('@shikijs/langs/shellscript'),
+  sh: () => import('@shikijs/langs/shellscript'),
+  shell: () => import('@shikijs/langs/shellscript'),
+  zsh: () => import('@shikijs/langs/shellscript'),
 } as Record<BundledLanguage, DynamicImportLanguageRegistration>
 
 const bundledThemes = {
@@ -64,7 +64,7 @@ const createHighlighter = /* @__PURE__ */ createdBundledHighlighter<
 >({
   langs: bundledLanguages,
   themes: bundledThemes,
-  engine: () => createJavaScriptRawEngine(),
+  engine: () => createJavaScriptRegexEngine(),
 })
 
 const {

diff --git a/packages/devtools/scripts/prepare.ts b/packages/devtools/scripts/prepare.ts
@@ -23,8 +23,8 @@ const { code } = await codegen({
     'diff',
     'shellscript',
   ],
-  precompiled: true,
-  engine: 'javascript-raw',
+  precompiled: false,
+  engine: 'javascript',
   typescript: true,
   header: [
     '/* Generate by @shikijs/codegen */',