Switch from internal markup package to github.com/git-pkgs/markup

Replace the local internal/markup package with the published module.
Same rendering support (Markdown native, external tools for other
formats) with a cleaner registry-based API.

Author: andrew

go.mod

@@ -4,9 +4,14 @@ go 1.25.6
 
 require (
 	github.com/git-pkgs/changelog v0.1.1
+	github.com/git-pkgs/markup v0.1.0
 	github.com/go-enry/go-enry/v2 v2.9.2
 	github.com/rs/cors v1.11.1
-	github.com/yuin/goldmark v1.7.8
 )
 
-require github.com/go-enry/go-oniguruma v1.2.1 // indirect
+require (
+	github.com/go-enry/go-oniguruma v1.2.1 // indirect
+	github.com/niklasfasching/go-org v1.9.1 // indirect
+	github.com/yuin/goldmark v1.8.2 // indirect
+	golang.org/x/net v0.45.0 // indirect
+)

go.sum

@@ -3,10 +3,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/git-pkgs/changelog v0.1.1 h1:hGEraBDgwUUQfwV8y6MVS+QywbpcYNAFVtg25LfCnIM=
 github.com/git-pkgs/changelog v0.1.1/go.mod h1:psv6VJyJKYzDYajKdV9oPw7LUEOIqSiB0L3wcKdX6Ac=
+github.com/git-pkgs/markup v0.1.0 h1:y4MB7bWE6Txz68c0WnR0UykV5NxCDXMgrgdIEuukYUU=
+github.com/git-pkgs/markup v0.1.0/go.mod h1:301O9D4beTPZjJMxMfRsLrk2cUzNoPPBj8bmLdhRaZU=
 github.com/go-enry/go-enry/v2 v2.9.2 h1:giOQAtCgBX08kosrX818DCQJTCNtKwoPBGu0qb6nKTY=
 github.com/go-enry/go-enry/v2 v2.9.2/go.mod h1:9yrj4ES1YrbNb1Wb7/PWYr2bpaCXUGRt0uafN0ISyG8=
 github.com/go-enry/go-oniguruma v1.2.1 h1:k8aAMuJfMrqm/56SG2lV9Cfti6tC4x8673aHCcBk+eo=
 github.com/go-enry/go-oniguruma v1.2.1/go.mod h1:bWDhYP+S6xZQgiRL7wlTScFYBe023B6ilRZbCAD5Hf4=
+github.com/niklasfasching/go-org v1.9.1 h1:/3s4uTPOF06pImGa2Yvlp24yKXZoTYM+nsIlMzfpg/0=
+github.com/niklasfasching/go-org v1.9.1/go.mod h1:ZAGFFkWvUQcpazmi/8nHqwvARpr1xpb+Es67oUGX/48=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
@@ -18,8 +22,10 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
-github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
+github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE=
+github.com/yuin/goldmark v1.8.2/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
+golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM=
+golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/archive/readme.go

@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/ecosyste-ms/archives/internal/markup"
+	"github.com/git-pkgs/markup"
 	"github.com/go-enry/go-enry/v2"
 )
 
@@ -215,12 +215,14 @@ func (a *RemoteArchive) Changelog() (*ChangelogResult, error) {
 	}, nil
 }
 
+var markupRegistry = markup.NewDefaultRegistry()
+
 // renderFile uses the markup package to render a file to HTML.
 // Falls back to go-enry for language detection if markup doesn't handle the format.
-func renderFile(filename string, content []byte) (html string, language string) {
-	result, ok := markup.Render(filename, content)
-	if ok {
-		return result.HTML, result.Language
+func renderFile(filename string, content []byte) (htmlStr string, language string) {
+	result, err := markupRegistry.Render(filename, content)
+	if err == nil {
+		return result.HTML, result.Format.String()
 	}
 	// Format not supported by markup package, return empty HTML
 	lang := detectLanguage(filename, content)

internal/archive/readme_test.go

@@ -3,7 +3,7 @@ package archive
 import (
 	"testing"
 
-	"github.com/ecosyste-ms/archives/internal/markup"
+	"github.com/git-pkgs/markup"
 )
 
 func TestRenderFileMarkdown(t *testing.T) {
@@ -24,7 +24,8 @@ func TestRenderFileUnknown(t *testing.T) {
 }
 
 func TestRenderFileAsciiDoc(t *testing.T) {
-	if !markup.Supported(markup.FormatAsciiDoc) {
+	reg := markup.NewDefaultRegistry()
+	if !reg.Supported("README.adoc") {
 		t.Skip("asciidoctor not installed")
 	}
 	html, lang := renderFile("README.adoc", []byte("= Hello\n\nWorld\n"))