git.iko.soy/crush
on main help sign in
fix(deps): use charm.land glamour and log (#1469)

Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>

commita7d13872fe1ba8b6b3c8b1690583dbc74281e338 authorCarlos Alexandro Becker <caarlos0@users.noreply.github.com> dateSat 13 Dec 2025, 13:10 (1 year ago) parent9ca6557
6 files changed+11−11
compare with main
unifiedsplit
go.mod+2−2 go.sum+4−4 internal/cmd/logs.go+1−1 internal/tui/styles/chroma.go+1−1 internal/tui/styles/markdown.go+2−2 internal/tui/styles/theme.go+1−1
go.mod+2−2
@@ -6,7 +6,9 @@ require (
66 charm.land/bubbles/v2 v2.0.0-rc.1
77 charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251212194116-6348bd4b7475
88 charm.land/fantasy v0.5.2
9+ charm.land/glamour/v2 v2.0.0-20251110203732-69649f93d3b1
910 charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971
11+ charm.land/log/v2 v2.0.0-20251110204020-529bb77f35da
1012 charm.land/x/vcr v0.1.1
1113 github.com/JohannesKaufmann/html-to-markdown v1.6.0
1214 github.com/MakeNowJust/heredoc v1.0.0
@@ -19,8 +21,6 @@ require (
1921 github.com/charmbracelet/catwalk v0.10.1
2022 github.com/charmbracelet/colorprofile v0.4.1
2123 github.com/charmbracelet/fang v0.4.4
22− github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930
23− github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0
2424 github.com/charmbracelet/ultraviolet v0.0.0-20251212194010-b927aa605560
2525 github.com/charmbracelet/x/ansi v0.11.3
2626 github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3
go.sum+4−4
@@ -4,8 +4,12 @@ charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251212194116-6348bd4b7475 h1:73ohAau8fvq
44charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251212194116-6348bd4b7475/go.mod h1:pDM18flq3Z4njKZPA3zCvyVSSIJbMcoqlE82BdGUtL8=
55charm.land/fantasy v0.5.2 h1:4zlNsIcsyF3Jr+1onEuhHqZRzuH1LlxBle/gInS00QY=
66charm.land/fantasy v0.5.2/go.mod h1:SPOsnIlkBKnhw2Wnasv+wZ82EmCMIGesx0je3tgR6+M=
7+charm.land/glamour/v2 v2.0.0-20251110203732-69649f93d3b1 h1:9q4+yyU7105T3OrOx0csMyKnw89yMSijJ+rVld/Z2ek=
8+charm.land/glamour/v2 v2.0.0-20251110203732-69649f93d3b1/go.mod h1:J3kVhY6oHXZq5f+8vC3hmDO95fEvbqj3z7xDwxrfzU8=
79charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971 h1:xZFcNsJMiIDbFtWRyDmkKNk1sjojfaom4Zoe0cyH/8c=
810charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971/go.mod h1:i61Y3FmdbcBNSKa+pKB3DaE4uVQmBLMs/xlvRyHcXAE=
11+charm.land/log/v2 v2.0.0-20251110204020-529bb77f35da h1:vZa/Ow0uLclpfaDY0ubjzE+B0eLQqi2zanmpeALanow=
12+charm.land/log/v2 v2.0.0-20251110204020-529bb77f35da/go.mod h1:Tj12StbPc4GwksDF6XwhC9wdXouinIVxRGKKmmmzdSU=
913charm.land/x/vcr v0.1.1 h1:PXCFMUG0rPtyk35rhfzYCJEduOzWXCIbrXTFq4OF/9Q=
1014charm.land/x/vcr v0.1.1/go.mod h1:eByq2gqzWvcct/8XE2XO5KznoWEBiXH56+y2gphbltM=
1115cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=
@@ -94,10 +98,6 @@ github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco
9498github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
9599github.com/charmbracelet/fang v0.4.4 h1:G4qKxF6or/eTPgmAolwPuRNyuci3hTUGGX1rj1YkHJY=
96100github.com/charmbracelet/fang v0.4.4/go.mod h1:P5/DNb9DddQ0Z0dbc0P3ol4/ix5Po7Ofr2KMBfAqoCo=
97−github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930 h1:+47Z2jVAWPSLGjPRbfZizW3OpcAYsu7EUk2DR+66FyM=
98−github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930/go.mod h1:izs11tnkYaT3DTEH2E0V/lCb18VGZ7k9HLYEGuvgXGA=
99−github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0 h1:lxHzxsHd4P7o7+5D5OcEItYkQ1xY3ovNg8Dc5ftd3rI=
100−github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0/go.mod h1:Q7oMtlboDPnnrYiJDXNwdWmJblOmuOnycPKczlVju6I=
101101github.com/charmbracelet/ultraviolet v0.0.0-20251212194010-b927aa605560 h1:j3PW2hypGoPKBy3ooKzW0TFxaxhyHK3NbkLLn4KeRFc=
102102github.com/charmbracelet/ultraviolet v0.0.0-20251212194010-b927aa605560/go.mod h1:VWATWLRwYP06VYCEur7FsNR2B1xAo7Y+xl1PTbd1ePc=
103103github.com/charmbracelet/x/ansi v0.11.3 h1:6DcVaqWI82BBVM/atTyq6yBoRLZFBsnoDoX9GCu2YOI=
internal/cmd/logs.go+1−1
@@ -10,9 +10,9 @@ import (
1010 "slices"
1111 "time"
1212
13+ "charm.land/log/v2"
1314 "github.com/charmbracelet/colorprofile"
1415 "github.com/charmbracelet/crush/internal/config"
15− "github.com/charmbracelet/log/v2"
1616 "github.com/charmbracelet/x/term"
1717 "github.com/nxadm/tail"
1818 "github.com/spf13/cobra"
internal/tui/styles/chroma.go+1−1
@@ -1,8 +1,8 @@
11package styles
22
33import (
4+ "charm.land/glamour/v2/ansi"
45 "github.com/alecthomas/chroma/v2"
5− "github.com/charmbracelet/glamour/v2/ansi"
66)
77
88func chromaStyle(style ansi.StylePrimitive) string {
internal/tui/styles/markdown.go+2−2
@@ -4,8 +4,8 @@ import (
44 "fmt"
55 "image/color"
66
7− "github.com/charmbracelet/glamour/v2"
8− "github.com/charmbracelet/glamour/v2/ansi"
7+ "charm.land/glamour/v2"
8+ "charm.land/glamour/v2/ansi"
99)
1010
1111// lipglossColorToHex converts a color.Color to hex string
internal/tui/styles/theme.go+1−1
@@ -10,9 +10,9 @@ import (
1010 "charm.land/bubbles/v2/textarea"
1111 "charm.land/bubbles/v2/textinput"
1212 tea "charm.land/bubbletea/v2"
13+ "charm.land/glamour/v2/ansi"
1314 "charm.land/lipgloss/v2"
1415 "github.com/charmbracelet/crush/internal/tui/exp/diffview"
15− "github.com/charmbracelet/glamour/v2/ansi"
1616 "github.com/charmbracelet/x/exp/charmtone"
1717 "github.com/lucasb-eyer/go-colorful"
1818 "github.com/rivo/uniseg"