Compare commits

..

No commits in common. "master" and "v0.146.6" have entirely different histories.

221 changed files with 1147 additions and 3680 deletions

View file

@ -2,8 +2,8 @@
# Twitter: https://twitter.com/gohugoio # Twitter: https://twitter.com/gohugoio
# Website: https://gohugo.io/ # Website: https://gohugo.io/
ARG GO_VERSION="1.24" ARG GO_VERSION="1.23.2"
ARG ALPINE_VERSION="3.22" ARG ALPINE_VERSION="3.20"
ARG DART_SASS_VERSION="1.79.3" ARG DART_SASS_VERSION="1.79.3"
FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.5.0 AS xx FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.5.0 AS xx

View file

@ -65,11 +65,9 @@ See the [features] section of the documentation for a comprehensive summary of H
<p>&nbsp;</p> <p>&nbsp;</p>
<p float="left"> <p float="left">
<a href="https://www.linode.com/?utm_campaign=hugosponsor&utm_medium=banner&utm_source=hugogithub" target="_blank"><img src="https://raw.githubusercontent.com/gohugoio/hugoDocs/master/assets/images/sponsors/linode-logo_standard_light_medium.png" width="200" alt="Linode"></a> <a href="https://www.linode.com/?utm_campaign=hugosponsor&utm_medium=banner&utm_source=hugogithub" target="_blank"><img src="https://raw.githubusercontent.com/gohugoio/gohugoioTheme/master/assets/images/sponsors/linode-logo_standard_light_medium.png" width="200" alt="Linode"></a>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
<a href="https://www.jetbrains.com/go/?utm_source=OSS&utm_medium=referral&utm_campaign=hugo" target="_blank"><img src="https://raw.githubusercontent.com/gohugoio/hugoDocs/master/assets/images/sponsors/goland.svg" width="200" alt="The complete IDE crafted for professional Go developers."></a> <a href="https://www.jetbrains.com/go/?utm_source=OSS&utm_medium=referral&utm_campaign=hugo" target="_blank"><img src="https://raw.githubusercontent.com/gohugoio/gohugoioTheme/master/assets/images/sponsors/goland.svg" width="200" alt="The complete IDE crafted for professional Go developers."></a>
&nbsp;&nbsp;&nbsp;
<a href="https://pinme.eth.limo/?s=hugo" target="_blank"><img src="https://raw.githubusercontent.com/gohugoio/hugoDocs/master/assets/images/sponsors/logo-pinme.svg" width="200" alt="PinMe."></a>
</p> </p>
## Editions ## Editions

View file

