Skip to content

Commit de804c6

Browse files
committed
Update to glamour v0.9.0 with contribution
This branch was pinned to the commit SHA after our contribution was merged, however our friends at Charm have cut a new release, which we should use instead.
1 parent bde34d5 commit de804c6

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

go.mod

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ require (
99
github.com/MakeNowJust/heredoc v1.0.0
1010
github.com/Masterminds/sprig/v3 v3.3.0
1111
github.com/alecthomas/chroma/v2 v2.14.0
12-
github.com/charmbracelet/glamour v0.8.1-0.20250310130207-4c040b7fd5c0
13-
github.com/charmbracelet/lipgloss v1.0.0
12+
github.com/charmbracelet/glamour v0.9.0
13+
github.com/charmbracelet/lipgloss v1.1.0
1414
github.com/cli/browser v1.3.0
1515
github.com/cli/safeexec v1.0.0
1616
github.com/cli/shurcooL-graphql v0.0.4
@@ -36,7 +36,10 @@ require (
3636
github.com/Masterminds/semver/v3 v3.3.0 // indirect
3737
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
3838
github.com/aymerick/douceur v0.2.0 // indirect
39+
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
3940
github.com/charmbracelet/x/ansi v0.8.0 // indirect
41+
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
42+
github.com/charmbracelet/x/term v0.2.1 // indirect
4043
github.com/davecgh/go-spew v1.1.1 // indirect
4144
github.com/dlclark/regexp2 v1.11.0 // indirect
4245
github.com/google/uuid v1.6.0 // indirect
@@ -56,6 +59,7 @@ require (
5659
github.com/rivo/uniseg v0.4.7 // indirect
5760
github.com/shopspring/decimal v1.4.0 // indirect
5861
github.com/spf13/cast v1.7.0 // indirect
62+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
5963
github.com/yuin/goldmark v1.7.8 // indirect
6064
github.com/yuin/goldmark-emoji v1.0.5 // indirect
6165
golang.org/x/crypto v0.31.0 // indirect

go.sum

+12
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,24 @@ github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWp
2424
github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
2525
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
2626
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
27+
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs=
28+
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
2729
github.com/charmbracelet/glamour v0.8.1-0.20250310130207-4c040b7fd5c0 h1:lOLrvPjJIqVkx1+v1mbWEQEVRLg9aZtpmPk/NQn9cZQ=
2830
github.com/charmbracelet/glamour v0.8.1-0.20250310130207-4c040b7fd5c0/go.mod h1:223ZO7jiO3qpV8LGaOf2+tMNfHn0RrRjRmhyQM5R3s8=
31+
github.com/charmbracelet/glamour v0.9.0 h1:1Hm3wxww7qXvGI+Fb3zDmIZo5oDOvVOWJ4OrIB+ef7c=
32+
github.com/charmbracelet/glamour v0.9.0/go.mod h1:+SHvIS8qnwhgTpVMiXwn7OfGomSqff1cHBCI8jLOetk=
2933
github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
3034
github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
35+
github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
36+
github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
3137
github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE=
3238
github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q=
39+
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8=
40+
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
3341
github.com/charmbracelet/x/exp/golden v0.0.0-20240806155701-69247e0abc2a h1:G99klV19u0QnhiizODirwVksQB91TJKV/UaTnACcG30=
3442
github.com/charmbracelet/x/exp/golden v0.0.0-20240806155701-69247e0abc2a/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
43+
github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
44+
github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
3545
github.com/cli/browser v1.3.0 h1:LejqCrpWr+1pRqmEPDGnTZOjsMe7sehifLynZJuqJpo=
3646
github.com/cli/browser v1.3.0/go.mod h1:HH8s+fOAxjhQoBUAsKuPCbqUuxZDhQ2/aD+SzsEfBTk=
3747
github.com/cli/safeexec v1.0.0 h1:0VngyaIyqACHdcMNWfo6+KdUYnqEr2Sg+bSP1pdF+dI=
@@ -124,6 +134,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
124134
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
125135
github.com/thlib/go-timezone-local v0.0.0-20210907160436-ef149e42d28e h1:BuzhfgfWQbX0dWzYzT1zsORLnHRv3bcRcsaUk0VmXA8=
126136
github.com/thlib/go-timezone-local v0.0.0-20210907160436-ef149e42d28e/go.mod h1:/Tnicc6m/lsJE0irFMA0LfIwTBo4QP7A8IfyIv4zZKI=
137+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
138+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
127139
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
128140
github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
129141
github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=

pkg/x/markdown/accessibility.go

+2
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ func accessibleDarkStyleConfig() ansi.StyleConfig {
115115
cfg.HorizontalRule.Color = white.code()
116116

117117
// Code block colors
118+
// Unsetting StyleBlock color until we understand what it does versus Chroma style
118119
cfg.CodeBlock.StyleBlock.StylePrimitive.Color = nil
119120

120121
return cfg
@@ -147,6 +148,7 @@ func accessibleLightStyleConfig() ansi.StyleConfig {
147148
cfg.HorizontalRule.Color = white.code()
148149

149150
// Code block colors
151+
// Unsetting StyleBlock color until we understand what it does versus Chroma style
150152
cfg.CodeBlock.StyleBlock.StylePrimitive.Color = nil
151153

152154
return cfg

0 commit comments

Comments
 (0)