From 644fd14ba80810aea174b81a7169de5575910d68 Mon Sep 17 00:00:00 2001 From: George Cushen Date: Fri, 25 Jun 2021 00:00:30 +0100 Subject: [PATCH] feat: support Hugo 0.84.1 and full Go modules Remove webmanifest output spec as Hugo now has it built-in --- wowchemy-cms/functions/parse.html | 7 ++++--- wowchemy-cms/go.mod | 2 +- wowchemy/config.yaml | 22 ++++++++++++++++------ wowchemy/data/wowchemy.toml | 2 +- wowchemy/go.mod | 2 +- wowchemy/layouts/partials/site_head.html | 4 ++-- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/wowchemy-cms/functions/parse.html b/wowchemy-cms/functions/parse.html index c5adcdb3..53769c6a 100644 --- a/wowchemy-cms/functions/parse.html +++ b/wowchemy-cms/functions/parse.html @@ -10,10 +10,11 @@ {{ $return = merge $return $publish_mode }} {{ end }} -{{ if site.Params.cms.local_backend }} - {{ $local_backend := dict "local_backend" true }} - {{ $return = merge $return $local_backend }} +{{ $local_backend := false }} +{{ if site.Params.cms.local_backend | or (not hugo.IsProduction) }} + {{ $local_backend = true }} {{ end }} +{{ $return = merge $return (dict "local_backend" $local_backend) }} {{ $backend := dict "backend" $backend_opts }} {{ $return := merge $return $backend }} diff --git a/wowchemy-cms/go.mod b/wowchemy-cms/go.mod index 73993a61..a0429c19 100644 --- a/wowchemy-cms/go.mod +++ b/wowchemy-cms/go.mod @@ -1,3 +1,3 @@ -module github.com/wowchemy/wowchemy-hugo-modules/wowchemy-cms +module github.com/wowchemy/wowchemy-hugo-modules/wowchemy-cms/v5 go 1.15 diff --git a/wowchemy/config.yaml b/wowchemy/config.yaml index 165cb5c4..0353ed1f 100644 --- a/wowchemy/config.yaml +++ b/wowchemy/config.yaml @@ -1,13 +1,23 @@ +markup: + _merge: deep + defaultMarkdownHandler: goldmark + goldmark: + renderer: + unsafe: true + parser: + attribute: + block: true + title: true + highlight: + codeFences: false + tableOfContents: + startLevel: 2 + endLevel: 3 mediaTypes: - application/manifest+json: - suffixes: [webmanifest] text/netlify: delimiter: '' suffixes: [''] outputFormats: - WebAppManifest: - mediaType: application/manifest+json - rel: manifest headers: baseName: _headers isPlainText: true @@ -20,7 +30,7 @@ outputFormats: notAlternative: true module: hugoVersion: - min: '0.81.0' + min: '0.84.1' extended: true mounts: - source: content diff --git a/wowchemy/data/wowchemy.toml b/wowchemy/data/wowchemy.toml index 5aecf726..e78f334e 100644 --- a/wowchemy/data/wowchemy.toml +++ b/wowchemy/data/wowchemy.toml @@ -1,3 +1,3 @@ # Wowchemy -version = "5.2.0" +version = "5.3.0" diff --git a/wowchemy/go.mod b/wowchemy/go.mod index fe651bd3..949d165a 100644 --- a/wowchemy/go.mod +++ b/wowchemy/go.mod @@ -1,3 +1,3 @@ -module github.com/wowchemy/wowchemy-hugo-modules/wowchemy +module github.com/wowchemy/wowchemy-hugo-modules/wowchemy/v5 go 1.15 diff --git a/wowchemy/layouts/partials/site_head.html b/wowchemy/layouts/partials/site_head.html index 9d651dbe..d0f4b888 100644 --- a/wowchemy/layouts/partials/site_head.html +++ b/wowchemy/layouts/partials/site_head.html @@ -219,8 +219,8 @@ {{ end }} - {{ if site.Home.OutputFormats.Get "WebAppManifest" }} - + {{ with site.Home.OutputFormats.Get "WebAppManifest" }} + {{ end }}