@ -972,9 +972,6 @@ func (c *hugoBuilder) handleEvents(watcher *watcher.Batcher,
lrl.Logf("force refresh") lrl.Logf("force refresh")
livereload.ForceRefresh() livereload.ForceRefresh()
} }
} else {
lrl.Logf("force refresh")
livereload.ForceRefresh()
} }
if len(cssChanges) > 0 { if len(cssChanges) > 0 {

View file

@ -76,8 +76,10 @@ Ensure you run this within the root directory of your site.`,
&simpleCommand{ &simpleCommand{
name: "site", name: "site",
use: "site [path]", use: "site [path]",
short: "Create a new site", short: "Create a new site (skeleton)",
long: `Create a new site at the specified path.`, long: `Create a new site in the provided directory.
The new site will have the correct structure, but no content or theme yet.
Use ` + "`hugo new [contentPath]`" + ` to create new content.`,
run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error { run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
if len(args) < 1 { if len(args) < 1 {
return newUserError("path needs to be provided") return newUserError("path needs to be provided")
@ -122,9 +124,11 @@ Ensure you run this within the root directory of your site.`,
&simpleCommand{ &simpleCommand{
name: "theme", name: "theme",
use: "theme [name]", use: "theme [name]",
short: "Create a new theme", short: "Create a new theme (skeleton)",
long: `Create a new theme with the specified name in the ./themes directory. long: `Create a new theme (skeleton) called [name] in ./themes.
This generates a functional theme including template examples and sample content.`, New theme is a skeleton. Please add content to the touched files. Add your
name to the copyright line in the license and adjust the theme.toml file
according to your needs.`,
run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error { run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
if len(args) < 1 { if len(args) < 1 {
return newUserError("theme name needs to be provided") return newUserError("theme name needs to be provided")

View file

@ -627,7 +627,7 @@ func (c *serverCommand) setServerInfoInConfig() error {
panic("no server ports set") panic("no server ports set")
} }
return c.withConfE(func(conf *commonConfig) error { return c.withConfE(func(conf *commonConfig) error {
for i, language := range conf.configs.LanguagesDefaultFirst { for i, language := range conf.configs.Languages {
isMultihost := conf.configs.IsMultihost isMultihost := conf.configs.IsMultihost
var serverPort int var serverPort int
if isMultihost { if isMultihost {

View file

@ -15,7 +15,6 @@ package collections
import ( import (
"html/template" "html/template"
"reflect"
"testing" "testing"
qt "github.com/frankban/quicktest" qt "github.com/frankban/quicktest"
@ -78,7 +77,6 @@ func TestAppend(t *testing.T) {
{[]string{"a", "b"}, []any{nil}, []any{"a", "b", nil}}, {[]string{"a", "b"}, []any{nil}, []any{"a", "b", nil}},
{[]string{"a", "b"}, []any{nil, "d", nil}, []any{"a", "b", nil, "d", nil}}, {[]string{"a", "b"}, []any{nil, "d", nil}, []any{"a", "b", nil, "d", nil}},
{[]any{"a", nil, "c"}, []any{"d", nil, "f"}, []any{"a", nil, "c", "d", nil, "f"}}, {[]any{"a", nil, "c"}, []any{"d", nil, "f"}, []any{"a", nil, "c", "d", nil, "f"}},
{[]string{"a", "b"}, []any{}, []string{"a", "b"}},
} { } {
result, err := Append(test.start, test.addend...) result, err := Append(test.start, test.addend...)
@ -148,66 +146,3 @@ func TestAppendShouldMakeACopyOfTheInputSlice(t *testing.T) {
c.Assert(result, qt.DeepEquals, []string{"a", "b", "c"}) c.Assert(result, qt.DeepEquals, []string{"a", "b", "c"})
c.Assert(slice, qt.DeepEquals, []string{"d", "b"}) c.Assert(slice, qt.DeepEquals, []string{"d", "b"})
} }
func TestIndirect(t *testing.T) {
t.Parallel()
c := qt.New(t)
type testStruct struct {
Field string
}
var (
nilPtr *testStruct
nilIface interface{} = nil
nonNilIface interface{} = &testStruct{Field: "hello"}
)
tests := []struct {
name string
input any
wantKind reflect.Kind
wantNil bool
}{
{
name: "nil pointer",
input: nilPtr,
wantKind: reflect.Ptr,
wantNil: true,
},
{
name: "nil interface",
input: nilIface,
wantKind: reflect.Invalid,
wantNil: false,
},
{
name: "non-nil pointer to struct",
input: &testStruct{Field: "abc"},
wantKind: reflect.Struct,
wantNil: false,
},
{
name: "non-nil interface holding pointer",
input: nonNilIface,
wantKind: reflect.Struct,
wantNil: false,
},
{
name: "plain value",
input: testStruct{Field: "xyz"},
wantKind: reflect.Struct,
wantNil: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
v := reflect.ValueOf(tt.input)
got, isNil := indirect(v)
c.Assert(got.Kind(), qt.Equals, tt.wantKind)
c.Assert(isNil, qt.Equals, tt.wantNil)
})
}
}

View file

@ -136,37 +136,3 @@ func TestSortedStringSlice(t *testing.T) {
c.Assert(s.Count("z"), qt.Equals, 0) c.Assert(s.Count("z"), qt.Equals, 0)
c.Assert(s.Count("a"), qt.Equals, 1) c.Assert(s.Count("a"), qt.Equals, 1)
} }
func TestStringSliceToInterfaceSlice(t *testing.T) {
t.Parallel()
c := qt.New(t)
tests := []struct {
name string
in []string
want []any
}{
{
name: "empty slice",
in: []string{},
want: []any{},
},
{
name: "single element",
in: []string{"hello"},
want: []any{"hello"},
},
{
name: "multiple elements",
in: []string{"a", "b", "c"},
want: []any{"a", "b", "c"},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got := StringSliceToInterfaceSlice(tt.in)
c.Assert(got, qt.DeepEquals, tt.want)
})
}
}

View file

@ -1,77 +0,0 @@
package collections
import (
"testing"
qt "github.com/frankban/quicktest"
)
func TestNewStack(t *testing.T) {
t.Parallel()
c := qt.New(t)
s := NewStack[int]()
c.Assert(s, qt.IsNotNil)
}
func TestStackBasic(t *testing.T) {
t.Parallel()
c := qt.New(t)
s := NewStack[int]()
c.Assert(s.Len(), qt.Equals, 0)
s.Push(1)
s.Push(2)
s.Push(3)
c.Assert(s.Len(), qt.Equals, 3)
top, ok := s.Peek()
c.Assert(ok, qt.Equals, true)
c.Assert(top, qt.Equals, 3)
popped, ok := s.Pop()
c.Assert(ok, qt.Equals, true)
c.Assert(popped, qt.Equals, 3)
c.Assert(s.Len(), qt.Equals, 2)
_, _ = s.Pop()
_, _ = s.Pop()
_, ok = s.Pop()
c.Assert(ok, qt.Equals, false)
}
func TestStackDrain(t *testing.T) {
t.Parallel()
c := qt.New(t)
s := NewStack[string]()
s.Push("a")
s.Push("b")
got := s.Drain()
c.Assert(got, qt.DeepEquals, []string{"a", "b"})
c.Assert(s.Len(), qt.Equals, 0)
}
func TestStackDrainMatching(t *testing.T) {
t.Parallel()
c := qt.New(t)
s := NewStack[int]()
s.Push(1)
s.Push(2)
s.Push(3)
s.Push(4)
got := s.DrainMatching(func(v int) bool { return v%2 == 0 })
c.Assert(got, qt.DeepEquals, []int{4, 2})
c.Assert(s.Drain(), qt.DeepEquals, []int{1, 3})
}

View file

@ -24,7 +24,6 @@ const (
WarnRenderShortcodesInHTML = "warning-rendershortcodes-in-html" WarnRenderShortcodesInHTML = "warning-rendershortcodes-in-html"
WarnGoldmarkRawHTML = "warning-goldmark-raw-html" WarnGoldmarkRawHTML = "warning-goldmark-raw-html"
WarnPartialSuperfluousPrefix = "warning-partial-superfluous-prefix" WarnPartialSuperfluousPrefix = "warning-partial-superfluous-prefix"
WarnHomePageIsLeafBundle = "warning-home-page-is-leaf-bundle"
) )
// Field/method names with special meaning. // Field/method names with special meaning.

View file

@ -17,7 +17,7 @@ package hugo
// This should be the only one. // This should be the only one.
var CurrentVersion = Version{ var CurrentVersion = Version{
Major: 0, Major: 0,
Minor: 148, Minor: 146,
PatchLevel: 0, PatchLevel: 6,
Suffix: "-DEV", Suffix: "",
} }

View file

@ -120,24 +120,18 @@ func (pp *PathParser) parse(component, s string) (*Path, error) {
return p, nil return p, nil
} }
func (pp *PathParser) parseIdentifier(component, s string, p *Path, i, lastDot, numDots int, isLast bool) { func (pp *PathParser) parseIdentifier(component, s string, p *Path, i, lastDot int) {
if p.posContainerHigh != -1 { if p.posContainerHigh != -1 {
return return
} }
mayHaveLang := numDots > 1 && p.posIdentifierLanguage == -1 && pp.LanguageIndex != nil mayHaveLang := pp.LanguageIndex != nil
mayHaveLang = mayHaveLang && (component == files.ComponentFolderContent || component == files.ComponentFolderLayouts) mayHaveLang = mayHaveLang && (component == files.ComponentFolderContent || component == files.ComponentFolderLayouts)
mayHaveOutputFormat := component == files.ComponentFolderLayouts mayHaveOutputFormat := component == files.ComponentFolderLayouts
mayHaveKind := p.posIdentifierKind == -1 && mayHaveOutputFormat mayHaveKind := mayHaveOutputFormat
var mayHaveLayout bool
if p.pathType == TypeShortcode {
mayHaveLayout = !isLast && component == files.ComponentFolderLayouts
} else {
mayHaveLayout = component == files.ComponentFolderLayouts
}
var found bool var found bool
var high int var high int
if len(p.identifiersKnown) > 0 { if len(p.identifiers) > 0 {
high = lastDot high = lastDot
} else { } else {
high = len(p.s) high = len(p.s)
@ -145,9 +139,9 @@ func (pp *PathParser) parseIdentifier(component, s string, p *Path, i, lastDot,
id := types.LowHigh[string]{Low: i + 1, High: high} id := types.LowHigh[string]{Low: i + 1, High: high}
sid := p.s[id.Low:id.High] sid := p.s[id.Low:id.High]
if len(p.identifiersKnown) == 0 { if len(p.identifiers) == 0 {
// The first is always the extension. // The first is always the extension.
p.identifiersKnown = append(p.identifiersKnown, id) p.identifiers = append(p.identifiers, id)
found = true found = true
// May also be the output format. // May also be the output format.
@ -170,8 +164,9 @@ func (pp *PathParser) parseIdentifier(component, s string, p *Path, i, lastDot,
} }
found = langFound found = langFound
if langFound { if langFound {
p.identifiersKnown = append(p.identifiersKnown, id) p.identifiers = append(p.identifiers, id)
p.posIdentifierLanguage = len(p.identifiersKnown) - 1 p.posIdentifierLanguage = len(p.identifiers) - 1
} }
} }
@ -182,33 +177,28 @@ func (pp *PathParser) parseIdentifier(component, s string, p *Path, i, lastDot,
// false positives on the form css.html. // false positives on the form css.html.
if pp.IsOutputFormat(sid, p.Ext()) { if pp.IsOutputFormat(sid, p.Ext()) {
found = true found = true
p.identifiersKnown = append(p.identifiersKnown, id) p.identifiers = append(p.identifiers, id)
p.posIdentifierOutputFormat = len(p.identifiersKnown) - 1 p.posIdentifierOutputFormat = len(p.identifiers) - 1
} }
} }
if !found && mayHaveKind { if !found && mayHaveKind {
if kinds.GetKindMain(sid) != "" { if kinds.GetKindMain(sid) != "" {
found = true found = true
p.identifiersKnown = append(p.identifiersKnown, id) p.identifiers = append(p.identifiers, id)
p.posIdentifierKind = len(p.identifiersKnown) - 1 p.posIdentifierKind = len(p.identifiers) - 1
} }
} }
if !found && sid == identifierBaseof { if !found && sid == identifierBaseof {
found = true found = true
p.identifiersKnown = append(p.identifiersKnown, id) p.identifiers = append(p.identifiers, id)
p.posIdentifierBaseof = len(p.identifiersKnown) - 1 p.posIdentifierBaseof = len(p.identifiers) - 1
}
if !found && mayHaveLayout {
p.identifiersKnown = append(p.identifiersKnown, id)
p.posIdentifierLayout = len(p.identifiersKnown) - 1
found = true
} }
if !found { if !found {
p.identifiersUnknown = append(p.identifiersUnknown, id) p.identifiers = append(p.identifiers, id)
p.identifiersUnknown = append(p.identifiersUnknown, len(p.identifiers)-1)
} }
} }
@ -238,24 +228,19 @@ func (pp *PathParser) doParse(component, s string, p *Path) (*Path, error) {
p.s = s p.s = s
slashCount := 0 slashCount := 0
lastDot := 0 lastDot := 0
lastSlashIdx := strings.LastIndex(s, "/")
numDots := strings.Count(s[lastSlashIdx+1:], ".")
if strings.Contains(s, "/_shortcodes/") {
p.pathType = TypeShortcode
}
for i := len(s) - 1; i >= 0; i-- { for i := len(s) - 1; i >= 0; i-- {
c := s[i] c := s[i]
switch c { switch c {
case '.': case '.':
pp.parseIdentifier(component, s, p, i, lastDot, numDots, false) pp.parseIdentifier(component, s, p, i, lastDot)
lastDot = i lastDot = i
case '/': case '/':
slashCount++ slashCount++
if p.posContainerHigh == -1 { if p.posContainerHigh == -1 {
if lastDot > 0 { if lastDot > 0 {
pp.parseIdentifier(component, s, p, i, lastDot, numDots, true) pp.parseIdentifier(component, s, p, i, lastDot)
} }
p.posContainerHigh = i + 1 p.posContainerHigh = i + 1
} else if p.posContainerLow == -1 { } else if p.posContainerLow == -1 {
@ -267,13 +252,13 @@ func (pp *PathParser) doParse(component, s string, p *Path) (*Path, error) {
} }
} }
if len(p.identifiersKnown) > 0 { if len(p.identifiers) > 0 {
isContentComponent := p.component == files.ComponentFolderContent || p.component == files.ComponentFolderArchetypes isContentComponent := p.component == files.ComponentFolderContent || p.component == files.ComponentFolderArchetypes
isContent := isContentComponent && pp.IsContentExt(p.Ext()) isContent := isContentComponent && pp.IsContentExt(p.Ext())
id := p.identifiersKnown[len(p.identifiersKnown)-1] id := p.identifiers[len(p.identifiers)-1]
if id.Low > p.posContainerHigh { if id.High > p.posContainerHigh {
b := p.s[p.posContainerHigh : id.Low-1] b := p.s[p.posContainerHigh:id.High]
if isContent { if isContent {
switch b { switch b {
case "index": case "index":
@ -291,9 +276,10 @@ func (pp *PathParser) doParse(component, s string, p *Path) (*Path, error) {
p.pathType = TypeContentData p.pathType = TypeContentData
} }
} }
} }
if p.pathType < TypeMarkup && component == files.ComponentFolderLayouts { if component == files.ComponentFolderLayouts {
if p.posIdentifierBaseof != -1 { if p.posIdentifierBaseof != -1 {
p.pathType = TypeBaseof p.pathType = TypeBaseof
} else { } else {
@ -308,14 +294,6 @@ func (pp *PathParser) doParse(component, s string, p *Path) (*Path, error) {
} }
} }
if p.pathType == TypeShortcode && p.posIdentifierLayout != -1 {
id := p.identifiersKnown[p.posIdentifierLayout]
if id.Low == p.posContainerHigh {
// First identifier is shortcode name.
p.posIdentifierLayout = -1
}
}
return p, nil return p, nil
} }
@ -372,14 +350,13 @@ type Path struct {
component string component string
pathType Type pathType Type
identifiersKnown []types.LowHigh[string] identifiers []types.LowHigh[string]
identifiersUnknown []types.LowHigh[string]
posIdentifierLanguage int posIdentifierLanguage int
posIdentifierOutputFormat int posIdentifierOutputFormat int
posIdentifierKind int posIdentifierKind int
posIdentifierLayout int
posIdentifierBaseof int posIdentifierBaseof int
identifiersUnknown []int
disabled bool disabled bool
trimLeadingSlash bool trimLeadingSlash bool
@ -411,11 +388,10 @@ func (p *Path) reset() {
p.posSectionHigh = -1 p.posSectionHigh = -1
p.component = "" p.component = ""
p.pathType = 0 p.pathType = 0
p.identifiersKnown = p.identifiersKnown[:0] p.identifiers = p.identifiers[:0]
p.posIdentifierLanguage = -1 p.posIdentifierLanguage = -1
p.posIdentifierOutputFormat = -1 p.posIdentifierOutputFormat = -1
p.posIdentifierKind = -1 p.posIdentifierKind = -1
p.posIdentifierLayout = -1
p.posIdentifierBaseof = -1 p.posIdentifierBaseof = -1
p.disabled = false p.disabled = false
p.trimLeadingSlash = false p.trimLeadingSlash = false
@ -503,7 +479,7 @@ func (p *Path) Name() string {
// Name returns the last element of path without any extension. // Name returns the last element of path without any extension.
func (p *Path) NameNoExt() string { func (p *Path) NameNoExt() string {
if i := p.identifierIndex(0); i != -1 { if i := p.identifierIndex(0); i != -1 {
return p.s[p.posContainerHigh : p.identifiersKnown[i].Low-1] return p.s[p.posContainerHigh : p.identifiers[i].Low-1]
} }
return p.s[p.posContainerHigh:] return p.s[p.posContainerHigh:]
} }
@ -515,7 +491,7 @@ func (p *Path) NameNoLang() string {
return p.Name() return p.Name()
} }
return p.s[p.posContainerHigh:p.identifiersKnown[i].Low-1] + p.s[p.identifiersKnown[i].High:] return p.s[p.posContainerHigh:p.identifiers[i].Low-1] + p.s[p.identifiers[i].High:]
} }
// BaseNameNoIdentifier returns the logical base name for a resource without any identifier (e.g. no extension). // BaseNameNoIdentifier returns the logical base name for a resource without any identifier (e.g. no extension).
@ -534,15 +510,15 @@ func (p *Path) NameNoIdentifier() string {
} }
func (p *Path) nameLowHigh() types.LowHigh[string] { func (p *Path) nameLowHigh() types.LowHigh[string] {
if len(p.identifiersKnown) > 0 { if len(p.identifiers) > 0 {
lastID := p.identifiersKnown[len(p.identifiersKnown)-1] lastID := p.identifiers[len(p.identifiers)-1]
if p.posContainerHigh == lastID.Low { if p.posContainerHigh == lastID.Low {
// The last identifier is the name. // The last identifier is the name.
return lastID return lastID
} }
return types.LowHigh[string]{ return types.LowHigh[string]{
Low: p.posContainerHigh, Low: p.posContainerHigh,
High: p.identifiersKnown[len(p.identifiersKnown)-1].Low - 1, High: p.identifiers[len(p.identifiers)-1].Low - 1,
} }
} }
return types.LowHigh[string]{ return types.LowHigh[string]{
@ -590,7 +566,7 @@ func (p *Path) PathNoIdentifier() string {
// PathBeforeLangAndOutputFormatAndExt returns the path up to the first identifier that is not a language or output format. // PathBeforeLangAndOutputFormatAndExt returns the path up to the first identifier that is not a language or output format.
func (p *Path) PathBeforeLangAndOutputFormatAndExt() string { func (p *Path) PathBeforeLangAndOutputFormatAndExt() string {
if len(p.identifiersKnown) == 0 { if len(p.identifiers) == 0 {
return p.norm(p.s) return p.norm(p.s)
} }
i := p.identifierIndex(0) i := p.identifierIndex(0)
@ -606,7 +582,7 @@ func (p *Path) PathBeforeLangAndOutputFormatAndExt() string {
return p.norm(p.s) return p.norm(p.s)
} }
id := p.identifiersKnown[i] id := p.identifiers[i]
return p.norm(p.s[:id.Low-1]) return p.norm(p.s[:id.Low-1])
} }
@ -657,11 +633,11 @@ func (p *Path) BaseNoLeadingSlash() string {
} }
func (p *Path) base(preserveExt, isBundle bool) string { func (p *Path) base(preserveExt, isBundle bool) string {
if len(p.identifiersKnown) == 0 { if len(p.identifiers) == 0 {
return p.norm(p.s) return p.norm(p.s)
} }
if preserveExt && len(p.identifiersKnown) == 1 { if preserveExt && len(p.identifiers) == 1 {
// Preserve extension. // Preserve extension.
return p.norm(p.s) return p.norm(p.s)
} }
@ -683,7 +659,7 @@ func (p *Path) base(preserveExt, isBundle bool) string {
} }
// For txt files etc. we want to preserve the extension. // For txt files etc. we want to preserve the extension.
id := p.identifiersKnown[0] id := p.identifiers[0]
return p.norm(p.s[:high] + p.s[id.Low-1:id.High]) return p.norm(p.s[:high] + p.s[id.Low-1:id.High])
} }
@ -700,10 +676,6 @@ func (p *Path) Kind() string {
return p.identifierAsString(p.posIdentifierKind) return p.identifierAsString(p.posIdentifierKind)
} }
func (p *Path) Layout() string {
return p.identifierAsString(p.posIdentifierLayout)
}
func (p *Path) Lang() string { func (p *Path) Lang() string {
return p.identifierAsString(p.posIdentifierLanguage) return p.identifierAsString(p.posIdentifierLanguage)
} }
@ -717,8 +689,8 @@ func (p *Path) Disabled() bool {
} }
func (p *Path) Identifiers() []string { func (p *Path) Identifiers() []string {
ids := make([]string, len(p.identifiersKnown)) ids := make([]string, len(p.identifiers))
for i, id := range p.identifiersKnown { for i, id := range p.identifiers {
ids[i] = p.s[id.Low:id.High] ids[i] = p.s[id.Low:id.High]
} }
return ids return ids
@ -727,7 +699,7 @@ func (p *Path) Identifiers() []string {
func (p *Path) IdentifiersUnknown() []string { func (p *Path) IdentifiersUnknown() []string {
ids := make([]string, len(p.identifiersUnknown)) ids := make([]string, len(p.identifiersUnknown))
for i, id := range p.identifiersUnknown { for i, id := range p.identifiersUnknown {
ids[i] = p.s[id.Low:id.High] ids[i] = p.s[p.identifiers[id].Low:p.identifiers[id].High]
} }
return ids return ids
} }
@ -763,12 +735,12 @@ func (p *Path) identifierAsString(i int) string {
return "" return ""
} }
id := p.identifiersKnown[i] id := p.identifiers[i]
return p.s[id.Low:id.High] return p.s[id.Low:id.High]
} }
func (p *Path) identifierIndex(i int) int { func (p *Path) identifierIndex(i int) int {
if i < 0 || i >= len(p.identifiersKnown) { if i < 0 || i >= len(p.identifiers) {
return -1 return -1
} }
return i return i

View file

@ -171,25 +171,22 @@ func TestParse(t *testing.T) {
"/a/b.a.b.no.txt", "/a/b.a.b.no.txt",
func(c *qt.C, p *Path) { func(c *qt.C, p *Path) {
c.Assert(p.Name(), qt.Equals, "b.a.b.no.txt") c.Assert(p.Name(), qt.Equals, "b.a.b.no.txt")
c.Assert(p.NameNoIdentifier(), qt.Equals, "b.a.b") c.Assert(p.NameNoIdentifier(), qt.Equals, "b")
c.Assert(p.NameNoLang(), qt.Equals, "b.a.b.txt") c.Assert(p.NameNoLang(), qt.Equals, "b.a.b.txt")
c.Assert(p.Identifiers(), qt.DeepEquals, []string{"txt", "no"}) c.Assert(p.Identifiers(), qt.DeepEquals, []string{"txt", "no", "b", "a", "b"})
c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{"b", "a", "b"}) c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{"b", "a", "b"})
c.Assert(p.Base(), qt.Equals, "/a/b.a.b.txt") c.Assert(p.Base(), qt.Equals, "/a/b.txt")
c.Assert(p.BaseNoLeadingSlash(), qt.Equals, "a/b.a.b.txt") c.Assert(p.BaseNoLeadingSlash(), qt.Equals, "a/b.txt")
c.Assert(p.Path(), qt.Equals, "/a/b.a.b.no.txt") c.Assert(p.Path(), qt.Equals, "/a/b.a.b.no.txt")
c.Assert(p.PathNoLang(), qt.Equals, "/a/b.a.b.txt") c.Assert(p.PathNoLang(), qt.Equals, "/a/b.txt")
c.Assert(p.Ext(), qt.Equals, "txt") c.Assert(p.Ext(), qt.Equals, "txt")
c.Assert(p.PathNoIdentifier(), qt.Equals, "/a/b.a.b") c.Assert(p.PathNoIdentifier(), qt.Equals, "/a/b")
}, },
}, },
{ {
"Home branch cundle", "Home branch cundle",
"/_index.md", "/_index.md",
func(c *qt.C, p *Path) { func(c *qt.C, p *Path) {
c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md"})
c.Assert(p.IsBranchBundle(), qt.IsTrue)
c.Assert(p.IsBundle(), qt.IsTrue)
c.Assert(p.Base(), qt.Equals, "/") c.Assert(p.Base(), qt.Equals, "/")
c.Assert(p.BaseReTyped("foo"), qt.Equals, "/foo") c.Assert(p.BaseReTyped("foo"), qt.Equals, "/foo")
c.Assert(p.Path(), qt.Equals, "/_index.md") c.Assert(p.Path(), qt.Equals, "/_index.md")
@ -209,8 +206,7 @@ func TestParse(t *testing.T) {
c.Assert(p.ContainerDir(), qt.Equals, "") c.Assert(p.ContainerDir(), qt.Equals, "")
c.Assert(p.Dir(), qt.Equals, "/a") c.Assert(p.Dir(), qt.Equals, "/a")
c.Assert(p.Ext(), qt.Equals, "md") c.Assert(p.Ext(), qt.Equals, "md")
c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{"index"}) c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md", "index"})
c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md"})
c.Assert(p.IsBranchBundle(), qt.IsFalse) c.Assert(p.IsBranchBundle(), qt.IsFalse)
c.Assert(p.IsBundle(), qt.IsTrue) c.Assert(p.IsBundle(), qt.IsTrue)
c.Assert(p.IsLeafBundle(), qt.IsTrue) c.Assert(p.IsLeafBundle(), qt.IsTrue)
@ -232,7 +228,7 @@ func TestParse(t *testing.T) {
c.Assert(p.ContainerDir(), qt.Equals, "/a") c.Assert(p.ContainerDir(), qt.Equals, "/a")
c.Assert(p.Dir(), qt.Equals, "/a/b") c.Assert(p.Dir(), qt.Equals, "/a/b")
c.Assert(p.Ext(), qt.Equals, "md") c.Assert(p.Ext(), qt.Equals, "md")
c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md", "no"}) c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md", "no", "index"})
c.Assert(p.IsBranchBundle(), qt.IsFalse) c.Assert(p.IsBranchBundle(), qt.IsFalse)
c.Assert(p.IsBundle(), qt.IsTrue) c.Assert(p.IsBundle(), qt.IsTrue)
c.Assert(p.IsLeafBundle(), qt.IsTrue) c.Assert(p.IsLeafBundle(), qt.IsTrue)
@ -254,7 +250,7 @@ func TestParse(t *testing.T) {
c.Assert(p.Container(), qt.Equals, "b") c.Assert(p.Container(), qt.Equals, "b")
c.Assert(p.ContainerDir(), qt.Equals, "/a") c.Assert(p.ContainerDir(), qt.Equals, "/a")
c.Assert(p.Ext(), qt.Equals, "md") c.Assert(p.Ext(), qt.Equals, "md")
c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md", "no"}) c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md", "no", "_index"})
c.Assert(p.IsBranchBundle(), qt.IsTrue) c.Assert(p.IsBranchBundle(), qt.IsTrue)
c.Assert(p.IsBundle(), qt.IsTrue) c.Assert(p.IsBundle(), qt.IsTrue)
c.Assert(p.IsLeafBundle(), qt.IsFalse) c.Assert(p.IsLeafBundle(), qt.IsFalse)
@ -293,7 +289,7 @@ func TestParse(t *testing.T) {
func(c *qt.C, p *Path) { func(c *qt.C, p *Path) {
c.Assert(p.Base(), qt.Equals, "/a/b/index.txt") c.Assert(p.Base(), qt.Equals, "/a/b/index.txt")
c.Assert(p.Ext(), qt.Equals, "txt") c.Assert(p.Ext(), qt.Equals, "txt")
c.Assert(p.Identifiers(), qt.DeepEquals, []string{"txt", "no"}) c.Assert(p.Identifiers(), qt.DeepEquals, []string{"txt", "no", "index"})
c.Assert(p.IsLeafBundle(), qt.IsFalse) c.Assert(p.IsLeafBundle(), qt.IsFalse)
c.Assert(p.PathNoIdentifier(), qt.Equals, "/a/b/index") c.Assert(p.PathNoIdentifier(), qt.Equals, "/a/b/index")
}, },
@ -376,7 +372,7 @@ func TestParse(t *testing.T) {
} }
for _, test := range tests { for _, test := range tests {
c.Run(test.name, func(c *qt.C) { c.Run(test.name, func(c *qt.C) {
if test.name != "Home branch cundle" { if test.name != "Basic Markdown file" {
// return // return
} }
test.assert(c, testParser.Parse(files.ComponentFolderContent, test.path)) test.assert(c, testParser.Parse(files.ComponentFolderContent, test.path))
@ -405,58 +401,10 @@ func TestParseLayouts(t *testing.T) {
"/list.no.html", "/list.no.html",
func(c *qt.C, p *Path) { func(c *qt.C, p *Path) {
c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "no", "list"}) c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "no", "list"})
c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{})
c.Assert(p.Base(), qt.Equals, "/list.html") c.Assert(p.Base(), qt.Equals, "/list.html")
c.Assert(p.Lang(), qt.Equals, "no") c.Assert(p.Lang(), qt.Equals, "no")
}, },
}, },
{
"Kind",
"/section.no.html",
func(c *qt.C, p *Path) {
c.Assert(p.Kind(), qt.Equals, kinds.KindSection)
c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "no", "section"})
c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{})
c.Assert(p.Base(), qt.Equals, "/section.html")
c.Assert(p.Lang(), qt.Equals, "no")
},
},
{
"Layout",
"/list.section.no.html",
func(c *qt.C, p *Path) {
c.Assert(p.Layout(), qt.Equals, "list")
c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "no", "section", "list"})
c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{})
c.Assert(p.Base(), qt.Equals, "/list.html")
c.Assert(p.Lang(), qt.Equals, "no")
},
},
{
"Layout multiple",
"/mylayout.list.section.no.html",
func(c *qt.C, p *Path) {
c.Assert(p.Layout(), qt.Equals, "mylayout")
c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "no", "section", "list", "mylayout"})
c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{})
c.Assert(p.Base(), qt.Equals, "/mylayout.html")
c.Assert(p.Lang(), qt.Equals, "no")
},
},
{
"Layout shortcode",
"/_shortcodes/myshort.list.no.html",
func(c *qt.C, p *Path) {
c.Assert(p.Layout(), qt.Equals, "list")
},
},
{
"Layout baseof",
"/baseof.list.no.html",
func(c *qt.C, p *Path) {
c.Assert(p.Layout(), qt.Equals, "list")
},
},
{ {
"Lang and output format", "Lang and output format",
"/list.no.amp.not.html", "/list.no.amp.not.html",
@ -481,21 +429,6 @@ func TestParseLayouts(t *testing.T) {
c.Assert(p.OutputFormat(), qt.Equals, "html") c.Assert(p.OutputFormat(), qt.Equals, "html")
}, },
}, },
{
"Shortcode with layout",
"/_shortcodes/myshortcode.list.html",
func(c *qt.C, p *Path) {
c.Assert(p.Base(), qt.Equals, "/_shortcodes/myshortcode.html")
c.Assert(p.Type(), qt.Equals, TypeShortcode)
c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "list"})
c.Assert(p.Layout(), qt.Equals, "list")
c.Assert(p.PathNoIdentifier(), qt.Equals, "/_shortcodes/myshortcode")
c.Assert(p.PathBeforeLangAndOutputFormatAndExt(), qt.Equals, "/_shortcodes/myshortcode.list")
c.Assert(p.Lang(), qt.Equals, "")
c.Assert(p.Kind(), qt.Equals, "")
c.Assert(p.OutputFormat(), qt.Equals, "html")
},
},
{ {
"Sub dir", "Sub dir",
"/pages/home.html", "/pages/home.html",
@ -512,7 +445,7 @@ func TestParseLayouts(t *testing.T) {
"/pages/baseof.list.section.fr.amp.html", "/pages/baseof.list.section.fr.amp.html",
func(c *qt.C, p *Path) { func(c *qt.C, p *Path) {
c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "amp", "fr", "section", "list", "baseof"}) c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "amp", "fr", "section", "list", "baseof"})
c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{}) c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{"list"})
c.Assert(p.Kind(), qt.Equals, kinds.KindSection) c.Assert(p.Kind(), qt.Equals, kinds.KindSection)
c.Assert(p.Lang(), qt.Equals, "fr") c.Assert(p.Lang(), qt.Equals, "fr")
c.Assert(p.OutputFormat(), qt.Equals, "amp") c.Assert(p.OutputFormat(), qt.Equals, "amp")
@ -564,32 +497,10 @@ func TestParseLayouts(t *testing.T) {
c.Assert(p.Type(), qt.Equals, TypePartial) c.Assert(p.Type(), qt.Equals, TypePartial)
}, },
}, },
{
"Shortcode lang in root",
"/_shortcodes/no.html",
func(c *qt.C, p *Path) {
c.Assert(p.Type(), qt.Equals, TypeShortcode)
c.Assert(p.Lang(), qt.Equals, "")
c.Assert(p.NameNoIdentifier(), qt.Equals, "no")
},
},
{
"Shortcode lang layout",
"/_shortcodes/myshortcode.no.html",
func(c *qt.C, p *Path) {
c.Assert(p.Type(), qt.Equals, TypeShortcode)
c.Assert(p.Lang(), qt.Equals, "no")
c.Assert(p.Layout(), qt.Equals, "")
c.Assert(p.NameNoIdentifier(), qt.Equals, "myshortcode")
},
},
} }
for _, test := range tests { for _, test := range tests {
c.Run(test.name, func(c *qt.C) { c.Run(test.name, func(c *qt.C) {
if test.name != "Shortcode lang layout" {
// return
}
test.assert(c, testParser.Parse(files.ComponentFolderLayouts, test.path)) test.assert(c, testParser.Parse(files.ComponentFolderLayouts, test.path))
}) })
} }

