chore: bump deps (#3390)

package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0-rc.33",
   "description": "Vite & Vue powered static site generator",
   "type": "module",
-  "packageManager": "pnpm@8.12.1",
+  "packageManager": "pnpm@8.13.1",
   "main": "dist/node/index.js",
   "types": "types/index.d.ts",
   "exports": {
@@ -93,18 +93,19 @@
     "@docsearch/css": "^3.5.2",
     "@docsearch/js": "^3.5.2",
     "@types/markdown-it": "^13.0.7",
-    "@vitejs/plugin-vue": "^5.0.0",
+    "@vitejs/plugin-vue": "^5.0.2",
     "@vue/devtools-api": "^6.5.1",
-    "@vueuse/core": "^10.7.0",
+    "@vueuse/core": "^10.7.1",
-    "@vueuse/integrations": "^10.7.0",
+    "@vueuse/integrations": "^10.7.1",
     "focus-trap": "^7.5.4",
     "mark.js": "8.11.1",
     "minisearch": "^6.3.0",
     "mrmime": "^2.0.0",
-    "shikiji": "^0.9.12",
+    "shikiji": "^0.9.15",
-    "shikiji-transformers": "^0.9.12",
+    "shikiji-core": "^0.9.15",
+    "shikiji-transformers": "^0.9.15",
     "vite": "^5.0.10",
-    "vue": "^3.4.0-rc.2"
+    "vue": "^3.4.3"
   },
   "peerDependencies": {
     "markdown-it-mathjax3": "^4.3.2",
@@ -144,16 +145,16 @@
     "@types/markdown-it-emoji": "^2.0.4",
     "@types/micromatch": "^4.0.6",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^20.10.5",
+    "@types/node": "^20.10.6",
     "@types/postcss-prefix-selector": "^1.16.3",
     "@types/prompts": "^2.4.9",
-    "@vue/shared": "^3.3.13",
+    "@vue/shared": "^3.4.3",
     "chokidar": "^3.5.3",
     "compression": "^1.7.4",
     "conventional-changelog-cli": "^4.1.0",
     "cross-spawn": "^7.0.3",
     "debug": "^4.3.4",
-    "esbuild": "^0.19.10",
+    "esbuild": "^0.19.11",
     "escape-html": "^1.0.3",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
@@ -174,7 +175,7 @@
     "nanoid": "^5.0.4",
     "npm-run-all": "^4.1.5",
     "ora": "^8.0.1",
-    "p-map": "^7.0.0",
+    "p-map": "^7.0.1",
     "path-to-regexp": "^6.2.1",
     "picocolors": "^1.0.0",
     "pkg-dir": "^8.0.0",
@@ -185,18 +186,17 @@
     "prompts": "^2.4.2",
     "punycode": "^2.3.1",
     "rimraf": "^5.0.5",
-    "rollup": "^4.9.1",
+    "rollup": "^4.9.2",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.0",
     "semver": "^7.5.4",
-    "shikiji-core": "^0.9.12",
     "simple-git-hooks": "^2.9.0",
     "sirv": "^2.0.4",
     "sitemap": "^7.1.1",
     "supports-color": "^9.4.0",
     "typescript": "^5.3.3",
     "vitest": "^1.1.0",
-    "vue-tsc": "^1.8.26",
+    "vue-tsc": "^1.8.27",
     "wait-on": "^7.2.0"
   },
   "simple-git-hooks": {

src/node/markdown/markdown.ts

@@ -19,6 +19,13 @@ import anchorPlugin from 'markdown-it-anchor'
 import attrsPlugin from 'markdown-it-attrs'
 // @ts-ignore
 import { full as emojiPlugin } from 'markdown-it-emoji'
+import type {
+  BuiltinTheme,
+  Highlighter,
+  LanguageInput,
+  ShikijiTransformer,
+  ThemeRegistrationAny
+} from 'shikiji'
 import type { Logger } from 'vite'
 import { containerPlugin, type ContainerOptions } from './plugins/containers'
 import { highlight } from './plugins/highlight'
@@ -28,22 +35,15 @@ import { lineNumberPlugin } from './plugins/lineNumbers'
 import { linkPlugin } from './plugins/link'
 import { preWrapperPlugin } from './plugins/preWrapper'
 import { snippetPlugin } from './plugins/snippet'
-import type {
-  ThemeRegistration,
-  BuiltinTheme,
-  LanguageInput,
-  ShikijiTransformer,
-  Highlighter
-} from 'shikiji'
 
 export type { Header } from '../shared'
 
 export type ThemeOptions =
-  | ThemeRegistration
+  | ThemeRegistrationAny
   | BuiltinTheme
   | {
-      light: ThemeRegistration | BuiltinTheme
+      light: ThemeRegistrationAny | BuiltinTheme
-      dark: ThemeRegistration | BuiltinTheme
+      dark: ThemeRegistrationAny | BuiltinTheme
     }
 
 export interface MarkdownOptions extends MarkdownIt.Options {

src/node/markdown/plugins/highlight.ts

@@ -2,14 +2,12 @@ import { customAlphabet } from 'nanoid'
 import c from 'picocolors'
 import type { ShikijiTransformer } from 'shikiji'
 import {
+  addClassToHast,
   bundledLanguages,
   getHighlighter,
-  addClassToHast,
   isPlaintext as isPlainLang,
   isSpecialLang
 } from 'shikiji'
-import type { Logger } from 'vite'
-import type { MarkdownOptions, ThemeOptions } from '../markdown'
 import {
   transformerCompactLineOptions,
   transformerNotationDiff,
@@ -18,6 +16,8 @@ import {
   transformerNotationHighlight,
   type TransformerCompactLineOption
 } from 'shikiji-transformers'
+import type { Logger } from 'vite'
+import type { MarkdownOptions, ThemeOptions } from '../markdown'
 
 const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz', 10)
 
@@ -65,9 +65,9 @@ export async function highlight(
 
   const highlighter = await getHighlighter({
     themes:
-      typeof theme === 'string' || 'name' in theme
+      typeof theme === 'object' && 'light' in theme && 'dark' in theme
-        ? [theme]
+        ? [theme.light, theme.dark]
-        : [theme.light, theme.dark],
+        : [theme],
     langs: [...Object.keys(bundledLanguages), ...(options.languages || [])],
     langAlias: options.languageAlias
   })
@@ -169,15 +169,10 @@ export async function highlight(
         },
         ...userTransformers
       ],
-      meta: {
+      meta: { __raw: attrs },
-        __raw: attrs
+      ...(typeof theme === 'object' && 'light' in theme && 'dark' in theme
-      },
+        ? { themes: theme, defaultColor: false }
-      ...(typeof theme === 'string' || 'name' in theme
+        : { theme })
-        ? { theme }
-        : {
-            themes: theme,
-            defaultColor: false
-          })
     })
 
     return fillEmptyHighlightedLine(restoreMustache(highlighted))