Merge branch 'develop' into merge/2025-03-24

This commit is contained in:
Hazelnoot 2025-04-13 13:07:24 -04:00
commit 91fb75dece
11 changed files with 34 additions and 6 deletions

View file

@ -458,6 +458,7 @@ export class ClientServerService {
url: this.config.url,
title: this.meta.name ?? 'Sharkey',
desc: this.meta.description,
customHead: this.config.customHtml.head,
...await this.generateCommonPugData(this.meta),
...data,
});

View file

@ -45,6 +45,8 @@ html
link(rel='stylesheet' href=`/static-assets/fonts/sharkey-icons/style.css?version=${version}`)
link(rel='modulepreload' href=`/vite/${entry.file}`)
| !{customHead}
if !config.frontendManifestExists
script(type="module" src="/vite/@vite/client")