diff --git a/scripts/view-starter-dev.sh b/scripts/view-starter-dev.sh index 271ec3ab..c057f955 100755 --- a/scripts/view-starter-dev.sh +++ b/scripts/view-starter-dev.sh @@ -2,5 +2,5 @@ HUGOxPARAMSxCMSxLOCAL_BACKEND=true \ HUGO_MODULE_REPLACEMENTS="github.com/wowchemy/wowchemy-hugo-modules/wowchemy/v5 -> ../../../wowchemy,github.com/wowchemy/wowchemy-hugo-modules/wowchemy-cms/v5 -> ../../../wowchemy-cms" \ -hugo server --renderStaticToDisk -F --port 80 --bind 0.0.0.0 \ +hugo server --panicOnWarning --renderStaticToDisk -F --port 80 --bind 0.0.0.0 \ --source "starters/$1" diff --git a/scripts/view-starter.sh b/scripts/view-starter.sh index f4ba8f4d..2021dfc3 100755 --- a/scripts/view-starter.sh +++ b/scripts/view-starter.sh @@ -1,5 +1,5 @@ #!/usr/bin/env zsh HUGOxPARAMSxCMSxLOCAL_BACKEND=true \ -hugo server --renderStaticToDisk -F --port 80 --bind 0.0.0.0 \ +hugo server --panicOnWarning --renderStaticToDisk -F --port 80 --bind 0.0.0.0 \ --source "starters/$1" diff --git a/starters/markdown-slides/config/_default/config.yaml b/starters/markdown-slides/config/_default/config.yaml index e7eae444..f92d7f2e 100644 --- a/starters/markdown-slides/config/_default/config.yaml +++ b/starters/markdown-slides/config/_default/config.yaml @@ -52,9 +52,6 @@ taxonomies: category: categories markup: merge: _deep - highlight: - # See https://github.com/wowchemy/wowchemy-hugo-themes/issues/2708 - codeFences: false related: threshold: 80 includeNewer: true diff --git a/wowchemy/layouts/partials/site_head.html b/wowchemy/layouts/partials/site_head.html index 9400df79..a5fe5cbe 100644 --- a/wowchemy/layouts/partials/site_head.html +++ b/wowchemy/layouts/partials/site_head.html @@ -37,16 +37,6 @@ {{- end -}} - {{ with site.Params.marketing.verification.google }} - - {{- end -}} - {{ with site.Params.marketing.verification.baidu }} - - {{- end -}} - {{ with site.Params.marketing.verification.bing }} - - {{- end -}} - {{/* Attempt to load superuser. */}} {{ $superuser_name := "" }} {{ $superuser_username := "" }} @@ -147,21 +137,6 @@ {{ printf "" (printf $css.fancybox.url $css.fancybox.version) $css.fancybox.sri | safeHTML }} {{ end }} - {{/* Default to disabling highlighting, but allow the user to override it in .Params or site.Params. - Use $scr to store "highlight_enabled", so that we can read it again in footer.html. */}} - {{ $scr.Set "highlight_enabled" false }} - {{ if isset .Params "highlight" }} - {{ $scr.Set "highlight_enabled" .Params.highlight }} - {{ else if isset site.Params.features.syntax_highlighter "enable" }} - {{ $scr.Set "highlight_enabled" site.Params.features.syntax_highlighter.enable }} - {{ end }} - {{ $hl_theme_light := site.Params.features.syntax_highlighter.theme_day | default "github-light" }} - {{ $hl_theme_dark := site.Params.features.syntax_highlighter.theme_night | default "dracula" }} - {{ $hl_theme_light_css := resources.Get (printf "css/libs/chroma/%s.css" $hl_theme_light) | minify }} - {{ $hl_theme_dark_css := resources.Get (printf "css/libs/chroma/%s.css" $hl_theme_dark) | minify }} - - - {{/* Maps CSS. */}} {{ $map_provider := lower site.Params.features.map.provider }} {{ if in (slice "mapnik" "mapbox") $map_provider }} @@ -188,6 +163,7 @@ {{ end }} {{ end }} + {{/* Load WC style */}} {{ $license := printf "/*! Wowchemy v%s | https://wowchemy.com/ */\n" site.Data.wowchemy.version }} {{ $license := $license | printf "%s/*! Copyright 2016-present George Cushen (https://georgecushen.com/) */\n" }} {{ $license := $license | printf "%s/*! License: https://github.com/wowchemy/wowchemy-hugo-themes/blob/main/LICENSE.md */\n" }} @@ -214,25 +190,53 @@ {{- end -}} + {{/* Hugo Chroma Syntax Highlighter Initialization */}} + {{/* TODO: optimize to only include the Chroma CSS themes when the page has code blocks. */}} + {{ $hl_theme_light := site.Params.features.syntax_highlighter.theme_light | default "github-light" }} + {{ $hl_theme_dark := site.Params.features.syntax_highlighter.theme_dark | default "dracula" }} + {{ $hl_theme_light_path := printf "css/libs/chroma/%s.css" $hl_theme_light }} + {{ $hl_theme_dark_path := printf "css/libs/chroma/%s.css" $hl_theme_dark }} + {{ if not (fileExists (printf "assets/%s" $hl_theme_light_path)) | or (not (fileExists (printf "assets/%s" $hl_theme_dark_path))) }} + {{ errorf "Hugo Chroma themes %s.css and %s.css not found in `css/libs/chroma/`. See https://gohugo.io/commands/hugo_gen_chromastyles/" $hl_theme_light $hl_theme_dark }} + {{ else }} + {{ $hl_theme_light_css := resources.Get $hl_theme_light_path | minify }} + {{ $hl_theme_dark_css := resources.Get $hl_theme_dark_path | minify }} + + + {{ end }} + + {{/* Marketing */}} + {{ with site.Params.marketing.verification.google }} + + {{- end -}} + {{ with site.Params.marketing.verification.baidu }} + + {{- end -}} + {{ with site.Params.marketing.verification.bing }} + + {{- end -}} {{ partial "marketing/google_analytics" . }} {{ partial "marketing/google_tag_manager" . }} {{ partial "marketing/microsoft_clarity" . }} {{ partial "marketing/baidu_tongji" . }} {{/* Netlify Identity integration. */}} - {{ $use_cms := templates.Exists "wowchemycms/single.wowchemycms_config.yml" | default (site.Params.extensions.cms.netlify_cms | default false) }} + {{ $use_cms := templates.Exists "wowchemycms/single.wowchemycms_config.yml" | default (site.Params.extensions.cms.enable | default false) }} {{ if .IsHome | and $use_cms }} {{ end }} + {{/* RSS Feed */}} {{ with .OutputFormats.Get "RSS" }} {{ end }} + {{/* Progressive Web App (PWA) Manifest */}} {{ with site.Home.OutputFormats.Get "WebAppManifest" }} {{ end }} + {{/* Progressive Web App (PWA) Icon */}} diff --git a/wowchemy/layouts/slides/baseof.html b/wowchemy/layouts/slides/baseof.html index 1ffae172..e5c86bcc 100644 --- a/wowchemy/layouts/slides/baseof.html +++ b/wowchemy/layouts/slides/baseof.html @@ -2,7 +2,7 @@ - {{ $cdn_url_reveal := "https://cdn.jsdelivr.net/npm/reveal.js@4.2.1" }} + {{ $cdn_url_reveal := "https://cdn.jsdelivr.net/npm/reveal.js@4.3.1" }} {{ $js := site.Data.assets.js }} {{ $css := site.Data.assets.css }} @@ -22,14 +22,22 @@ {{ .Title }} | {{ site.Title }} + {{/* Load Reveal CSS */}} {{- $theme := $.Param "slides.theme" | default "black" -}} + {{/* Hugo Chroma Syntax Highlighter Initialization */}} {{ $hl_theme := $.Param "slides.highlight_style" | default "dracula" }} - {{ $hl_theme_css := resources.Get (printf "css/libs/chroma/%s.css" $hl_theme) | minify }} - + {{ $hl_theme_path := printf "css/libs/chroma/%s.css" $hl_theme }} + {{ if not (fileExists (printf "assets/%s" $hl_theme_path)) }} + {{ errorf "Hugo Chroma themes %s.css not found in `css/libs/chroma/`. See https://gohugo.io/commands/hugo_gen_chromastyles/" $hl_theme }} + {{ else }} + {{ $hl_theme_css := resources.Get $hl_theme_path | minify }} + + {{ end }} + {{/* Load any Reveal CSS customizations */}} {{ $css_custom := resources.Get "css/reveal_custom.css" }} {{ $style := slice $css_custom | resources.Concat "css/reveal_custom.css" | resources.Minify }} @@ -38,6 +46,7 @@ {{ block "main" . }}{{ end }} + {{/* Load Reveal and built-in plugins. */}} @@ -45,17 +54,19 @@ - {{/* Third-party Reveal plugins. */}} + {{/* Load third-party Reveal plugins. */}} {{ if $.Param "slides.reveal_options.menu_enabled" | default true}} {{ end }} + {{/* Load Mermaid. */}} {{ if $.Param "slides.diagram" | default false}} {{ printf "" (printf $js.mermaid.url $js.mermaid.version) $js.mermaid.sri | safeHTML }} {{ end }} + {{/* Initialize slides. */}} {{ $slidejs := resources.Get "js/wowchemy-slides.js" | js.Build (dict "params" (dict "slides" $.Params.slides )) }}