diff --git a/docs/data/docs.yaml b/docs/data/docs.yaml index 2cdb0dd53..48a12f522 100644 --- a/docs/data/docs.yaml +++ b/docs/data/docs.yaml @@ -824,6 +824,8 @@ chroma: - Aliases: - typoscripthtmldata Name: TypoScriptHtmlData + - Aliases: null + Name: ucode - Aliases: - v - vlang @@ -1254,6 +1256,9 @@ config: keepEndTags: true keepQuotes: false keepWhitespace: false + templateDelims: + - "" + - "" js: keepVarNames: false precision: 0 @@ -2741,6 +2746,21 @@ tpl: map[string]interface {}{ "Hugo": "Rocks!", } + TestDeprecationErr: + Aliases: null + Args: null + Description: "" + Examples: null + TestDeprecationInfo: + Aliases: null + Args: null + Description: "" + Examples: null + TestDeprecationWarn: + Aliases: null + Args: null + Description: "" + Examples: null Timer: Aliases: null Args: null @@ -4364,6 +4384,16 @@ tpl: - - '{{ "hello = \"Hello World\"" | resources.FromString "data/greetings.toml" | transform.Unmarshal }}' - map[hello:Hello World] + XMLEscape: + Aliases: null + Args: + - s + Description: |- + XMLEscape returns the given string, removing disallowed characters then + escaping the result to its XML equivalent. + Examples: + - - '{{ transform.XMLEscape "

abc

" }}' + - '<p>abc</p>' urls: AbsLangURL: Aliases: diff --git a/go.mod b/go.mod index 3a5b6a6c7..d166587b5 100644 --- a/go.mod +++ b/go.mod @@ -61,8 +61,8 @@ require ( github.com/spf13/cobra v1.8.0 github.com/spf13/fsync v0.9.0 github.com/spf13/pflag v1.0.5 - github.com/tdewolff/minify/v2 v2.20.7 - github.com/tdewolff/parse/v2 v2.7.5 + github.com/tdewolff/minify/v2 v2.20.8 + github.com/tdewolff/parse/v2 v2.7.6 github.com/yuin/goldmark v1.6.0 github.com/yuin/goldmark-emoji v1.0.2 go.uber.org/atomic v1.11.0 diff --git a/go.sum b/go.sum index d273d6ac1..5cd515ec9 100644 --- a/go.sum +++ b/go.sum @@ -326,10 +326,10 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.7 h1:NUkuzJ9dvQUNJjSdmmrfELa/ZpnMdyMR/ZKU2bw7N/E= -github.com/tdewolff/minify/v2 v2.20.7/go.mod h1:bj2NpP3zoUhsPzE4oM4JYwuUyVCU/uMaCYZ6/riEjIo= -github.com/tdewolff/parse/v2 v2.7.5 h1:RdcN3Ja6zAMSvnxxO047xRoWexX3RrXKi3H6EQHzXto= -github.com/tdewolff/parse/v2 v2.7.5/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= +github.com/tdewolff/minify/v2 v2.20.8 h1:OqDc95F0OK239T7P5g5oL5XthQtOtKbhbhM9GKc2W9g= +github.com/tdewolff/minify/v2 v2.20.8/go.mod h1:hZnNtFqXVQ5QIAR05tdgvS7h6E80jyRwHSGVmM4jbzQ= +github.com/tdewolff/parse/v2 v2.7.6 h1:PGZH2b/itDSye9RatReRn4GBhsT+KFEMtAMjHRuY1h8= +github.com/tdewolff/parse/v2 v2.7.6/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= diff --git a/markup/goldmark/integration_test.go b/markup/goldmark/integration_test.go index fdcbf4975..a2bf16374 100644 --- a/markup/goldmark/integration_test.go +++ b/markup/goldmark/integration_test.go @@ -689,3 +689,25 @@ title: "p1" b.AssertFileContentExact("public/p1/index.html", "

:x:

") } + +// Issue #5748 +func TestGoldmarkTemplateDelims(t *testing.T) { + t.Parallel() + + files := ` +-- config.toml -- +[minify] + minifyOutput = true +[minify.tdewolff.html] + templateDelims = [""] +-- layouts/index.html -- +
+{{ safeHTML "" }} +
+` + + b := hugolib.Test(t, files) + b.AssertFileContent("public/index.html", "
\n
") +}