chore: update

pull/3237/head
Anthony Fu 2 years ago
parent 6f41ab210f
commit dedd9cfdd9

@ -14,24 +14,11 @@ export default defineConfig({
markdown: { markdown: {
math: true, math: true,
transformers: [ shikijiTransformers: [
// We use `[!!code` in demo to prevent transformation, here we revert it back. // We use `[!!code` in demo to prevent transformation, here we revert it back.
{ {
code(code) { postprocess(code) {
for (const line of code.children) { return code.replace(/\[\!\!code/g, '[!!code')
if (line.type !== 'element') continue
for (const token of line.children) {
if (
token.type === 'element' &&
token.children[0].type === 'text'
) {
token.children[0].value = token.children[0].value.replace(
'[!!code',
'[!code'
)
}
}
}
} }
} }
] ]

@ -101,8 +101,8 @@
"mark.js": "8.11.1", "mark.js": "8.11.1",
"minisearch": "^6.2.0", "minisearch": "^6.2.0",
"mrmime": "^1.0.1", "mrmime": "^1.0.1",
"shikiji": "^0.7.0-beta.1", "shikiji": "^0.7.0",
"shikiji-transformers": "^0.7.0-beta.1", "shikiji-transformers": "^0.7.0",
"vite": "^5.0.0", "vite": "^5.0.0",
"vue": "^3.3.8" "vue": "^3.3.8"
}, },

@ -45,11 +45,11 @@ importers:
specifier: ^1.0.1 specifier: ^1.0.1
version: 1.0.1 version: 1.0.1
shikiji: shikiji:
specifier: ^0.7.0-beta.1 specifier: ^0.7.0
version: 0.7.0-beta.1 version: 0.7.0
shikiji-transformers: shikiji-transformers:
specifier: ^0.7.0-beta.1 specifier: ^0.7.0
version: 0.7.0-beta.1 version: 0.7.0
vite: vite:
specifier: ^5.0.0 specifier: ^5.0.0
version: 5.0.0(@types/node@20.9.1) version: 5.0.0(@types/node@20.9.1)
@ -4163,14 +4163,14 @@ packages:
resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==} resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
dev: true dev: true
/shikiji-transformers@0.7.0-beta.1: /shikiji-transformers@0.7.0:
resolution: {integrity: sha512-WW2sKb9MxYCa4gxixUuRB1WMbv7VJT0/dCkWP3FtwWplhhaMq2o5zkreumnTgWWPpW1d2QuNXZ923zG0XThMPw==} resolution: {integrity: sha512-IuujhNtUjs6kyNRjrn36k5Aj/Ea7JZpoB5YaM7rqkK+sM6MdIQBcZDAOhvoD/ITgFht4bcamGXvZ8+Aw1j7VZQ==}
dependencies: dependencies:
shikiji: 0.7.0-beta.1 shikiji: 0.7.0
dev: false dev: false
/shikiji@0.7.0-beta.1: /shikiji@0.7.0:
resolution: {integrity: sha512-/Kbrv6dTjeztqeS4BeGlLddot/U9bM60N8ovpVjx521Qzqet/h9/sKTSuz/tKPj5omffwGy14LFz0/fnxB33iA==} resolution: {integrity: sha512-Tzx9pS9ixMVNsfZjeOoJWR3t3Vw054LU/r2euAGSRJPg8/v1sumxZsZQrajai2jpksn0qT3HJXcqzNaiJcJSag==}
dependencies: dependencies:
hast-util-to-html: 9.0.0 hast-util-to-html: 9.0.0
dev: false dev: false

@ -67,7 +67,7 @@ export interface MarkdownOptions extends MarkdownIt.Options {
component?: ComponentPluginOptions component?: ComponentPluginOptions
math?: boolean | any math?: boolean | any
container?: ContainerOptions container?: ContainerOptions
transformers?: ShikijiTransformer[] shikijiTransformers?: ShikijiTransformer[]
} }
export type MarkdownRenderer = MarkdownIt export type MarkdownRenderer = MarkdownIt
@ -91,7 +91,7 @@ export const createMarkdownRenderer = async (
options.languages, options.languages,
options.defaultHighlightLang, options.defaultHighlightLang,
logger, logger,
options.transformers options.shikijiTransformers
)), )),
...options ...options
}) })

@ -5,7 +5,8 @@ import {
bundledLanguages, bundledLanguages,
getHighlighter, getHighlighter,
addClassToHast, addClassToHast,
isPlaintext as isPlainLang isPlaintext as isPlainLang,
isSpecialLang
} from 'shikiji' } from 'shikiji'
import type { Logger } from 'vite' import type { Logger } from 'vite'
import type { ThemeOptions } from '../markdown' import type { ThemeOptions } from '../markdown'
@ -100,7 +101,7 @@ export async function highlight(
if (lang) { if (lang) {
const langLoaded = highlighter.getLoadedLanguages().includes(lang as any) const langLoaded = highlighter.getLoadedLanguages().includes(lang as any)
if (!langLoaded && !isPlainLang(lang) && lang !== 'ansi') { if (!langLoaded && !isPlainLang(lang) && !isSpecialLang(lang)) {
logger.warn( logger.warn(
c.yellow( c.yellow(
`\nThe language '${lang}' is not loaded, falling back to '${ `\nThe language '${lang}' is not loaded, falling back to '${

Loading…
Cancel
Save