Skip to content

Commit

Permalink
deps: Update github.com/tdewolff/minify/v2 v2.20.7 => v2.20.8
Browse files Browse the repository at this point in the history
Closes #5748
  • Loading branch information
jmooring committed Nov 29, 2023
1 parent 26a8ec2 commit 81cc41b
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 8 deletions.
30 changes: 30 additions & 0 deletions docs/data/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,8 @@ chroma:
- Aliases:
- typoscripthtmldata
Name: TypoScriptHtmlData
- Aliases: null
Name: ucode
- Aliases:
- v
- vlang
Expand Down Expand Up @@ -1254,6 +1256,9 @@ config:
keepEndTags: true
keepQuotes: false
keepWhitespace: false
templateDelims:
- ""
- ""
js:
keepVarNames: false
precision: 0
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 "<p>abc</p>" }}'
- '&lt;p&gt;abc&lt;/p&gt;'
urls:
AbsLangURL:
Aliases:
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,6 @@ github.com/bep/godartsass/v2 v2.0.0 h1:Ruht+BpBWkpmW+yAM2dkp7RSSeN0VLaTobyW0CiSP
github.com/bep/godartsass/v2 v2.0.0/go.mod h1:AcP8QgC+OwOXEq6im0WgDRYK7scDsmZCEW62o1prQLo=
github.com/bep/golibsass v1.1.1 h1:xkaet75ygImMYjM+FnHIT3xJn7H0xBA9UxSOJjk8Khw=
github.com/bep/golibsass v1.1.1/go.mod h1:DL87K8Un/+pWUS75ggYv41bliGiolxzDKWJAq3eJ1MA=
github.com/bep/gowebp v0.2.0 h1:ZVfK8i9PpZqKHEmthQSt3qCnnHycbLzBPEsVtk2ch2Q=
github.com/bep/gowebp v0.2.0/go.mod h1:ZhFodwdiFp8ehGJpF4LdPl6unxZm9lLFjxD3z2h2AgI=
github.com/bep/gowebp v0.3.0 h1:MhmMrcf88pUY7/PsEhMgEP0T6fDUnRTMpN8OclDrbrY=
github.com/bep/gowebp v0.3.0/go.mod h1:ZhFodwdiFp8ehGJpF4LdPl6unxZm9lLFjxD3z2h2AgI=
github.com/bep/helpers v0.4.0 h1:ab9veaAiWY4ST48Oxp5usaqivDmYdB744fz+tcZ3Ifs=
Expand Down Expand Up @@ -425,10 +423,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=
Expand Down
22 changes: 22 additions & 0 deletions markup/goldmark/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -689,3 +689,25 @@ title: "p1"

b.AssertFileContentExact("public/p1/index.html", "<p>:x:</p>")
}

// Issue #5748
func TestGoldmarkTemplateDelims(t *testing.T) {
t.Parallel()

files := `
-- config.toml --
[minify]
minifyOutput = true
[minify.tdewolff.html]
templateDelims = ["<?php","?>"]
-- layouts/index.html --
<div class="foo">
{{ safeHTML "<?php" }}
echo "hello";
{{ safeHTML "?>" }}
</div>
`

b := hugolib.Test(t, files)
b.AssertFileContent("public/index.html", "<div class=foo><?php\necho \"hello\";\n?>\n</div>")
}

0 comments on commit 81cc41b

Please sign in to comment.