feat: update deps and themes, close #810

shikijs · Oct 24, 2024 · 2b51398 · 2b51398
1 parent b8471aa
commit 2b51398
Show file tree

Hide file tree

Showing 5 changed files with 876 additions and 780 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "type": "module",
   "version": "1.22.0",
   "private": true,
-  "packageManager": "pnpm@9.11.0",
+  "packageManager": "pnpm@9.12.2",
   "scripts": {
     "lint": "eslint . --cache",
     "release": "bumpp",
@@ -37,7 +37,7 @@
     "@vitest/coverage-v8": "catalog:",
     "ansi-sequence-parser": "catalog:",
     "bumpp": "catalog:",
-    "diff-match-patch-es": "^0.1.0",
+    "diff-match-patch-es": "^0.1.1",
     "eslint": "catalog:",
     "eslint-plugin-format": "catalog:",
     "esno": "catalog:",

diff --git a/packages/shiki/scripts/prepare/langs.ts b/packages/shiki/scripts/prepare/langs.ts
@@ -95,18 +95,18 @@ export async function prepareLangs() {
     if (deps.length > 10)
       console.log(json.name, json.embeddedLangs)
 
+    const depsStr = [
+      ...deps.map(i => `...${i.replace(/\W/g, '_')}`),
+      'lang',
+    ].join(',\n') || ''
+
     await fs.writeFile(
       `./src/langs/${lang.name}.mjs`,
       `${deps.map(i => `import ${i.replace(/\W/g, '_')} from './${i}.mjs'`).join('\n')}
 
 const lang = Object.freeze(JSON.parse(${JSON.stringify(JSON.stringify(json))}))
 
-export default [
-${[
-    ...deps.map(i => `  ...${i.replace(/\W/g, '_')}`),
-    '  lang',
-  ].join(',\n') || ''}
-]
+export default [\n${depsStr}\n]
 `.replace(/\n{2,}/g, '\n\n').trimStart(),
       'utf-8',
     )

diff --git a/packages/shiki/src/themes.ts b/packages/shiki/src/themes.ts
@@ -122,6 +122,24 @@ export const bundledThemesInfo: BundledThemeInfo[] = [
     "type": "dark",
     "import": (() => import('./themes/houston.mjs')) as unknown as DynamicImportThemeRegistration
   },
+  {
+    "id": "kanagawa-dragon",
+    "displayName": "Kanagawa Dragon",
+    "type": "dark",
+    "import": (() => import('./themes/kanagawa-dragon.mjs')) as unknown as DynamicImportThemeRegistration
+  },
+  {
+    "id": "kanagawa-lotus",
+    "displayName": "Kanagawa Lotus",
+    "type": "light",
+    "import": (() => import('./themes/kanagawa-lotus.mjs')) as unknown as DynamicImportThemeRegistration
+  },
+  {
+    "id": "kanagawa-wave",
+    "displayName": "Kanagawa Wave",
+    "type": "dark",
+    "import": (() => import('./themes/kanagawa-wave.mjs')) as unknown as DynamicImportThemeRegistration
+  },
   {
     "id": "laserwave",
     "displayName": "LaserWave",
@@ -331,6 +349,9 @@ export type BundledTheme =
   | 'github-light-default'
   | 'github-light-high-contrast'
   | 'houston'
+  | 'kanagawa-dragon'
+  | 'kanagawa-lotus'
+  | 'kanagawa-wave'
   | 'laserwave'
   | 'light-plus'
   | 'material-theme'