diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-04-13 13:07:24 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-04-13 13:07:24 -0400 |
| commit | 91fb75dece86b757b68e3678e864c5361267fe26 (patch) | |
| tree | 63990da60c40b58d89d2a81215a6a5def7ebd8ab /packages/backend/src/server/web | |
| parent | Merge tag '2025.4.0' into merge/2025-03-24 (diff) | |
| parent | merge: feat: Allow injection of raw HTML strings inside <head> (!959) (diff) | |
| download | sharkey-91fb75dece86b757b68e3678e864c5361267fe26.tar.gz sharkey-91fb75dece86b757b68e3678e864c5361267fe26.tar.bz2 sharkey-91fb75dece86b757b68e3678e864c5361267fe26.zip | |
Merge branch 'develop' into merge/2025-03-24
Diffstat (limited to 'packages/backend/src/server/web')
| -rw-r--r-- | packages/backend/src/server/web/ClientServerService.ts | 1 | ||||
| -rw-r--r-- | packages/backend/src/server/web/views/base.pug | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index 99cc922281..34b69fd7b2 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -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, }); diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index f57dbbbf4e..f7b0377b22 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -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") |