From a3c6ea16a5b38d24ec076f693b8f3b04de94cd40 Mon Sep 17 00:00:00 2001 From: pengzhanbo Date: Wed, 29 May 2024 05:09:58 +0800 Subject: [PATCH] fix: build fail --- patches/@vuepress__markdown@2.0.0-rc.11.patch | 13 ------------- patches/@vuepress__markdown@2.0.0-rc.8.patch | 13 ------------- patches/@vuepress__markdown@2.0.0-rc.9.patch | 13 ------------- theme/src/client/composables/watermark.ts | 4 +++- theme/src/node/theme.ts | 1 + 5 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 patches/@vuepress__markdown@2.0.0-rc.11.patch delete mode 100644 patches/@vuepress__markdown@2.0.0-rc.8.patch delete mode 100644 patches/@vuepress__markdown@2.0.0-rc.9.patch diff --git a/patches/@vuepress__markdown@2.0.0-rc.11.patch b/patches/@vuepress__markdown@2.0.0-rc.11.patch deleted file mode 100644 index 2c22ffd1..00000000 --- a/patches/@vuepress__markdown@2.0.0-rc.11.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/dist/index.js b/dist/index.js -index 7bad660ca70fe8c5873cebd8d237cd2b4257deb9..2c2540df2f278f781e081ac56f038b1e332ec803 100644 ---- a/dist/index.js -+++ b/dist/index.js -@@ -267,7 +267,7 @@ var codePlugin = (md, { - const info = token.info ? md.utils.unescapeAll(token.info).trim() : ""; - const language = resolveLanguage(info); - const languageClass = `${options.langPrefix}${language.name}`; -- const code = options.highlight?.(token.content, language.name, "") || md.utils.escapeHtml(token.content); -+ const code = options.highlight?.(token.content, language.name, info || "") || md.utils.escapeHtml(token.content); - token.attrJoin("class", languageClass); - let result = code.startsWith("${code}`; - const useVPre = resolveVPre(info) ?? vPreBlock; diff --git a/patches/@vuepress__markdown@2.0.0-rc.8.patch b/patches/@vuepress__markdown@2.0.0-rc.8.patch deleted file mode 100644 index f4263ee7..00000000 --- a/patches/@vuepress__markdown@2.0.0-rc.8.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/dist/index.js b/dist/index.js -index 057c2897fdb1a01960724b83707a9c9d28205988..169e64c5e1d4b40aa48cdf07d0fb807e404f000e 100644 ---- a/dist/index.js -+++ b/dist/index.js -@@ -267,7 +267,7 @@ var codePlugin = (md, { - const info = token.info ? md.utils.unescapeAll(token.info).trim() : ""; - const language = resolveLanguage(info); - const languageClass = `${options.langPrefix}${language.name}`; -- const code = options.highlight?.(token.content, language.name, "") || md.utils.escapeHtml(token.content); -+ const code = options.highlight?.(token.content, language.name, info || "") || md.utils.escapeHtml(token.content); - token.attrJoin("class", languageClass); - let result = code.startsWith("${code}`; - const useVPre = resolveVPre(info) ?? vPreBlock; diff --git a/patches/@vuepress__markdown@2.0.0-rc.9.patch b/patches/@vuepress__markdown@2.0.0-rc.9.patch deleted file mode 100644 index f4263ee7..00000000 --- a/patches/@vuepress__markdown@2.0.0-rc.9.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/dist/index.js b/dist/index.js -index 057c2897fdb1a01960724b83707a9c9d28205988..169e64c5e1d4b40aa48cdf07d0fb807e404f000e 100644 ---- a/dist/index.js -+++ b/dist/index.js -@@ -267,7 +267,7 @@ var codePlugin = (md, { - const info = token.info ? md.utils.unescapeAll(token.info).trim() : ""; - const language = resolveLanguage(info); - const languageClass = `${options.langPrefix}${language.name}`; -- const code = options.highlight?.(token.content, language.name, "") || md.utils.escapeHtml(token.content); -+ const code = options.highlight?.(token.content, language.name, info || "") || md.utils.escapeHtml(token.content); - token.attrJoin("class", languageClass); - let result = code.startsWith("${code}`; - const useVPre = resolveVPre(info) ?? vPreBlock; diff --git a/theme/src/client/composables/watermark.ts b/theme/src/client/composables/watermark.ts index 681ef911..3011893f 100644 --- a/theme/src/client/composables/watermark.ts +++ b/theme/src/client/composables/watermark.ts @@ -5,13 +5,15 @@ import type { PlumeThemePageFrontmatter } from '../../shared/index.js' declare const __PLUME_WM_FP__: boolean +const FP = __PLUME_WM_FP__ + export function setupWatermark(): void { const frontmatter = usePageFrontmatter() defineWatermarkConfig(computed(() => { const disableFullPage = typeof frontmatter.value.watermark === 'object' && frontmatter.value.watermark.fullPage === false return { - parent: !__PLUME_WM_FP__ || disableFullPage ? '.plume-content' : 'body', + parent: !FP || disableFullPage ? '.plume-content' : 'body', } })) } diff --git a/theme/src/node/theme.ts b/theme/src/node/theme.ts index b9d3df97..d8791887 100644 --- a/theme/src/node/theme.ts +++ b/theme/src/node/theme.ts @@ -60,6 +60,7 @@ export function plumeTheme({ addViteSsrNoExternal(bundlerOptions, app, [ '@vuepress/helper', '@vuepress/plugin-reading-time', + '@vuepress/plugin-watermark', ]) },