mirror of
https://github.com/gohugoio/hugo.git
synced 2025-04-26 13:40:38 +03:00

This more or less completes the simplification of the template handling code in Hugo started in v0.62. The main motivation was to fix a long lasting issue about a crash in HTML content files without front matter. But this commit also comes with a big functional improvement. As we now have moved the base template evaluation to the build stage we now use the same lookup rules for `baseof` as for `list` etc. type of templates. This means that in this simple example you can have a `baseof` template for the `blog` section without having to duplicate the others: ``` layouts ├── _default │ ├── baseof.html │ ├── list.html │ └── single.html └── blog └── baseof.html ``` Also, when simplifying code, you often get rid of some double work, as shown in the "site building" benchmarks below. These benchmarks looks suspiciously good, but I have repeated the below with ca. the same result. Compared to master: ``` name old time/op new time/op delta SiteNew/Bundle_with_image-16 13.1ms ± 1% 10.5ms ± 1% -19.34% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 13.0ms ± 0% 10.7ms ± 1% -18.05% (p=0.029 n=4+4) SiteNew/Tags_and_categories-16 46.4ms ± 2% 43.1ms ± 1% -7.15% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 52.2ms ± 2% 47.8ms ± 1% -8.30% (p=0.029 n=4+4) SiteNew/Deep_content_tree-16 77.9ms ± 1% 70.9ms ± 1% -9.01% (p=0.029 n=4+4) SiteNew/Many_HTML_templates-16 43.0ms ± 0% 37.2ms ± 1% -13.54% (p=0.029 n=4+4) SiteNew/Page_collections-16 58.2ms ± 1% 52.4ms ± 1% -9.95% (p=0.029 n=4+4) name old alloc/op new alloc/op delta SiteNew/Bundle_with_image-16 3.81MB ± 0% 2.22MB ± 0% -41.70% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 3.60MB ± 0% 2.01MB ± 0% -44.20% (p=0.029 n=4+4) SiteNew/Tags_and_categories-16 19.3MB ± 1% 14.1MB ± 0% -26.91% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 70.7MB ± 0% 69.0MB ± 0% -2.40% (p=0.029 n=4+4) SiteNew/Deep_content_tree-16 37.1MB ± 0% 31.2MB ± 0% -15.94% (p=0.029 n=4+4) SiteNew/Many_HTML_templates-16 17.6MB ± 0% 10.6MB ± 0% -39.92% (p=0.029 n=4+4) SiteNew/Page_collections-16 25.9MB ± 0% 21.2MB ± 0% -17.99% (p=0.029 n=4+4) name old allocs/op new allocs/op delta SiteNew/Bundle_with_image-16 52.3k ± 0% 26.1k ± 0% -50.18% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 52.3k ± 0% 26.1k ± 0% -50.16% (p=0.029 n=4+4) SiteNew/Tags_and_categories-16 336k ± 1% 269k ± 0% -19.90% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 422k ± 0% 395k ± 0% -6.43% (p=0.029 n=4+4) SiteNew/Deep_content_tree-16 401k ± 0% 313k ± 0% -21.79% (p=0.029 n=4+4) SiteNew/Many_HTML_templates-16 247k ± 0% 143k ± 0% -42.17% (p=0.029 n=4+4) SiteNew/Page_collections-16 282k ± 0% 207k ± 0% -26.55% (p=0.029 n=4+4) ``` Fixes #6716 Fixes #6760 Fixes #6768 Fixes #6778
349 lines
10 KiB
Go
349 lines
10 KiB
Go
// Copyright 2019 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless requiredF by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package hugolib
|
|
|
|
import (
|
|
"testing"
|
|
)
|
|
|
|
func TestRenderHooks(t *testing.T) {
|
|
config := `
|
|
baseURL="https://example.org"
|
|
workingDir="/mywork"
|
|
`
|
|
b := newTestSitesBuilder(t).WithWorkingDir("/mywork").WithConfigFile("toml", config).Running()
|
|
b.WithTemplatesAdded("_default/single.html", `{{ .Content }}`)
|
|
b.WithTemplatesAdded("shortcodes/myshortcode1.html", `{{ partial "mypartial1" }}`)
|
|
b.WithTemplatesAdded("shortcodes/myshortcode2.html", `{{ partial "mypartial2" }}`)
|
|
b.WithTemplatesAdded("shortcodes/myshortcode3.html", `SHORT3|`)
|
|
b.WithTemplatesAdded("shortcodes/myshortcode4.html", `
|
|
<div class="foo">
|
|
{{ .Inner | markdownify }}
|
|
</div>
|
|
`)
|
|
b.WithTemplatesAdded("shortcodes/myshortcode5.html", `
|
|
Inner Inline: {{ .Inner | .Page.RenderString }}
|
|
Inner Block: {{ .Inner | .Page.RenderString (dict "display" "block" ) }}
|
|
`)
|
|
|
|
b.WithTemplatesAdded("shortcodes/myshortcode6.html", `.Render: {{ .Page.Render "myrender" }}`)
|
|
b.WithTemplatesAdded("partials/mypartial1.html", `PARTIAL1`)
|
|
b.WithTemplatesAdded("partials/mypartial2.html", `PARTIAL2 {{ partial "mypartial3.html" }}`)
|
|
b.WithTemplatesAdded("partials/mypartial3.html", `PARTIAL3`)
|
|
b.WithTemplatesAdded("partials/mypartial4.html", `PARTIAL4`)
|
|
b.WithTemplatesAdded("customview/myrender.html", `myrender: {{ .Title }}|P4: {{ partial "mypartial4" }}`)
|
|
b.WithTemplatesAdded("_default/_markup/render-link.html", `{{ with .Page }}{{ .Title }}{{ end }}|{{ .Destination | safeURL }}|Title: {{ .Title | safeHTML }}|Text: {{ .Text | safeHTML }}|END`)
|
|
b.WithTemplatesAdded("docs/_markup/render-link.html", `Link docs section: {{ .Text | safeHTML }}|END`)
|
|
b.WithTemplatesAdded("_default/_markup/render-image.html", `IMAGE: {{ .Page.Title }}||{{ .Destination | safeURL }}|Title: {{ .Title | safeHTML }}|Text: {{ .Text | safeHTML }}|END`)
|
|
|
|
b.WithContent("customview/p1.md", `---
|
|
title: Custom View
|
|
---
|
|
|
|
{{< myshortcode6 >}}
|
|
|
|
`, "blog/p1.md", `---
|
|
title: Cool Page
|
|
---
|
|
|
|
[First Link](https://www.google.com "Google's Homepage")
|
|
|
|
{{< myshortcode3 >}}
|
|
|
|
[Second Link](https://www.google.com "Google's Homepage")
|
|
|
|
Image:
|
|
|
|

|
|
|
|
|
|
`, "blog/p2.md", `---
|
|
title: Cool Page2
|
|
layout: mylayout
|
|
---
|
|
|
|
{{< myshortcode1 >}}
|
|
|
|
[Some Text](https://www.google.com "Google's Homepage")
|
|
|
|
|
|
|
|
`, "blog/p3.md", `---
|
|
title: Cool Page3
|
|
---
|
|
|
|
{{< myshortcode2 >}}
|
|
|
|
|
|
`, "docs/docs1.md", `---
|
|
title: Docs 1
|
|
---
|
|
|
|
|
|
[Docs 1](https://www.google.com "Google's Homepage")
|
|
|
|
|
|
`, "blog/p4.md", `---
|
|
title: Cool Page With Image
|
|
---
|
|
|
|
Image:
|
|
|
|

|
|
|
|
|
|
`, "blog/p5.md", `---
|
|
title: Cool Page With Markdownify
|
|
---
|
|
|
|
{{< myshortcode4 >}}
|
|
Inner Link: [Inner Link](https://www.google.com "Google's Homepage")
|
|
{{< /myshortcode4 >}}
|
|
|
|
`, "blog/p6.md", `---
|
|
title: With RenderString
|
|
---
|
|
|
|
{{< myshortcode5 >}}Inner Link: [Inner Link](https://www.gohugo.io "Hugo's Homepage"){{< /myshortcode5 >}}
|
|
|
|
`)
|
|
b.Build(BuildCfg{})
|
|
b.AssertFileContent("public/blog/p1/index.html", `
|
|
<p>Cool Page|https://www.google.com|Title: Google's Homepage|Text: First Link|END</p>
|
|
Text: Second
|
|
SHORT3|
|
|
<p>IMAGE: Cool Page||/images/Dragster.jpg|Title: image title|Text: Drag Racing|END</p>
|
|
`)
|
|
|
|
b.AssertFileContent("public/customview/p1/index.html", `.Render: myrender: Custom View|P4: PARTIAL4`)
|
|
b.AssertFileContent("public/blog/p2/index.html", `PARTIAL`)
|
|
b.AssertFileContent("public/blog/p3/index.html", `PARTIAL3`)
|
|
// We may add type template support later, keep this for then. b.AssertFileContent("public/docs/docs1/index.html", `Link docs section: Docs 1|END`)
|
|
b.AssertFileContent("public/blog/p4/index.html", `<p>IMAGE: Cool Page With Image||/images/Dragster.jpg|Title: image title|Text: Drag Racing|END</p>`)
|
|
// The regular markdownify func currently gets regular links.
|
|
b.AssertFileContent("public/blog/p5/index.html", "Inner Link: <a href=\"https://www.google.com\" title=\"Google's Homepage\">Inner Link</a>\n</div>")
|
|
|
|
b.AssertFileContent("public/blog/p6/index.html",
|
|
"Inner Inline: Inner Link: With RenderString|https://www.gohugo.io|Title: Hugo's Homepage|Text: Inner Link|END",
|
|
"Inner Block: <p>Inner Link: With RenderString|https://www.gohugo.io|Title: Hugo's Homepage|Text: Inner Link|END</p>",
|
|
)
|
|
|
|
b.EditFiles(
|
|
"layouts/_default/_markup/render-link.html", `EDITED: {{ .Destination | safeURL }}|`,
|
|
"layouts/_default/_markup/render-image.html", `IMAGE EDITED: {{ .Destination | safeURL }}|`,
|
|
"layouts/docs/_markup/render-link.html", `DOCS EDITED: {{ .Destination | safeURL }}|`,
|
|
"layouts/partials/mypartial1.html", `PARTIAL1_EDITED`,
|
|
"layouts/partials/mypartial3.html", `PARTIAL3_EDITED`,
|
|
"layouts/partials/mypartial4.html", `PARTIAL4_EDITED`,
|
|
"layouts/shortcodes/myshortcode3.html", `SHORT3_EDITED|`,
|
|
)
|
|
|
|
b.Build(BuildCfg{})
|
|
b.AssertFileContent("public/customview/p1/index.html", `.Render: myrender: Custom View|P4: PARTIAL4_EDITED`)
|
|
b.AssertFileContent("public/blog/p1/index.html", `<p>EDITED: https://www.google.com|</p>`, "SHORT3_EDITED|")
|
|
b.AssertFileContent("public/blog/p2/index.html", `PARTIAL1_EDITED`)
|
|
b.AssertFileContent("public/blog/p3/index.html", `PARTIAL3_EDITED`)
|
|
// We may add type template support later, keep this for then. b.AssertFileContent("public/docs/docs1/index.html", `DOCS EDITED: https://www.google.com|</p>`)
|
|
b.AssertFileContent("public/blog/p4/index.html", `IMAGE EDITED: /images/Dragster.jpg|`)
|
|
b.AssertFileContent("public/blog/p6/index.html", "<p>Inner Link: EDITED: https://www.gohugo.io|</p>")
|
|
|
|
}
|
|
|
|
func TestRenderHooksDeleteTemplate(t *testing.T) {
|
|
config := `
|
|
baseURL="https://example.org"
|
|
workingDir="/mywork"
|
|
`
|
|
b := newTestSitesBuilder(t).WithWorkingDir("/mywork").WithConfigFile("toml", config).Running()
|
|
b.WithTemplatesAdded("_default/single.html", `{{ .Content }}`)
|
|
b.WithTemplatesAdded("_default/_markup/render-link.html", `html-render-link`)
|
|
|
|
b.WithContent("p1.md", `---
|
|
title: P1
|
|
---
|
|
[First Link](https://www.google.com "Google's Homepage")
|
|
|
|
`)
|
|
b.Build(BuildCfg{})
|
|
|
|
b.AssertFileContent("public/p1/index.html", `<p>html-render-link</p>`)
|
|
|
|
b.RemoveFiles(
|
|
"layouts/_default/_markup/render-link.html",
|
|
)
|
|
|
|
b.Build(BuildCfg{})
|
|
b.AssertFileContent("public/p1/index.html", `<p><a href="https://www.google.com" title="Google's Homepage">First Link</a></p>`)
|
|
|
|
}
|
|
|
|
func TestRenderHookAddTemplate(t *testing.T) {
|
|
config := `
|
|
baseURL="https://example.org"
|
|
workingDir="/mywork"
|
|
`
|
|
b := newTestSitesBuilder(t).WithWorkingDir("/mywork").WithConfigFile("toml", config).Running()
|
|
b.WithTemplatesAdded("_default/single.html", `{{ .Content }}`)
|
|
|
|
b.WithContent("p1.md", `---
|
|
title: P1
|
|
---
|
|
[First Link](https://www.google.com "Google's Homepage")
|
|
|
|
`)
|
|
b.Build(BuildCfg{})
|
|
|
|
b.AssertFileContent("public/p1/index.html", `<p><a href="https://www.google.com" title="Google's Homepage">First Link</a></p>`)
|
|
|
|
b.EditFiles("layouts/_default/_markup/render-link.html", `html-render-link`)
|
|
|
|
b.Build(BuildCfg{})
|
|
|
|
b.AssertFileContent("public/p1/index.html", `<p>html-render-link</p>`)
|
|
|
|
}
|
|
|
|
func TestRenderHooksRSS(t *testing.T) {
|
|
|
|
b := newTestSitesBuilder(t)
|
|
|
|
b.WithTemplates("index.html", `
|
|
{{ $p := site.GetPage "p1.md" }}
|
|
|
|
P1: {{ $p.Content }}
|
|
|
|
`, "index.xml", `
|
|
|
|
{{ $p2 := site.GetPage "p2.md" }}
|
|
{{ $p3 := site.GetPage "p3.md" }}
|
|
|
|
P2: {{ $p2.Content }}
|
|
P3: {{ $p3.Content }}
|
|
|
|
|
|
`,
|
|
"_default/_markup/render-link.html", `html-link: {{ .Destination | safeURL }}|`,
|
|
"_default/_markup/render-link.rss.xml", `xml-link: {{ .Destination | safeURL }}|`,
|
|
)
|
|
|
|
b.WithContent("p1.md", `---
|
|
title: "p1"
|
|
---
|
|
P1. [I'm an inline-style link](https://www.gohugo.io)
|
|
|
|
|
|
`, "p2.md", `---
|
|
title: "p2"
|
|
---
|
|
P1. [I'm an inline-style link](https://www.bep.is)
|
|
|
|
|
|
`,
|
|
"p3.md", `---
|
|
title: "p2"
|
|
outputs: ["rss"]
|
|
---
|
|
P3. [I'm an inline-style link](https://www.example.org)
|
|
|
|
`,
|
|
)
|
|
|
|
b.Build(BuildCfg{})
|
|
|
|
b.AssertFileContent("public/index.html", "P1: <p>P1. html-link: https://www.gohugo.io|</p>")
|
|
b.AssertFileContent("public/index.xml", `
|
|
P2: <p>P1. xml-link: https://www.bep.is|</p>
|
|
P3: <p>P3. xml-link: https://www.example.org|</p>
|
|
`)
|
|
|
|
}
|
|
|
|
// https://github.com/gohugoio/hugo/issues/6629
|
|
func TestRenderLinkWithMarkupInText(t *testing.T) {
|
|
|
|
b := newTestSitesBuilder(t)
|
|
b.WithConfigFile("toml", `
|
|
|
|
baseURL="https://example.org"
|
|
|
|
[markup]
|
|
[markup.goldmark]
|
|
[markup.goldmark.renderer]
|
|
unsafe = true
|
|
|
|
`)
|
|
|
|
b.WithTemplates("index.html", `
|
|
{{ $p := site.GetPage "p1.md" }}
|
|
P1: {{ $p.Content }}
|
|
|
|
`,
|
|
"_default/_markup/render-link.html", `html-link: {{ .Destination | safeURL }}|Text: {{ .Text | safeHTML }}|Plain: {{ .PlainText | safeHTML }}`,
|
|
"_default/_markup/render-image.html", `html-image: {{ .Destination | safeURL }}|Text: {{ .Text | safeHTML }}|Plain: {{ .PlainText | safeHTML }}`,
|
|
)
|
|
|
|
b.WithContent("p1.md", `---
|
|
title: "p1"
|
|
---
|
|
|
|
START: [**should be bold**](https://gohugo.io)END
|
|
|
|
Some regular **markup**.
|
|
|
|
Image:
|
|
|
|
END
|
|
|
|
`)
|
|
|
|
b.Build(BuildCfg{})
|
|
|
|
b.AssertFileContent("public/index.html", `
|
|
P1: <p>START: html-link: https://gohugo.io|Text: <strong>should be bold</strong>|Plain: should be boldEND</p>
|
|
<p>Some regular <strong>markup</strong>.</p>
|
|
<p>html-image: image.jpg|Text: Hello<br> Goodbye|Plain: Hello GoodbyeEND</p>
|
|
`)
|
|
|
|
}
|
|
|
|
func TestRenderString(t *testing.T) {
|
|
|
|
b := newTestSitesBuilder(t)
|
|
|
|
b.WithTemplates("index.html", `
|
|
{{ $p := site.GetPage "p1.md" }}
|
|
{{ $optBlock := dict "display" "block" }}
|
|
{{ $optOrg := dict "markup" "org" }}
|
|
RSTART:{{ "**Bold Markdown**" | $p.RenderString }}:REND
|
|
RSTART:{{ "**Bold Block Markdown**" | $p.RenderString $optBlock }}:REND
|
|
RSTART:{{ "/italic org mode/" | $p.RenderString $optOrg }}:REND
|
|
|
|
|
|
`)
|
|
|
|
b.WithContent("p1.md", `---
|
|
title: "p1"
|
|
---
|
|
`,
|
|
)
|
|
|
|
b.Build(BuildCfg{})
|
|
|
|
b.AssertFileContent("public/index.html", `
|
|
RSTART:<strong>Bold Markdown</strong>:REND
|
|
RSTART:<p><strong>Bold Block Markdown</strong></p>
|
|
RSTART:<em>italic org mode</em>:REND
|
|
`)
|
|
|
|
}
|