From e337ab380fef307ed51e411f55fcca46cd392ef8 Mon Sep 17 00:00:00 2001 From: taskylizard <75871323+taskylizard@users.noreply.github.com> Date: Sun, 1 Sep 2024 15:12:33 +0000 Subject: [PATCH] fix: update to upstream vitepress Fixes WEB-25 --- docs/.vitepress/config.mts | 36 +++++--------- docs/.vitepress/constants.ts | 34 +++++++++++-- docs/.vitepress/hooks/meta.ts | 7 +++ docs/.vitepress/theme/Appearance.vue | 72 +++++++++++++++++++++++++++ package.json | 2 +- pnpm-lock.yaml | Bin 244512 -> 244281 bytes 6 files changed, 124 insertions(+), 27 deletions(-) create mode 100644 docs/.vitepress/theme/Appearance.vue diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts index 2143ae51a..fe5049258 100644 --- a/docs/.vitepress/config.mts +++ b/docs/.vitepress/config.mts @@ -1,3 +1,4 @@ +import { fileURLToPath } from 'node:url' import consola from 'consola' import UnoCSS from 'unocss/vite' import AutoImport from 'unplugin-auto-import/vite' @@ -8,6 +9,7 @@ import { commitRef, feedback, meta, + nav, search, sidebar, socialLinks @@ -58,6 +60,16 @@ export default defineConfig({ ssr: { noExternal: ['@fmhy/components'] }, + resolve: { + alias: [ + { + find: /^.*VPSwitchAppearance\.vue$/, + replacement: fileURLToPath( + new URL('./theme/Appearance.vue', import.meta.url) + ) + } + ] + }, optimizeDeps: { exclude: ['workbox-window'] }, plugins: [ OptimizeExclude(), @@ -121,29 +133,7 @@ export default defineConfig({ }, outline: 'deep', logo: '/fmhy.ico', - nav: [ - { text: '🔖 Glossary', link: 'https://rentry.org/The-Piracy-Glossary' }, - { text: '📑 Guides', link: 'https://rentry.co/fmhy-guides' }, - { - text: '💾 Backups', - link: 'https://github.com/fmhy/FMHY/wiki/Backups' - }, - { - text: '🪅 Ecosystem', - items: [ - { text: '💙 Feedback', link: '/feedback' }, - { text: '🌐 Search', link: '/posts/search' }, - { text: '🏞 Wallpapers', link: '/other/wallpapers' }, - { text: '📋 snowbin', link: 'https://pastes.fmhy.net' }, - { text: '🔍 SearXNG', link: 'https://searx.fmhy.net/' }, - { text: '🔍 Whoogle', link: 'https://whoogle.fmhy.net/' }, - { - text: '🔗 Bookmarks', - link: 'https://github.com/fmhy/bookmarks' - } - ] - } - ], + nav, sidebar, socialLinks } diff --git a/docs/.vitepress/constants.ts b/docs/.vitepress/constants.ts index e8e2eda05..b52cf9315 100644 --- a/docs/.vitepress/constants.ts +++ b/docs/.vitepress/constants.ts @@ -28,8 +28,9 @@ export const meta = { export const commitRef = process.env.CF_PAGES && process.env.CF_PAGES_COMMIT_SHA - ? `${process.env.CF_PAGES_COMMIT_SHA.slice(0, 8)}` + ? `${process.env.CF_PAGES_COMMIT_SHA.slice(0, 8)}` : 'dev' export const feedback = `Made with ❤` @@ -113,7 +114,10 @@ export const socialLinks: DefaultTheme.SocialLink[] = [ { icon: 'github', link: 'https://github.com/fmhy/FMHYEdit' }, { icon: 'discord', link: 'https://discord.gg/Stz6y6NgNg' }, { - icon: 'reddit', + ariaLabel: 'Reddit', + icon: { + svg: 'Reddit' + }, link: 'https://reddit.com/r/FREEMEDIAHECKYEAH' }, { @@ -125,6 +129,30 @@ export const socialLinks: DefaultTheme.SocialLink[] = [ } ] +export const nav: DefaultTheme.NavItem[] = [ + { text: '🔖 Glossary', link: 'https://rentry.org/The-Piracy-Glossary' }, + { text: '📑 Guides', link: 'https://rentry.co/fmhy-guides' }, + { + text: '💾 Backups', + link: 'https://github.com/fmhy/FMHY/wiki/Backups' + }, + { + text: '🪅 Ecosystem', + items: [ + { text: '💙 Feedback', link: '/feedback' }, + { text: '🌐 Search', link: '/posts/search' }, + { text: '🏞 Wallpapers', link: '/other/wallpapers' }, + { text: '📋 snowbin', link: 'https://pastes.fmhy.net' }, + { text: '🔍 SearXNG', link: 'https://searx.fmhy.net/' }, + { text: '🔍 Whoogle', link: 'https://whoogle.fmhy.net/' }, + { + text: '🔗 Bookmarks', + link: 'https://github.com/fmhy/bookmarks' + } + ] + } +] + export const sidebar: DefaultTheme.Sidebar | DefaultTheme.NavItemWithLink[] = [ { text: ' Beginners Guide', diff --git a/docs/.vitepress/hooks/meta.ts b/docs/.vitepress/hooks/meta.ts index b5f72c498..1269fdf74 100644 --- a/docs/.vitepress/hooks/meta.ts +++ b/docs/.vitepress/hooks/meta.ts @@ -20,6 +20,8 @@ export function generateMeta(context: TransformContext, hostname: string) { const head: HeadConfig[] = [] const { pageData } = context + if (pageData.isNotFound) return head + const url = `${hostname}/${pageData.relativePath.replace(/((^|\/)index)?\.md$/, '$2')}` head.push( @@ -30,6 +32,7 @@ export function generateMeta(context: TransformContext, hostname: string) { ['meta', { property: 'og:title', content: pageData.frontmatter.title }], ['meta', { name: 'twitter:title', content: pageData.frontmatter.title }] ) + if (pageData.frontmatter.description) { head.push( [ @@ -48,6 +51,7 @@ export function generateMeta(context: TransformContext, hostname: string) { ] ) } + if (pageData.frontmatter.image) { head.push([ 'meta', @@ -87,12 +91,14 @@ export function generateMeta(context: TransformContext, hostname: string) { ] ) } + if (pageData.frontmatter.tag) { head.push([ 'meta', { property: 'article:tag', content: pageData.frontmatter.tag } ]) } + if (pageData.frontmatter.date) { head.push([ 'meta', @@ -102,6 +108,7 @@ export function generateMeta(context: TransformContext, hostname: string) { } ]) } + if (pageData.lastUpdated && pageData.frontmatter.lastUpdated !== false) { head.push([ 'meta', diff --git a/docs/.vitepress/theme/Appearance.vue b/docs/.vitepress/theme/Appearance.vue new file mode 100644 index 000000000..d2a81f015 --- /dev/null +++ b/docs/.vitepress/theme/Appearance.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/package.json b/package.json index 04105b2aa..eefe54685 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "nprogress": "^0.2.0", "pathe": "^1.1.2", "unocss": "^0.58.9", - "vitepress": "npm:@taskylizard/vitepress@1.1.1", + "vitepress": "^1.3.4", "vue": "^3.4.38", "x-satori": "^0.1.5", "zod": "^3.23.8" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c9f276844b027dad31a0759394d63f60afe6afe9..618bf74127f04bee5e64b6a65628b0c2791254b0 100644 GIT binary patch delta 5737 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 F{tsC~W+?yw delta 5970 zcma)Ad$8PQb)S_SJ9g}AJ9eGej-BfOxpp?(l~&r9ONdvy+FfZ^(n_nnDC9t<8lwsiIPS0J*XrSqk0UfI3`EyM6KbaG-#X9BckBzfx8NmEl4TR(#?uPU=^ zG5GU$y&E|0y>Itv@HceY_K`iMH&^=n`}h28B?No=L$~otx!a6n5;HYciRsX+C@1WG zf#=nnGU0nA$x@<%W8g73$@XScB9m%Yx;efv!6Iy=Ysm)05#G=6W+->mvyR@MluUqwMJKkplo&!8_k?zkCEftq*iwNqnhM&h>R7X z@JxJ$QzlxVGd4V~*Bhm2a*!VPpe%~gb~S9!M#2?p8FPBa9p3&sZ}RqW3tsr?1%HnX z?%35bM{#uZc)SlkcB(d-6bmI3gJVuyRcIcgETWZ3S*0?kOX=8%I$s}XUMu~O4uk@s+IFZO4KO@=c0{irQCEY`K|%O^Qc11ysoN_nwYL6Ws%JdP`BM>mZgRb^({DEMG!{Dl{Rg>@96 zN7^nSh(@FiH`CE}LCWMaL`8yxnvv0HK8a0aHjH)01E)Ua8CC3CrK-;KpfsH8IFYcF zj!T2MNnx(SxG3q42H9zXWWCVSH+c(R-Si6xm+R3&qbyg_SuNG+O8K0|CO9ZE<%{iv z5zmTK0&S>~YAJ`qQ=8*5g<0Ftm1s|6O$Y5nW^NH7l8n-`FdKCymLx*<{M_#S+mqgt z|9sGAUIey#uYYyN#^L1^g5`!O-HAnsiZ&t`ylO-UZCGj=t~}v%v5a&|Jt6?B)>?yV zjBm+P#noL1iW(5@I3_%cHhWGcshWeCRsKPhZ`vs!DZB~Ppn?QT$U6oUWL*Hw3W@P z*-|@+*aMQ1YYmqTEc>x>(mVULTQ&@eX4Nb*k}FZ$ZjB->B^M?VR1%f7{B)usO(C1G z^WhR+(`T+0X&cF~TvY9G6c;jbXVQW@or6w(Mb)?G`z*HQyYe47XBgUbhM8bla0|rbtQ=j%tvk3bo*An!&vER4$a3k*UVLmsTfAjG_qA0 zU_*i_44Y$_uXejt6HB5*xhUuIsX|J{CuF`B-wL?k|7Zg4yJjsd>Ww$x=n4KkD@C zJU=MM_;HEWlqps%B5FQg#Wf*rka*_xv>MorY4tBW7dfzQYAUf zh_0IF(rqT!30Jzf*sU^SHxFy#xIp)&16{9@tx2mF3D+XH)rqs--scJ%r{~aGtSiK3 zok=EBGzQI%j>TgF#lbL5V&RIVIt4ch4Ml@X%T`zHy8YgeACOT|x2pWvYd>q-?>NPQ$p|$+A{9ZMhQ& z%6GAgHFgu)KIa2C3^*+@x(H5p~rI8V5 zDrIb}G^A8}#+HSN6)BM!rt3_T?D^&APl1QtywdRQdGNNXU8_`Bovh4AK`$|!sy9i# z&EYi9##u^EP1LD29wQ9bwiF7V70te5!!4XLGSNQG!*Qb(%gI%A91#&M8y3dF^}+P3 z{u{l}A%8&uZt|yX;8Fhv-vsY3Uy00AxKha5Tvv)mcroQY`uLIaOBY`RLUAv&aI4_PJH?qJ)=eVcONYbK zERS^!dl(lpy26RQp%o_JWS4Z3{b7x-XL({Ku@iGP!!fGUSG!GNHmUN%BEk;y!>nG) zsH9UKPQ816c6=Qm))=J(q$`t>ifg)M6g4f}=`~^;FHFtKc$^c1XtHNSuO$t}a)u9^ z94WD45N1i(nwcy->Q)lC37d_kQgKbBfs`WB9N^IIald6s;+aHHMy?sdMRLqYB!zIl zZ%;e4=IC)Lncz4Xm$H=5uNA^7Ggb>#b2<#1RH~EF8jL1lj60f!JMCs)8rE1hsK*LI zF{njywg%6P%=G-{e*Rg&Gv2w>XlYyn8nQByj&$saC~G2bQYcMzosO1NV=*a@77|n` zlHq0v#+((p17l+MP{+(*7}ajmVR2GVOI9{JZPrrRdaX9ZR4d4Gcl-M<1BboQs~_4n zFIVT)p5P$kEK13vM41fh9Rn%UljTwwYXy~ITB&5Y$h1{VCPWwNv3S@Z)mAIl??l9= z&?Vh4QEj+9CFJc(z-kTx`RnGpTe1j7idNj+IAdaa3u#Xkrj<8U>YbofeNIOGqp^%NBUG)12oW zcImix$ED-}bhWl#TolcgZJ%De3tC3J`!C%ZxW<#0PK6Nf+n4IW^M#cY=PR$h653Sk ztjyLEN?b{bLX9>QV@4xVxrP)+!wkzHO{!P7F-jB(JBegQcE=oJ-MUf;liFm^m~q&2 z9GR7PmPz)Ia(fzXi-abOP%XIl@7@(Cv~(tD2JEpES@$1!twmTmy{c@`y=dODceL7_ z(Hc?54W!(y!zF~4>Aoef)e2`BjVWo7y)dSyOv3Hh3el_;c)3`ajqRby$Wby(o1Co# zIuuf2q?fOB8>LzWuT|mm?bjdthfv&q1OiUg2mPEn5OJxR9Ms*8P?#l9u`fIQh!|Y& z9Vm%&3gk>Ripm>08ZJ$^N~SmHw8L)Rs9AkMliA`VQ*j7h=_6$*$+#ll$OKmUU+2KX z{!t-x^U7!bKD474Tr>W?M?*{1n3=#E6_(JZg>ey;_$Jgy!iL_o1DBzyc0)2oqsEA% z6j+`1#Zi0EFs#^c>UQIHVmf17vKJ6C9Aybyk+BMC8gmn-_jmPUE8Je-+JzA0!%Lwh zK~kkmN$uqANm=A=i?mC#YQB2g}gF)`kpC}MQl!wpypO2W~!W2O6KQKIrSt0vSL z0(VDBr^FeZUb&)~Ts$qf%!pn2)-hmPdfuLS`;WY>nwf?ZZV74TQxUp}VaZH5$+p?% zh>M~5sX@5m8bzROgzSk8a#9bgvs8LW)(tt&D%pCa&XrSU8NyJj-5GEcBj80_5g0Fh z%VBTn;$i>K{}A|~kGu!C=$Bi-$Uocx_V~bo(5=;~ZK!gpfu}0tn#4&BqZn-|St8bO zJA*WjLuRxhr{e=EZQ1n+%~NzbLzYOqPS;!bEQR738u}x?}z<1u} ze~=IDncp?X{XcpYxYmD{2<%zeAp-YTf43I<&wlsD*ni_S;Kr3_KM%ZiblbcG_V<4* zKwbVOaD)G)9{_vSXy={>THDt;WdFjy0tZ(<^l!j}z!m(u3vTz{|Lx#l8s7o#T7BW| zf99b7jqd;l<{tN@r-5VMd;an8j`db@gYa8D=9U+`)(X5;nt$fIz(HTP!EOH6UI2D) z2;C$v{1$J}sr&}p6}`(9GM{-7xPFVcedb`?nZ(hz_f&he!rWw@mw}s$)uMN!(%wp) zm%^)*z~(DU)lHgr_p_Urt30JCxW$5%mw?R&txLPy@b9@;W_Vg2hr1|0KGJ`O5iu-W$?2j8;#@P)_0TSBn^{l~$Z z7og?XZ%$+;uipo}&Hw2|;H|5)mFIo{ zJapYvLE8Uj+{A33-SB_o^Tz@+fYl733OKUy z{L^0nw}g`Zk1qq}1}XTM5&u)K1=Bl{1FqZp(ZBmEU}1xAzIAuKl@{k=_=8~kHa z@Zc58AWa-tUtSL$S-E=(Dm(mEHqdDMS@7U$EWh*;aP!JL&VqLx4&vwH`@rM=*>3@d zSCjcQt0PYT_P+s-uDtPA;D26a0PElSF!+u)4}tk?)<5?!c=MVPK^PqHfASMxw;y>K z*t>H1VeqM|$-FZBTK)r%fc4}5|1@?@_wRi%xc+uN6(GQmf{}FtN~Z&>#HWB8{f8a} zOKYn9_oEb4LL1;_zCdD#tQbI`UH5#4M=J|#jOpOf9P$3}5$uFb>Ro