View file

@ -78,26 +78,3 @@ disablePathToLower = true
b.AssertFileContent("public/en/mysection/mybundle/index.html", "en|Single") b.AssertFileContent("public/en/mysection/mybundle/index.html", "en|Single")
b.AssertFileContent("public/fr/MySection/MyBundle/index.html", "fr|Single") b.AssertFileContent("public/fr/MySection/MyBundle/index.html", "fr|Single")
} }
func TestIssue13596(t *testing.T) {
t.Parallel()
files := `
-- hugo.toml --
disableKinds = ['home','rss','section','sitemap','taxonomy','term']
-- content/p1/index.md --
---
title: p1
---
-- content/p1/a.1.txt --
-- content/p1/a.2.txt --
-- layouts/all.html --
{{ range .Resources.Match "*" }}{{ .Name }}|{{ end }}
`
b := hugolib.Test(t, files)
b.AssertFileContent("public/p1/index.html", "a.1.txt|a.2.txt|")
b.AssertFileExists("public/p1/a.1.txt", true)
b.AssertFileExists("public/p1/a.2.txt", true) // fails
}

View file

@ -17,6 +17,7 @@ package terminal
import ( import (
"fmt" "fmt"
"os" "os"
"runtime"
"strings" "strings"
isatty "github.com/mattn/go-isatty" isatty "github.com/mattn/go-isatty"
@ -40,6 +41,10 @@ func PrintANSIColors(f *os.File) bool {
// IsTerminal return true if the file descriptor is terminal and the TERM // IsTerminal return true if the file descriptor is terminal and the TERM
// environment variable isn't a dumb one. // environment variable isn't a dumb one.
func IsTerminal(f *os.File) bool { func IsTerminal(f *os.File) bool {
if runtime.GOOS == "windows" {
return false
}
fd := f.Fd() fd := f.Fd()
return os.Getenv("TERM") != "dumb" && (isatty.IsTerminal(fd) || isatty.IsCygwinTerminal(fd)) return os.Getenv("TERM") != "dumb" && (isatty.IsTerminal(fd) || isatty.IsCygwinTerminal(fd))
} }

View file

@ -146,7 +146,7 @@ type Config struct {
// The cascade configuration section contains the top level front matter cascade configuration options, // The cascade configuration section contains the top level front matter cascade configuration options,
// a slice of page matcher and params to apply to those pages. // a slice of page matcher and params to apply to those pages.
Cascade *config.ConfigNamespace[[]page.PageMatcherParamsConfig, *maps.Ordered[page.PageMatcher, page.PageMatcherParamsConfig]] `mapstructure:"-"` Cascade *config.ConfigNamespace[[]page.PageMatcherParamsConfig, *maps.Ordered[page.PageMatcher, maps.Params]] `mapstructure:"-"`
// The segments defines segments for the site. Used for partial/segmented builds. // The segments defines segments for the site. Used for partial/segmented builds.
Segments *config.ConfigNamespace[map[string]segments.SegmentConfig, segments.Segments] `mapstructure:"-"` Segments *config.ConfigNamespace[map[string]segments.SegmentConfig, segments.Segments] `mapstructure:"-"`
@ -776,7 +776,7 @@ type Configs struct {
} }
func (c *Configs) Validate(logger loggers.Logger) error { func (c *Configs) Validate(logger loggers.Logger) error {
c.Base.Cascade.Config.Range(func(p page.PageMatcher, cfg page.PageMatcherParamsConfig) bool { c.Base.Cascade.Config.Range(func(p page.PageMatcher, params maps.Params) bool {
page.CheckCascadePattern(logger, p) page.CheckCascadePattern(logger, p)
return true return true
}) })
@ -800,58 +800,30 @@ func (c *Configs) IsZero() bool {
func (c *Configs) Init() error { func (c *Configs) Init() error {
var languages langs.Languages var languages langs.Languages
defaultContentLanguage := c.Base.DefaultContentLanguage
var langKeys []string for k, v := range c.LanguageConfigMap {
var hasEn bool
const en = "en"
for k := range c.LanguageConfigMap {
langKeys = append(langKeys, k)
if k == en {
hasEn = true
}
}
// Sort the LanguageConfigSlice by language weight (if set) or lang.
sort.Slice(langKeys, func(i, j int) bool {
ki := langKeys[i]
kj := langKeys[j]
lki := c.LanguageConfigMap[ki]
lkj := c.LanguageConfigMap[kj]
li := lki.Languages[ki]
lj := lkj.Languages[kj]
if li.Weight != lj.Weight {
return li.Weight < lj.Weight
}
return ki < kj
})
// See issue #13646.
defaultConfigLanguageFallback := en
if !hasEn {
// Pick the first one.
defaultConfigLanguageFallback = langKeys[0]
}
if c.Base.DefaultContentLanguage == "" {
c.Base.DefaultContentLanguage = defaultConfigLanguageFallback
}
for _, k := range langKeys {
v := c.LanguageConfigMap[k]
if v.DefaultContentLanguage == "" {
v.DefaultContentLanguage = defaultConfigLanguageFallback
}
c.LanguageConfigSlice = append(c.LanguageConfigSlice, v)
languageConf := v.Languages[k] languageConf := v.Languages[k]
language, err := langs.NewLanguage(k, c.Base.DefaultContentLanguage, v.TimeZone, languageConf) language, err := langs.NewLanguage(k, defaultContentLanguage, v.TimeZone, languageConf)
if err != nil { if err != nil {
return err return err
} }
languages = append(languages, language) languages = append(languages, language)
} }
// Sort the sites by language weight (if set) or lang.
sort.Slice(languages, func(i, j int) bool {
li := languages[i]
lj := languages[j]
if li.Weight != lj.Weight {
return li.Weight < lj.Weight
}
return li.Lang < lj.Lang
})
for _, l := range languages {
c.LanguageConfigSlice = append(c.LanguageConfigSlice, c.LanguageConfigMap[l.Lang])
}
// Filter out disabled languages. // Filter out disabled languages.
var n int var n int
for _, l := range languages { for _, l := range languages {
@ -864,12 +836,12 @@ func (c *Configs) Init() error {
var languagesDefaultFirst langs.Languages var languagesDefaultFirst langs.Languages
for _, l := range languages { for _, l := range languages {
if l.Lang == c.Base.DefaultContentLanguage { if l.Lang == defaultContentLanguage {
languagesDefaultFirst = append(languagesDefaultFirst, l) languagesDefaultFirst = append(languagesDefaultFirst, l)
} }
} }
for _, l := range languages { for _, l := range languages {
if l.Lang != c.Base.DefaultContentLanguage { if l.Lang != defaultContentLanguage {
languagesDefaultFirst = append(languagesDefaultFirst, l) languagesDefaultFirst = append(languagesDefaultFirst, l)
} }
} }
@ -955,48 +927,17 @@ func (c Configs) GetByLang(lang string) config.AllProvider {
return nil return nil
} }
func newDefaultConfig() *Config {
return &Config{
Taxonomies: map[string]string{"tag": "tags", "category": "categories"},
Sitemap: config.SitemapConfig{Priority: -1, Filename: "sitemap.xml"},
RootConfig: RootConfig{
Environment: hugo.EnvironmentProduction,
TitleCaseStyle: "AP",
PluralizeListTitles: true,
CapitalizeListTitles: true,
StaticDir: []string{"static"},
SummaryLength: 70,
Timeout: "60s",
CommonDirs: config.CommonDirs{
ArcheTypeDir: "archetypes",
ContentDir: "content",
ResourceDir: "resources",
PublishDir: "public",
ThemesDir: "themes",
AssetDir: "assets",
LayoutDir: "layouts",
I18nDir: "i18n",
DataDir: "data",
},
},
}
}
// fromLoadConfigResult creates a new Config from res. // fromLoadConfigResult creates a new Config from res.
func fromLoadConfigResult(fs afero.Fs, logger loggers.Logger, res config.LoadConfigResult) (*Configs, error) { func fromLoadConfigResult(fs afero.Fs, logger loggers.Logger, res config.LoadConfigResult) (*Configs, error) {
if !res.Cfg.IsSet("languages") { if !res.Cfg.IsSet("languages") {
// We need at least one // We need at least one
lang := res.Cfg.GetString("defaultContentLanguage") lang := res.Cfg.GetString("defaultContentLanguage")
if lang == "" {
lang = "en"
}
res.Cfg.Set("languages", maps.Params{lang: maps.Params{}}) res.Cfg.Set("languages", maps.Params{lang: maps.Params{}})
} }
bcfg := res.BaseConfig bcfg := res.BaseConfig
cfg := res.Cfg cfg := res.Cfg
all := newDefaultConfig() all := &Config{}
err := decodeConfigFromParams(fs, logger, bcfg, cfg, all, nil) err := decodeConfigFromParams(fs, logger, bcfg, cfg, all, nil)
if err != nil { if err != nil {
@ -1006,7 +947,6 @@ func fromLoadConfigResult(fs afero.Fs, logger loggers.Logger, res config.LoadCon
langConfigMap := make(map[string]*Config) langConfigMap := make(map[string]*Config)
languagesConfig := cfg.GetStringMap("languages") languagesConfig := cfg.GetStringMap("languages")
var isMultihost bool var isMultihost bool
if err := all.CompileConfig(logger); err != nil { if err := all.CompileConfig(logger); err != nil {

View file

@ -5,7 +5,6 @@ import (
"testing" "testing"
qt "github.com/frankban/quicktest" qt "github.com/frankban/quicktest"
"github.com/gohugoio/hugo/common/hugo"
"github.com/gohugoio/hugo/config/allconfig" "github.com/gohugoio/hugo/config/allconfig"
"github.com/gohugoio/hugo/hugolib" "github.com/gohugoio/hugo/hugolib"
"github.com/gohugoio/hugo/media" "github.com/gohugoio/hugo/media"
@ -235,147 +234,3 @@ baseURL = "https://example.com"
b.Assert(c.IsContentFile("foo.md"), qt.Equals, true) b.Assert(c.IsContentFile("foo.md"), qt.Equals, true)
b.Assert(len(s), qt.Equals, 6) b.Assert(len(s), qt.Equals, 6)
} }
func TestMergeDeep(t *testing.T) {
t.Parallel()
files := `
-- hugo.toml --
baseURL = "https://example.com"
theme = ["theme1", "theme2"]
_merge = "deep"
-- themes/theme1/hugo.toml --
[sitemap]
filename = 'mysitemap.xml'
[services]
[services.googleAnalytics]
id = 'foo bar'
[taxonomies]
foo = 'bars'
-- themes/theme2/config/_default/hugo.toml --
[taxonomies]
bar = 'baz'
-- layouts/home.html --
GA ID: {{ site.Config.Services.GoogleAnalytics.ID }}.
`
b := hugolib.Test(t, files)
conf := b.H.Configs
base := conf.Base
b.Assert(base.Environment, qt.Equals, hugo.EnvironmentProduction)
b.Assert(base.BaseURL, qt.Equals, "https://example.com")
b.Assert(base.Sitemap.Filename, qt.Equals, "mysitemap.xml")
b.Assert(base.Taxonomies, qt.DeepEquals, map[string]string{"bar": "baz", "foo": "bars"})
b.AssertFileContent("public/index.html", "GA ID: foo bar.")
}
func TestMergeDeepBuildStats(t *testing.T) {
t.Parallel()
files := `
-- hugo.toml --
baseURL = "https://example.com"
title = "Theme 1"
_merge = "deep"
[module]
[module.hugoVersion]
[[module.imports]]
path = "theme1"
-- themes/theme1/hugo.toml --
[build]
[build.buildStats]
disableIDs = true
enable = true
-- layouts/home.html --
Home.
`
b := hugolib.Test(t, files, hugolib.TestOptOsFs())
conf := b.H.Configs
base := conf.Base
b.Assert(base.Title, qt.Equals, "Theme 1")
b.Assert(len(base.Module.Imports), qt.Equals, 1)
b.Assert(base.Build.BuildStats.Enable, qt.Equals, true)
b.AssertFileExists("/hugo_stats.json", true)
}
func TestMergeDeepBuildStatsTheme(t *testing.T) {
t.Parallel()
files := `
-- hugo.toml --
baseURL = "https://example.com"
_merge = "deep"
theme = ["theme1"]
-- themes/theme1/hugo.toml --
title = "Theme 1"
[build]
[build.buildStats]
disableIDs = true
enable = true
-- layouts/home.html --
Home.
`
b := hugolib.Test(t, files, hugolib.TestOptOsFs())
conf := b.H.Configs
base := conf.Base
b.Assert(base.Title, qt.Equals, "Theme 1")
b.Assert(len(base.Module.Imports), qt.Equals, 1)
b.Assert(base.Build.BuildStats.Enable, qt.Equals, true)
b.AssertFileExists("/hugo_stats.json", true)
}
func TestDefaultConfigLanguageBlankWhenNoEnglishExists(t *testing.T) {
t.Parallel()
files := `
-- hugo.toml --
baseURL = "https://example.com"
[languages]
[languages.nn]
weight = 20
[languages.sv]
weight = 10
[languages.sv.taxonomies]
tag = "taggar"
-- layouts/all.html --
All.
`
b := hugolib.Test(t, files)
b.Assert(b.H.Conf.DefaultContentLanguage(), qt.Equals, "sv")
}
func TestDefaultConfigEnvDisableLanguagesIssue13707(t *testing.T) {
t.Parallel()
files := `
-- hugo.toml --
disableLanguages = []
[languages]
[languages.en]
weight = 1
[languages.nn]
weight = 2
[languages.sv]
weight = 3
`
b := hugolib.Test(t, files, hugolib.TestOptWithConfig(func(conf *hugolib.IntegrationTestConfig) {
conf.Environ = []string{`HUGO_DISABLELANGUAGES=sv nn`}
}))
b.Assert(len(b.H.Sites), qt.Equals, 1)
}

View file

@ -249,18 +249,14 @@ var allDecoderSetups = map[string]decodeWeight{
key: "sitemap", key: "sitemap",
decode: func(d decodeWeight, p decodeConfig) error { decode: func(d decodeWeight, p decodeConfig) error {
var err error var err error
if p.p.IsSet(d.key) { p.c.Sitemap, err = config.DecodeSitemap(config.SitemapConfig{Priority: -1, Filename: "sitemap.xml"}, p.p.GetStringMap(d.key))
p.c.Sitemap, err = config.DecodeSitemap(p.c.Sitemap, p.p.GetStringMap(d.key))
}
return err return err
}, },
}, },
"taxonomies": { "taxonomies": {
key: "taxonomies", key: "taxonomies",
decode: func(d decodeWeight, p decodeConfig) error { decode: func(d decodeWeight, p decodeConfig) error {
if p.p.IsSet(d.key) {
p.c.Taxonomies = maps.CleanConfigStringMapString(p.p.GetStringMapString(d.key)) p.c.Taxonomies = maps.CleanConfigStringMapString(p.p.GetStringMapString(d.key))
}
return nil return nil
}, },
}, },
@ -310,7 +306,6 @@ var allDecoderSetups = map[string]decodeWeight{
} }
// Validate defaultContentLanguage. // Validate defaultContentLanguage.
if p.c.DefaultContentLanguage != "" {
var found bool var found bool
for lang := range p.c.Languages { for lang := range p.c.Languages {
if lang == p.c.DefaultContentLanguage { if lang == p.c.DefaultContentLanguage {
@ -321,7 +316,6 @@ var allDecoderSetups = map[string]decodeWeight{
if !found { if !found {
return fmt.Errorf("config value %q for defaultContentLanguage does not match any language definition", p.c.DefaultContentLanguage) return fmt.Errorf("config value %q for defaultContentLanguage does not match any language definition", p.c.DefaultContentLanguage)
} }
}
return nil return nil
}, },
@ -330,7 +324,7 @@ var allDecoderSetups = map[string]decodeWeight{
key: "cascade", key: "cascade",
decode: func(d decodeWeight, p decodeConfig) error { decode: func(d decodeWeight, p decodeConfig) error {
var err error var err error
p.c.Cascade, err = page.DecodeCascadeConfig(nil, true, p.p.Get(d.key)) p.c.Cascade, err = page.DecodeCascadeConfig(nil, p.p.Get(d.key))
return err return err
}, },
}, },

View file

@ -159,9 +159,63 @@ func (l configLoader) applyConfigAliases() error {
func (l configLoader) applyDefaultConfig() error { func (l configLoader) applyDefaultConfig() error {
defaultSettings := maps.Params{ defaultSettings := maps.Params{
// These dirs are used early/before we build the config struct. "baseURL": "",
"cleanDestinationDir": false,
"watch": false,
"contentDir": "content",
"resourceDir": "resources",
"publishDir": "public",
"publishDirOrig": "public",
"themesDir": "themes", "themesDir": "themes",
"assetDir": "assets",
"layoutDir": "layouts",
"i18nDir": "i18n",
"dataDir": "data",
"archetypeDir": "archetypes",
"configDir": "config", "configDir": "config",
"staticDir": "static",
"buildDrafts": false,
"buildFuture": false,
"buildExpired": false,
"params": maps.Params{},
"environment": hugo.EnvironmentProduction,
"uglyURLs": false,
"verbose": false,
"ignoreCache": false,
"canonifyURLs": false,
"relativeURLs": false,
"removePathAccents": false,
"titleCaseStyle": "AP",
"taxonomies": maps.Params{"tag": "tags", "category": "categories"},
"permalinks": maps.Params{},
"sitemap": maps.Params{"priority": -1, "filename": "sitemap.xml"},
"menus": maps.Params{},
"disableLiveReload": false,
"pluralizeListTitles": true,
"capitalizeListTitles": true,
"forceSyncStatic": false,
"footnoteAnchorPrefix": "",
"footnoteReturnLinkContents": "",
"newContentEditor": "",
"paginate": 0, // Moved into the paginator struct in Hugo v0.128.0.
"paginatePath": "", // Moved into the paginator struct in Hugo v0.128.0.
"summaryLength": 70,
"rssLimit": -1,
"sectionPagesMenu": "",
"disablePathToLower": false,
"hasCJKLanguage": false,
"enableEmoji": false,
"defaultContentLanguage": "en",
"defaultContentLanguageInSubdir": false,
"enableMissingTranslationPlaceholders": false,
"enableGitInfo": false,
"ignoreFiles": make([]string, 0),
"disableAliases": false,
"debug": false,
"disableFastRender": false,
"timeout": "30s",
"timeZone": "",
"enableInlineShortcodes": false,
} }
l.cfg.SetDefaults(defaultSettings) l.cfg.SetDefaults(defaultSettings)
@ -233,18 +287,17 @@ func (l configLoader) applyOsEnvOverrides(environ []string) error {
if existing != nil { if existing != nil {
val, err := metadecoders.Default.UnmarshalStringTo(env.Value, existing) val, err := metadecoders.Default.UnmarshalStringTo(env.Value, existing)
if err == nil { if err != nil {
val = l.envValToVal(env.Key, val) continue
}
if owner != nil { if owner != nil {
owner[nestedKey] = val owner[nestedKey] = val
} else { } else {
l.cfg.Set(env.Key, val) l.cfg.Set(env.Key, val)
} }
continue } else {
} if nestedKey != "" {
}
if owner != nil && nestedKey != "" {
owner[nestedKey] = env.Value owner[nestedKey] = env.Value
} else { } else {
var val any var val any
@ -256,28 +309,18 @@ func (l configLoader) applyOsEnvOverrides(environ []string) error {
val = v val = v
} }
} }
if val == nil { if val == nil {
// A string. // A string.
val = l.envStringToVal(key, env.Value) val = l.envStringToVal(key, env.Value)
} }
l.cfg.Set(key, val) l.cfg.Set(key, val)
} }
}
} }
return nil return nil
} }
func (l *configLoader) envValToVal(k string, v any) any {
switch v := v.(type) {
case string:
return l.envStringToVal(k, v)
default:
return v
}
}
func (l *configLoader) envStringToVal(k, v string) any { func (l *configLoader) envStringToVal(k, v string) any {
switch k { switch k {
case "disablekinds", "disablelanguages": case "disablekinds", "disablelanguages":

View file

@ -17,7 +17,6 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"regexp" "regexp"
"slices"
"sort" "sort"
"strings" "strings"
@ -29,6 +28,7 @@ import (
"github.com/gohugoio/hugo/common/herrors" "github.com/gohugoio/hugo/common/herrors"
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
"github.com/spf13/cast" "github.com/spf13/cast"
"slices"
) )
type BaseConfig struct { type BaseConfig struct {

View file

@ -76,7 +76,7 @@ type AllProvider interface {
} }
// We cannot import the media package as that would create a circular dependency. // We cannot import the media package as that would create a circular dependency.
// This interface defines a subset of what media.ContentTypes provides. // This interface defineds a sub set of what media.ContentTypes provides.
type ContentTypesProvider interface { type ContentTypesProvider interface {
IsContentSuffix(suffix string) bool IsContentSuffix(suffix string) bool
IsContentFile(filename string) bool IsContentFile(filename string) bool

View file

@ -101,9 +101,6 @@ func DecodeConfig(cfg config.Provider) (c Config, err error) {
if c.RSS.Limit == 0 { if c.RSS.Limit == 0 {
c.RSS.Limit = cfg.GetInt(rssLimitKey) c.RSS.Limit = cfg.GetInt(rssLimitKey)
if c.RSS.Limit == 0 {
c.RSS.Limit = -1
}
} }
return return

View file

@ -36,7 +36,6 @@ import (
"github.com/dustin/go-humanize" "github.com/dustin/go-humanize"
"github.com/gobwas/glob" "github.com/gobwas/glob"
"github.com/gohugoio/hugo/common/loggers" "github.com/gohugoio/hugo/common/loggers"
"github.com/gohugoio/hugo/common/para"
"github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/config"
"github.com/gohugoio/hugo/deploy/deployconfig" "github.com/gohugoio/hugo/deploy/deployconfig"
"github.com/gohugoio/hugo/media" "github.com/gohugoio/hugo/media"
@ -488,12 +487,7 @@ func knownHiddenDirectory(name string) bool {
// walkLocal walks the source directory and returns a flat list of files, // walkLocal walks the source directory and returns a flat list of files,
// using localFile.SlashPath as the map keys. // using localFile.SlashPath as the map keys.
func (d *Deployer) walkLocal(fs afero.Fs, matchers []*deployconfig.Matcher, include, exclude glob.Glob, mediaTypes media.Types, mappath func(string) string) (map[string]*localFile, error) { func (d *Deployer) walkLocal(fs afero.Fs, matchers []*deployconfig.Matcher, include, exclude glob.Glob, mediaTypes media.Types, mappath func(string) string) (map[string]*localFile, error) {
retval := make(map[string]*localFile) retval := map[string]*localFile{}
var mu sync.Mutex
workers := para.New(d.cfg.Workers)
g, _ := workers.Start(context.Background())
err := afero.Walk(fs, "", func(path string, info os.FileInfo, err error) error { err := afero.Walk(fs, "", func(path string, info os.FileInfo, err error) error {
if err != nil { if err != nil {
return err return err
@ -514,8 +508,6 @@ func (d *Deployer) walkLocal(fs afero.Fs, matchers []*deployconfig.Matcher, incl
return nil return nil
} }
// Process each file in a worker
g.Run(func() error {
// When a file system is HFS+, its filepath is in NFD form. // When a file system is HFS+, its filepath is in NFD form.
if runtime.GOOS == "darwin" { if runtime.GOOS == "darwin" {
path = norm.NFC.String(path) path = norm.NFC.String(path)
@ -549,19 +541,12 @@ func (d *Deployer) walkLocal(fs afero.Fs, matchers []*deployconfig.Matcher, incl
if err != nil { if err != nil {
return err return err
} }
mu.Lock()
retval[lf.SlashPath] = lf retval[lf.SlashPath] = lf
mu.Unlock()
return nil
})
return nil return nil
}) })
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err := g.Wait(); err != nil {
return nil, err
}
return retval, nil return retval, nil
} }

View file

@ -623,7 +623,7 @@ func TestEndToEndSync(t *testing.T) {
localFs: test.fs, localFs: test.fs,
bucket: test.bucket, bucket: test.bucket,
mediaTypes: media.DefaultTypes, mediaTypes: media.DefaultTypes,
cfg: deployconfig.DeployConfig{Workers: 2, MaxDeletes: -1}, cfg: deployconfig.DeployConfig{MaxDeletes: -1},
} }
// Initial deployment should sync remote with local. // Initial deployment should sync remote with local.
@ -706,7 +706,7 @@ func TestMaxDeletes(t *testing.T) {
localFs: test.fs, localFs: test.fs,
bucket: test.bucket, bucket: test.bucket,
mediaTypes: media.DefaultTypes, mediaTypes: media.DefaultTypes,
cfg: deployconfig.DeployConfig{Workers: 2, MaxDeletes: -1}, cfg: deployconfig.DeployConfig{MaxDeletes: -1},
} }
// Sync remote with local. // Sync remote with local.
@ -836,7 +836,7 @@ func TestIncludeExclude(t *testing.T) {
} }
deployer := &Deployer{ deployer := &Deployer{
localFs: fsTest.fs, localFs: fsTest.fs,
cfg: deployconfig.DeployConfig{Workers: 2, MaxDeletes: -1}, bucket: fsTest.bucket, cfg: deployconfig.DeployConfig{MaxDeletes: -1}, bucket: fsTest.bucket,
target: tgt, target: tgt,
mediaTypes: media.DefaultTypes, mediaTypes: media.DefaultTypes,
} }
@ -893,7 +893,7 @@ func TestIncludeExcludeRemoteDelete(t *testing.T) {
} }
deployer := &Deployer{ deployer := &Deployer{
localFs: fsTest.fs, localFs: fsTest.fs,
cfg: deployconfig.DeployConfig{Workers: 2, MaxDeletes: -1}, bucket: fsTest.bucket, cfg: deployconfig.DeployConfig{MaxDeletes: -1}, bucket: fsTest.bucket,
mediaTypes: media.DefaultTypes, mediaTypes: media.DefaultTypes,
} }
@ -945,7 +945,7 @@ func TestCompression(t *testing.T) {
deployer := &Deployer{ deployer := &Deployer{
localFs: test.fs, localFs: test.fs,
bucket: test.bucket, bucket: test.bucket,
cfg: deployconfig.DeployConfig{Workers: 2, MaxDeletes: -1, Matchers: []*deployconfig.Matcher{{Pattern: ".*", Gzip: true, Re: regexp.MustCompile(".*")}}}, cfg: deployconfig.DeployConfig{MaxDeletes: -1, Matchers: []*deployconfig.Matcher{{Pattern: ".*", Gzip: true, Re: regexp.MustCompile(".*")}}},
mediaTypes: media.DefaultTypes, mediaTypes: media.DefaultTypes,
} }
@ -1000,7 +1000,7 @@ func TestMatching(t *testing.T) {
deployer := &Deployer{ deployer := &Deployer{
localFs: test.fs, localFs: test.fs,
bucket: test.bucket, bucket: test.bucket,
cfg: deployconfig.DeployConfig{Workers: 2, MaxDeletes: -1, Matchers: []*deployconfig.Matcher{{Pattern: "^subdir/aaa$", Force: true, Re: regexp.MustCompile("^subdir/aaa$")}}}, cfg: deployconfig.DeployConfig{MaxDeletes: -1, Matchers: []*deployconfig.Matcher{{Pattern: "^subdir/aaa$", Force: true, Re: regexp.MustCompile("^subdir/aaa$")}}},
mediaTypes: media.DefaultTypes, mediaTypes: media.DefaultTypes,
} }
@ -1097,6 +1097,5 @@ func verifyRemote(ctx context.Context, bucket *blob.Bucket, local []*fileData) (
func newDeployer() *Deployer { func newDeployer() *Deployer {
return &Deployer{ return &Deployer{
logger: loggers.NewDefault(), logger: loggers.NewDefault(),
cfg: deployconfig.DeployConfig{Workers: 2},
} }
} }

View file

@ -249,7 +249,7 @@ HUGO_FILE_LOG_FORMAT
HUGO_MEMORYLIMIT HUGO_MEMORYLIMIT
: {{< new-in 0.123.0 />}} : {{< new-in 0.123.0 />}}
: (`int`) The maximum amount of system memory, in gigabytes, that Hugo can use while rendering your site. Default is 25% of total system memory. Note that `HUGO_MEMORYLIMIT` is a "best effort" setting. Don't expect Hugo to build a million pages with only 1 GB of memory. You can get more information about how this behaves during the build by building with `hugo --logLevel info` and look for the `dynacache` label. : (`int`) The maximum amount of system memory, in gigabytes, that Hugo can use while rendering your site. Default is 25% of total system memory. Note that The `HUGO_MEMORYLIMIT` is a “best effort” setting. Don't expect Hugo to build a million pages with only 1 GB memory. You can get more information about how this behaves during the build by building with `hugo --logLevel info` and look for the `dynacache` label.
HUGO_NUMWORKERMULTIPLIER HUGO_NUMWORKERMULTIPLIER
: (`int`) The number of workers used in parallel processing. Default is the number of logical CPUs. : (`int`) The number of workers used in parallel processing. Default is the number of logical CPUs.

View file

@ -11,7 +11,7 @@ aliases: [/extras/menus/]
To create a menu for your site: To create a menu for your site:
1. Define the menu entries 1. Define the menu entries
1. [Localize](multilingual/#menus) each entry 1. [Localize] each entry
1. Render the menu with a [template] 1. Render the menu with a [template]
Create multiple menus, either flat or nested. For example, create a main menu for the header, and a separate menu for the footer. Create multiple menus, either flat or nested. For example, create a main menu for the header, and a separate menu for the footer.

View file

@ -112,7 +112,7 @@ Yes → Hugo is fast.
### Function and method descriptions ### Function and method descriptions
Start descriptions in the functions and methods sections with "Returns", or for boolean values, "Reports whether". Start descriptions in the functions and methods sections with "Returns", of for booelan values, "Reports whether".
### File paths and names ### File paths and names

View file

@ -87,6 +87,7 @@ Use any of the following logical operators:
: (`bool`) Reports whether the given field value (a slice) contains one or more elements in common with `VALUE`. See&nbsp;[details](/functions/collections/intersect). : (`bool`) Reports whether the given field value (a slice) contains one or more elements in common with `VALUE`. See&nbsp;[details](/functions/collections/intersect).
`like` `like`
: {{< new-in 0.116.0 />}}
: (`bool`) Reports whether the given field value matches the [regular expression](g) specified in `VALUE`. Use the `like` operator to compare `string` values. The `like` operator returns `false` when comparing other data types to the regular expression. : (`bool`) Reports whether the given field value matches the [regular expression](g) specified in `VALUE`. Use the `like` operator to compare `string` values. The `like` operator returns `false` when comparing other data types to the regular expression.
> [!note] > [!note]
@ -166,6 +167,8 @@ For example, to return a collection of pages where any of the terms in the "genr
## Regular expression comparison ## Regular expression comparison
{{< new-in 0.116.0 />}}
To return a collection of pages where the "author" page parameter begins with either "victor" or "Victor": To return a collection of pages where the "author" page parameter begins with either "victor" or "Victor":
```go-html-template ```go-html-template

View file

@ -12,66 +12,13 @@ params:
{{< new-in 0.128.0 />}} {{< new-in 0.128.0 />}}
Transpile Sass to CSS using the LibSass transpiler included in Hugo's extended and extended/deploy editions, or [install Dart Sass](#dart-sass) to use the latest features of the Sass language. ```go-html-template
Sass has two forms of syntax: [SCSS] and [indented]. Hugo supports both.
[scss]: https://sass-lang.com/documentation/syntax#scss
[indented]: https://sass-lang.com/documentation/syntax#the-indented-syntax
## Options
enableSourceMap
: (`bool`) Whether to generate a source map. Default is `false`.
includePaths
: (`slice`) A slice of paths, relative to the project root, that the transpiler will use when resolving `@use` and `@import` statements.
outputStyle
: (`string`) The output style of the resulting CSS. With LibSass, one of `nested` (default), `expanded`, `compact`, or `compressed`. With Dart Sass, either `expanded` (default) or `compressed`.
precision
: (`int`) The precision of floating point math. Applicable to LibSass. Default is `8`.
silenceDeprecations
: {{< new-in 0.139.0 />}}
: (`slice`) A slice of deprecation IDs to silence. IDs are enclosed in brackets within Dart Sass warning messages (e.g., `import` in `WARN Dart Sass: DEPRECATED [import]`). Applicable to Dart Sass. Default is `false`.
silenceDependencyDeprecations
: {{< new-in 0.146.0 />}}
: (`bool`) Whether to silence deprecation warnings from dependencies, where a dependency is considered any file transitively imported through a load path. This does not apply to `@warn` or `@debug` rules.Default is `false`.
sourceMapIncludeSources
: (`bool`) Whether to embed sources in the generated source map. Applicable to Dart Sass. Default is `false`.
targetPath
: (`string`) The publish path for the transformed resource, relative to the[`publishDir`]. If unset, the target path defaults to the asset's original path with a `.css` extension.
transpiler
: (`string`) The transpiler to use, either `libsass` or `dartsass`. Hugo's extended and extended/deploy editions include the LibSass transpiler. To use the Dart Sass transpiler, see the [installation instructions](#dart-sass). Default is `libsass`.
vars
: (`map`) A map of key-value pairs that will be available in the `hugo:vars` namespace. Useful for [initializing Sass variables from Hugo templates](https://discourse.gohugo.io/t/42053/).
```scss
// LibSass
@import "hugo:vars";
// Dart Sass
@use "hugo:vars" as v;
```
## Example
```go-html-template {copy=true}
{{ with resources.Get "sass/main.scss" }} {{ with resources.Get "sass/main.scss" }}
{{ $opts := dict {{ $opts := dict
"enableSourceMap" (not hugo.IsProduction) "enableSourceMap" (not hugo.IsProduction)
"outputStyle" (cond hugo.IsProduction "compressed" "expanded") "outputStyle" (cond hugo.IsProduction "compressed" "expanded")
"targetPath" "css/main.css" "targetPath" "css/main.css"
"transpiler" "dartsass" "transpiler" "libsass"
"vars" site.Params.styles
"includePaths" (slice "node_modules/bootstrap/scss")
}} }}
{{ with . | toCSS $opts }} {{ with . | toCSS $opts }}
{{ if hugo.IsProduction }} {{ if hugo.IsProduction }}
@ -85,6 +32,63 @@ vars
{{ end }} {{ end }}
``` ```
Transpile Sass to CSS using the LibSass transpiler included in Hugo's extended and extended/deploy editions, or [install Dart Sass](#dart-sass) to use the latest features of the Sass language.
Sass has two forms of syntax: [SCSS] and [indented]. Hugo supports both.
[scss]: https://sass-lang.com/documentation/syntax#scss
[indented]: https://sass-lang.com/documentation/syntax#the-indented-syntax
## Options
transpiler
: (`string`) The transpiler to use, either `libsass` (default) or `dartsass`. Hugo's extended and extended/deploy editions include the LibSass transpiler. To use the Dart Sass transpiler, see the [installation instructions](#dart-sass) below.
targetPath
: (`string`) If not set, the transformed resource's target path will be the original path of the asset file with its extension replaced by `.css`.
vars
: (`map`) A map of key-value pairs that will be available in the `hugo:vars` namespace. Useful for [initializing Sass variables from Hugo templates](https://discourse.gohugo.io/t/42053/).
```scss
// LibSass
@import "hugo:vars";
// Dart Sass
@use "hugo:vars" as v;
```
outputStyle
: (`string`) Output styles available to LibSass include `nested` (default), `expanded`, `compact`, and `compressed`. Output styles available to Dart Sass include `expanded` (default) and `compressed`.
precision
: (`int`) Precision of floating point math. Not applicable to Dart Sass.
enableSourceMap
: (`bool`) Whether to generate a source map. Default is `false`.
sourceMapIncludeSources
: (`bool`) Whether to embed sources in the generated source map. Not applicable to LibSass. Default is `false`.
includePaths
: (`slice`) A slice of paths, relative to the project root, that the transpiler will use when resolving `@use` and `@import` statements.
```go-html-template
{{ $opts := dict
"transpiler" "dartsass"
"targetPath" "css/style.css"
"vars" site.Params.styles
"enableSourceMap" (not hugo.IsProduction)
"includePaths" (slice "node_modules/bootstrap/scss")
}}
{{ with resources.Get "sass/main.scss" | toCSS $opts | minify | fingerprint }}
<link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
{{ end }}
```
silenceDeprecations
: (`slice`) {{< new-in 0.139.0 />}} A slice of deprecation IDs to silence. The deprecation IDs are printed to in the warning message, e.g "import" in `WARN Dart Sass: DEPRECATED [import] ...`. This is for Dart Sass only.
## Dart Sass ## Dart Sass
Hugo's extended and extended/deploy editions include [LibSass] to transpile Sass to CSS. In 2020, the Sass team deprecated LibSass in favor of [Dart Sass]. Hugo's extended and extended/deploy editions include [LibSass] to transpile Sass to CSS. In 2020, the Sass team deprecated LibSass in favor of [Dart Sass].
@ -117,9 +121,6 @@ You may also install [prebuilt binaries] for Linux, macOS, and Windows.
Run `hugo env` to list the active transpilers. Run `hugo env` to list the active transpilers.
> [!note]
> If you build Hugo from source and run `mage test -v`, the test will fail if you install Dart Sass as a Snap package. This is due to the Snap package's strict confinement model.
### Installing in a production environment ### Installing in a production environment
For [CI/CD](g) deployments (e.g., GitHub Pages, GitLab Pages, Netlify, etc.) you must edit the workflow to install Dart Sass before Hugo builds the site[^2]. Some providers allow you to use one of the package managers above, or you can download and extract one of the prebuilt binaries. For [CI/CD](g) deployments (e.g., GitHub Pages, GitLab Pages, Netlify, etc.) you must edit the workflow to install Dart Sass before Hugo builds the site[^2]. Some providers allow you to use one of the package managers above, or you can download and extract one of the prebuilt binaries.
@ -135,6 +136,8 @@ To install Dart Sass for your builds on GitHub Pages, add this step to the GitHu
run: sudo snap install dart-sass run: sudo snap install dart-sass
``` ```
If you are using GitHub Pages for the first time with your repository, GitHub provides a [starter workflow] for Hugo that includes Dart Sass. This is the simplest way to get started.
#### GitLab Pages #### GitLab Pages
To install Dart Sass for your builds on GitLab Pages, the `.gitlab-ci.yml` file should look something like this: To install Dart Sass for your builds on GitLab Pages, the `.gitlab-ci.yml` file should look something like this:
@ -191,6 +194,34 @@ command = """\
""" """
``` ```
### Example
To transpile with Dart Sass, set `transpiler` to `dartsass` in the options map passed to `css.Sass`. For example:
```go-html-template
{{ with resources.Get "sass/main.scss" }}
{{ $opts := dict
"enableSourceMap" (not hugo.IsProduction)
"outputStyle" (cond hugo.IsProduction "compressed" "expanded")
"targetPath" "css/main.css"
"transpiler" "dartsass"
}}
{{ with . | toCSS $opts }}
{{ if hugo.IsProduction }}
{{ with . | fingerprint }}
<link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
{{ end }}
{{ else }}
<link rel="stylesheet" href="{{ .RelPermalink }}">
{{ end }}
{{ end }}
{{ end }}
```
### Miscellaneous
If you build Hugo from source and run `mage test -v`, the test will fail if you install Dart Sass as a Snap package. This is due to the Snap package's strict confinement model.
[brew.sh]: https://brew.sh/ [brew.sh]: https://brew.sh/
[chocolatey.org]: https://community.chocolatey.org/packages/sass [chocolatey.org]: https://community.chocolatey.org/packages/sass
[dart sass]: https://sass-lang.com/dart-sass [dart sass]: https://sass-lang.com/dart-sass
@ -201,4 +232,3 @@ command = """\
[snap package]: /installation/linux/#snap [snap package]: /installation/linux/#snap
[snapcraft.io]: https://snapcraft.io/dart-sass [snapcraft.io]: https://snapcraft.io/dart-sass
[starter workflow]: https://github.com/actions/starter-workflows/blob/main/pages/hugo.yml [starter workflow]: https://github.com/actions/starter-workflows/blob/main/pages/hugo.yml
[`publishDir`]: /configuration/all/#publishdir

View file

@ -10,18 +10,7 @@ params:
signatures: ['template NAME [CONTEXT]'] signatures: ['template NAME [CONTEXT]']
--- ---
Use the `template` function to execute any of these [embedded templates](g): Use the `template` function to execute [embedded templates]. For example:
- [`disqus.html`]
- [`google_analytics.html`]
- [`opengraph.html`]
- [`pagination.html`]
- [`schema.html`]
- [`twitter_cards.html`]
For example:
```go-html-template ```go-html-template
{{ range (.Paginate .Pages).Pages }} {{ range (.Paginate .Pages).Pages }}
@ -50,21 +39,8 @@ The example above can be rewritten using an [inline partial] template:
{{ end }} {{ end }}
``` ```
The key distinctions between the preceding two examples are:
1. Inline partials are globally scoped. That means that an inline partial defined in _one_ template may be called from _any_ template.
2. Leveraging the [`partialCached`] function when calling an inline partial allows for performance optimization through result caching.
3. An inline partial can [`return`] a value of any data type instead of rendering a string.
{{% include "/_common/functions/go-template/text-template.md" %}} {{% include "/_common/functions/go-template/text-template.md" %}}
[`disqus.html`]: /templates/embedded/#disqus
[`google_analytics.html`]: /templates/embedded/#google-analytics
[`opengraph.html`]: /templates/embedded/#open-graph
[`pagination.html`]: /templates/embedded/#pagination
[`partialCached`]: /functions/partials/includecached/
[`partial`]: /functions/partials/include/ [`partial`]: /functions/partials/include/
[`return`]: /functions/go-template/return/
[`schema.html`]: /templates/embedded/#schema
[`twitter_cards.html`]: /templates/embedded/#x-twitter-cards
[inline partial]: /templates/partial/#inline-partials [inline partial]: /templates/partial/#inline-partials
[embedded templates]: /templates/embedded/

View file

@ -18,9 +18,6 @@ alignx
: {{< new-in 0.141.0 />}} : {{< new-in 0.141.0 />}}
: (`string`) The horizontal alignment of the text relative to the horizontal offset, one of `left`, `center`, or `right`. Default is `left`. : (`string`) The horizontal alignment of the text relative to the horizontal offset, one of `left`, `center`, or `right`. Default is `left`.
aligny
: (`string`) The vertical alignment of the text relative to the vertical offset, one of `top`, `center`, or `bottom`. Default is `top`.
color color
: (`string`) The font color, either a 3-digit or 6-digit hexadecimal color code. Default is `#ffffff` (white). : (`string`) The font color, either a 3-digit or 6-digit hexadecimal color code. Default is `#ffffff` (white).

View file

@ -1,155 +0,0 @@
---
title: templates.Current
description: Returns information about the currently executing template.
categories: []
keywords: []
params:
functions_and_methods:
aliases: []
returnType: tpl.CurrentTemplateInfo
signatures: [templates.Current]
---
> [!note]
> This function is experimental and subject to change.
{{< new-in 0.146.0 />}}
The `templates.Current` function provides introspection capabilities, allowing you to access details about the currently executing templates. This is useful for debugging complex template hierarchies and understanding the flow of execution during rendering.
## Methods
Ancestors
: (`tpl.CurrentTemplateInfos`) Returns a slice containing information about each template in the current execution chain, starting from the parent of the current template and going up towards the initial template called. It excludes any base template applied via `define` and `block`. You can chain the `Reverse` method to this result to get the slice in chronological execution order.
Base
: (`tpl.CurrentTemplateInfoCommonOps`) Returns an object representing the base template that was applied to the current template, if any. This may be `nil`.
Filename
: (`string`) Returns the absolute path of the current template. This will be empty for embedded templates.
Name
: (`string`) Returns the name of the current template. This is usually the path relative to the layouts directory.
Parent
: (`tpl.CurrentTemplateInfo`) Returns an object representing the parent of the current template, if any. This may be `nil`.
## Examples
The examples below help visualize template execution and require a `debug` parameter set to `true` in your site configuration:
{{< code-toggle file=hugo >}}
[params]
debug = true
{{< /code-toggle >}}
### Boundaries
To visually mark where a template begins and ends execution:
```go-html-template {file="layouts/_default/single.html"}
{{ define "main" }}
{{ if site.Params.debug }}
<div class="debug">[entering {{ templates.Current.Filename }}]</div>
{{ end }}
<h1>{{ .Title }}</h1>
{{ .Content }}
{{ if site.Params.debug }}
<div class="debug">[leaving {{ templates.Current.Filename }}]</div>
{{ end }}
{{ end }}
```
### Call stack
To display the chain of templates that led to the current one, create a partial template that iterates through its ancestors:
```go-html-template {file="layouts/partials/template-call-stack.html" copy=true}
{{ with templates.Current }}
<div class="debug">
{{ range .Ancestors }}
{{ .Filename }}<br>
{{ with .Base }}
{{ .Filename }}<br>
{{ end }}
{{ end }}
</div>
{{ end }}
```
Then call the partial from any template:
```go-html-template {file="layouts/partials/footer/copyright.html" copy=true}
{{ if site.Params.debug }}
{{ partial "template-call-stack.html" . }}
{{ end }}
```
The rendered template stack would look something like this:
```text
/home/user/project/layouts/partials/footer/copyright.html
/home/user/project/themes/foo/layouts/partials/footer.html
/home/user/project/layouts/_default/single.html
/home/user/project/themes/foo/layouts/_default/baseof.html
```
To reverse the order of the entries, chain the `Reverse` method to the `Ancestors` method:
```go-html-template {file="layouts/partials/template-call-stack.html" copy=true}
{{ with templates.Current }}
<div class="debug">
{{ range .Ancestors.Reverse }}
{{ with .Base }}
{{ .Filename }}<br>
{{ end }}
{{ .Filename }}<br>
{{ end }}
</div>
{{ end }}
```
### VS Code
To render links that, when clicked, will open the template in Microsoft Visual Studio Code, create a partial template with anchor elements that use the `vscode` URI scheme:
```go-html-template {file="layouts/partials/template-open-in-vs-code.html" copy=true}
{{ with templates.Current.Parent }}
<div class="debug">
<a href="vscode://file/{{ .Filename }}">{{ .Name }}</a>
{{ with .Base }}
<a href="vscode://file/{{ .Filename }}">{{ .Name }}</a>
{{ end }}
</div>
{{ end }}
```
Then call the partial from any template:
```go-html-template {file="layouts/_default/single.html" copy=true}
{{ define "main" }}
<h1>{{ .Title }}</h1>
{{ .Content }}
{{ if site.Params.debug }}
{{ partial "template-open-in-vs-code.html" . }}
{{ end }}
{{ end }}
```
Use the same approach to render the entire call stack as links:
```go-html-template {file="layouts/partials/template-call-stack.html" copy=true}
{{ with templates.Current }}
<div class="debug">
{{ range .Ancestors }}
<a href="vscode://file/{{ .Filename }}">{{ .Filename }}</a><br>
{{ with .Base }}
<a href="vscode://file/{{ .Filename }}">{{ .Filename }}</a><br>
{{ end }}
{{ end }}
</div>
{{ end }}
```

View file

@ -1,30 +0,0 @@
---
title: time.In
description: Returns the given date/time as represented in the specified IANA time zone.
categories: []
keywords: []
params:
functions_and_methods:
aliases: []
returnType: time.Time
signatures: [time.In TIMEZONE INPUT]
---
{{< new-in 0.146.0 />}}
The `time.In` function returns the given date/time as represented in the specified [IANA](g) time zone.
- If the time zone is an empty string or `UTC`, the time is returned in [UTC](g).
- If the time zone is `Local`, the time is returned in the system's local time zone.
- Otherwise, the time zone must be a valid IANA [time zone name].
[time zone name]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
```go-html-template
{{ $layout := "2006-01-02T15:04:05-07:00" }}
{{ $t := time.AsTime "2025-03-31T14:45:00-00:00" }}
{{ $t | time.In "America/Denver" | time.Format $layout }} → 2025-03-31T08:45:00-06:00
{{ $t | time.In "Australia/Adelaide" | time.Format $layout }} → 2025-04-01T01:15:00+10:30
{{ $t | time.In "Europe/Oslo" | time.Format $layout }} → 2025-03-31T16:45:00+02:00
```

View file

@ -114,14 +114,12 @@ A remote resource is a file on a remote server, accessible via HTTP or HTTPS.
> >
> `{{ $data = .Content | transform.Unmarshal }}` > `{{ $data = .Content | transform.Unmarshal }}`
## Working with CSV ## Options
### Options
When unmarshaling a CSV file, provide an optional map of options. When unmarshaling a CSV file, provide an optional map of options.
delimiter delimiter
: (`string`) The delimiter used. Default is `,`. : (`string`) The delimiter used, default is `,`.
comment comment
: (`string`) The comment character used in the CSV. If set, lines beginning with the comment character without preceding whitespace are ignored. : (`string`) The comment character used in the CSV. If set, lines beginning with the comment character without preceding whitespace are ignored.
@ -130,85 +128,8 @@ lazyQuotes
: {{< new-in 0.122.0 />}} : {{< new-in 0.122.0 />}}
: (`bool`) Whether to allow a quote in an unquoted field, or to allow a non-doubled quote in a quoted field. Default is `false`. : (`bool`) Whether to allow a quote in an unquoted field, or to allow a non-doubled quote in a quoted field. Default is `false`.
targetType
: {{< new-in 0.146.7 />}}
: (`string`) The target data type, either `slice` or `map`. Default is `slice`.
### Examples
The examples below use this CSV file:
```csv
"name","type","breed","age"
"Spot","dog","Collie",3
"Rover","dog","Boxer",5
"Felix","cat","Calico",7
```
To render an HTML table from a CSV file:
```go-html-template ```go-html-template
{{ $data := slice }} {{ $csv := "a;b;c" | transform.Unmarshal (dict "delimiter" ";") }}
{{ $file := "pets.csv" }}
{{ with or (.Resources.Get $file) (resources.Get $file) }}
{{ $opts := dict "targetType" "slice" }}
{{ $data = transform.Unmarshal $opts . }}
{{ end }}
{{ with $data }}
<table>
<thead>
<tr>
{{ range index . 0 }}
<th>{{ . }}</th>
{{ end }}
</tr>
</thead>
<tbody>
{{ range . | after 1 }}
<tr>
{{ range . }}
<td>{{ . }}</td>
{{ end }}
</tr>
{{ end }}
</tbody>
</table>
{{ end }}
```
To extract a subset of the data, or to sort the data, unmarshal to a map instead of a slice:
```go-html-template
{{ $data := slice }}
{{ $file := "pets.csv" }}
{{ with or (.Resources.Get $file) (resources.Get $file) }}
{{ $opts := dict "targetType" "map" }}
{{ $data = transform.Unmarshal $opts . }}
{{ end }}
{{ with sort (where $data "type" "dog") "name" "asc" }}
<table>
<thead>
<tr>
<th>name</th>
<th>type</th>
<th>breed</th>
<th>age</th>
</tr>
</thead>
<tbody>
{{ range . }}
<tr>
<td>{{ .name }}</td>
<td>{{ .type }}</td>
<td>{{ .breed }}</td>
<td>{{ .age }}</td>
</tr>
{{ end }}
</tbody>
</table>
{{ end }}
``` ```
## Working with XML ## Working with XML

View file

@ -136,8 +136,6 @@ jobs:
key: hugo-${{ github.run_id }} key: hugo-${{ github.run_id }}
restore-keys: restore-keys:
hugo- hugo-
- name: Configure Git
run: git config core.quotepath false
- name: Build with Hugo - name: Build with Hugo
run: | run: |
hugo \ hugo \

View file

@ -23,15 +23,15 @@ Define your [CI/CD](g) jobs by creating a `.gitlab-ci.yml` file in the root of y
```yaml {file=".gitlab-ci.yml" copy=true} ```yaml {file=".gitlab-ci.yml" copy=true}
variables: variables:
DART_SASS_VERSION: 1.87.0 DART_SASS_VERSION: 1.85.0
GIT_DEPTH: 0 GIT_DEPTH: 0
GIT_STRATEGY: clone GIT_STRATEGY: clone
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
HUGO_VERSION: 0.146.7 HUGO_VERSION: 0.144.2
NODE_VERSION: 22.x NODE_VERSION: 23.x
TZ: America/Los_Angeles TZ: America/Los_Angeles
image: image:
name: golang:1.24.2-bookworm name: golang:1.23.4-bookworm
pages: pages:
script: script:
@ -53,8 +53,6 @@ pages:
- apt-get install -y nodejs - apt-get install -y nodejs
# Install Node.js dependencies # Install Node.js dependencies
- "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true" - "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true"
# Configure Git
- git config core.quotepath false
# Build # Build
- hugo --gc --minify --baseURL ${CI_PAGES_URL} - hugo --gc --minify --baseURL ${CI_PAGES_URL}
# Compress # Compress

View file

@ -113,23 +113,21 @@ Create a new file named netlify.toml in the root of your project directory. In i
```toml {file="netlify.toml"} ```toml {file="netlify.toml"}
[build.environment] [build.environment]
GO_VERSION = "1.24" HUGO_VERSION = "0.144.2"
HUGO_VERSION = "0.146.7"
NODE_VERSION = "22" NODE_VERSION = "22"
TZ = "America/Los_Angeles" TZ = "America/Los_Angeles"
[build] [build]
publish = "public" publish = "public"
command = "git config core.quotepath false && hugo --gc --minify" command = "hugo --gc --minify"
``` ```
If your site requires Dart Sass to transpile Sass to CSS, the configuration file should look something like this: If your site requires Dart Sass to transpile Sass to CSS, the configuration file should look something like this:
```toml {file="netlify.toml"} ```toml {file="netlify.toml"}
[build.environment] [build.environment]
DART_SASS_VERSION = "1.87.0" HUGO_VERSION = "0.144.2"
GO_VERSION = "1.24" DART_SASS_VERSION = "1.85.0"
HUGO_VERSION = "0.146.7"
NODE_VERSION = "22" NODE_VERSION = "22"
TZ = "America/Los_Angeles" TZ = "America/Los_Angeles"
@ -140,7 +138,6 @@ command = """\
tar -xf dart-sass-${DART_SASS_VERSION}-linux-x64.tar.gz && \ tar -xf dart-sass-${DART_SASS_VERSION}-linux-x64.tar.gz && \
rm dart-sass-${DART_SASS_VERSION}-linux-x64.tar.gz && \ rm dart-sass-${DART_SASS_VERSION}-linux-x64.tar.gz && \
export PATH=/opt/build/repo/dart-sass:$PATH && \ export PATH=/opt/build/repo/dart-sass:$PATH && \
git config core.quotepath false && \
hugo --gc --minify \ hugo --gc --minify \
""" """
``` ```

View file

@ -30,33 +30,17 @@ To install the extended edition of Hugo:
sudo snap install hugo sudo snap install hugo
``` ```
To control automatic updates: To enable or revoke access to removable media:
```sh ```sh
# disable automatic updates
sudo snap refresh --hold hugo
# enable automatic updates
sudo snap refresh --unhold hugo
```
To control access to removable media:
```sh
# allow access
sudo snap connect hugo:removable-media sudo snap connect hugo:removable-media
# revoke access
sudo snap disconnect hugo:removable-media sudo snap disconnect hugo:removable-media
``` ```
To control access to SSH keys: To enable or revoke access to SSH keys:
```sh ```sh
# allow access
sudo snap connect hugo:ssh-keys sudo snap connect hugo:ssh-keys
# revoke access
sudo snap disconnect hugo:ssh-keys sudo snap disconnect hugo:ssh-keys
``` ```

View file

@ -23,8 +23,7 @@
"dates" $dates "dates" $dates
"kind" "page" "kind" "page"
"params" $params "params" $params
"path" (strings.Replace .name "." "-") "path" .name
"slug" .name
"title" (printf "Release %s" .name) "title" (printf "Release %s" .name)
}} }}
{{ $.AddPage $page }} {{ $.AddPage $page }}

View file

@ -1,6 +0,0 @@
---
title: IANA
reference: https://www.iana.org/about
---
_IANA_ is an abbreviation for the Internet Assigned Numbers Authority, a non-profit organization that manages the allocation of global IP addresses, autonomous system numbers, DNS root zone, media types, and other Internet Protocol-related resources.

View file

@ -1,6 +0,0 @@
---
title: UTC
reference: https://en.wikipedia.org/wiki/Coordinated_Universal_Time
---
_UTC_ is an abbreviation for Coordinated Universal Time, the primary time standard used worldwide to regulate clocks and time. It is the basis for civil time and time zones across the globe.

View file

@ -10,7 +10,7 @@ keywords: []
> To override Hugo's embedded `ref` shortcode, copy the [source code] to a file with the same name in the `layouts/shortcodes` directory. > To override Hugo's embedded `ref` shortcode, copy the [source code] to a file with the same name in the `layouts/shortcodes` directory.
> [!note] > [!note]
> When working with Markdown, this shortcode is obsolete. Instead, use a [link render hook] that resolves the link destination using the `GetPage` method on the `Page` object. You can either create your own, or simply enable the [embedded link render hook]. The embedded link render hook is automatically enabled for multilingual single-host projects. > When working with the Markdown [content format], this shortcode has become largely redundant. Its functionality is now primarily handled by [link render hooks], specifically the embedded one provided by Hugo. This hook effectively addresses all the use cases previously covered by this shortcode.
## Usage ## Usage
@ -56,7 +56,6 @@ Rendered:
{{% include "_common/ref-and-relref-error-handling.md" %}} {{% include "_common/ref-and-relref-error-handling.md" %}}
[content format]: /content-management/formats/ [content format]: /content-management/formats/
[embedded link render hook]: /render-hooks/links/#default [link render hooks]: /render-hooks/images/#default
[link render hook]: /render-hooks/links/
[Markdown notation]: /content-management/shortcodes/#notation [Markdown notation]: /content-management/shortcodes/#notation
[source code]: {{% eturl relref %}} [source code]: {{% eturl ref %}}

View file

@ -10,7 +10,7 @@ keywords: []
> To override Hugo's embedded `relref` shortcode, copy the [source code] to a file with the same name in the `layouts/shortcodes` directory. > To override Hugo's embedded `relref` shortcode, copy the [source code] to a file with the same name in the `layouts/shortcodes` directory.
> [!note] > [!note]
> When working with Markdown, this shortcode is obsolete. Instead, use a [link render hook] that resolves the link destination using the `GetPage` method on the `Page` object. You can either create your own, or simply enable the [embedded link render hook]. The embedded link render hook is automatically enabled for multilingual single-host projects. > When working with the Markdown [content format], this shortcode has become largely redundant. Its functionality is now primarily handled by [link render hooks], specifically the embedded one provided by Hugo. This hook effectively addresses all the use cases previously covered by this shortcode.
## Usage ## Usage
@ -56,7 +56,6 @@ Rendered:
{{% include "_common/ref-and-relref-error-handling.md" %}} {{% include "_common/ref-and-relref-error-handling.md" %}}
[content format]: /content-management/formats/ [content format]: /content-management/formats/
[embedded link render hook]: /render-hooks/links/#default [link render hooks]: /render-hooks/links/
[link render hook]: /render-hooks/links/
[Markdown notation]: /content-management/shortcodes/#notation [Markdown notation]: /content-management/shortcodes/#notation
[source code]: {{% eturl relref %}} [source code]: {{% eturl relref %}}

View file

@ -29,27 +29,19 @@ Hugo renders this to:
## Arguments ## Arguments
id
: (string) The video `id`. Optional if the `id` is provided as a positional argument as shown in the example above.
allowFullScreen
: {{< new-in 0.146.0 />}}
: (`bool`) Whether the `iframe` element can activate full screen mode. Default is `true`.
class class
: (`string`) The `class` attribute of the wrapping `div` element. Adding one or more CSS classes disables inline styling. : (`string`) The `class` attribute of the wrapping `div` element. Adding one or more CSS classes disables inline styling.
loading id
: {{< new-in 0.146.0 />}} : (`string`) The `id` of the Vimeo video
: (`string`) The loading attribute of the `iframe` element, either `eager` or `lazy`. Default is `eager`.
title title
: (`string`) The `title` attribute of the `iframe` element. : (`string`) The `title` attribute of the `iframe` element.
Here's an example using some of the available arguments: If you provide a `class` or `title` you must use a named parameter for the `id`.
```text ```text
{{</* vimeo id=55073825 allowFullScreen=false loading=lazy */>}} {{</* vimeo id=55073825 class="foo bar" title="My Video" */>}}
``` ```
## Privacy ## Privacy

View file

@ -70,7 +70,7 @@ start
title title
: (`string`) The `title` attribute of the `iframe` element. Defaults to "YouTube video". : (`string`) The `title` attribute of the `iframe` element. Defaults to "YouTube video".
Here's an example using some of the available arguments: Example using some of the above:
```text ```text
{{</* youtube id=0RKpf3rK57I start=30 end=60 loading=lazy */>}} {{</* youtube id=0RKpf3rK57I start=30 end=60 loading=lazy */>}}

View file

@ -1,6 +1,6 @@
--- ---
title: Embedded partial templates title: Embedded templates
description: Hugo provides embedded partial templates for common use cases. description: Hugo provides embedded templates for common use cases.
categories: [] categories: []
keywords: [] keywords: []
weight: 170 weight: 170
@ -145,10 +145,6 @@ Various optional metadata can also be set:
If using YouTube this will produce a og:video tag like `<meta property="og:video" content="url">`. Use the `https://youtu.be/<id>` format with YouTube videos (example: `https://youtu.be/qtIqKaDlqXo`). If using YouTube this will produce a og:video tag like `<meta property="og:video" content="url">`. Use the `https://youtu.be/<id>` format with YouTube videos (example: `https://youtu.be/qtIqKaDlqXo`).
## Pagination
See [details](/templates/pagination/).
## Schema ## Schema
> [!note] > [!note]

View file

@ -49,7 +49,7 @@ As shown in the above example directory structure, you can nest your directories
### Variable scoping ### Variable scoping
The second argument in a partial call is the variable being passed down. The above examples are passing the dot (`.`), which tells the template receiving the partial to apply the current [context][context]. The second argument in a partial call is the variable being passed down. The above examples are passing the `.`, which tells the template receiving the partial to apply the current [context][context].
This means the partial will *only* be able to access those variables. The partial is isolated and cannot access the outer scope. From within the partial, `$.Var` is equivalent to `.Var`. This means the partial will *only* be able to access those variables. The partial is isolated and cannot access the outer scope. From within the partial, `$.Var` is equivalent to `.Var`.

View file

@ -329,7 +329,7 @@ You can use the `HasShortcode` method in your base template to conditionally loa
[`with`]: /functions/go-template/with/ [`with`]: /functions/go-template/with/
[content management]: /content-management/shortcodes/ [content management]: /content-management/shortcodes/
[embedded shortcodes]: /shortcodes/ [embedded shortcodes]: /shortcodes/
[GitHub]: https://github.com/gohugoio/hugo/tree/master/tpl/tplimpl/embedded/templates/_shortcodes [GitHub]: https://github.com/gohugoio/hugo/tree/master/tpl/tplimpl/embedded/templates/shortcodes
[introduction to templating]: /templates/introduction/ [introduction to templating]: /templates/introduction/
[Markdown notation]: /content-management/shortcodes/#markdown-notation [Markdown notation]: /content-management/shortcodes/#markdown-notation
[named or positional]: /content-management/shortcodes/#arguments [named or positional]: /content-management/shortcodes/#arguments

View file

@ -34,11 +34,6 @@ Use the [`printf`] function (render) or [`warnf`] function (log to console) to i
{{ printf "%[1]v (%[1]T)" $value }} → 42 (int) {{ printf "%[1]v (%[1]T)" $value }} → 42 (int)
``` ```
{{< new-in 0.146.0 />}}
Use the [`templates.Current`] function to visually mark template execution boundaries or to display the template call stack.
[`debug.Dump`]: /functions/debug/dump/ [`debug.Dump`]: /functions/debug/dump/
[`printf`]: /functions/fmt/printf/ [`printf`]: /functions/fmt/printf/
[`warnf`]: /functions/fmt/warnf/ [`warnf`]: /functions/fmt/warnf/
[`templates.Current`]: /functions/templates/current/

View file

@ -4,39 +4,39 @@
# BaseURL # BaseURL
'base_url' = 'https://github.com/gohugoio/hugo/blob/master/tpl/tplimpl/embedded/templates' 'base_url' = 'https://github.com/gohugoio/hugo/blob/master/tpl/tplimpl/embedded/templates'
# Partials # Templates
'disqus' = '_partials/disqus.html' 'alias' = 'alias.html'
'google_analytics' = '_partials/google_analytics.html' 'disqus' = 'disqus.html'
'opengraph' = '_partials/opengraph.html' 'google_analytics' = 'google_analytics.html'
'pagination' = '_partials/pagination.html' 'opengraph' = 'opengraph.html'
'schema' = '_partials/schema.html' 'pagination' = 'pagination.html'
'twitter_cards' = '_partials/twitter_cards.html' 'robots' = '_default/robots.txt'
'rss' = '_default/rss.xml'
'schema' = 'schema.html'
'sitemap' = '_default/sitemap.xml'
'sitemapindex' = '_default/sitemapindex.xml'
'twitter_cards' = 'twitter_cards.html'
# Render hooks # Render hooks
'render-codeblock-goat' = '_markup/render-codeblock-goat.html' 'render-codeblock-goat' = '_default/_markup/render-codeblock-goat.html'
'render-image' = '_markup/render-image.html' 'render-image' = '_default/_markup/render-image.html'
'render-link' = '_markup/render-link.html' 'render-link' = '_default/_markup/render-link.html'
'render-table' = '_markup/render-table.html' 'render-table' = '_default/_markup/render-table.html'
# Shortcodes # Shortcodes
'details' = '_shortcodes/details.html' 'details' = 'shortcodes/details.html'
'figure' = '_shortcodes/figure.html' 'figure' = 'shortcodes/figure.html'
'gist' = '_shortcodes/gist.html' 'gist' = 'shortcodes/gist.html'
'highlight' = '_shortcodes/highlight.html' 'highlight' = 'shortcodes/highlight.html'
'instagram' = '_shortcodes/instagram.html' 'instagram' = 'shortcodes/instagram.html'
'param' = '_shortcodes/param.html' 'param' = 'shortcodes/param.html'
'qr' = '_shortcodes/qr.html' 'qr' = 'shortcodes/qr.html'
'ref' = '_shortcodes/ref.html' 'ref' = 'shortcodes/ref.html'
'relref' = '_shortcodes/relref.html' 'relref' = 'shortcodes/relref.html'
'vimeo' = '_shortcodes/vimeo.html' 'twitter' = 'shortcodes/twitter.html'
'vimeo_simple' = '_shortcodes/vimeo_simple.html' 'twitter_simple' = 'shortcodes/twitter_simple.html'
'x' = '_shortcodes/x.html' 'vimeo' = 'shortcodes/vimeo.html'
'x_simple' = '_shortcodes/x_simple.html' 'vimeo_simple' = 'shortcodes/vimeo_simple.html'
'youtube' = '_shortcodes/youtube.html' 'x' = 'shortcodes/x.html'
'x_simple' = 'shortcodes/x_simple.html'
# Other 'youtube' = 'shortcodes/youtube.html'
'alias' = 'alias.html'
'robots' = 'robots.txt'
'rss' = 'rss.xml'
'sitemap' = 'sitemap.xml'
'sitemapindex' = 'sitemapindex.xml'

View file

@ -196,7 +196,7 @@ either of these shortcodes in conjunction with this render hook.
>{{ .Text }}</a >{{ .Text }}</a
> >
{{- define "_partials/inline/h-rh-l/validate-fragment.html" }} {{- define "partials/inline/h-rh-l/validate-fragment.html" }}
{{- /* {{- /*
Validates the fragment portion of a link destination. Validates the fragment portion of a link destination.
@ -248,7 +248,7 @@ either of these shortcodes in conjunction with this render hook.
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- define "_partials/inline/h-rh-l/get-glossary-link-attributes.html" }} {{- define "partials/inline/h-rh-l/get-glossary-link-attributes.html" }}
{{- /* {{- /*
Returns the anchor element attributes for a link to the given glossary term. Returns the anchor element attributes for a link to the given glossary term.

View file

@ -44,8 +44,6 @@
{{ block "header" . }} {{ block "header" . }}
{{ partial "layouts/header/header.html" . }} {{ partial "layouts/header/header.html" . }}
{{ end }} {{ end }}
{{ block "subheader" . }}
{{ end }}
{{ block "hero" . }} {{ block "hero" . }}
{{ end }} {{ end }}
<div class="flex w-full xl:w-6xl h-full flex-auto mx-auto"> <div class="flex w-full xl:w-6xl h-full flex-auto mx-auto">

View file

@ -5,7 +5,6 @@
{{ $image1x := $image.Resize (printf "%dx" $width1x) }} {{ $image1x := $image.Resize (printf "%dx" $width1x) }}
{{ $image1xWebp := $image.Resize (printf "%dx webp" $width1x) }} {{ $image1xWebp := $image.Resize (printf "%dx webp" $width1x) }}
{{ $class := .class | default "h-64 tablet:h-96 lg:h-full w-full object-cover lg:absolute" }} {{ $class := .class | default "h-64 tablet:h-96 lg:h-full w-full object-cover lg:absolute" }}
{{ $loading := .loading | default "eager" }}
<picture> <picture>
<source <source
srcset="{{ $imageWebp.RelPermalink }}" srcset="{{ $imageWebp.RelPermalink }}"
@ -21,7 +20,6 @@
class="{{ $class }}" class="{{ $class }}"
src="{{ $image1x.RelPermalink }}" src="{{ $image1x.RelPermalink }}"
alt="" alt=""
loading="{{ $loading }}"
width="{{ $image1x.Width }}" width="{{ $image1x.Width }}"
height="{{ $image1x.Height }}"> height="{{ $image1x.Height }}">
</picture> </picture>

View file

@ -10,7 +10,7 @@
{{ partial "layouts/blocks/modal.html" (dict "modal_button" $qr "modal_content" $qrBig "modal_title" (printf "QR code linking to %s" $.Permalink )) }} {{ partial "layouts/blocks/modal.html" (dict "modal_button" $qr "modal_content" $qrBig "modal_title" (printf "QR code linking to %s" $.Permalink )) }}
</div> </div>
{{ define "_partials/_inline/qr" }} {{ define "partials/_inline/qr" }}
{{ $img_class := .img_class | default "w-10" }} {{ $img_class := .img_class | default "w-10" }}
{{ with images.QR $.page.Permalink (dict "targetDir" "images/qr") }} {{ with images.QR $.page.Permalink (dict "targetDir" "images/qr") }}

View file

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 5 KiB

Before After
Before After

Some files were not shown because too many files have changed in this diff Show more