Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-03-11 15:13:18 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-03-11 16:44:01 +0300
commit1a796d723c90e2747ea83440ad85ff0319770f2c (patch)
treeb983bb2faea7a282e163fdd8d5f1fe8be935a4a5
parent64b7b7a89753a39661219b2fcb92d7f185a03f63 (diff)
deps: Fix Goldmark regression with HTML comments
Fixes #9650
-rw-r--r--go.mod2
-rw-r--r--go.sum4
-rw-r--r--hugolib/integrationtest_builder.go8
-rw-r--r--markup/goldmark/integration_test.go30
4 files changed, 43 insertions, 1 deletions
diff --git a/go.mod b/go.mod
index bab239dd2..cacafa240 100644
--- a/go.mod
+++ b/go.mod
@@ -58,7 +58,7 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/pflag v1.0.5
github.com/tdewolff/minify/v2 v2.10.0
- github.com/yuin/goldmark v1.4.8
+ github.com/yuin/goldmark v1.4.9
go.uber.org/atomic v1.9.0
gocloud.dev v0.20.0
golang.org/x/image v0.0.0-20211028202545-6944b10bf410
diff --git a/go.sum b/go.sum
index 6a14eb2a9..93c1565bf 100644
--- a/go.sum
+++ b/go.sum
@@ -577,8 +577,12 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.7 h1:KHHlQL4EKBZ43vpA1KBEQHfodk4JeIgeb0xJLg7rvDI=
+github.com/yuin/goldmark v1.4.7/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
github.com/yuin/goldmark v1.4.8 h1:zHPiabbIRssZOI0MAzJDHsyvG4MXCGqVaMOwR+HeoQQ=
github.com/yuin/goldmark v1.4.8/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
+github.com/yuin/goldmark v1.4.9 h1:RmdXMGe/HwhQEWIjFAu8fjjvkxJ0tDRVbWGrsPNrclw=
+github.com/yuin/goldmark v1.4.9/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs=
diff --git a/hugolib/integrationtest_builder.go b/hugolib/integrationtest_builder.go
index b7b43624f..1bfa194bd 100644
--- a/hugolib/integrationtest_builder.go
+++ b/hugolib/integrationtest_builder.go
@@ -133,6 +133,14 @@ func (s *IntegrationTestBuilder) AssertFileContent(filename string, matches ...s
}
}
+func (s *IntegrationTestBuilder) AssertFileContentExact(filename string, matches ...string) {
+ s.Helper()
+ content := s.FileContent(filename)
+ for _, m := range matches {
+ s.Assert(content, qt.Contains, m, qt.Commentf(m))
+ }
+}
+
func (s *IntegrationTestBuilder) AssertDestinationExists(filename string, b bool) {
checker := qt.IsTrue
if !b {
diff --git a/markup/goldmark/integration_test.go b/markup/goldmark/integration_test.go
index cab85cfdd..064ffb85d 100644
--- a/markup/goldmark/integration_test.go
+++ b/markup/goldmark/integration_test.go
@@ -535,3 +535,33 @@ Link https procol: https://www.example.org
}
}
+
+// Issue 9650
+func TestRenderingOfHtmlComments(t *testing.T) {
+ t.Parallel()
+
+ files := `
+-- config.toml --
+[markup.goldmark.renderer]
+unsafe = true
+-- content/p1.md --
+---
+title: "p1"
+---
+a <!-- b --> c
+
+-- layouts/_default/single.html --
+{{ .Content }}
+`
+
+ b := hugolib.NewIntegrationTestBuilder(
+ hugolib.IntegrationTestConfig{
+ T: t,
+ TxtarString: files,
+ },
+ ).Build()
+
+ b.AssertFileContentExact("public/p1/index.html",
+ "<p>a <!-- b --> c</p>",
+ )
+}