summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hugolib/content_map.go2
-rw-r--r--hugolib/page__meta.go24
-rw-r--r--hugolib/pagesfromdata/pagesfromgotmpl_integration_test.go42
-rw-r--r--hugolib/site.go2
-rw-r--r--hugoreleaser.env5
-rw-r--r--resources/page/pagemeta/page_frontmatter.go20
-rw-r--r--resources/page/pagemeta/page_frontmatter_test.go3
-rw-r--r--tpl/math/init.go7
-rw-r--r--tpl/math/math.go5
-rw-r--r--tpl/math/math_test.go11
-rw-r--r--tpl/templates/templates_integration_test.go16
-rw-r--r--tpl/tplimpl/templatestore.go1
12 files changed, 109 insertions, 29 deletions
diff --git a/hugolib/content_map.go b/hugolib/content_map.go
index 56a602f54..454d36df7 100644
--- a/hugolib/content_map.go
+++ b/hugolib/content_map.go
@@ -356,7 +356,7 @@ func (m *pageMap) addPagesFromGoTmplFi(fi hugofs.FileMetaInfo, buildConfig *Buil
Watching: s.Conf.Watching(),
HandlePage: func(pt *pagesfromdata.PagesFromTemplate, pc *pagemeta.PageConfig) error {
s := pt.Site.(*Site)
- if err := pc.Compile(pt.GoTmplFi.Meta().PathInfo.Base(), true, "", s.Log, s.conf.MediaTypes.Config); err != nil {
+ if err := pc.Compile(pt.GoTmplFi.Meta().PathInfo.Base(), true, "", s.Log, s.conf.OutputFormats.Config, s.conf.MediaTypes.Config); err != nil {
return err
}
diff --git a/hugolib/page__meta.go b/hugolib/page__meta.go
index 9516c482a..94dbbab3e 100644
--- a/hugolib/page__meta.go
+++ b/hugolib/page__meta.go
@@ -54,7 +54,6 @@ type pageMeta struct {
resource.Staler
*pageMetaParams
- pageMetaFrontMatter
// Set for standalone pages, e.g. robotsTXT.
standaloneOutputFormat output.Format
@@ -79,7 +78,6 @@ func (m *pageMeta) setMetaPostPrepareRebuild() {
Path: m.pageConfig.Path,
Params: params,
}
- m.pageMetaFrontMatter = pageMetaFrontMatter{}
}
type pageMetaParams struct {
@@ -94,11 +92,6 @@ type pageMetaParams struct {
cascadeOriginal *maps.Ordered[page.PageMatcher, maps.Params] // contains the original cascade as defined in the front matter.
}
-// From page front matter.
-type pageMetaFrontMatter struct {
- configuredOutputFormats output.Formats // outputs defined in front matter.
-}
-
func (m *pageMetaParams) init(preserveOriginal bool) {
if preserveOriginal {
m.paramsOriginal = xmaps.Clone[maps.Params](m.pageConfig.Params)
@@ -531,16 +524,7 @@ params:
for i, s := range o {
o[i] = strings.ToLower(s)
}
- if len(o) > 0 {
- // Output formats are explicitly set in front matter, use those.
- outFormats, err := p.s.conf.OutputFormats.Config.GetByNames(o...)
- if err != nil {
- p.s.Log.Errorf("Failed to resolve output formats: %s", err)
- } else {
- pm.configuredOutputFormats = outFormats
- params[loki] = outFormats
- }
- }
+ pm.pageConfig.Outputs = o
case "draft":
draft = new(bool)
*draft = cast.ToBool(v)
@@ -672,7 +656,7 @@ params:
return err
}
- if err := pcfg.Compile("", false, ext, p.s.Log, p.s.conf.MediaTypes.Config); err != nil {
+ if err := pcfg.Compile("", false, ext, p.s.Log, p.s.conf.OutputFormats.Config, p.s.conf.MediaTypes.Config); err != nil {
return err
}
@@ -829,8 +813,8 @@ func (p *pageMeta) newContentConverter(ps *pageState, markup string) (converter.
// The output formats this page will be rendered to.
func (m *pageMeta) outputFormats() output.Formats {
- if len(m.configuredOutputFormats) > 0 {
- return m.configuredOutputFormats
+ if len(m.pageConfig.ConfiguredOutputFormats) > 0 {
+ return m.pageConfig.ConfiguredOutputFormats
}
return m.s.conf.C.KindOutputFormats[m.Kind()]
}
diff --git a/hugolib/pagesfromdata/pagesfromgotmpl_integration_test.go b/hugolib/pagesfromdata/pagesfromgotmpl_integration_test.go
index a31b93999..f6e4221a0 100644
--- a/hugolib/pagesfromdata/pagesfromgotmpl_integration_test.go
+++ b/hugolib/pagesfromdata/pagesfromgotmpl_integration_test.go
@@ -779,3 +779,45 @@ Single.
b.AssertFileContent("public/tags/index.html", "Terms: mytag: 1|§s")
}
+
+func TestContentAdapterOutputsIssue13689(t *testing.T) {
+ t.Parallel()
+
+ files := `
+-- hugo.toml --
+disableKinds = ['home','rss','section','sitemap','taxonomy','term']
+[outputs]
+page = ['html','json']
+-- layouts/page.html --
+html: {{ .Title }}
+-- layouts/page.json --
+json: {{ .Title }}
+-- content/p1.md --
+---
+title: p1
+---
+-- content/p2.md --
+---
+title: p2
+outputs:
+ - html
+---
+-- content/_content.gotmpl --
+{{ $page := dict "path" "p3" "title" "p3" }}
+{{ $.AddPage $page }}
+
+{{ $page := dict "path" "p4" "title" "p4" "outputs" (slice "html") }}
+{{ $.AddPage $page }}
+`
+
+ b := hugolib.Test(t, files)
+
+ b.AssertFileExists("public/p1/index.html", true)
+ b.AssertFileExists("public/p1/index.json", true)
+ b.AssertFileExists("public/p2/index.html", true)
+ b.AssertFileExists("public/p2/index.json", false)
+ b.AssertFileExists("public/p3/index.html", true)
+ b.AssertFileExists("public/p3/index.json", true)
+ b.AssertFileExists("public/p4/index.html", true)
+ b.AssertFileExists("public/p4/index.json", false) // currently returns true
+}
diff --git a/hugolib/site.go b/hugolib/site.go
index 728b036d2..0e658086b 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -804,7 +804,7 @@ func (s *Site) initRenderFormats() {
Tree: s.pageMap.treePages,
Handle: func(key string, n contentNodeI, match doctree.DimensionFlag) (bool, error) {
if p, ok := n.(*pageState); ok {
- for _, f := range p.m.configuredOutputFormats {
+ for _, f := range p.m.pageConfig.ConfiguredOutputFormats {
if !formatSet[f.Name] {
formats = append(formats, f)
formatSet[f.Name] = true
diff --git a/hugoreleaser.env b/hugoreleaser.env
index 4015dbc5c..5d373cd71 100644
--- a/hugoreleaser.env
+++ b/hugoreleaser.env
@@ -1,7 +1,8 @@
# Release env.
# These will be replaced by script before release.
-HUGORELEASER_TAG=v0.147.1
-HUGORELEASER_COMMITISH=95666fc5a4fd2d87528a1a69d562e0538a97062a
+HUGORELEASER_TAG=v0.147.2
+HUGORELEASER_COMMITISH=c7feb15d10b29a94d7fb57c31e8bcb2e92718fb7
+
diff --git a/resources/page/pagemeta/page_frontmatter.go b/resources/page/pagemeta/page_frontmatter.go
index 7f98b1b88..eb52e5055 100644
--- a/resources/page/pagemeta/page_frontmatter.go
+++ b/resources/page/pagemeta/page_frontmatter.go
@@ -29,6 +29,7 @@ import (
"github.com/gohugoio/hugo/hugofs/files"
"github.com/gohugoio/hugo/markup"
"github.com/gohugoio/hugo/media"
+ "github.com/gohugoio/hugo/output"
"github.com/gohugoio/hugo/resources/kinds"
"github.com/gohugoio/hugo/resources/page"
"github.com/gohugoio/hugo/resources/resource"
@@ -114,9 +115,10 @@ type PageConfig struct {
Content Source
// Compiled values.
- CascadeCompiled *maps.Ordered[page.PageMatcher, maps.Params] `mapstructure:"-" json:"-"`
- ContentMediaType media.Type `mapstructure:"-" json:"-"`
- IsFromContentAdapter bool `mapstructure:"-" json:"-"`
+ CascadeCompiled *maps.Ordered[page.PageMatcher, maps.Params] `mapstructure:"-" json:"-"`
+ ContentMediaType media.Type `mapstructure:"-" json:"-"`
+ ConfiguredOutputFormats output.Formats `mapstructure:"-" json:"-"`
+ IsFromContentAdapter bool `mapstructure:"-" json:"-"`
}
var DefaultPageConfig = PageConfig{
@@ -150,7 +152,7 @@ func (p *PageConfig) Validate(pagesFromData bool) error {
}
// Compile sets up the page configuration after all fields have been set.
-func (p *PageConfig) Compile(basePath string, pagesFromData bool, ext string, logger loggers.Logger, mediaTypes media.Types) error {
+func (p *PageConfig) Compile(basePath string, pagesFromData bool, ext string, logger loggers.Logger, outputFormats output.Formats, mediaTypes media.Types) error {
// In content adapters, we always get relative paths.
if basePath != "" {
p.Path = path.Join(basePath, p.Path)
@@ -195,6 +197,15 @@ func (p *PageConfig) Compile(basePath string, pagesFromData bool, ext string, lo
p.Content.Markup = p.ContentMediaType.SubType
}
+ if len(p.Outputs) > 0 {
+ outFormats, err := outputFormats.GetByNames(p.Outputs...)
+ if err != nil {
+ return fmt.Errorf("failed to resolve output formats %v: %w", p.Outputs, err)
+ } else {
+ p.ConfiguredOutputFormats = outFormats
+ }
+ }
+
if pagesFromData {
if p.Kind == "" {
p.Kind = kinds.KindPage
@@ -205,6 +216,7 @@ func (p *PageConfig) Compile(basePath string, pagesFromData bool, ext string, lo
// but also because people tend to use use the filename to name their resources (with spaces and all),
// and this isn't relevant when creating resources from an API where it's easy to add textual meta data.
p.Path = paths.NormalizePathStringBasic(p.Path)
+
}
if p.Cascade != nil {
diff --git a/resources/page/pagemeta/page_frontmatter_test.go b/resources/page/pagemeta/page_frontmatter_test.go
index fe9d3d99c..de2932391 100644
--- a/resources/page/pagemeta/page_frontmatter_test.go
+++ b/resources/page/pagemeta/page_frontmatter_test.go
@@ -22,6 +22,7 @@ import (
"github.com/gohugoio/hugo/config"
"github.com/gohugoio/hugo/config/testconfig"
"github.com/gohugoio/hugo/media"
+ "github.com/gohugoio/hugo/output"
"github.com/gohugoio/hugo/resources/page/pagemeta"
@@ -175,7 +176,7 @@ func TestContentMediaTypeFromMarkup(t *testing.T) {
} {
var pc pagemeta.PageConfig
pc.Content.Markup = test.in
- c.Assert(pc.Compile("", true, "", logger, media.DefaultTypes), qt.IsNil)
+ c.Assert(pc.Compile("", true, "", logger, output.DefaultFormats, media.DefaultTypes), qt.IsNil)
c.Assert(pc.ContentMediaType.Type, qt.Equals, test.expected)
}
}
diff --git a/tpl/math/init.go b/tpl/math/init.go
index bfaf4526a..bb3c02bd6 100644
--- a/tpl/math/init.go
+++ b/tpl/math/init.go
@@ -115,6 +115,13 @@ func init() {
},
)
+ ns.AddMethodMapping(ctx.MaxInt64,
+ nil,
+ [][2]string{
+ {"{{ math.MaxInt64 }}", "9223372036854775807"},
+ },
+ )
+
ns.AddMethodMapping(ctx.Min,
nil,
[][2]string{
diff --git a/tpl/math/math.go b/tpl/math/math.go
index a0512c045..01e75e9c8 100644
--- a/tpl/math/math.go
+++ b/tpl/math/math.go
@@ -147,6 +147,11 @@ func (ns *Namespace) Max(inputs ...any) (maximum float64, err error) {
return ns.applyOpToScalarsOrSlices("Max", math.Max, inputs...)
}
+// MaxInt64 returns the maximum value for a signed 64-bit integer.
+func (ns *Namespace) MaxInt64() int64 {
+ return math.MaxInt64
+}
+
// Min returns the smaller of all numbers in inputs. Any slices in inputs are flattened.
func (ns *Namespace) Min(inputs ...any) (minimum float64, err error) {
return ns.applyOpToScalarsOrSlices("Min", math.Min, inputs...)
diff --git a/tpl/math/math_test.go b/tpl/math/math_test.go
index d45a2aace..cc4fe31eb 100644
--- a/tpl/math/math_test.go
+++ b/tpl/math/math_test.go
@@ -879,3 +879,14 @@ func TestToRadians(t *testing.T) {
c.Assert(result, qt.Equals, test.expect)
}
}
+
+func TestMaxInt64(t *testing.T) {
+ t.Parallel()
+ ns := New(nil)
+
+ var want int64 = 9223372036854775807
+ got := ns.MaxInt64()
+ if want != got {
+ t.Errorf("want %d, got %d", want, got)
+ }
+}
diff --git a/tpl/templates/templates_integration_test.go b/tpl/templates/templates_integration_test.go
index d16333ed4..baa917eee 100644
--- a/tpl/templates/templates_integration_test.go
+++ b/tpl/templates/templates_integration_test.go
@@ -299,3 +299,19 @@ P2.
b := hugolib.Test(t, files)
b.AssertFileContent("public/index.html", "P1: P1.\nP2: foo bar")
}
+
+func TestTemplateExistsCaseIssue13684(t *testing.T) {
+ t.Parallel()
+
+ files := `
+-- hugo.toml --
+-- layouts/home.html --
+P1: {{ templates.Exists "_partials/MyPartial.html" }}|P1: {{ templates.Exists "_partials/mypartial.html" }}|
+-- layouts/_partials/MyPartial.html --
+MyPartial.
+
+`
+
+ b := hugolib.Test(t, files)
+ b.AssertFileContent("public/index.html", "P1: true|P1: true|")
+}
diff --git a/tpl/tplimpl/templatestore.go b/tpl/tplimpl/templatestore.go
index 4adf76b29..53880eb33 100644
--- a/tpl/tplimpl/templatestore.go
+++ b/tpl/tplimpl/templatestore.go
@@ -712,6 +712,7 @@ func (s *TemplateStore) RefreshFiles(include func(fi hugofs.FileMetaInfo) bool)
}
func (s *TemplateStore) HasTemplate(templatePath string) bool {
+ templatePath = strings.ToLower(templatePath)
templatePath = paths.AddLeadingSlash(templatePath)
return s.templatesByPath.Contains(templatePath)
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-08 12:18:52 +0000