/
+ await options?.shikijiSetup?.(highlighter)
+
+ const transformers: ShikijiTransformer[] = [
+ transformerNotationDiff(),
+ transformerNotationFocus({
+ classActiveLine: 'has-focus',
+ classActivePre: 'has-focused-lines'
+ }),
+ transformerNotationHighlight(),
+ transformerNotationErrorLevel(),
+ {
+ name: 'vitepress:add-class',
+ pre(node) {
+ addClassToHast(node, 'vp-code')
+ }
+ },
+ {
+ name: 'vitepress:clean-up',
+ pre(node) {
+ delete node.properties.tabindex
+ delete node.properties.style
+ }
+ }
+ ]
+
const vueRE = /-vue$/
const lineNoStartRE = /=(\d*)/
const lineNoRE = /:(no-)?line-numbers(=\d*)?$/
@@ -102,7 +113,7 @@ export async function highlight(
if (lang) {
const langLoaded = highlighter.getLoadedLanguages().includes(lang as any)
- if (!langLoaded && !['ansi', 'plaintext', 'txt', 'text'].includes(lang)) {
+ if (!langLoaded && !isPlainLang(lang) && !isSpecialLang(lang)) {
logger.warn(
c.yellow(
`\nThe language '${lang}' is not loaded, falling back to '${
@@ -115,16 +126,6 @@ export async function highlight(
}
const lineOptions = attrsToLines(attrs)
- const cleanup = (str: string) => {
- return str
- .replace(
- preRE,
- (_, attributes) =>
- ``
- )
- .replace(styleRE, (_, style) => _.replace(style, ''))
- }
-
const mustaches = new Map()
const removeMustache = (s: string) => {
@@ -155,24 +156,30 @@ export async function highlight(
str = removeMustache(str).trimEnd()
- const codeToHtml = (theme: IThemeRegistration) => {
- const res =
- lang === 'ansi'
- ? highlighter.ansiToHtml(str, {
- lineOptions,
- theme: getThemeName(theme)
- })
- : highlighter.codeToHtml(str, {
- lang,
- lineOptions,
- theme: getThemeName(theme)
- })
- return fillEmptyHighlightedLine(cleanup(restoreMustache(res)))
- }
+ const highlighted = highlighter.codeToHtml(str, {
+ lang,
+ transformers: [
+ ...transformers,
+ transformerCompactLineOptions(lineOptions),
+ {
+ name: 'vitepress:v-pre',
+ pre(node) {
+ if (vPre) node.properties['v-pre'] = ''
+ }
+ },
+ ...userTransformers
+ ],
+ meta: {
+ __raw: attrs
+ },
+ ...(typeof theme === 'string' || 'name' in theme
+ ? { theme }
+ : {
+ themes: theme,
+ defaultColor: false
+ })
+ })
- if (hasSingleTheme) return codeToHtml(theme)
- const dark = addClass(codeToHtml(theme.dark), 'vp-code-dark', 'pre')
- const light = addClass(codeToHtml(theme.light), 'vp-code-light', 'pre')
- return dark + light
+ return fillEmptyHighlightedLine(restoreMustache(highlighted))
}
}
diff --git a/src/node/plugin.ts b/src/node/plugin.ts
index 6cfc02f6..c079dad6 100644
--- a/src/node/plugin.ts
+++ b/src/node/plugin.ts
@@ -152,7 +152,8 @@ export async function createVitePressPlugin(
site.themeConfig?.search?.provider === 'algolia' ||
!!site.themeConfig?.algolia, // legacy
__CARBON__: !!site.themeConfig?.carbonAds,
- __ASSETS_DIR__: JSON.stringify(siteConfig.assetsDir)
+ __ASSETS_DIR__: JSON.stringify(siteConfig.assetsDir),
+ __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: !!process.env.DEBUG
},
optimizeDeps: {
// force include vue to avoid duplicated copies when linked + optimized
diff --git a/src/node/plugins/dynamicRoutesPlugin.ts b/src/node/plugins/dynamicRoutesPlugin.ts
index 2807d3ff..e42e8c13 100644
--- a/src/node/plugins/dynamicRoutesPlugin.ts
+++ b/src/node/plugins/dynamicRoutesPlugin.ts
@@ -119,7 +119,7 @@ export const dynamicRoutesPlugin = async (
// inject raw content
// this is intended for integration with CMS
- // we use a speical injection syntax so the content is rendered as
+ // we use a special injection syntax so the content is rendered as
// static local content instead of included as runtime data.
if (content) {
baseContent = baseContent.replace(//, content)
diff --git a/src/node/siteConfig.ts b/src/node/siteConfig.ts
index 56c0592c..74174280 100644
--- a/src/node/siteConfig.ts
+++ b/src/node/siteConfig.ts
@@ -147,6 +147,15 @@ export interface UserConfig
*/
useWebFonts?: boolean
+ /**
+ * This option allows you to configure the concurrency of the build.
+ * A lower number will reduce the memory usage but will increase the build time.
+ *
+ * @experimental
+ * @default 64
+ */
+ buildConcurrency?: number
+
/**
* @experimental
*
@@ -240,4 +249,5 @@ export interface SiteConfig
}
logger: Logger
userConfig: UserConfig
+ buildConcurrency: number
}
diff --git a/src/shared/shared.ts b/src/shared/shared.ts
index c69f7277..9dd05e34 100644
--- a/src/shared/shared.ts
+++ b/src/shared/shared.ts
@@ -113,6 +113,10 @@ export function createTitle(siteData: SiteData, pageData: PageData): string {
const templateString = createTitleTemplate(siteData.title, template)
+ if (title === templateString.slice(3)) {
+ return title
+ }
+
return `${title}${templateString}`
}
diff --git a/template/markdown-examples.md b/template/markdown-examples.md
index 8e55eb8a..3ea9aa9f 100644
--- a/template/markdown-examples.md
+++ b/template/markdown-examples.md
@@ -4,11 +4,11 @@ This page demonstrates some of the built-in markdown extensions provided by Vite
## Syntax Highlighting
-VitePress provides Syntax Highlighting powered by [Shiki](https://github.com/shikijs/shiki), with additional features like line-highlighting:
+VitePress provides Syntax Highlighting powered by [Shikiji](https://github.com/antfu/shikiji), with additional features like line-highlighting:
**Input**
-````
+````md
```js{4}
export default {
data () {
diff --git a/tsconfig.json b/tsconfig.json
index b780a0df..a69d45e8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,5 +12,12 @@
"jsx": "preserve",
"lib": ["esnext", "dom", "dom.iterable"]
},
- "exclude": ["**/node_modules/**", "**/dist/**", "template"]
+ "exclude": [
+ "**/node_modules/**",
+ "**/dist/**",
+ "template",
+ "bin",
+ "docs/snippets",
+ "scripts"
+ ]
}
diff --git a/types/default-theme.d.ts b/types/default-theme.d.ts
index 94dfb95c..c89551b0 100644
--- a/types/default-theme.d.ts
+++ b/types/default-theme.d.ts
@@ -345,6 +345,7 @@ export namespace DefaultTheme {
desc?: string
links?: SocialLink[]
sponsor?: string
+ actionText?: string
}
// outline -------------------------------------------------------------------